v2.5.7: Reservation overhaul, Day Detail Panel, i18n, paste support, auto dark mode

BREAKING: Reservations have been completely rebuilt. Existing place-level reservations are no longer used. All reservations must be re-created via the Bookings tab. Your trips, places, and other data are unaffected. Reservation System (rebuilt from scratch): - Reservations now link to specific day assignments instead of places - Same place on different days can have independent reservations - New assignment picker in booking modal (grouped by day, searchable) - Removed day/place dropdowns from booking form - Reservation badges in day plan sidebar with type-specific icons - Reservation details in place inspector (only for selected assignment) - Reservation summary in day detail panel Day Detail Panel (new): - Opens on day click in the sidebar - Detailed weather: hourly forecast, precipitation, wind, sunrise/sunset - Historical climate averages for dates beyond 16 days - Accommodation management with check-in/check-out, confirmation number - Hotel assignment across multiple days with day range picker - Reservation overview for the day Places: - Places can now be assigned to the same day multiple times - Start time + end time fields (replaces single time field) - Map badges show multiple position numbers (e.g. "1 · 4") - Route optimization fixed for duplicate places - File attachments during place editing (not just creation) - Cover image upload during trip creation (not just editing) - Paste support (Ctrl+V) for images in trip, place, and file forms Internationalization: - 200+ hardcoded German strings translated to i18n (EN + DE) - Server error messages in English - Category seeds in English for new installations - All planner, register, photo, packing components translated UI/UX: - Auto dark mode (follows system preference, configurable in settings) - Navbar toggle switches light/dark (overrides auto) - Sidebar minimize buttons z-index fixed - Transport mode selector removed from day plan - CustomSelect supports grouped headers (isHeader option) - Optimistic updates for day notes (instant feedback) - Booking cards redesigned with type-colored headers and structured details Weather: - Wind speed in mph when using Fahrenheit setting - Weather description language matches app language Admin: - Weather info panel replaces OpenWeatherMap key input - "Recommended" badge styling updated
v2.5.6: Open-Meteo weather, WebSocket fixes, admin improvements
2026-06-21 06:11:45 +00:00 · 2026-03-24 20:10:45 +01:00 · 2026-03-24 10:02:03 +01:00 · 2026-03-23 21:11:20 +01:00 · 2026-03-23 20:47:39 +01:00 · 2026-03-23 20:46:20 +01:00
114 changed files with 13316 additions and 1845 deletions
@@ -4,6 +4,9 @@ node_modules/
 # Build output
 client/dist/

+# Generated PWA icons (built from SVG via prebuild)
+client/public/icons/*.png
+
 # Database
 *.db
 *.db-shm
@@ -11,9 +11,11 @@ FROM node:22-alpine

 WORKDIR /app

-# Server-Dependencies installieren
+# Server-Dependencies installieren (better-sqlite3 braucht Build-Tools)
 COPY server/package*.json ./
-RUN npm ci --production
+RUN apk add --no-cache python3 make g++ && \
+    npm ci --production && \
+    apk del python3 make g++

 # Server-Code kopieren
 COPY server/ ./
@@ -33,4 +35,4 @@ ENV PORT=3000

 EXPOSE 3000

-CMD ["node", "--experimental-sqlite", "src/index.js"]
+CMD ["node", "src/index.js"]
@@ -1,17 +1,28 @@
-# NOMAD
+<p align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="client/public/logo-light.svg" />
+    <source media="(prefers-color-scheme: light)" srcset="client/public/logo-dark.svg" />
+    <img src="client/public/logo-light.svg" alt="NOMAD" height="60" />
+  </picture>
+  <br />
+  <em>Navigation Organizer for Maps, Activities & Destinations</em>
+</p>

-**Navigation Organizer for Maps, Activities & Destinations**
+<p align="center">
+  <a href="LICENSE"><img src="https://img.shields.io/badge/License-AGPL_v3-blue.svg" alt="License: AGPL v3" /></a>
+  <a href="https://hub.docker.com/r/mauriceboe/nomad"><img src="https://img.shields.io/docker/pulls/mauriceboe/nomad" alt="Docker Pulls" /></a>
+  <a href="https://github.com/mauriceboe/NOMAD"><img src="https://img.shields.io/github/stars/mauriceboe/NOMAD" alt="GitHub Stars" /></a>
+  <a href="https://github.com/mauriceboe/NOMAD/commits"><img src="https://img.shields.io/github/last-commit/mauriceboe/NOMAD" alt="Last Commit" /></a>
+</p>

-A self-hosted, real-time collaborative travel planner for organizing trips with interactive maps, budgets, packing lists, and more.
-
-[![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/mauriceboe/nomad)](https://hub.docker.com/r/mauriceboe/nomad)
-[![GitHub Stars](https://img.shields.io/github/stars/mauriceboe/NOMAD)](https://github.com/mauriceboe/NOMAD)
-[![Last Commit](https://img.shields.io/github/last-commit/mauriceboe/NOMAD)](https://github.com/mauriceboe/NOMAD/commits)
-
-**[Live Demo](https://demo-nomad.pakulat.org)** — Try NOMAD without installing. Resets hourly.
+<p align="center">
+  A self-hosted, real-time collaborative travel planner with interactive maps, budgets, packing lists, and more.
+  <br />
+  <strong><a href="https://demo-nomad.pakulat.org">Live Demo</a></strong> — Try NOMAD without installing. Resets hourly.
+</p>

 ![NOMAD Screenshot](docs/screenshot.png)
+![NOMAD Screenshot 2](docs/screenshot-2.png)

 <details>
 <summary>More Screenshots</summary>
@@ -19,43 +30,61 @@ A self-hosted, real-time collaborative travel planner for organizing trips with
 | | |
 |---|---|
 | ![Plan Detail](docs/screenshot-plan-detail.png) | ![Bookings](docs/screenshot-bookings.png) |
-| ![Packing List](docs/screenshot-packing.png) | ![Budget](docs/screenshot-budget.png) |
+| ![Budget](docs/screenshot-budget.png) | ![Packing List](docs/screenshot-packing.png) |
 | ![Files](docs/screenshot-files.png) | |

 </details>

 ## Features

- **Real-Time Collaboration** — Plan together via WebSocket live sync — changes appear instantly across all connected users
- **Interactive Map** — Leaflet map with marker clustering, route visualization, and customizable tile sources
- **Place Search** — Search via Google Places (with photos, ratings, opening hours) or OpenStreetMap (free, no API key needed)
- **Single Sign-On (OIDC)** — Login with Google, Apple, Authentik, Keycloak, or any OIDC provider
+### Trip Planning
 - **Drag & Drop Planner** — Organize places into day plans with reordering and cross-day moves
- **Weather Forecasts** — Current weather and 5-day forecasts with smart caching (requires API key)
+- **Interactive Map** — Leaflet map with photo markers, clustering, route visualization, and customizable tile sources
+- **Place Search** — Search via Google Places (with photos, ratings, opening hours) or OpenStreetMap (free, no API key needed)
+- **Day Notes** — Add timestamped, icon-tagged notes to individual days with drag & drop reordering
+- **Route Optimization** — Auto-optimize place order and export to Google Maps
+- **Weather Forecasts** — 16-day forecasts via Open-Meteo (no API key needed) with historical climate averages as fallback
+
+### Travel Management
+- **Reservations & Bookings** — Track flights, hotels, restaurants with status, confirmation numbers, and file attachments
 - **Budget Tracking** — Category-based expenses with pie chart, per-person/per-day splitting, and multi-currency support
 - **Packing Lists** — Categorized checklists with progress tracking, color coding, and smart suggestions
- **Reservations & Bookings** — Track flights, hotels, restaurants with status, confirmation numbers, and file attachments
 - **Document Manager** — Attach documents, tickets, and PDFs to trips, places, or reservations (up to 50 MB per file)
- **PDF Export** — Export complete trip plans as PDF with images and notes
+- **PDF Export** — Export complete trip plans as PDF with cover page, images, notes, and NOMAD branding
+
+### Mobile & PWA
+- **Progressive Web App** — Install on iOS and Android directly from the browser, no App Store needed
+- **Offline Support** — Service Worker caches map tiles, API data, uploads, and static assets via Workbox
+- **Native App Feel** — Fullscreen standalone mode, custom app icon, themed status bar, and splash screen
+- **Touch Optimized** — Responsive design with mobile-specific layouts, touch-friendly controls, and safe area handling
+
+### Collaboration
+- **Real-Time Sync** — Plan together via WebSocket — changes appear instantly across all connected users
 - **Multi-User** — Invite members to collaborate on shared trips with role-based access
- **Admin Panel** — User management, create users, global categories, API key configuration, and backups
- **Auto-Backups** — Scheduled backups with configurable interval and retention
- **Route Optimization** — Auto-optimize place order and export to Google Maps
- **Day Notes** — Add timestamped notes to individual days
- **Dark Mode** — Full light and dark theme support
+- **Single Sign-On (OIDC)** — Login with Google, Apple, Authentik, Keycloak, or any OIDC provider
+
+### Addons (modular, admin-toggleable)
+- **Vacay** — Personal vacation day planner with calendar view, public holidays (100+ countries), company holidays, user fusion with live sync, and carry-over tracking
+- **Atlas** — Interactive world map with visited countries, travel stats, continent breakdown, streak tracking, and liquid glass UI effects
+- **Dashboard Widgets** — Currency converter and timezone clock, toggleable per user
+
+### Customization & Admin
+- **Dark Mode** — Full light and dark theme with dynamic status bar color matching
 - **Multilingual** — English and German (i18n)
- **Mobile Friendly** — Responsive design with touch-optimized controls
+- **Admin Panel** — User management, global categories, addon management, API keys, backups, and GitHub release history
+- **Auto-Backups** — Scheduled backups with configurable interval and retention
 - **Customizable** — Temperature units, time format (12h/24h), map tile sources, default coordinates

 ## Tech Stack

- **Backend**: Node.js 22 + Express + SQLite (`node:sqlite`)
+- **Backend**: Node.js 22 + Express + SQLite (`better-sqlite3`)
 - **Frontend**: React 18 + Vite + Tailwind CSS
+- **PWA**: vite-plugin-pwa + Workbox
 - **Real-Time**: WebSocket (`ws`)
 - **State**: Zustand
- **Auth**: JWT
+- **Auth**: JWT + OIDC
 - **Maps**: Leaflet + react-leaflet-cluster + Google Places API (optional)
- **Weather**: OpenWeatherMap API (optional)
+- **Weather**: Open-Meteo API (free, no key required)
 - **Icons**: lucide-react

 ## Quick Start
@@ -66,6 +95,15 @@ docker run -d -p 3000:3000 -v ./data:/app/data -v ./uploads:/app/uploads maurice

 The app runs on port `3000`. The first user to register becomes the admin.

+### Install as App (PWA)
+
+NOMAD works as a Progressive Web App — no App Store needed:
+
+1. Open your NOMAD instance in the browser (HTTPS required)
+2. **iOS**: Share button → "Add to Home Screen"
+3. **Android**: Menu → "Install app" or "Add to Home Screen"
+4. NOMAD launches fullscreen with its own icon, just like a native app
+
 <details>
 <summary>Docker Compose (recommended for production)</summary>

@@ -2,9 +2,25 @@
 <html lang="de">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23111827' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'><path d='M17.8 19.2 16 11l3.5-3.5C21 6 21 4 19 2c-2-2-4-2-5.5-.5L10 5 1.8 6.2c-.5.1-.9.6-.6 1.1l1.9 2.9 2.5-.9 4-4 2.7 2.7-4 4 .9 2.5 2.9 1.9c.5.3 1 0 1.1-.5z'/></svg>" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
    <title>NOMAD</title>
+
+    <!-- PWA / iOS -->
+    <meta name="theme-color" content="#09090b" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="default" />
+    <meta name="apple-mobile-web-app-title" content="NOMAD" />
+    <link rel="apple-touch-icon" href="/icons/apple-touch-icon-180x180.png" />
+
+    <!-- Favicon -->
+    <link rel="icon" type="image/svg+xml" href="/icons/icon-dark.svg" />
+
+    <!-- Fonts -->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=MuseoModerno:wght@400;700;800&display=swap" rel="stylesheet" />
+
+    <!-- Leaflet -->
    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
  </head>
  <body>
@@ -1,10 +1,11 @@
 {
  "name": "nomad-client",
-  "version": "2.0.0",
+  "version": "2.5.7",
  "private": true,
  "type": "module",
  "scripts": {
    "dev": "vite",
+    "prebuild": "node scripts/generate-icons.mjs",
    "build": "vite build",
    "preview": "vite preview"
  },
@@ -30,7 +31,9 @@
    "@vitejs/plugin-react": "^4.2.1",
    "autoprefixer": "^10.4.18",
    "postcss": "^8.4.35",
+    "sharp": "^0.33.0",
    "tailwindcss": "^3.4.1",
-    "vite": "^5.1.4"
+    "vite": "^5.1.4",
+    "vite-plugin-pwa": "^0.21.0"
  }
 }
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="2000" zoomAndPan="magnify" viewBox="0 0 1500 1499.999933" height="2000" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="a5b4275efd"><path d="M 45 5.265625 L 1455 5.265625 L 1455 1494.765625 L 45 1494.765625 Z M 45 5.265625 " clip-rule="nonzero"/></clipPath><clipPath id="61932b752f"><path d="M 855.636719 699.203125 L 222.246094 699.203125 C 197.679688 699.203125 179.90625 675.753906 186.539062 652.101562 L 360.429688 32.390625 C 364.921875 16.386719 379.511719 5.328125 396.132812 5.328125 L 1029.527344 5.328125 C 1054.089844 5.328125 1071.867188 28.777344 1065.230469 52.429688 L 891.339844 672.136719 C 886.851562 688.140625 872.257812 699.203125 855.636719 699.203125 Z M 444.238281 1166.980469 L 533.773438 847.898438 C 540.410156 824.246094 522.632812 800.796875 498.070312 800.796875 L 172.472656 800.796875 C 155.851562 800.796875 141.261719 811.855469 136.769531 827.859375 L 47.234375 1146.941406 C 40.597656 1170.59375 58.375 1194.042969 82.9375 1194.042969 L 408.535156 1194.042969 C 425.15625 1194.042969 439.75 1182.984375 444.238281 1166.980469 Z M 609.003906 827.859375 L 435.113281 1447.570312 C 428.476562 1471.21875 446.253906 1494.671875 470.816406 1494.671875 L 1104.210938 1494.671875 C 1120.832031 1494.671875 1135.421875 1483.609375 1139.914062 1467.605469 L 1313.804688 847.898438 C 1320.441406 824.246094 1302.664062 800.796875 1278.101562 800.796875 L 644.707031 800.796875 C 628.085938 800.796875 613.492188 811.855469 609.003906 827.859375 Z M 1056.105469 333.019531 L 966.570312 652.101562 C 959.933594 675.753906 977.710938 699.203125 1002.273438 699.203125 L 1327.871094 699.203125 C 1344.492188 699.203125 1359.085938 688.140625 1363.574219 672.136719 L 1453.109375 353.054688 C 1459.746094 329.40625 1441.96875 305.953125 1417.40625 305.953125 L 1091.808594 305.953125 C 1075.1875 305.953125 1060.597656 317.015625 1056.105469 333.019531 Z M 1056.105469 333.019531 " clip-rule="nonzero"/></clipPath></defs><g clip-path="url(#a5b4275efd)"><g clip-path="url(#61932b752f)"><path fill="#000000" d="M 40.597656 5.328125 L 40.597656 1494.671875 L 1459.472656 1494.671875 L 1459.472656 5.328125 Z M 40.597656 5.328125 " fill-opacity="1" fill-rule="nonzero"/></g></g></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="2000" zoomAndPan="magnify" viewBox="0 0 1500 1499.999933" height="2000" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="ff6253e8fa"><path d="M 45 5.265625 L 1455 5.265625 L 1455 1494.765625 L 45 1494.765625 Z M 45 5.265625 " clip-rule="nonzero"/></clipPath><clipPath id="c6b14a8188"><path d="M 855.636719 699.203125 L 222.246094 699.203125 C 197.679688 699.203125 179.90625 675.75 186.539062 652.101562 L 360.429688 32.390625 C 364.921875 16.386719 379.511719 5.328125 396.132812 5.328125 L 1029.527344 5.328125 C 1054.089844 5.328125 1071.867188 28.777344 1065.230469 52.429688 L 891.339844 672.136719 C 886.851562 688.140625 872.257812 699.203125 855.636719 699.203125 Z M 444.238281 1166.980469 L 533.773438 847.898438 C 540.410156 824.246094 522.632812 800.796875 498.070312 800.796875 L 172.472656 800.796875 C 155.851562 800.796875 141.261719 811.855469 136.769531 827.859375 L 47.234375 1146.941406 C 40.597656 1170.59375 58.375 1194.042969 82.9375 1194.042969 L 408.535156 1194.042969 C 425.15625 1194.042969 439.75 1182.984375 444.238281 1166.980469 Z M 609.003906 827.859375 L 435.113281 1447.570312 C 428.476562 1471.21875 446.253906 1494.671875 470.816406 1494.671875 L 1104.210938 1494.671875 C 1120.832031 1494.671875 1135.421875 1483.609375 1139.914062 1467.605469 L 1313.804688 847.898438 C 1320.441406 824.246094 1302.664062 800.796875 1278.101562 800.796875 L 644.707031 800.796875 C 628.085938 800.796875 613.492188 811.855469 609.003906 827.859375 Z M 1056.105469 333.019531 L 966.570312 652.101562 C 959.933594 675.75 977.710938 699.203125 1002.273438 699.203125 L 1327.871094 699.203125 C 1344.492188 699.203125 1359.085938 688.140625 1363.574219 672.136719 L 1453.109375 353.054688 C 1459.746094 329.40625 1441.96875 305.953125 1417.40625 305.953125 L 1091.808594 305.953125 C 1075.1875 305.953125 1060.597656 317.015625 1056.105469 333.019531 Z M 1056.105469 333.019531 " clip-rule="nonzero"/></clipPath></defs><g clip-path="url(#ff6253e8fa)"><g clip-path="url(#c6b14a8188)"><path fill="#ffffff" d="M 40.597656 5.328125 L 40.597656 1494.671875 L 1459.472656 1494.671875 L 1459.472656 5.328125 Z M 40.597656 5.328125 " fill-opacity="1" fill-rule="nonzero"/></g></g></svg>
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+  <defs>
+    <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#1e293b"/>
+      <stop offset="100%" stop-color="#0f172a"/>
+    </linearGradient>
+    <clipPath id="icon">
+      <path d="M 855.636719 699.203125 L 222.246094 699.203125 C 197.679688 699.203125 179.90625 675.75 186.539062 652.101562 L 360.429688 32.390625 C 364.921875 16.386719 379.511719 5.328125 396.132812 5.328125 L 1029.527344 5.328125 C 1054.089844 5.328125 1071.867188 28.777344 1065.230469 52.429688 L 891.339844 672.136719 C 886.851562 688.140625 872.257812 699.203125 855.636719 699.203125 Z M 444.238281 1166.980469 L 533.773438 847.898438 C 540.410156 824.246094 522.632812 800.796875 498.070312 800.796875 L 172.472656 800.796875 C 155.851562 800.796875 141.261719 811.855469 136.769531 827.859375 L 47.234375 1146.941406 C 40.597656 1170.59375 58.375 1194.042969 82.9375 1194.042969 L 408.535156 1194.042969 C 425.15625 1194.042969 439.75 1182.984375 444.238281 1166.980469 Z M 609.003906 827.859375 L 435.113281 1447.570312 C 428.476562 1471.21875 446.253906 1494.671875 470.816406 1494.671875 L 1104.210938 1494.671875 C 1120.832031 1494.671875 1135.421875 1483.609375 1139.914062 1467.605469 L 1313.804688 847.898438 C 1320.441406 824.246094 1302.664062 800.796875 1278.101562 800.796875 L 644.707031 800.796875 C 628.085938 800.796875 613.492188 811.855469 609.003906 827.859375 Z M 1056.105469 333.019531 L 966.570312 652.101562 C 959.933594 675.75 977.710938 699.203125 1002.273438 699.203125 L 1327.871094 699.203125 C 1344.492188 699.203125 1359.085938 688.140625 1363.574219 672.136719 L 1453.109375 353.054688 C 1459.746094 329.40625 1441.96875 305.953125 1417.40625 305.953125 L 1091.808594 305.953125 C 1075.1875 305.953125 1060.597656 317.015625 1056.105469 333.019531 Z"/>
+    </clipPath>
+  </defs>
+  <rect width="512" height="512" fill="url(#bg)"/>
+  <g transform="translate(56,51) scale(0.267)">
+    <rect width="1500" height="1500" fill="#ffffff" clip-path="url(#icon)"/>
+  </g>
+</svg>
@@ -0,0 +1,29 @@
+/**
+ * Generates PNG icons for PWA from the master SVG icon.
+ * Run: node scripts/generate-icons.mjs
+ * Called automatically via the "prebuild" npm script.
+ */
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import sharp from 'sharp';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const iconsDir = join(__dirname, '..', 'public', 'icons');
+const svgBuffer = readFileSync(join(iconsDir, 'icon.svg'));
+
+const sizes = [
+  { name: 'apple-touch-icon-180x180.png', size: 180 },
+  { name: 'icon-192x192.png', size: 192 },
+  { name: 'icon-512x512.png', size: 512 },
+];
+
+for (const { name, size } of sizes) {
+  await sharp(svgBuffer, { density: 300 })
+    .resize(size, size)
+    .png({ compressionLevel: 9 })
+    .toFile(join(iconsDir, name));
+  console.log(`  \u2713 ${name} (${size}x${size})`);
+}
+
+console.log('PWA icons generated.');
@@ -10,20 +10,23 @@ import TripPlannerPage from './pages/TripPlannerPage'
 import FilesPage from './pages/FilesPage'
 import AdminPage from './pages/AdminPage'
 import SettingsPage from './pages/SettingsPage'
+import VacayPage from './pages/VacayPage'
+import AtlasPage from './pages/AtlasPage'
 import { ToastContainer } from './components/shared/Toast'
-import { TranslationProvider } from './i18n'
+import { TranslationProvider, useTranslation } from './i18n'
 import DemoBanner from './components/Layout/DemoBanner'
 import { authApi } from './api/client'

 function ProtectedRoute({ children, adminRequired = false }) {
  const { isAuthenticated, user, isLoading } = useAuthStore()
+  const { t } = useTranslation()

  if (isLoading) {
    return (
      <div className="min-h-screen flex items-center justify-center bg-slate-50">
        <div className="flex flex-col items-center gap-3">
          <div className="w-10 h-10 border-4 border-slate-200 border-t-slate-900 rounded-full animate-spin"></div>
-          <p className="text-slate-500 text-sm">Wird geladen...</p>
+          <p className="text-slate-500 text-sm">{t('common.loading')}</p>
        </div>
      </div>
    )
@@ -33,7 +36,7 @@ function ProtectedRoute({ children, adminRequired = false }) {
    return <Navigate to="/login" replace />
  }

-  if (adminRequired && user?.role !== 'admin') {
+  if (adminRequired && user && user.role !== 'admin') {
    return <Navigate to="/dashboard" replace />
  }

@@ -76,13 +79,24 @@ export default function App() {
    }
  }, [isAuthenticated])

-  // Apply dark mode class to <html>
+  // Apply dark mode class to <html> + update PWA theme-color
  useEffect(() => {
-    if (settings.dark_mode) {
-      document.documentElement.classList.add('dark')
-    } else {
-      document.documentElement.classList.remove('dark')
+    const mode = settings.dark_mode
+    const applyDark = (isDark) => {
+      document.documentElement.classList.toggle('dark', isDark)
+      const meta = document.querySelector('meta[name="theme-color"]')
+      if (meta) meta.setAttribute('content', isDark ? '#09090b' : '#ffffff')
    }
+
+    if (mode === 'auto') {
+      const mq = window.matchMedia('(prefers-color-scheme: dark)')
+      applyDark(mq.matches)
+      const handler = (e) => applyDark(e.matches)
+      mq.addEventListener('change', handler)
+      return () => mq.removeEventListener('change', handler)
+    }
+    // Support legacy boolean + new string values
+    applyDark(mode === true || mode === 'dark')
  }, [settings.dark_mode])

  return (
@@ -132,6 +146,22 @@ export default function App() {
            </ProtectedRoute>
          }
        />
+        <Route
+          path="/vacay"
+          element={
+            <ProtectedRoute>
+              <VacayPage />
+            </ProtectedRoute>
+          }
+        />
+        <Route
+          path="/atlas"
+          element={
+            <ProtectedRoute>
+              <AtlasPage />
+            </ProtectedRoute>
+          }
+        />
        <Route path="*" element={<Navigate to="/" replace />} />
      </Routes>
    </TranslationProvider>
@@ -94,6 +94,7 @@ export const assignmentsApi = {
  delete: (tripId, dayId, id) => apiClient.delete(`/trips/${tripId}/days/${dayId}/assignments/${id}`).then(r => r.data),
  reorder: (tripId, dayId, orderedIds) => apiClient.put(`/trips/${tripId}/days/${dayId}/assignments/reorder`, { orderedIds }).then(r => r.data),
  move: (tripId, assignmentId, newDayId, orderIndex) => apiClient.put(`/trips/${tripId}/assignments/${assignmentId}/move`, { new_day_id: newDayId, order_index: orderIndex }).then(r => r.data),
+  update: (tripId, dayId, id, data) => apiClient.put(`/trips/${tripId}/days/${dayId}/assignments/${id}`, data).then(r => r.data),
 }

 export const packingApi = {
@@ -127,6 +128,14 @@ export const adminApi = {
  saveDemoBaseline: () => apiClient.post('/admin/save-demo-baseline').then(r => r.data),
  getOidc: () => apiClient.get('/admin/oidc').then(r => r.data),
  updateOidc: (data) => apiClient.put('/admin/oidc', data).then(r => r.data),
+  addons: () => apiClient.get('/admin/addons').then(r => r.data),
+  updateAddon: (id, data) => apiClient.put(`/admin/addons/${id}`, data).then(r => r.data),
+  checkVersion: () => apiClient.get('/admin/version-check').then(r => r.data),
+  installUpdate: () => apiClient.post('/admin/update', {}, { timeout: 300000 }).then(r => r.data),
+}
+
+export const addonsApi = {
+  enabled: () => apiClient.get('/addons').then(r => r.data),
 }

 export const mapsApi = {
@@ -159,7 +168,8 @@ export const reservationsApi = {
 }

 export const weatherApi = {
-  get: (lat, lng, date) => apiClient.get('/weather', { params: { lat, lng, date, units: 'metric' } }).then(r => r.data),
+  get: (lat, lng, date) => apiClient.get('/weather', { params: { lat, lng, date } }).then(r => r.data),
+  getDetailed: (lat, lng, date, lang) => apiClient.get('/weather/detailed', { params: { lat, lng, date, lang } }).then(r => r.data),
 }

 export const settingsApi = {
@@ -168,6 +178,13 @@ export const settingsApi = {
  setBulk: (settings) => apiClient.post('/settings/bulk', { settings }).then(r => r.data),
 }

+export const accommodationsApi = {
+  list: (tripId) => apiClient.get(`/trips/${tripId}/accommodations`).then(r => r.data),
+  create: (tripId, data) => apiClient.post(`/trips/${tripId}/accommodations`, data).then(r => r.data),
+  update: (tripId, id, data) => apiClient.put(`/trips/${tripId}/accommodations/${id}`, data).then(r => r.data),
+  delete: (tripId, id) => apiClient.delete(`/trips/${tripId}/accommodations/${id}`).then(r => r.data),
+}
+
 export const dayNotesApi = {
  list: (tripId, dayId) => apiClient.get(`/trips/${tripId}/days/${dayId}/notes`).then(r => r.data),
  create: (tripId, dayId, data) => apiClient.post(`/trips/${tripId}/days/${dayId}/notes`, data).then(r => r.data),
@@ -183,7 +200,7 @@ export const backupApi = {
    const res = await fetch(`/api/backup/download/${filename}`, {
      headers: { Authorization: `Bearer ${token}` },
    })
-    if (!res.ok) throw new Error('Download fehlgeschlagen')
+    if (!res.ok) throw new Error('Download failed')
    const blob = await res.blob()
    const url = URL.createObjectURL(blob)
    const a = document.createElement('a')
@@ -29,10 +29,8 @@ function handleMessage(event) {
    // Store our socket ID from welcome message
    if (parsed.type === 'welcome') {
      mySocketId = parsed.socketId
-      console.log('[WS] Got socketId:', mySocketId)
      return
    }
-    console.log('[WS] Received:', parsed.type, parsed)
    listeners.forEach(fn => {
      try { fn(parsed) } catch (err) { console.error('WebSocket listener error:', err) }
    })
@@ -61,14 +59,14 @@ function connectInternal(token, isReconnect = false) {
  socket = new WebSocket(url)

  socket.onopen = () => {
-    console.log('[WS] Connected', isReconnect ? '(reconnect)' : '(initial)')
+    // connection established
    reconnectDelay = 1000
    // Join active trips on any connect (initial or reconnect)
    if (activeTrips.size > 0) {
      activeTrips.forEach(tripId => {
        if (socket && socket.readyState === WebSocket.OPEN) {
          socket.send(JSON.stringify({ type: 'join', tripId }))
-          console.log('[WS] Joined trip', tripId)
+          // joined trip room
        }
      })
      // Refetch trip data for active trips
@@ -0,0 +1,163 @@
+import React, { useEffect, useState } from 'react'
+import { adminApi } from '../../api/client'
+import { useTranslation } from '../../i18n'
+import { useSettingsStore } from '../../store/settingsStore'
+import { useToast } from '../shared/Toast'
+import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase } from 'lucide-react'
+
+const ICON_MAP = {
+  ListChecks, Wallet, FileText, CalendarDays, Puzzle, Globe, Briefcase,
+}
+
+function AddonIcon({ name, size = 20 }) {
+  const Icon = ICON_MAP[name] || Puzzle
+  return <Icon size={size} />
+}
+
+export default function AddonManager() {
+  const { t } = useTranslation()
+  const dm = useSettingsStore(s => s.settings.dark_mode)
+  const dark = dm === true || dm === 'dark' || (dm === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  const toast = useToast()
+  const [addons, setAddons] = useState([])
+  const [loading, setLoading] = useState(true)
+
+  useEffect(() => {
+    loadAddons()
+  }, [])
+
+  const loadAddons = async () => {
+    setLoading(true)
+    try {
+      const data = await adminApi.addons()
+      setAddons(data.addons)
+    } catch (err) {
+      toast.error(t('admin.addons.toast.error'))
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const handleToggle = async (addon) => {
+    const newEnabled = !addon.enabled
+    // Optimistic update
+    setAddons(prev => prev.map(a => a.id === addon.id ? { ...a, enabled: newEnabled } : a))
+    try {
+      await adminApi.updateAddon(addon.id, { enabled: newEnabled })
+      window.dispatchEvent(new Event('addons-changed'))
+      toast.success(t('admin.addons.toast.updated'))
+    } catch (err) {
+      // Rollback
+      setAddons(prev => prev.map(a => a.id === addon.id ? { ...a, enabled: !newEnabled } : a))
+      toast.error(t('admin.addons.toast.error'))
+    }
+  }
+
+  const tripAddons = addons.filter(a => a.type === 'trip')
+  const globalAddons = addons.filter(a => a.type === 'global')
+
+  if (loading) {
+    return (
+      <div className="p-8 text-center">
+        <div className="w-8 h-8 border-2 border-slate-200 border-t-slate-900 rounded-full animate-spin mx-auto" style={{ borderTopColor: 'var(--text-primary)' }}></div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Header */}
+      <div className="rounded-xl border overflow-hidden" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+        <div className="px-6 py-4 border-b" style={{ borderColor: 'var(--border-secondary)' }}>
+          <h2 className="font-semibold" style={{ color: 'var(--text-primary)' }}>{t('admin.addons.title')}</h2>
+          <p className="text-xs mt-1" style={{ color: 'var(--text-muted)', display: 'flex', alignItems: 'center', gap: 4, flexWrap: 'wrap' }}>
+            {t('admin.addons.subtitleBefore')}<img src={dark ? '/text-light.svg' : '/text-dark.svg'} alt="NOMAD" style={{ height: 11, display: 'inline', verticalAlign: 'middle', opacity: 0.7 }} />{t('admin.addons.subtitleAfter')}
+          </p>
+        </div>
+
+        {addons.length === 0 ? (
+          <div className="p-8 text-center text-sm" style={{ color: 'var(--text-faint)' }}>
+            {t('admin.addons.noAddons')}
+          </div>
+        ) : (
+          <div>
+            {/* Trip Addons */}
+            {tripAddons.length > 0 && (
+              <div>
+                <div className="px-6 py-2.5 border-b flex items-center gap-2" style={{ background: 'var(--bg-secondary)', borderColor: 'var(--border-secondary)' }}>
+                  <Briefcase size={13} style={{ color: 'var(--text-muted)' }} />
+                  <span className="text-xs font-medium uppercase tracking-wider" style={{ color: 'var(--text-muted)' }}>
+                    {t('admin.addons.type.trip')} — {t('admin.addons.tripHint')}
+                  </span>
+                </div>
+                {tripAddons.map(addon => (
+                  <AddonRow key={addon.id} addon={addon} onToggle={handleToggle} t={t} />
+                ))}
+              </div>
+            )}
+
+            {/* Global Addons */}
+            {globalAddons.length > 0 && (
+              <div>
+                <div className="px-6 py-2.5 border-b border-t flex items-center gap-2" style={{ background: 'var(--bg-secondary)', borderColor: 'var(--border-secondary)' }}>
+                  <Globe size={13} style={{ color: 'var(--text-muted)' }} />
+                  <span className="text-xs font-medium uppercase tracking-wider" style={{ color: 'var(--text-muted)' }}>
+                    {t('admin.addons.type.global')} — {t('admin.addons.globalHint')}
+                  </span>
+                </div>
+                {globalAddons.map(addon => (
+                  <AddonRow key={addon.id} addon={addon} onToggle={handleToggle} t={t} />
+                ))}
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+function AddonRow({ addon, onToggle, t }) {
+  return (
+    <div className="flex items-center gap-4 px-6 py-4 border-b transition-colors hover:opacity-95" style={{ borderColor: 'var(--border-secondary)' }}>
+      {/* Icon */}
+      <div className="w-10 h-10 rounded-xl flex items-center justify-center shrink-0" style={{ background: 'var(--bg-secondary)', color: 'var(--text-primary)' }}>
+        <AddonIcon name={addon.icon} size={20} />
+      </div>
+
+      {/* Info */}
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center gap-2">
+          <span className="text-sm font-semibold" style={{ color: 'var(--text-primary)' }}>{addon.name}</span>
+          <span className="text-[10px] font-medium px-1.5 py-0.5 rounded-full" style={{
+            background: addon.type === 'global' ? 'var(--bg-secondary)' : 'var(--bg-secondary)',
+            color: 'var(--text-muted)',
+          }}>
+            {addon.type === 'global' ? t('admin.addons.type.global') : t('admin.addons.type.trip')}
+          </span>
+        </div>
+        <p className="text-xs mt-0.5" style={{ color: 'var(--text-muted)' }}>{addon.description}</p>
+      </div>
+
+      {/* Toggle */}
+      <div className="flex items-center gap-2 shrink-0">
+        <span className="text-xs font-medium" style={{ color: addon.enabled ? 'var(--text-primary)' : 'var(--text-faint)' }}>
+          {addon.enabled ? t('admin.addons.enabled') : t('admin.addons.disabled')}
+        </span>
+        <button
+          onClick={() => onToggle(addon)}
+          className="relative inline-flex h-6 w-11 items-center rounded-full transition-colors"
+          style={{ background: addon.enabled ? 'var(--text-primary)' : 'var(--border-primary)' }}
+        >
+          <span
+            className="inline-block h-4 w-4 transform rounded-full transition-transform"
+            style={{
+              background: addon.enabled ? 'var(--bg-card)' : 'var(--bg-card)',
+              transform: addon.enabled ? 'translateX(22px)' : 'translateX(4px)',
+            }}
+          />
+        </button>
+      </div>
+    </div>
+  )
+}
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { backupApi } from '../../api/client'
 import { useToast } from '../shared/Toast'
-import { Download, Trash2, Plus, RefreshCw, RotateCcw, Upload, Clock, Check, HardDrive } from 'lucide-react'
+import { Download, Trash2, Plus, RefreshCw, RotateCcw, Upload, Clock, Check, HardDrive, AlertTriangle } from 'lucide-react'
 import { useTranslation } from '../../i18n'

 const INTERVAL_OPTIONS = [
@@ -29,9 +29,10 @@ export default function BackupPanel() {
  const [autoSettings, setAutoSettings] = useState({ enabled: false, interval: 'daily', keep_days: 7 })
  const [autoSettingsSaving, setAutoSettingsSaving] = useState(false)
  const [autoSettingsDirty, setAutoSettingsDirty] = useState(false)
+  const [restoreConfirm, setRestoreConfirm] = useState(null) // { type: 'file'|'upload', filename, file? }
  const fileInputRef = useRef(null)
  const toast = useToast()
-  const { t, locale } = useTranslation()
+  const { t, language, locale } = useTranslation()

  const loadBackups = async () => {
    setIsLoading(true)
@@ -67,32 +68,42 @@ export default function BackupPanel() {
    }
  }

-  const handleRestore = async (filename) => {
-    if (!confirm(t('backup.confirm.restore', { name: filename }))) return
-    setRestoringFile(filename)
-    try {
-      await backupApi.restore(filename)
-      toast.success(t('backup.toast.restored'))
-      setTimeout(() => window.location.reload(), 1500)
-    } catch (err) {
-      toast.error(err.response?.data?.error || t('backup.toast.restoreError'))
-      setRestoringFile(null)
-    }
+  const handleRestore = (filename) => {
+    setRestoreConfirm({ type: 'file', filename })
  }

-  const handleUploadRestore = async (e) => {
+  const handleUploadRestore = (e) => {
    const file = e.target.files?.[0]
    if (!file) return
    e.target.value = ''
-    if (!confirm(t('backup.confirm.uploadRestore', { name: file.name }))) return
-    setIsUploading(true)
-    try {
-      await backupApi.uploadRestore(file)
-      toast.success(t('backup.toast.restored'))
-      setTimeout(() => window.location.reload(), 1500)
-    } catch (err) {
-      toast.error(err.response?.data?.error || t('backup.toast.uploadError'))
-      setIsUploading(false)
+    setRestoreConfirm({ type: 'upload', filename: file.name, file })
+  }
+
+  const executeRestore = async () => {
+    if (!restoreConfirm) return
+    const { type, filename, file } = restoreConfirm
+    setRestoreConfirm(null)
+
+    if (type === 'file') {
+      setRestoringFile(filename)
+      try {
+        await backupApi.restore(filename)
+        toast.success(t('backup.toast.restored'))
+        setTimeout(() => window.location.reload(), 1500)
+      } catch (err) {
+        toast.error(err.response?.data?.error || t('backup.toast.restoreError'))
+        setRestoringFile(null)
+      }
+    } else {
+      setIsUploading(true)
+      try {
+        await backupApi.uploadRestore(file)
+        toast.success(t('backup.toast.restored'))
+        setTimeout(() => window.location.reload(), 1500)
+      } catch (err) {
+        toast.error(err.response?.data?.error || t('backup.toast.uploadError'))
+        setIsUploading(false)
+      }
    }
  }

@@ -153,8 +164,8 @@ export default function BackupPanel() {
          <div className="flex items-center gap-3">
            <HardDrive className="w-5 h-5 text-gray-400" />
            <div>
-              <h2 className="text-lg font-semibold text-gray-900">{t('backup.title')}</h2>
-              <p className="text-sm text-gray-500 mt-0.5">{t('backup.subtitle')}</p>
+              <h2 className="font-semibold" style={{ color: 'var(--text-primary)' }}>{t('backup.title')}</h2>
+              <p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>{t('backup.subtitle')}</p>
            </div>
          </div>
          <div className="flex items-center gap-2">
@@ -179,26 +190,28 @@ export default function BackupPanel() {
              onClick={() => fileInputRef.current?.click()}
              disabled={isUploading}
              className="flex items-center gap-2 border border-gray-200 text-gray-700 px-3 py-2 rounded-lg hover:bg-gray-50 text-sm font-medium disabled:opacity-60"
+              title={isUploading ? t('backup.uploading') : t('backup.upload')}
            >
              {isUploading ? (
                <div className="w-4 h-4 border-2 border-gray-400 border-t-transparent rounded-full animate-spin" />
              ) : (
                <Upload className="w-4 h-4" />
              )}
-              {isUploading ? t('backup.uploading') : t('backup.upload')}
+              <span className="hidden sm:inline">{isUploading ? t('backup.uploading') : t('backup.upload')}</span>
            </button>

            <button
              onClick={handleCreate}
              disabled={isCreating}
-              className="flex items-center gap-2 bg-slate-900 dark:bg-slate-100 text-white dark:text-slate-900 px-4 py-2 rounded-lg hover:bg-slate-900 text-sm font-medium disabled:opacity-60"
+              className="flex items-center gap-2 bg-slate-900 dark:bg-slate-100 text-white dark:text-slate-900 px-3 sm:px-4 py-2 rounded-lg hover:bg-slate-900 text-sm font-medium disabled:opacity-60"
+              title={isCreating ? t('backup.creating') : t('backup.create')}
            >
              {isCreating ? (
                <div className="w-4 h-4 border-2 border-white border-t-transparent rounded-full animate-spin" />
              ) : (
                <Plus className="w-4 h-4" />
              )}
-              {isCreating ? t('backup.creating') : t('backup.create')}
+              <span className="hidden sm:inline">{isCreating ? t('backup.creating') : t('backup.create')}</span>
            </button>
          </div>
        </div>
@@ -275,23 +288,23 @@ export default function BackupPanel() {
        <div className="flex items-center gap-3 mb-6">
          <Clock className="w-5 h-5 text-gray-400" />
          <div>
-            <h2 className="text-lg font-semibold text-gray-900">{t('backup.auto.title')}</h2>
-            <p className="text-sm text-gray-500 mt-0.5">{t('backup.auto.subtitle')}</p>
+            <h2 className="font-semibold" style={{ color: 'var(--text-primary)' }}>{t('backup.auto.title')}</h2>
+            <p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>{t('backup.auto.subtitle')}</p>
          </div>
        </div>

        <div className="flex flex-col gap-5">
          {/* Enable toggle */}
-          <label className="flex items-center justify-between cursor-pointer">
-            <div>
+          <label className="flex items-center justify-between gap-4 cursor-pointer">
+            <div className="min-w-0">
              <span className="text-sm font-medium text-gray-900">{t('backup.auto.enable')}</span>
              <p className="text-xs text-gray-500 mt-0.5">{t('backup.auto.enableHint')}</p>
            </div>
            <button
              onClick={() => handleAutoSettingsChange('enabled', !autoSettings.enabled)}
-              className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${autoSettings.enabled ? 'bg-slate-900 dark:bg-slate-100' : 'bg-gray-200 dark:bg-gray-600'}`}
+              className={`relative shrink-0 inline-flex h-6 w-11 items-center rounded-full transition-colors ${autoSettings.enabled ? 'bg-slate-900 dark:bg-slate-100' : 'bg-gray-200 dark:bg-gray-600'}`}
            >
-              <span className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${autoSettings.enabled ? 'translate-x-6' : 'translate-x-1'}`} />
+              <span className={`absolute left-1 h-4 w-4 rounded-full bg-white shadow transition-transform duration-200 ${autoSettings.enabled ? 'translate-x-5' : 'translate-x-0'}`} />
            </button>
          </label>

@@ -355,6 +368,67 @@ export default function BackupPanel() {
          </div>
        </div>
      </div>
+
+      {/* Restore Warning Modal */}
+      {restoreConfirm && (
+        <div
+          style={{ position: 'fixed', inset: 0, zIndex: 9999, background: 'rgba(0,0,0,0.5)', backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }}
+          onClick={() => setRestoreConfirm(null)}
+        >
+          <div
+            onClick={e => e.stopPropagation()}
+            style={{ width: '100%', maxWidth: 440, borderRadius: 16, overflow: 'hidden' }}
+            className="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700"
+          >
+            {/* Red header */}
+            <div style={{ background: 'linear-gradient(135deg, #dc2626, #b91c1c)', padding: '20px 24px', display: 'flex', alignItems: 'center', gap: 12 }}>
+              <div style={{ width: 40, height: 40, borderRadius: 10, background: 'rgba(255,255,255,0.2)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                <AlertTriangle size={20} style={{ color: 'white' }} />
+              </div>
+              <div>
+                <h3 style={{ margin: 0, fontSize: 16, fontWeight: 700, color: 'white' }}>
+                  {t('backup.restoreConfirmTitle')}
+                </h3>
+                <p style={{ margin: '2px 0 0', fontSize: 12, color: 'rgba(255,255,255,0.8)' }}>
+                  {restoreConfirm.filename}
+                </p>
+              </div>
+            </div>
+
+            {/* Body */}
+            <div style={{ padding: '20px 24px' }}>
+              <p className="text-gray-700 dark:text-gray-300" style={{ fontSize: 13, lineHeight: 1.6, margin: 0 }}>
+                {t('backup.restoreWarning')}
+              </p>
+
+              <div style={{ marginTop: 14, padding: '10px 12px', borderRadius: 10, fontSize: 12, lineHeight: 1.5 }}
+                className="bg-red-50 dark:bg-red-900/30 text-red-700 dark:text-red-300 border border-red-200 dark:border-red-800"
+              >
+                {t('backup.restoreTip')}
+              </div>
+            </div>
+
+            {/* Footer */}
+            <div style={{ padding: '0 24px 20px', display: 'flex', gap: 10, justifyContent: 'flex-end' }}>
+              <button
+                onClick={() => setRestoreConfirm(null)}
+                className="text-gray-600 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700"
+                style={{ padding: '9px 20px', borderRadius: 10, fontSize: 13, fontWeight: 600, border: 'none', cursor: 'pointer', fontFamily: 'inherit' }}
+              >
+                {t('common.cancel')}
+              </button>
+              <button
+                onClick={executeRestore}
+                style={{ padding: '9px 20px', borderRadius: 10, fontSize: 13, fontWeight: 600, border: 'none', cursor: 'pointer', fontFamily: 'inherit', background: '#dc2626', color: 'white' }}
+                onMouseEnter={e => e.currentTarget.style.background = '#b91c1c'}
+                onMouseLeave={e => e.currentTarget.style.background = '#dc2626'}
+              >
+                {t('backup.restoreConfirm')}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
    </div>
  )
 }
@@ -190,13 +190,14 @@ export default function CategoryManager() {
    <div className="bg-white rounded-2xl border border-gray-200 p-6">
      <div className="flex items-center justify-between mb-6">
        <div>
-          <h2 className="text-lg font-semibold text-gray-900">{t('categories.title')}</h2>
-          <p className="text-sm text-gray-500 mt-0.5">{t('categories.subtitle')}</p>
+          <h2 className="font-semibold" style={{ color: 'var(--text-primary)' }}>{t('categories.title')}</h2>
+          <p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>{t('categories.subtitle')}</p>
        </div>
        <button onClick={handleStartCreate}
-          className="flex items-center gap-2 bg-slate-900 text-white px-4 py-2 rounded-lg hover:bg-slate-700 text-sm font-medium">
+          className="flex items-center gap-2 bg-slate-900 text-white px-3 sm:px-4 py-2 rounded-lg hover:bg-slate-700 text-sm font-medium">
          <Plus className="w-4 h-4" />
-          {t('categories.new')}
+          <span className="hidden sm:inline">{t('categories.new')}</span>
+          <span className="sm:hidden">Add</span>
        </button>
      </div>

@@ -0,0 +1,263 @@
+import React, { useState, useEffect } from 'react'
+import { Tag, Calendar, ExternalLink, ChevronDown, ChevronUp, Loader2 } from 'lucide-react'
+import { useTranslation } from '../../i18n'
+
+const REPO = 'mauriceboe/NOMAD'
+const PER_PAGE = 10
+
+export default function GitHubPanel() {
+  const { t, language } = useTranslation()
+  const [releases, setReleases] = useState([])
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState(null)
+  const [expanded, setExpanded] = useState({})
+  const [page, setPage] = useState(1)
+  const [hasMore, setHasMore] = useState(true)
+  const [loadingMore, setLoadingMore] = useState(false)
+
+  const fetchReleases = async (pageNum = 1, append = false) => {
+    try {
+      const res = await fetch(`https://api.github.com/repos/${REPO}/releases?per_page=${PER_PAGE}&page=${pageNum}`)
+      if (!res.ok) throw new Error(`GitHub API: ${res.status}`)
+      const data = await res.json()
+      setReleases(prev => append ? [...prev, ...data] : data)
+      setHasMore(data.length === PER_PAGE)
+    } catch (err) {
+      setError(err.message)
+    }
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    fetchReleases(1).finally(() => setLoading(false))
+  }, [])
+
+  const handleLoadMore = async () => {
+    const next = page + 1
+    setLoadingMore(true)
+    await fetchReleases(next, true)
+    setPage(next)
+    setLoadingMore(false)
+  }
+
+  const toggleExpand = (id) => {
+    setExpanded(prev => ({ ...prev, [id]: !prev[id] }))
+  }
+
+  const formatDate = (dateStr) => {
+    const d = new Date(dateStr)
+    return d.toLocaleDateString(language === 'de' ? 'de-DE' : 'en-US', { day: 'numeric', month: 'short', year: 'numeric' })
+  }
+
+  // Simple markdown-to-html for release notes (handles headers, bold, lists, links)
+  const renderBody = (body) => {
+    if (!body) return null
+    const lines = body.split('\n')
+    const elements = []
+    let listItems = []
+
+    const flushList = () => {
+      if (listItems.length > 0) {
+        elements.push(
+          <ul key={`ul-${elements.length}`} className="space-y-1 my-2">
+            {listItems.map((item, i) => (
+              <li key={i} className="flex gap-2 text-xs" style={{ color: 'var(--text-muted)' }}>
+                <span className="mt-1.5 w-1 h-1 rounded-full flex-shrink-0" style={{ background: 'var(--text-faint)' }} />
+                <span dangerouslySetInnerHTML={{ __html: inlineFormat(item) }} />
+              </li>
+            ))}
+          </ul>
+        )
+        listItems = []
+      }
+    }
+
+    const inlineFormat = (text) => {
+      return text
+        .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
+        .replace(/`(.+?)`/g, '<code style="font-size:11px;padding:1px 4px;border-radius:4px;background:var(--bg-secondary)">$1</code>')
+        .replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" target="_blank" rel="noopener noreferrer" style="color:#3b82f6;text-decoration:underline">$1</a>')
+    }
+
+    for (const line of lines) {
+      const trimmed = line.trim()
+      if (!trimmed) { flushList(); continue }
+
+      if (trimmed.startsWith('### ')) {
+        flushList()
+        elements.push(
+          <h4 key={elements.length} className="text-xs font-semibold mt-3 mb-1" style={{ color: 'var(--text-primary)' }}>
+            {trimmed.slice(4)}
+          </h4>
+        )
+      } else if (trimmed.startsWith('## ')) {
+        flushList()
+        elements.push(
+          <h3 key={elements.length} className="text-sm font-semibold mt-3 mb-1" style={{ color: 'var(--text-primary)' }}>
+            {trimmed.slice(3)}
+          </h3>
+        )
+      } else if (/^[-*] /.test(trimmed)) {
+        listItems.push(trimmed.slice(2))
+      } else {
+        flushList()
+        elements.push(
+          <p key={elements.length} className="text-xs my-1" style={{ color: 'var(--text-muted)' }}
+            dangerouslySetInnerHTML={{ __html: inlineFormat(trimmed) }}
+          />
+        )
+      }
+    }
+    flushList()
+    return elements
+  }
+
+  if (loading) {
+    return (
+      <div className="rounded-xl border overflow-hidden" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+        <div className="p-8 flex items-center justify-center">
+          <Loader2 className="w-6 h-6 animate-spin" style={{ color: 'var(--text-muted)' }} />
+        </div>
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="rounded-xl border overflow-hidden" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+        <div className="p-6 text-center">
+          <p className="text-sm" style={{ color: 'var(--text-muted)' }}>{t('admin.github.error')}</p>
+          <p className="text-xs mt-1" style={{ color: 'var(--text-faint)' }}>{error}</p>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-3">
+      {/* Header card */}
+      <div className="rounded-xl border overflow-hidden" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+        <div className="px-5 py-4 border-b flex items-center justify-between" style={{ borderColor: 'var(--border-secondary)' }}>
+          <div>
+            <h2 className="font-semibold" style={{ color: 'var(--text-primary)' }}>{t('admin.github.title')}</h2>
+            <p className="text-xs mt-0.5" style={{ color: 'var(--text-faint)' }}>{t('admin.github.subtitle').replace('{repo}', REPO)}</p>
+          </div>
+          <a
+            href={`https://github.com/${REPO}/releases`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-xs font-medium transition-colors"
+            style={{ background: 'var(--bg-secondary)', color: 'var(--text-muted)' }}
+          >
+            <ExternalLink size={12} />
+            GitHub
+          </a>
+        </div>
+
+        {/* Timeline */}
+        <div className="px-5 py-4">
+          <div className="relative">
+            {/* Timeline line */}
+            <div className="absolute left-[11px] top-3 bottom-3 w-px" style={{ background: 'var(--border-primary)' }} />
+
+            <div className="space-y-0">
+              {releases.map((release, idx) => {
+                const isLatest = idx === 0
+                const isExpanded = expanded[release.id]
+
+                return (
+                  <div key={release.id} className="relative pl-8 pb-5">
+                    {/* Timeline dot */}
+                    <div
+                      className="absolute left-0 top-1 w-[23px] h-[23px] rounded-full flex items-center justify-center border-2"
+                      style={{
+                        background: isLatest ? 'var(--text-primary)' : 'var(--bg-card)',
+                        borderColor: isLatest ? 'var(--text-primary)' : 'var(--border-primary)',
+                      }}
+                    >
+                      <Tag size={10} style={{ color: isLatest ? 'var(--bg-card)' : 'var(--text-faint)' }} />
+                    </div>
+
+                    {/* Release content */}
+                    <div>
+                      <div className="flex flex-wrap items-center gap-2">
+                        <span className="text-sm font-semibold" style={{ color: 'var(--text-primary)' }}>
+                          {release.tag_name}
+                        </span>
+                        {isLatest && (
+                          <span className="text-[10px] font-semibold px-2 py-0.5 rounded-full"
+                            style={{ background: 'rgba(34,197,94,0.12)', color: '#16a34a' }}>
+                            {t('admin.github.latest')}
+                          </span>
+                        )}
+                        {release.prerelease && (
+                          <span className="text-[10px] font-semibold px-2 py-0.5 rounded-full"
+                            style={{ background: 'rgba(245,158,11,0.12)', color: '#d97706' }}>
+                            {t('admin.github.prerelease')}
+                          </span>
+                        )}
+                      </div>
+
+                      {release.name && release.name !== release.tag_name && (
+                        <p className="text-xs font-medium mt-0.5" style={{ color: 'var(--text-muted)' }}>
+                          {release.name}
+                        </p>
+                      )}
+
+                      <div className="flex items-center gap-3 mt-1">
+                        <span className="flex items-center gap-1 text-[11px]" style={{ color: 'var(--text-faint)' }}>
+                          <Calendar size={10} />
+                          {formatDate(release.published_at || release.created_at)}
+                        </span>
+                        {release.author && (
+                          <span className="text-[11px]" style={{ color: 'var(--text-faint)' }}>
+                            {t('admin.github.by')} {release.author.login}
+                          </span>
+                        )}
+                      </div>
+
+                      {/* Expandable body */}
+                      {release.body && (
+                        <div className="mt-2">
+                          <button
+                            onClick={() => toggleExpand(release.id)}
+                            className="flex items-center gap-1 text-[11px] font-medium transition-colors"
+                            style={{ color: 'var(--text-muted)' }}
+                          >
+                            {isExpanded ? <ChevronUp size={12} /> : <ChevronDown size={12} />}
+                            {isExpanded ? t('admin.github.hideDetails') : t('admin.github.showDetails')}
+                          </button>
+
+                          {isExpanded && (
+                            <div className="mt-2 p-3 rounded-lg" style={{ background: 'var(--bg-secondary)' }}>
+                              {renderBody(release.body)}
+                            </div>
+                          )}
+                        </div>
+                      )}
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
+          </div>
+
+          {/* Load more */}
+          {hasMore && (
+            <div className="text-center pt-2">
+              <button
+                onClick={handleLoadMore}
+                disabled={loadingMore}
+                className="inline-flex items-center gap-2 px-4 py-2 rounded-lg text-xs font-medium transition-colors"
+                style={{ background: 'var(--bg-secondary)', color: 'var(--text-muted)' }}
+              >
+                {loadingMore ? <Loader2 size={12} className="animate-spin" /> : <ChevronDown size={12} />}
+                {loadingMore ? t('admin.github.loading') : t('admin.github.loadMore')}
+              </button>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
@@ -163,7 +163,7 @@ export default function BudgetPanel({ tripId }) {
  useEffect(() => { if (tripId) loadBudgetItems(tripId) }, [tripId])

  const grouped = useMemo(() => (budgetItems || []).reduce((acc, item) => {
-    const cat = item.category || 'Sonstiges'
+    const cat = item.category || 'Other'
    if (!acc[cat]) acc[cat] = []
    acc[cat].push(item)
    return acc
@@ -190,7 +190,7 @@ export default function BudgetPanel({ tripId }) {
  const handleAddCategory = () => {
    if (!newCategoryName.trim()) return
    addBudgetItem(tripId, { name: t('budget.defaultEntry'), category: newCategoryName.trim(), total_price: 0 })
-    setNewCategoryName(''); setShowAddCategory(false)
+    setNewCategoryName('')
  }

  const th = { padding: '6px 8px', textAlign: 'center', fontSize: 11, fontWeight: 600, color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em', borderBottom: '2px solid var(--border-primary)', whiteSpace: 'nowrap', background: 'var(--bg-secondary)' }
@@ -0,0 +1,89 @@
+import React, { useState, useEffect, useCallback } from 'react'
+import { ArrowRightLeft, RefreshCw } from 'lucide-react'
+import { useTranslation } from '../../i18n'
+import CustomSelect from '../shared/CustomSelect'
+
+const CURRENCIES = [
+  'EUR','USD','GBP','JPY','CHF','CAD','AUD','NZD','CNY','HKD',
+  'SGD','THB','TRY','SEK','NOK','DKK','PLN','CZK','HUF','RON',
+  'BGN','HRK','ISK','RUB','UAH','BRL','MXN','ARS','CLP','COP',
+  'INR','IDR','MYR','PHP','KRW','TWD','VND','ZAR','EGP','MAD',
+  'NGN','KES','AED','SAR','QAR','KWD','BHD','OMR','ILS',
+]
+
+const CURRENCY_OPTIONS = CURRENCIES.map(c => ({ value: c, label: c }))
+
+export default function CurrencyWidget() {
+  const { t } = useTranslation()
+  const [from, setFrom] = useState(() => localStorage.getItem('currency_from') || 'EUR')
+  const [to, setTo] = useState(() => localStorage.getItem('currency_to') || 'USD')
+  const [amount, setAmount] = useState('100')
+  const [rate, setRate] = useState(null)
+  const [loading, setLoading] = useState(false)
+
+  const fetchRate = useCallback(async () => {
+    if (from === to) { setRate(1); return }
+    setLoading(true)
+    try {
+      const resp = await fetch(`https://api.exchangerate-api.com/v4/latest/${from}`)
+      const data = await resp.json()
+      setRate(data.rates?.[to] || null)
+    } catch { setRate(null) }
+    finally { setLoading(false) }
+  }, [from, to])
+
+  useEffect(() => { fetchRate() }, [fetchRate])
+  useEffect(() => { localStorage.setItem('currency_from', from) }, [from])
+  useEffect(() => { localStorage.setItem('currency_to', to) }, [to])
+
+  const swap = () => { setFrom(to); setTo(from) }
+  const rawResult = rate && amount ? (parseFloat(amount) * rate).toFixed(2) : null
+  const formatNumber = (num) => {
+    if (!num || num === '—') return '—'
+    return parseFloat(num).toLocaleString('de-DE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+  }
+  const result = rawResult
+
+  return (
+    <div className="rounded-2xl border p-4" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+      <div className="flex items-center justify-between mb-3">
+        <span className="text-xs font-semibold uppercase tracking-wide" style={{ color: 'var(--text-faint)' }}>{t('dashboard.currency')}</span>
+        <button onClick={fetchRate} className="p-1 rounded-md transition-colors" style={{ color: 'var(--text-faint)' }}>
+          <RefreshCw size={12} className={loading ? 'animate-spin' : ''} />
+        </button>
+      </div>
+
+      {/* Amount */}
+      <div className="rounded-xl px-4 py-3 mb-3" style={{ background: 'var(--bg-secondary)', border: '1px solid var(--border-primary)' }}>
+        <input
+          type="number"
+          value={amount}
+          onChange={e => setAmount(e.target.value)}
+          className="w-full text-2xl font-black tabular-nums outline-none [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none"
+          style={{ color: 'var(--text-primary)', background: 'transparent', border: 'none' }}
+        />
+      </div>
+
+      {/* From / Swap / To */}
+      <div className="flex items-center gap-2 mb-3">
+        <div className="flex-1" style={{ '--bg-input': 'transparent', '--border-primary': 'transparent' }}>
+          <CustomSelect value={from} onChange={setFrom} options={CURRENCY_OPTIONS} searchable size="sm" />
+        </div>
+        <button onClick={swap} className="p-1.5 rounded-lg shrink-0 transition-colors" style={{ color: 'var(--text-muted)' }}>
+          <ArrowRightLeft size={13} />
+        </button>
+        <div className="flex-1" style={{ '--bg-input': 'transparent', '--border-primary': 'transparent' }}>
+          <CustomSelect value={to} onChange={setTo} options={CURRENCY_OPTIONS} searchable size="sm" />
+        </div>
+      </div>
+
+      {/* Result */}
+      <div className="rounded-xl p-3" style={{ background: 'var(--bg-secondary)' }}>
+        <p className="text-xl font-black tabular-nums" style={{ color: 'var(--text-primary)' }}>
+          {formatNumber(result)} <span className="text-sm font-semibold" style={{ color: 'var(--text-muted)' }}>{to}</span>
+        </p>
+        {rate && <p className="text-[10px] mt-0.5" style={{ color: 'var(--text-faint)' }}>1 {from} = {rate.toFixed(4)} {to}</p>}
+      </div>
+    </div>
+  )
+}
@@ -0,0 +1,126 @@
+import React, { useState, useEffect } from 'react'
+import { Clock, Plus, X } from 'lucide-react'
+import { useTranslation } from '../../i18n'
+
+const POPULAR_ZONES = [
+  { label: 'New York', tz: 'America/New_York' },
+  { label: 'London', tz: 'Europe/London' },
+  { label: 'Berlin', tz: 'Europe/Berlin' },
+  { label: 'Paris', tz: 'Europe/Paris' },
+  { label: 'Dubai', tz: 'Asia/Dubai' },
+  { label: 'Mumbai', tz: 'Asia/Kolkata' },
+  { label: 'Bangkok', tz: 'Asia/Bangkok' },
+  { label: 'Tokyo', tz: 'Asia/Tokyo' },
+  { label: 'Sydney', tz: 'Australia/Sydney' },
+  { label: 'Los Angeles', tz: 'America/Los_Angeles' },
+  { label: 'Chicago', tz: 'America/Chicago' },
+  { label: 'São Paulo', tz: 'America/Sao_Paulo' },
+  { label: 'Istanbul', tz: 'Europe/Istanbul' },
+  { label: 'Singapore', tz: 'Asia/Singapore' },
+  { label: 'Hong Kong', tz: 'Asia/Hong_Kong' },
+  { label: 'Seoul', tz: 'Asia/Seoul' },
+  { label: 'Moscow', tz: 'Europe/Moscow' },
+  { label: 'Cairo', tz: 'Africa/Cairo' },
+]
+
+function getTime(tz) {
+  try {
+    return new Date().toLocaleTimeString('de-DE', { timeZone: tz, hour: '2-digit', minute: '2-digit' })
+  } catch { return '—' }
+}
+
+function getOffset(tz) {
+  try {
+    const now = new Date()
+    const local = new Date(now.toLocaleString('en-US', { timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone }))
+    const remote = new Date(now.toLocaleString('en-US', { timeZone: tz }))
+    const diff = (remote - local) / 3600000
+    const sign = diff >= 0 ? '+' : ''
+    return `${sign}${diff}h`
+  } catch { return '' }
+}
+
+export default function TimezoneWidget() {
+  const { t } = useTranslation()
+  const [zones, setZones] = useState(() => {
+    const saved = localStorage.getItem('dashboard_timezones')
+    return saved ? JSON.parse(saved) : [
+      { label: 'New York', tz: 'America/New_York' },
+      { label: 'Tokyo', tz: 'Asia/Tokyo' },
+    ]
+  })
+  const [now, setNow] = useState(Date.now())
+  const [showAdd, setShowAdd] = useState(false)
+
+  useEffect(() => {
+    const i = setInterval(() => setNow(Date.now()), 10000)
+    return () => clearInterval(i)
+  }, [])
+
+  useEffect(() => {
+    localStorage.setItem('dashboard_timezones', JSON.stringify(zones))
+  }, [zones])
+
+  const addZone = (zone) => {
+    if (!zones.find(z => z.tz === zone.tz)) {
+      setZones([...zones, zone])
+    }
+    setShowAdd(false)
+  }
+
+  const removeZone = (tz) => setZones(zones.filter(z => z.tz !== tz))
+
+  const localTime = new Date().toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit' })
+  const rawZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  const localZone = rawZone.split('/').pop().replace(/_/g, ' ')
+  // Show abbreviated timezone name (e.g. CET, CEST, EST)
+  const tzAbbr = new Date().toLocaleTimeString('en-US', { timeZoneName: 'short' }).split(' ').pop()
+
+  return (
+    <div className="rounded-2xl border p-4" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+      <div className="flex items-center justify-between mb-3">
+        <span className="text-xs font-semibold uppercase tracking-wide" style={{ color: 'var(--text-faint)' }}>{t('dashboard.timezone')}</span>
+        <button onClick={() => setShowAdd(!showAdd)} className="p-1 rounded-md transition-colors" style={{ color: 'var(--text-faint)' }}>
+          <Plus size={12} />
+        </button>
+      </div>
+
+      {/* Local time */}
+      <div className="mb-3 pb-3" style={{ borderBottom: '1px solid var(--border-secondary)' }}>
+        <p className="text-2xl font-black tabular-nums" style={{ color: 'var(--text-primary)' }}>{localTime}</p>
+        <p className="text-[10px] font-semibold uppercase tracking-wide" style={{ color: 'var(--text-faint)' }}>{localZone} ({tzAbbr}) · {t('dashboard.localTime')}</p>
+      </div>
+
+      {/* Zone list */}
+      <div className="space-y-2">
+        {zones.map(z => (
+          <div key={z.tz} className="flex items-center justify-between group">
+            <div>
+              <p className="text-lg font-bold tabular-nums" style={{ color: 'var(--text-primary)' }}>{getTime(z.tz)}</p>
+              <p className="text-[10px]" style={{ color: 'var(--text-faint)' }}>{z.label} <span style={{ color: 'var(--text-muted)' }}>{getOffset(z.tz)}</span></p>
+            </div>
+            <button onClick={() => removeZone(z.tz)} className="opacity-0 group-hover:opacity-100 p-1 rounded transition-all" style={{ color: 'var(--text-faint)' }}>
+              <X size={11} />
+            </button>
+          </div>
+        ))}
+      </div>
+
+      {/* Add zone dropdown */}
+      {showAdd && (
+        <div className="mt-2 rounded-xl p-2 max-h-[200px] overflow-auto" style={{ background: 'var(--bg-secondary)' }}>
+          {POPULAR_ZONES.filter(z => !zones.find(existing => existing.tz === z.tz)).map(z => (
+            <button key={z.tz} onClick={() => addZone(z)}
+              className="w-full flex items-center justify-between px-2 py-1.5 rounded-lg text-xs text-left transition-colors"
+              style={{ color: 'var(--text-primary)' }}
+              onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
+              onMouseLeave={e => e.currentTarget.style.background = 'transparent'}>
+              <span className="font-medium">{z.label}</span>
+              <span className="text-[10px]" style={{ color: 'var(--text-faint)' }}>{getTime(z.tz)}</span>
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
@@ -106,7 +106,8 @@ async function loadGeoJson() {

 export default function TravelStats() {
  const { t } = useTranslation()
-  const dark = useSettingsStore(s => s.settings.dark_mode)
+  const dm = useSettingsStore(s => s.settings.dark_mode)
+  const dark = dm === true || dm === 'dark' || (dm === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
  const [stats, setStats] = useState(null)
  const [geoData, setGeoData] = useState(null)

@@ -1,4 +1,5 @@
 import React, { useState, useCallback } from 'react'
+import ReactDOM from 'react-dom'
 import { useDropzone } from 'react-dropzone'
 import { Upload, Trash2, ExternalLink, X, FileText, FileImage, File, MapPin, Ticket } from 'lucide-react'
 import { useToast } from '../shared/Toast'
@@ -68,10 +69,10 @@ function SourceBadge({ icon: Icon, label }) {
      fontSize: 10.5, color: '#4b5563',
      background: 'var(--bg-tertiary)', border: '1px solid var(--border-primary)',
      borderRadius: 6, padding: '2px 7px',
-      fontWeight: 500, whiteSpace: 'nowrap',
+      fontWeight: 500, maxWidth: '100%', overflow: 'hidden',
    }}>
      <Icon size={10} style={{ flexShrink: 0, color: 'var(--text-muted)' }} />
-      {label}
+      <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{label}</span>
    </span>
  )
 }
@@ -106,6 +107,23 @@ export default function FileManager({ files = [], onUpload, onDelete, onUpdate,
    noClick: false,
  })

+  // Paste support
+  const handlePaste = useCallback((e) => {
+    const items = e.clipboardData?.items
+    if (!items) return
+    const files = []
+    for (const item of items) {
+      if (item.kind === 'file') {
+        const file = item.getAsFile()
+        if (file) files.push(file)
+      }
+    }
+    if (files.length > 0) {
+      e.preventDefault()
+      onDrop(files)
+    }
+  }, [onDrop])
+
  const filteredFiles = files.filter(f => {
    if (filterType === 'pdf') return f.mime_type === 'application/pdf'
    if (filterType === 'image') return isImage(f.mime_type)
@@ -134,18 +152,18 @@ export default function FileManager({ files = [], onUpload, onDelete, onUpdate,
  }

  return (
-    <div className="flex flex-col h-full" style={{ fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }}>
+    <div className="flex flex-col h-full" style={{ fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }} onPaste={handlePaste} tabIndex={-1}>
      {/* Lightbox */}
      {lightboxFile && <ImageLightbox file={lightboxFile} onClose={() => setLightboxFile(null)} />}

-      {/* Datei-Vorschau Modal */}
-      {previewFile && (
+      {/* Datei-Vorschau Modal — portal to body to escape stacking context */}
+      {previewFile && ReactDOM.createPortal(
        <div
-          style={{ position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.7)', zIndex: 2000, display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 8 }}
+          style={{ position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.85)', zIndex: 10000, display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }}
          onClick={() => setPreviewFile(null)}
        >
          <div
-            style={{ width: '100%', maxWidth: 950, height: '95vh', background: 'var(--bg-card)', borderRadius: 12, overflow: 'hidden', display: 'flex', flexDirection: 'column', boxShadow: '0 20px 60px rgba(0,0,0,0.3)' }}
+            style={{ width: '100%', maxWidth: 950, height: '94vh', background: 'var(--bg-card)', borderRadius: 12, overflow: 'hidden', display: 'flex', flexDirection: 'column', boxShadow: '0 20px 60px rgba(0,0,0,0.3)' }}
            onClick={e => e.stopPropagation()}
          >
            <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '10px 16px', borderBottom: '1px solid var(--border-primary)', flexShrink: 0 }}>
@@ -176,7 +194,8 @@ export default function FileManager({ files = [], onUpload, onDelete, onUpdate,
              </p>
            </object>
          </div>
-        </div>
+        </div>,
+        document.body
      )}

      {/* Header */}
@@ -1,45 +1,76 @@
 import React, { useState, useEffect } from 'react'
-import { Info, Github, Shield, Key, Users, Database, Upload, Clock } from 'lucide-react'
+import { Info, Github, Shield, Key, Users, Database, Upload, Clock, Puzzle, CalendarDays, Globe, ArrowRightLeft, Map, Briefcase, ListChecks, Wallet, FileText, Plane } from 'lucide-react'
 import { useTranslation } from '../../i18n'

 const texts = {
  de: {
+    titleBefore: 'Willkommen bei ',
+    titleAfter: '',
    title: 'Willkommen zur NOMAD Demo',
    description: 'Du kannst Reisen ansehen, bearbeiten und eigene erstellen. Alle Aenderungen werden jede Stunde automatisch zurueckgesetzt.',
    resetIn: 'Naechster Reset in',
    minutes: 'Minuten',
    uploadNote: 'Datei-Uploads (Fotos, Dokumente, Cover) sind in der Demo deaktiviert.',
-    fullVersionTitle: 'In der Vollversion zusaetzlich verfuegbar:',
+    fullVersionTitle: 'In der Vollversion zusaetzlich:',
    features: [
-      'Datei-Uploads (Fotos, Dokumente, Reise-Cover)',
-      'API-Schluessel verwalten (Google Maps, Wetter)',
-      'Benutzer & Rechte verwalten',
-      'Automatische Backups & Wiederherstellung',
+      'Datei-Uploads (Fotos, Dokumente, Cover)',
+      'API-Schluessel (Google Maps, Wetter)',
+      'Benutzer- & Rechteverwaltung',
+      'Automatische Backups',
+      'Addon-Verwaltung (aktivieren/deaktivieren)',
+      'OIDC / SSO Single Sign-On',
    ],
-    selfHost: 'NOMAD ist Open Source — ',
+    addonsTitle: 'Modulare Addons (in der Vollversion deaktivierbar)',
+    addons: [
+      ['Vacay', 'Urlaubsplaner mit Kalender, Feiertagen & Fusion'],
+      ['Atlas', 'Weltkarte mit besuchten Laendern & Reisestatistiken'],
+      ['Packliste', 'Checklisten pro Reise'],
+      ['Budget', 'Kostenplanung mit Splitting'],
+      ['Dokumente', 'Dateien an Reisen anhaengen'],
+      ['Widgets', 'Waehrungsrechner & Zeitzonen'],
+    ],
+    whatIs: 'Was ist NOMAD?',
+    whatIsDesc: 'Ein selbst-gehosteter Reiseplaner mit Echtzeit-Kollaboration, interaktiver Karte, OIDC Login und Dark Mode.',
+    selfHost: 'Open Source — ',
    selfHostLink: 'selbst hosten',
    close: 'Verstanden',
  },
  en: {
+    titleBefore: 'Welcome to ',
+    titleAfter: '',
    title: 'Welcome to the NOMAD Demo',
    description: 'You can view, edit and create trips. All changes are automatically reset every hour.',
    resetIn: 'Next reset in',
    minutes: 'minutes',
    uploadNote: 'File uploads (photos, documents, covers) are disabled in demo mode.',
-    fullVersionTitle: 'Additionally available in the full version:',
+    fullVersionTitle: 'Additionally in the full version:',
    features: [
-      'File uploads (photos, documents, trip covers)',
+      'File uploads (photos, documents, covers)',
      'API key management (Google Maps, Weather)',
      'User & permission management',
-      'Automatic backups & restore',
+      'Automatic backups',
+      'Addon management (enable/disable)',
+      'OIDC / SSO single sign-on',
    ],
-    selfHost: 'NOMAD is open source — ',
+    addonsTitle: 'Modular Addons (can be deactivated in full version)',
+    addons: [
+      ['Vacay', 'Vacation planner with calendar, holidays & user fusion'],
+      ['Atlas', 'World map with visited countries & travel stats'],
+      ['Packing', 'Checklists per trip'],
+      ['Budget', 'Expense tracking with splitting'],
+      ['Documents', 'Attach files to trips'],
+      ['Widgets', 'Currency converter & timezones'],
+    ],
+    whatIs: 'What is NOMAD?',
+    whatIsDesc: 'A self-hosted travel planner with real-time collaboration, interactive maps, OIDC login and dark mode.',
+    selfHost: 'Open source — ',
    selfHostLink: 'self-host it',
    close: 'Got it',
  },
 }

-const featureIcons = [Upload, Key, Users, Database]
+const featureIcons = [Upload, Key, Users, Database, Puzzle, Shield]
+const addonIcons = [CalendarDays, Globe, ListChecks, Wallet, FileText, ArrowRightLeft]

 export default function DemoBanner() {
  const [dismissed, setDismissed] = useState(false)
@@ -57,85 +88,120 @@ export default function DemoBanner() {
  return (
    <div style={{
      position: 'fixed', inset: 0, zIndex: 9999,
-      background: 'rgba(0,0,0,0.5)', backdropFilter: 'blur(4px)',
+      background: 'rgba(0,0,0,0.6)', backdropFilter: 'blur(8px)',
      display: 'flex', alignItems: 'center', justifyContent: 'center',
-      padding: 24,
+      padding: 16, overflow: 'auto',
      fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif",
    }} onClick={() => setDismissed(true)}>
      <div style={{
-        background: 'white', borderRadius: 20, padding: '32px 28px 24px',
-        maxWidth: 440, width: '100%',
+        background: 'white', borderRadius: 20, padding: '28px 24px 20px',
+        maxWidth: 480, width: '100%',
        boxShadow: '0 20px 60px rgba(0,0,0,0.3)',
+        maxHeight: '90vh', overflow: 'auto',
      }} onClick={e => e.stopPropagation()}>

-        <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 16 }}>
-          <div style={{
-            width: 36, height: 36, borderRadius: 10,
-            background: 'linear-gradient(135deg, #f59e0b, #d97706)',
-            display: 'flex', alignItems: 'center', justifyContent: 'center',
-          }}>
-            <Info size={20} style={{ color: 'white' }} />
-          </div>
-          <h2 style={{ margin: 0, fontSize: 18, fontWeight: 700, color: '#111827' }}>
-            {t.title}
+        {/* Header */}
+        <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 14 }}>
+          <img src="/icons/icon-dark.svg" alt="" style={{ width: 36, height: 36, borderRadius: 10 }} />
+          <h2 style={{ margin: 0, fontSize: 17, fontWeight: 700, color: '#111827', display: 'flex', alignItems: 'center', gap: 5 }}>
+            {t.titleBefore}<img src="/text-dark.svg" alt="NOMAD" style={{ height: 18 }} />{t.titleAfter}
          </h2>
        </div>

-        <p style={{ fontSize: 14, color: '#6b7280', lineHeight: 1.6, margin: '0 0 12px' }}>
+        <p style={{ fontSize: 13, color: '#6b7280', lineHeight: 1.6, margin: '0 0 12px' }}>
          {t.description}
        </p>

-        <div style={{
-          display: 'flex', alignItems: 'center', gap: 8, margin: '0 0 12px',
-          background: '#f0f9ff', border: '1px solid #bae6fd', borderRadius: 10, padding: '10px 12px',
-        }}>
-          <Clock size={15} style={{ flexShrink: 0, color: '#0284c7' }} />
-          <span style={{ fontSize: 13, color: '#0369a1', fontWeight: 600 }}>
-            {t.resetIn} {minutesLeft} {t.minutes}
-          </span>
+        {/* Timer + Upload note */}
+        <div style={{ display: 'flex', gap: 8, marginBottom: 16 }}>
+          <div style={{
+            flex: 1, display: 'flex', alignItems: 'center', gap: 6,
+            background: '#f0f9ff', border: '1px solid #bae6fd', borderRadius: 10, padding: '8px 10px',
+          }}>
+            <Clock size={13} style={{ flexShrink: 0, color: '#0284c7' }} />
+            <span style={{ fontSize: 11, color: '#0369a1', fontWeight: 600 }}>
+              {t.resetIn} {minutesLeft} {t.minutes}
+            </span>
+          </div>
+          <div style={{
+            flex: 1, display: 'flex', alignItems: 'center', gap: 6,
+            background: '#fffbeb', border: '1px solid #fde68a', borderRadius: 10, padding: '8px 10px',
+          }}>
+            <Upload size={13} style={{ flexShrink: 0, color: '#b45309' }} />
+            <span style={{ fontSize: 11, color: '#b45309' }}>{t.uploadNote}</span>
+          </div>
        </div>

-        <p style={{
-          fontSize: 13, color: '#b45309', lineHeight: 1.5, margin: '0 0 20px',
-          background: '#fffbeb', border: '1px solid #fde68a', borderRadius: 10, padding: '10px 12px',
-          display: 'flex', alignItems: 'center', gap: 8,
+        {/* What is NOMAD */}
+        <div style={{
+          background: '#f8fafc', borderRadius: 12, padding: '12px 14px', marginBottom: 16,
+          border: '1px solid #e2e8f0',
        }}>
-          <Upload size={15} style={{ flexShrink: 0 }} />
-          {t.uploadNote}
-        </p>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 6 }}>
+            <Map size={14} style={{ color: '#111827' }} />
+            <span style={{ fontSize: 12, fontWeight: 700, color: '#111827', display: 'flex', alignItems: 'center', gap: 4 }}>
+              {language === 'de' ? 'Was ist ' : 'What is '}<img src="/text-dark.svg" alt="NOMAD" style={{ height: 13, marginRight: -2 }} />?
+            </span>
+          </div>
+          <p style={{ fontSize: 12, color: '#64748b', lineHeight: 1.5, margin: 0 }}>{t.whatIsDesc}</p>
+        </div>

-        <p style={{ fontSize: 12, fontWeight: 700, color: '#374151', margin: '0 0 10px', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+        {/* Addons */}
+        <p style={{ fontSize: 10, fontWeight: 700, color: '#374151', margin: '0 0 8px', textTransform: 'uppercase', letterSpacing: '0.08em', display: 'flex', alignItems: 'center', gap: 6 }}>
+          <Puzzle size={12} />
+          {t.addonsTitle}
+        </p>
+        <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 6, marginBottom: 16 }}>
+          {t.addons.map(([name, desc], i) => {
+            const Icon = addonIcons[i]
+            return (
+              <div key={name} style={{
+                background: '#f8fafc', borderRadius: 10, padding: '8px 10px',
+                border: '1px solid #f1f5f9',
+              }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: 6, marginBottom: 2 }}>
+                  <Icon size={12} style={{ flexShrink: 0, color: '#111827' }} />
+                  <span style={{ fontSize: 11, fontWeight: 700, color: '#111827' }}>{name}</span>
+                </div>
+                <p style={{ fontSize: 10, color: '#94a3b8', margin: 0, lineHeight: 1.3, paddingLeft: 18 }}>{desc}</p>
+              </div>
+            )
+          })}
+        </div>
+
+        {/* Full version features */}
+        <p style={{ fontSize: 10, fontWeight: 700, color: '#374151', margin: '0 0 8px', textTransform: 'uppercase', letterSpacing: '0.08em', display: 'flex', alignItems: 'center', gap: 6 }}>
+          <Shield size={12} />
          {t.fullVersionTitle}
        </p>
-
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 8, marginBottom: 20 }}>
+        <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 6, marginBottom: 16 }}>
          {t.features.map((text, i) => {
            const Icon = featureIcons[i]
            return (
-              <div key={text} style={{ display: 'flex', alignItems: 'center', gap: 10, fontSize: 13, color: '#4b5563' }}>
-                <Icon size={15} style={{ flexShrink: 0, color: '#d97706' }} />
+              <div key={text} style={{ display: 'flex', alignItems: 'center', gap: 8, fontSize: 11, color: '#4b5563', padding: '4px 0' }}>
+                <Icon size={13} style={{ flexShrink: 0, color: '#9ca3af' }} />
                <span>{text}</span>
              </div>
            )
          })}
        </div>

+        {/* Footer */}
        <div style={{
-          paddingTop: 16, borderTop: '1px solid #e5e7eb',
+          paddingTop: 14, borderTop: '1px solid #e5e7eb',
          display: 'flex', alignItems: 'center', justifyContent: 'space-between',
        }}>
-          <div style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 12, color: '#9ca3af' }}>
-            <Github size={14} />
+          <div style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 11, color: '#9ca3af' }}>
+            <Github size={13} />
            <span>{t.selfHost}</span>
            <a href="https://github.com/mauriceboe/NOMAD" target="_blank" rel="noopener noreferrer"
-              style={{ color: '#d97706', fontWeight: 600, textDecoration: 'none' }}>
+              style={{ color: '#111827', fontWeight: 600, textDecoration: 'none' }}>
              {t.selfHostLink}
            </a>
          </div>
-
          <button onClick={() => setDismissed(true)} style={{
            background: '#111827', color: 'white', border: 'none',
-            borderRadius: 10, padding: '8px 20px', fontSize: 13,
+            borderRadius: 10, padding: '8px 20px', fontSize: 12,
            fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit',
          }}>
            {t.close}
@@ -1,18 +1,40 @@
-import React, { useState, useEffect } from 'react'
-import { Link, useNavigate } from 'react-router-dom'
+import React, { useState, useEffect, useRef } from 'react'
+import ReactDOM from 'react-dom'
+import { Link, useNavigate, useLocation } from 'react-router-dom'
 import { useAuthStore } from '../../store/authStore'
 import { useSettingsStore } from '../../store/settingsStore'
 import { useTranslation } from '../../i18n'
-import { Plane, LogOut, Settings, ChevronDown, Shield, ArrowLeft, Users, Moon, Sun } from 'lucide-react'
+import { addonsApi } from '../../api/client'
+import { Plane, LogOut, Settings, ChevronDown, Shield, ArrowLeft, Users, Moon, Sun, Monitor, CalendarDays, Briefcase, Globe } from 'lucide-react'
+
+const ADDON_ICONS = { CalendarDays, Briefcase, Globe }

 export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare }) {
  const { user, logout } = useAuthStore()
  const { settings, updateSetting } = useSettingsStore()
  const { t, locale } = useTranslation()
  const navigate = useNavigate()
+  const location = useLocation()
  const [userMenuOpen, setUserMenuOpen] = useState(false)
  const [appVersion, setAppVersion] = useState(null)
-  const dark = settings.dark_mode
+  const [globalAddons, setGlobalAddons] = useState([])
+  const darkMode = settings.dark_mode
+  const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+
+  const loadAddons = () => {
+    if (user) {
+      addonsApi.enabled().then(data => {
+        setGlobalAddons(data.addons.filter(a => a.type === 'global'))
+      }).catch(() => {})
+    }
+  }
+  useEffect(loadAddons, [user, location.pathname])
+  // Listen for addon changes from AddonManager
+  useEffect(() => {
+    const handler = () => loadAddons()
+    window.addEventListener('addons-changed', handler)
+    return () => window.removeEventListener('addons-changed', handler)
+  }, [user])

  useEffect(() => {
    import('../../api/client').then(({ authApi }) => {
@@ -25,8 +47,8 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
    navigate('/login')
  }

-  const toggleDark = () => {
-    updateSetting('dark_mode', !dark).catch(() => {})
+  const toggleDarkMode = () => {
+    updateSetting('dark_mode', dark ? 'light' : 'dark').catch(() => {})
  }

  return (
@@ -35,7 +57,10 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
      backdropFilter: 'blur(20px)', WebkitBackdropFilter: 'blur(20px)',
      borderBottom: `1px solid ${dark ? 'rgba(255,255,255,0.07)' : 'rgba(0,0,0,0.07)'}`,
      boxShadow: dark ? '0 1px 12px rgba(0,0,0,0.2)' : '0 1px 12px rgba(0,0,0,0.05)',
-    }} className="h-14 flex items-center px-4 gap-4 fixed top-0 left-0 right-0 z-[200]">
+      touchAction: 'manipulation',
+      paddingTop: 'env(safe-area-inset-top, 0px)',
+      height: 'var(--nav-h)',
+    }} className="flex items-center px-4 gap-4 fixed top-0 left-0 right-0 z-[200]">
      {/* Left side */}
      <div className="flex items-center gap-3 min-w-0">
        {showBack && (
@@ -49,12 +74,47 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
          </button>
        )}

-        <Link to="/dashboard" className="flex items-center gap-2 transition-colors flex-shrink-0"
-          style={{ color: 'var(--text-primary)' }}>
-          <Plane className="w-5 h-5" style={{ color: 'var(--text-primary)' }} />
-          <span className="font-bold text-sm hidden sm:inline">NOMAD</span>
+        <Link to="/dashboard" className="flex items-center transition-colors flex-shrink-0">
+          <img src={dark ? '/icons/icon-white.svg' : '/icons/icon-dark.svg'} alt="NOMAD" className="sm:hidden" style={{ height: 22, width: 22 }} />
+          <img src={dark ? '/logo-light.svg' : '/logo-dark.svg'} alt="NOMAD" className="hidden sm:block" style={{ height: 28 }} />
        </Link>

+        {/* Global addon nav items */}
+        {globalAddons.length > 0 && !tripTitle && (
+          <>
+            <span style={{ color: 'var(--text-faint)' }}>|</span>
+            <Link to="/dashboard"
+              className="flex items-center gap-1.5 px-2.5 py-1 rounded-lg text-xs font-medium transition-colors flex-shrink-0"
+              style={{
+                color: location.pathname === '/dashboard' ? 'var(--text-primary)' : 'var(--text-muted)',
+                background: location.pathname === '/dashboard' ? 'var(--bg-hover)' : 'transparent',
+              }}
+              onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
+              onMouseLeave={e => { if (location.pathname !== '/dashboard') e.currentTarget.style.background = 'transparent' }}>
+              <Briefcase className="w-3.5 h-3.5" />
+              <span className="hidden md:inline">{t('nav.myTrips')}</span>
+            </Link>
+            {globalAddons.map(addon => {
+              const Icon = ADDON_ICONS[addon.icon] || CalendarDays
+              const path = `/${addon.id}`
+              const isActive = location.pathname === path
+              return (
+                <Link key={addon.id} to={path}
+                  className="flex items-center gap-1.5 px-2.5 py-1 rounded-lg text-xs font-medium transition-colors flex-shrink-0"
+                  style={{
+                    color: isActive ? 'var(--text-primary)' : 'var(--text-muted)',
+                    background: isActive ? 'var(--bg-hover)' : 'transparent',
+                  }}
+                  onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
+                  onMouseLeave={e => { if (!isActive) e.currentTarget.style.background = 'transparent' }}>
+                  <Icon className="w-3.5 h-3.5" />
+                  <span className="hidden md:inline">{addon.name}</span>
+                </Link>
+              )
+            })}
+          </>
+        )}
+
        {tripTitle && (
          <>
            <span className="hidden sm:inline" style={{ color: 'var(--text-faint)' }}>/</span>
@@ -80,8 +140,8 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
        </button>
      )}

-      {/* Dark mode toggle */}
-      <button onClick={toggleDark} title={dark ? t('nav.lightMode') : t('nav.darkMode')}
+      {/* Dark mode toggle (light ↔ dark, overrides auto) */}
+      <button onClick={toggleDarkMode} title={dark ? t('nav.lightMode') : t('nav.darkMode')}
        className="p-2 rounded-lg transition-colors flex-shrink-0"
        style={{ color: 'var(--text-muted)' }}
        onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
@@ -110,11 +170,10 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
            <ChevronDown className="w-4 h-4" style={{ color: 'var(--text-faint)' }} />
          </button>

-          {userMenuOpen && (
+          {userMenuOpen && ReactDOM.createPortal(
            <>
-              <div className="fixed inset-0 z-10" onClick={() => setUserMenuOpen(false)} />
-              <div className="absolute right-0 top-full mt-2 w-52 rounded-xl shadow-xl border z-20 overflow-hidden"
-                style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+              <div style={{ position: 'fixed', inset: 0, zIndex: 9998 }} onClick={() => setUserMenuOpen(false)} />
+              <div className="w-52 rounded-xl shadow-xl border overflow-hidden" style={{ position: 'fixed', top: 'var(--nav-h)', right: 8, zIndex: 9999, background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
                <div className="px-4 py-3 border-b" style={{ borderColor: 'var(--border-secondary)' }}>
                  <p className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>{user.username}</p>
                  <p className="text-xs truncate" style={{ color: 'var(--text-muted)' }}>{user.email}</p>
@@ -154,13 +213,17 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
                    {t('nav.logout')}
                  </button>
                  {appVersion && (
-                    <div className="px-4 py-1.5 text-center" style={{ fontSize: 10, color: 'var(--text-faint)' }}>
-                      NOMAD v{appVersion}
+                    <div className="px-4 pt-2 pb-2.5 text-center" style={{ marginTop: 4, borderTop: '1px solid var(--border-secondary)' }}>
+                      <div style={{ display: 'inline-flex', alignItems: 'center', gap: 5, background: 'var(--bg-tertiary)', borderRadius: 99, padding: '4px 12px' }}>
+                        <img src={dark ? '/text-light.svg' : '/text-dark.svg'} alt="NOMAD" style={{ height: 10, opacity: 0.5 }} />
+                        <span style={{ fontSize: 10, fontWeight: 600, color: 'var(--text-faint)' }}>v{appVersion}</span>
+                      </div>
                    </div>
                  )}
                </div>
              </div>
-            </>
+            </>,
+            document.body
          )}
        </div>
      )}
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useRef, useState, useMemo } from 'react'
 import { MapContainer, TileLayer, Marker, Tooltip, Polyline, useMap } from 'react-leaflet'
 import MarkerClusterGroup from 'react-leaflet-cluster'
 import L from 'leaflet'
@@ -19,7 +19,12 @@ L.Icon.Default.mergeOptions({
 * Create a round photo-circle marker.
 * Shows image_url if available, otherwise category icon in colored circle.
 */
-function createPlaceIcon(place, orderNumber, isSelected) {
+function escAttr(s) {
+  if (!s) return ''
+  return s.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+}
+
+function createPlaceIcon(place, orderNumbers, isSelected) {
  const size = isSelected ? 44 : 36
  const borderColor = isSelected ? '#111827' : 'white'
  const borderWidth = isSelected ? 3 : 2.5
@@ -29,20 +34,23 @@ function createPlaceIcon(place, orderNumber, isSelected) {
  const bgColor = place.category_color || '#6b7280'
  const icon = place.category_icon || '📍'

-  // White semi-transparent number badge (bottom-right), only when orderNumber is set
-  const badgeHtml = orderNumber != null ? `
-    <span style="
-      position:absolute;bottom:-3px;right:-3px;
-      min-width:18px;height:18px;border-radius:9px;
-      padding:0 3px;
-      background:rgba(255,255,255,0.92);
-      border:1.5px solid rgba(0,0,0,0.18);
+  // Number badges (bottom-right), supports multiple numbers for duplicate places
+  let badgeHtml = ''
+  if (orderNumbers && orderNumbers.length > 0) {
+    const label = orderNumbers.join(' · ')
+    badgeHtml = `<span style="
+      position:absolute;bottom:-4px;right:-4px;
+      min-width:18px;height:${orderNumbers.length > 1 ? 16 : 18}px;border-radius:${orderNumbers.length > 1 ? 8 : 9}px;
+      padding:0 ${orderNumbers.length > 1 ? 4 : 3}px;
+      background:rgba(255,255,255,0.94);
+      border:1.5px solid rgba(0,0,0,0.15);
      box-shadow:0 1px 4px rgba(0,0,0,0.18);
      display:flex;align-items:center;justify-content:center;
-      font-size:9px;font-weight:800;color:#111827;
+      font-size:${orderNumbers.length > 1 ? 7.5 : 9}px;font-weight:800;color:#111827;
      font-family:-apple-system,system-ui,sans-serif;line-height:1;
-      box-sizing:border-box;
-    ">${orderNumber}</span>` : ''
+      box-sizing:border-box;white-space:nowrap;
+    ">${label}</span>`
+  }

  if (place.image_url) {
    return L.divIcon({
@@ -55,7 +63,7 @@ function createPlaceIcon(place, orderNumber, isSelected) {
        cursor:pointer;flex-shrink:0;position:relative;
      ">
        <div style="width:100%;height:100%;border-radius:50%;overflow:hidden;">
-          <img src="${place.image_url}" style="width:100%;height:100%;object-fit:cover;" />
+          <img src="${escAttr(place.image_url)}" style="width:100%;height:100%;object-fit:cover;" />
        </div>
        ${badgeHtml}
      </div>`,
@@ -84,19 +92,26 @@ function createPlaceIcon(place, orderNumber, isSelected) {
  })
 }

-function SelectionController({ places, selectedPlaceId }) {
+function SelectionController({ places, selectedPlaceId, dayPlaces, paddingOpts }) {
  const map = useMap()
  const prev = useRef(null)

  useEffect(() => {
    if (selectedPlaceId && selectedPlaceId !== prev.current) {
-      const place = places.find(p => p.id === selectedPlaceId)
-      if (place?.lat && place?.lng) {
-        map.setView([place.lat, place.lng], Math.max(map.getZoom(), 15), { animate: true, duration: 0.5 })
+      // Fit all day places into view (so you see context), but ensure selected is visible
+      const toFit = dayPlaces.length > 0 ? dayPlaces : places.filter(p => p.id === selectedPlaceId)
+      const withCoords = toFit.filter(p => p.lat && p.lng)
+      if (withCoords.length > 0) {
+        try {
+          const bounds = L.latLngBounds(withCoords.map(p => [p.lat, p.lng]))
+          if (bounds.isValid()) {
+            map.fitBounds(bounds, { ...paddingOpts, maxZoom: 16, animate: true })
+          }
+        } catch {}
      }
    }
    prev.current = selectedPlaceId
-  }, [selectedPlaceId, places, map])
+  }, [selectedPlaceId, places, dayPlaces, paddingOpts, map])

  return null
 }
@@ -116,7 +131,7 @@ function MapController({ center, zoom }) {
 }

 // Fit bounds when places change (fitKey triggers re-fit)
-function BoundsController({ places, fitKey }) {
+function BoundsController({ places, fitKey, paddingOpts }) {
  const map = useMap()
  const prevFitKey = useRef(-1)

@@ -126,9 +141,9 @@ function BoundsController({ places, fitKey }) {
    if (places.length === 0) return
    try {
      const bounds = L.latLngBounds(places.map(p => [p.lat, p.lng]))
-      if (bounds.isValid()) map.fitBounds(bounds, { padding: [60, 60], maxZoom: 15, animate: true })
+      if (bounds.isValid()) map.fitBounds(bounds, { ...paddingOpts, maxZoom: 16, animate: true })
    } catch {}
-  }, [fitKey, places, map])
+  }, [fitKey, places, paddingOpts, map])

  return null
 }
@@ -148,6 +163,7 @@ const mapPhotoCache = new Map()

 export function MapView({
  places = [],
+  dayPlaces = [],
  route = null,
  selectedPlaceId = null,
  onMarkerClick,
@@ -157,7 +173,20 @@ export function MapView({
  tileUrl = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png',
  fitKey = 0,
  dayOrderMap = {},
+  leftWidth = 0,
+  rightWidth = 0,
+  hasInspector = false,
 }) {
+  // Dynamic padding: account for sidebars + bottom inspector
+  const paddingOpts = useMemo(() => {
+    const isMobile = typeof window !== 'undefined' && window.innerWidth < 768
+    if (isMobile) return { padding: [40, 20] }
+    const top = 60
+    const bottom = hasInspector ? 320 : 60
+    const left = leftWidth + 40
+    const right = rightWidth + 40
+    return { paddingTopLeft: [left, top], paddingBottomRight: [right, bottom] }
+  }, [leftWidth, rightWidth, hasInspector])
  const [photoUrls, setPhotoUrls] = useState({})

  // Fetch Google photos for places that have google_place_id but no image_url
@@ -195,8 +224,8 @@ export function MapView({
      />

      <MapController center={center} zoom={zoom} />
-      <BoundsController places={places} fitKey={fitKey} />
-      <SelectionController places={places} selectedPlaceId={selectedPlaceId} />
+      <BoundsController places={dayPlaces.length > 0 ? dayPlaces : places} fitKey={fitKey} paddingOpts={paddingOpts} />
+      <SelectionController places={places} selectedPlaceId={selectedPlaceId} dayPlaces={dayPlaces} paddingOpts={paddingOpts} />
      <MapClickHandler onClick={onMapClick} />

      <MarkerClusterGroup
@@ -206,6 +235,7 @@ export function MapView({
        spiderfyOnMaxZoom
        showCoverageOnHover={false}
        zoomToBoundsOnClick
+        singleMarkerMode
        iconCreateFunction={(cluster) => {
          const count = cluster.getChildCount()
          const size = count < 10 ? 36 : count < 50 ? 42 : 48
@@ -222,8 +252,8 @@ export function MapView({
        {places.map((place) => {
          const isSelected = place.id === selectedPlaceId
          const resolvedPhotoUrl = place.image_url || (place.google_place_id && photoUrls[place.google_place_id]) || null
-          const orderNumber = dayOrderMap[place.id] ?? null
-          const icon = createPlaceIcon({ ...place, image_url: resolvedPhotoUrl }, orderNumber, isSelected)
+          const orderNumbers = dayOrderMap[place.id] ?? null
+          const icon = createPlaceIcon({ ...place, image_url: resolvedPhotoUrl }, orderNumbers, isSelected)

          return (
            <Marker
@@ -9,7 +9,7 @@ const OSRM_BASE = 'https://router.project-osrm.org/route/v1'
 */
 export async function calculateRoute(waypoints, profile = 'driving') {
  if (!waypoints || waypoints.length < 2) {
-    throw new Error('Mindestens 2 Wegpunkte erforderlich')
+    throw new Error('At least 2 waypoints required')
  }

  const coords = waypoints.map(p => `${p.lng},${p.lat}`).join(';')
@@ -18,13 +18,13 @@ export async function calculateRoute(waypoints, profile = 'driving') {

  const response = await fetch(url)
  if (!response.ok) {
-    throw new Error('Route konnte nicht berechnet werden')
+    throw new Error('Route could not be calculated')
  }

  const data = await response.json()

  if (data.code !== 'Ok' || !data.routes || data.routes.length === 0) {
-    throw new Error('Keine Route gefunden')
+    throw new Error('No route found')
  }

  const route = data.routes[0]
@@ -74,20 +74,23 @@ export function optimizeRoute(places) {
  const visited = new Set()
  const result = []
  let current = valid[0]
-  visited.add(current.id)
+  visited.add(0)
  result.push(current)

  while (result.length < valid.length) {
-    let nearest = null
+    let nearestIdx = -1
    let minDist = Infinity
-    for (const place of valid) {
-      if (visited.has(place.id)) continue
+    for (let i = 0; i < valid.length; i++) {
+      if (visited.has(i)) continue
      const d = Math.sqrt(
-        Math.pow(place.lat - current.lat, 2) + Math.pow(place.lng - current.lng, 2)
+        Math.pow(valid[i].lat - current.lat, 2) + Math.pow(valid[i].lng - current.lng, 2)
      )
-      if (d < minDist) { minDist = d; nearest = place }
+      if (d < minDist) { minDist = d; nearestIdx = i }
    }
-    if (nearest) { visited.add(nearest.id); result.push(nearest); current = nearest }
+    if (nearestIdx === -1) break
+    visited.add(nearestIdx)
+    current = valid[nearestIdx]
+    result.push(current)
  }
  return result
 }
@@ -103,7 +106,7 @@ function formatDuration(seconds) {
  const h = Math.floor(seconds / 3600)
  const m = Math.floor((seconds % 3600) / 60)
  if (h > 0) {
-    return `${h} Std. ${m} Min.`
+    return `${h} h ${m} min`
  }
-  return `${m} Min.`
+  return `${m} min`
 }
@@ -1,8 +1,16 @@
 // Trip PDF via browser print window
 import { createElement } from 'react'
 import { getCategoryIcon } from '../shared/categoryIcons'
+import { FileText, Info, Clock, MapPin, Navigation, Train, Plane, Bus, Car, Ship, Coffee, Ticket, Star, Heart, Camera, Flag, Lightbulb, AlertTriangle, ShoppingBag, Bookmark } from 'lucide-react'
 import { mapsApi } from '../../api/client'

+const NOTE_ICON_MAP = { FileText, Info, Clock, MapPin, Navigation, Train, Plane, Bus, Car, Ship, Coffee, Ticket, Star, Heart, Camera, Flag, Lightbulb, AlertTriangle, ShoppingBag, Bookmark }
+function noteIconSvg(iconId) {
+  if (!_renderToStaticMarkup) return ''
+  const Icon = NOTE_ICON_MAP[iconId] || FileText
+  return _renderToStaticMarkup(createElement(Icon, { size: 14, strokeWidth: 1.8, color: '#94a3b8' }))
+}
+
 // ── SVG inline icons (for chips) ─────────────────────────────────────────────
 const svgPin   = `<svg width="11" height="11" viewBox="0 0 24 24" fill="#94a3b8" style="flex-shrink:0;margin-top:1px"><path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7z"/><circle cx="12" cy="9" r="2.5" fill="white"/></svg>`
 const svgClock = `<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="#374151" stroke-width="2" stroke-linecap="round"><circle cx="12" cy="12" r="9"/><path d="M12 7v5l3 3"/></svg>`
@@ -104,7 +112,7 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
    const cost = dayCost(assignments, day.id, loc)

    const merged = []
-    assigned.forEach(a => merged.push({ type: 'place', k: a.sort_order ?? 0, data: a }))
+    assigned.forEach(a => merged.push({ type: 'place', k: a.order_index ?? a.sort_order ?? 0, data: a }))
    notes.forEach(n    => merged.push({ type: 'note',  k: n.sort_order ?? 0, data: n }))
    merged.sort((a, b) => a.k - b.k)

@@ -117,12 +125,7 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
            return `
              <div class="note-card">
                <div class="note-line"></div>
-                <svg class="note-icon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#94a3b8" stroke-width="1.8" stroke-linecap="round">
-                  <rect x="4" y="3" width="16" height="18" rx="2"/>
-                  <line x1="8" y1="8" x2="16" y2="8"/>
-                  <line x1="8" y1="12" x2="16" y2="12"/>
-                  <line x1="8" y1="16" x2="13" y2="16"/>
-                </svg>
+                <span class="note-icon">${noteIconSvg(note.icon)}</span>
                <div class="note-body">
                  <div class="note-text">${escHtml(note.text)}</div>
                  ${note.time ? `<div class="note-time">${escHtml(note.time)}</div>` : ''}
@@ -141,9 +144,6 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
          const googleImg = photoMap[place.id] || null
          const img = directImg || googleImg

-          const confirmed = place.reservation_status === 'confirmed'
-          const pending   = place.reservation_status === 'pending'
-
          const iconSvg = categoryIconSvg(cat?.icon, color, 24)
          const thumbHtml = img
            ? `<img class="place-thumb" src="${escHtml(img)}" />`
@@ -154,8 +154,6 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
          const chips = [
            place.place_time ? `<span class="chip">${svgClock}${escHtml(place.place_time)}</span>` : '',
            place.price && parseFloat(place.price) > 0 ? `<span class="chip chip-green">${svgEuro}${Number(place.price).toLocaleString('de-DE')} EUR</span>` : '',
-            confirmed ? `<span class="chip chip-green">${svgCheck}${escHtml(tr('reservations.confirmed'))}</span>` : '',
-            pending   ? `<span class="chip chip-amber">${svgClock2}${escHtml(tr('reservations.pending'))}</span>` : '',
          ].filter(Boolean).join('')

          return `
@@ -200,6 +198,24 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
  body { font-family: 'Poppins', sans-serif; background: #fff; color: #1e293b; -webkit-print-color-adjust: exact; print-color-adjust: exact; }
  svg { -webkit-print-color-adjust: exact; print-color-adjust: exact; }

+  /* Footer on every printed page */
+  .pdf-footer {
+    position: fixed;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    opacity: 0.3;
+  }
+  .pdf-footer span {
+    font-size: 7px;
+    color: #64748b;
+    letter-spacing: 0.5px;
+  }
+
  /* ── Cover ─────────────────────────────────────── */
  .cover {
    width: 100%; min-height: 100vh;
@@ -215,8 +231,7 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
  .cover-dim { position: absolute; inset: 0; background: rgba(8,12,28,0.55); }
  .cover-brand {
    position: absolute; top: 36px; right: 52px;
-    font-size: 9px; font-weight: 600; letter-spacing: 2.5px;
-    color: rgba(255,255,255,0.3); text-transform: uppercase;
+    z-index: 2;
  }
  .cover-body { position: relative; z-index: 1; }
  .cover-circle {
@@ -316,17 +331,23 @@ export async function downloadTripPDF({ trip, days, places, assignments, categor
 </head>
 <body>

+<!-- Footer on every page -->
+<div class="pdf-footer">
+  <span>made with</span>
+  <img src="${absUrl('/logo-dark.svg')}" style="height:10px;opacity:0.6;" />
+</div>
+
 <!-- Cover -->
 <div class="cover">
  ${coverImg ? `<div class="cover-bg" style="background-image:url('${escHtml(coverImg)}')"></div>` : ''}
  <div class="cover-dim"></div>
-  <div class="cover-brand">NOMAD</div>
+  <div class="cover-brand"><img src="${absUrl('/logo-light.svg')}" style="height:28px;opacity:0.5;" /></div>
  <div class="cover-body">
    ${coverImg
      ? `<div class="cover-circle"><img src="${escHtml(coverImg)}" /></div>`
      : `<div class="cover-circle-ph"></div>`}
    <div class="cover-label">${escHtml(tr('pdf.travelPlan'))}</div>
-    <div class="cover-title">${escHtml(trip?.title || 'Meine Reise')}</div>
+    <div class="cover-title">${escHtml(trip?.title || 'My Trip')}</div>
    ${trip?.description ? `<div class="cover-desc">${escHtml(trip.description)}</div>` : ''}
    ${range ? `<div class="cover-dates">${range}</div>` : ''}
    <div class="cover-line"></div>
@@ -8,36 +8,36 @@ import {
 } from 'lucide-react'

 const VORSCHLAEGE = [
-  { name: 'Reisepass', kategorie: 'Dokumente' },
-  { name: 'Reiseversicherung', kategorie: 'Dokumente' },
-  { name: 'Visum-Unterlagen', kategorie: 'Dokumente' },
-  { name: 'Flugtickets', kategorie: 'Dokumente' },
-  { name: 'Hotelbuchungen', kategorie: 'Dokumente' },
-  { name: 'Impfpass', kategorie: 'Dokumente' },
-  { name: 'T-Shirts (5×)', kategorie: 'Kleidung' },
-  { name: 'Hosen (2×)', kategorie: 'Kleidung' },
-  { name: 'Unterwäsche (7×)', kategorie: 'Kleidung' },
-  { name: 'Socken (7×)', kategorie: 'Kleidung' },
-  { name: 'Jacke', kategorie: 'Kleidung' },
-  { name: 'Badeanzug / Badehose', kategorie: 'Kleidung' },
-  { name: 'Sportschuhe', kategorie: 'Kleidung' },
-  { name: 'Zahnbürste', kategorie: 'Körperpflege' },
-  { name: 'Zahnpasta', kategorie: 'Körperpflege' },
-  { name: 'Shampoo', kategorie: 'Körperpflege' },
-  { name: 'Sonnencreme', kategorie: 'Körperpflege' },
-  { name: 'Deo', kategorie: 'Körperpflege' },
-  { name: 'Rasierer', kategorie: 'Körperpflege' },
-  { name: 'Ladekabel Handy', kategorie: 'Elektronik' },
-  { name: 'Reiseadapter', kategorie: 'Elektronik' },
-  { name: 'Kopfhörer', kategorie: 'Elektronik' },
-  { name: 'Kamera', kategorie: 'Elektronik' },
-  { name: 'Powerbank', kategorie: 'Elektronik' },
-  { name: 'Erste-Hilfe-Set', kategorie: 'Gesundheit' },
-  { name: 'Verschreibungspflichtige Medikamente', kategorie: 'Gesundheit' },
-  { name: 'Schmerzmittel', kategorie: 'Gesundheit' },
-  { name: 'Mückenschutz', kategorie: 'Gesundheit' },
-  { name: 'Bargeld', kategorie: 'Finanzen' },
-  { name: 'Kreditkarte', kategorie: 'Finanzen' },
+  { name: 'Passport', category: 'Documents' },
+  { name: 'Travel Insurance', category: 'Documents' },
+  { name: 'Visa Documents', category: 'Documents' },
+  { name: 'Flight Tickets', category: 'Documents' },
+  { name: 'Hotel Bookings', category: 'Documents' },
+  { name: 'Vaccination Card', category: 'Documents' },
+  { name: 'T-Shirts (5x)', category: 'Clothing' },
+  { name: 'Pants (2x)', category: 'Clothing' },
+  { name: 'Underwear (7x)', category: 'Clothing' },
+  { name: 'Socks (7x)', category: 'Clothing' },
+  { name: 'Jacket', category: 'Clothing' },
+  { name: 'Swimwear', category: 'Clothing' },
+  { name: 'Sport Shoes', category: 'Clothing' },
+  { name: 'Toothbrush', category: 'Toiletries' },
+  { name: 'Toothpaste', category: 'Toiletries' },
+  { name: 'Shampoo', category: 'Toiletries' },
+  { name: 'Sunscreen', category: 'Toiletries' },
+  { name: 'Deodorant', category: 'Toiletries' },
+  { name: 'Razor', category: 'Toiletries' },
+  { name: 'Phone Charger', category: 'Electronics' },
+  { name: 'Travel Adapter', category: 'Electronics' },
+  { name: 'Headphones', category: 'Electronics' },
+  { name: 'Camera', category: 'Electronics' },
+  { name: 'Power Bank', category: 'Electronics' },
+  { name: 'First Aid Kit', category: 'Health' },
+  { name: 'Prescription Medication', category: 'Health' },
+  { name: 'Pain Medication', category: 'Health' },
+  { name: 'Insect Repellent', category: 'Health' },
+  { name: 'Cash', category: 'Finances' },
+  { name: 'Credit Card', category: 'Finances' },
 ]

 // Cycling color palette — works in light & dark mode
@@ -3,8 +3,10 @@ import { PhotoLightbox } from './PhotoLightbox'
 import { PhotoUpload } from './PhotoUpload'
 import { Upload, Camera } from 'lucide-react'
 import Modal from '../shared/Modal'
+import { useTranslation } from '../../i18n'

 export default function PhotoGallery({ photos, onUpload, onDelete, onUpdate, places, days, tripId }) {
+  const { t } = useTranslation()
  const [lightboxIndex, setLightboxIndex] = useState(null)
  const [showUpload, setShowUpload] = useState(false)
  const [filterDayId, setFilterDayId] = useState('')
@@ -49,7 +51,7 @@ export default function PhotoGallery({ photos, onUpload, onDelete, onUpdate, pla
          onChange={e => setFilterDayId(e.target.value)}
          className="border border-gray-200 rounded-lg px-3 py-1.5 text-sm text-gray-600 focus:outline-none focus:ring-2 focus:ring-slate-900"
        >
-          <option value="">Alle Tage</option>
+          <option value="">{t('photos.allDays')}</option>
          {(days || []).map(day => (
            <option key={day.id} value={day.id}>
              Tag {day.day_number}{day.date ? ` · ${formatDate(day.date)}` : ''}
@@ -62,7 +64,7 @@ export default function PhotoGallery({ photos, onUpload, onDelete, onUpdate, pla
            onClick={() => setFilterDayId('')}
            className="text-xs text-gray-500 hover:text-gray-700 underline"
          >
-            Zurücksetzen
+            {t('common.reset')}
          </button>
        )}

@@ -80,8 +82,8 @@ export default function PhotoGallery({ photos, onUpload, onDelete, onUpdate, pla
        {filteredPhotos.length === 0 ? (
          <div style={{ textAlign: 'center', padding: '60px 20px', color: '#9ca3af' }}>
            <Camera size={40} style={{ color: '#d1d5db', display: 'block', margin: '0 auto 12px' }} />
-            <p style={{ fontSize: 14, fontWeight: 600, color: '#374151', margin: '0 0 4px' }}>Noch keine Fotos</p>
-            <p style={{ fontSize: 13, color: '#9ca3af', margin: '0 0 20px' }}>Lade deine Reisefotos hoch</p>
+            <p style={{ fontSize: 14, fontWeight: 600, color: '#374151', margin: '0 0 4px' }}>{t('photos.noPhotos')}</p>
+            <p style={{ fontSize: 13, color: '#9ca3af', margin: '0 0 20px' }}>{t('photos.uploadHint')}</p>
            <button
              onClick={() => setShowUpload(true)}
              className="flex items-center gap-2 bg-slate-900 text-white px-6 py-3 rounded-xl hover:bg-slate-700 font-medium"
@@ -109,7 +111,7 @@ export default function PhotoGallery({ photos, onUpload, onDelete, onUpdate, pla
              className="aspect-square rounded-xl border-2 border-dashed border-gray-200 hover:border-slate-400 flex flex-col items-center justify-center gap-2 text-gray-400 hover:text-slate-700 transition-colors"
            >
              <Upload className="w-6 h-6" />
-              <span className="text-xs">Hinzufügen</span>
+              <span className="text-xs">{t('common.add')}</span>
            </button>
          </div>
        )}
@@ -1,7 +1,9 @@
 import React, { useState, useEffect, useCallback } from 'react'
 import { X, ChevronLeft, ChevronRight, Edit2, Trash2, Check } from 'lucide-react'
+import { useTranslation } from '../../i18n'

 export function PhotoLightbox({ photos, initialIndex, onClose, onUpdate, onDelete, days, places, tripId }) {
+  const { t } = useTranslation()
  const [index, setIndex] = useState(initialIndex || 0)
  const [editCaption, setEditCaption] = useState(false)
  const [caption, setCaption] = useState('')
@@ -81,7 +83,7 @@ export function PhotoLightbox({ photos, initialIndex, onClose, onUpdate, onDelet
            <button
              onClick={handleDelete}
              className="p-2 text-white/60 hover:text-red-400 hover:bg-white/10 rounded-lg transition-colors"
-              title="Löschen"
+              title={t('common.delete')}
            >
              <Trash2 className="w-4 h-4" />
            </button>
@@ -1,8 +1,10 @@
 import React, { useState, useCallback } from 'react'
 import { useDropzone } from 'react-dropzone'
 import { Upload, X, Image } from 'lucide-react'
+import { useTranslation } from '../../i18n'

 export function PhotoUpload({ tripId, days, places, onUpload, onClose }) {
+  const { t } = useTranslation()
  const [files, setFiles] = useState([])
  const [dayId, setDayId] = useState('')
  const [placeId, setPlaceId] = useState('')
@@ -78,7 +80,7 @@ export function PhotoUpload({ tripId, days, places, onUpload, onClose }) {
        ) : (
          <>
            <p className="text-gray-600 font-medium">Fotos hier ablegen</p>
-            <p className="text-gray-400 text-sm mt-1">oder klicken zum Auswählen</p>
+            <p className="text-gray-400 text-sm mt-1">{t('photos.clickToSelect')}</p>
            <p className="text-gray-400 text-xs mt-2">JPG, PNG, WebP · max. 10 MB · bis zu 30 Fotos</p>
          </>
        )}
@@ -128,13 +130,13 @@ export function PhotoUpload({ tripId, days, places, onUpload, onClose }) {
            </select>
          </div>
          <div>
-            <label className="block text-xs font-medium text-gray-700 mb-1">Ort verknüpfen</label>
+            <label className="block text-xs font-medium text-gray-700 mb-1">{t('photos.linkPlace')}</label>
            <select
              value={placeId}
              onChange={e => setPlaceId(e.target.value)}
              className="w-full border border-gray-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-slate-900"
            >
-              <option value="">Kein Ort</option>
+              <option value="">{t('photos.noPlace')}</option>
              {(places || []).map(place => (
                <option key={place.id} value={place.id}>{place.name}</option>
              ))}
@@ -175,7 +177,7 @@ export function PhotoUpload({ tripId, days, places, onUpload, onClose }) {
          onClick={onClose}
          className="px-4 py-2 text-sm text-gray-600 border border-gray-200 rounded-lg hover:bg-gray-50"
        >
-          Abbrechen
+          {t('common.cancel')}
        </button>
        <button
          onClick={handleUpload}
@@ -183,7 +185,7 @@ export function PhotoUpload({ tripId, days, places, onUpload, onClose }) {
          className="flex items-center gap-2 px-6 py-2 bg-slate-900 text-white text-sm rounded-lg hover:bg-slate-700 disabled:opacity-60 font-medium"
        >
          <Upload className="w-4 h-4" />
-          {uploading ? 'Hochladen...' : `${files.length} Foto${files.length !== 1 ? 's' : ''} hochladen`}
+          {uploading ? t('common.uploading') : t('photos.uploadN', { n: files.length })}
        </button>
      </div>
    </div>
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useSortable } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
-import { GripVertical, X, Edit2, Clock, DollarSign, CheckCircle, Clock3, MapPin } from 'lucide-react'
+import { GripVertical, X, Edit2, Clock, DollarSign, MapPin } from 'lucide-react'

 export default function AssignedPlaceItem({ assignment, dayId, onRemove, onEdit }) {
  const { place } = assignment
@@ -27,16 +27,6 @@ export default function AssignedPlaceItem({ assignment, dayId, onRemove, onEdit
    transition,
  }

-  const reservationIcon = () => {
-    if (place.reservation_status === 'confirmed') {
-      return <CheckCircle className="w-3.5 h-3.5 text-emerald-500" title="Confirmed" />
-    }
-    if (place.reservation_status === 'pending') {
-      return <Clock3 className="w-3.5 h-3.5 text-amber-500" title="Pending" />
-    }
-    return null
-  }
-
  return (
    <div
      ref={setNodeRef}
@@ -71,7 +61,6 @@ export default function AssignedPlaceItem({ assignment, dayId, onRemove, onEdit
              />
            )}
            <span className="text-sm font-medium text-slate-800 truncate">{place.name}</span>
-            {reservationIcon()}
          </div>

          {/* Time & price row */}
@@ -0,0 +1,537 @@
+import React, { useState, useEffect } from 'react'
+import ReactDOM from 'react-dom'
+import { X, Sun, Cloud, CloudRain, CloudSnow, CloudDrizzle, CloudLightning, Wind, Droplets, Sunrise, Sunset, Hotel, Calendar, MapPin, LogIn, LogOut, Hash, Pencil, Plane, Utensils, Train, Car, Ship, Ticket, FileText, Users } from 'lucide-react'
+
+const RES_TYPE_ICONS = { flight: Plane, hotel: Hotel, restaurant: Utensils, train: Train, car: Car, cruise: Ship, event: Ticket, tour: Users, other: FileText }
+const RES_TYPE_COLORS = { flight: '#3b82f6', hotel: '#8b5cf6', restaurant: '#ef4444', train: '#06b6d4', car: '#6b7280', cruise: '#0ea5e9', event: '#f59e0b', tour: '#10b981', other: '#6b7280' }
+import { weatherApi, accommodationsApi } from '../../api/client'
+import CustomSelect from '../shared/CustomSelect'
+import CustomTimePicker from '../shared/CustomTimePicker'
+import { useSettingsStore } from '../../store/settingsStore'
+import { useTranslation } from '../../i18n'
+
+const WEATHER_ICON_MAP = {
+  Clear: Sun, Clouds: Cloud, Rain: CloudRain, Drizzle: CloudDrizzle,
+  Thunderstorm: CloudLightning, Snow: CloudSnow, Mist: Wind, Fog: Wind, Haze: Wind,
+}
+
+function WIcon({ main, size = 14 }) {
+  const Icon = WEATHER_ICON_MAP[main] || Cloud
+  return <Icon size={size} strokeWidth={1.8} />
+}
+
+function cTemp(c, f) { return Math.round(f ? c * 9 / 5 + 32 : c) }
+
+function formatTime12(val, is12h) {
+  if (!val) return val
+  const [h, m] = val.split(':').map(Number)
+  if (isNaN(h) || isNaN(m)) return val
+  if (!is12h) return val
+  const period = h >= 12 ? 'PM' : 'AM'
+  const h12 = h === 0 ? 12 : h > 12 ? h - 12 : h
+  return `${h12}:${String(m).padStart(2, '0')} ${period}`
+}
+
+export default function DayDetailPanel({ day, days, places, categories = [], tripId, assignments, reservations = [], lat, lng, onClose, onAccommodationChange }) {
+  const { t, language } = useTranslation()
+  const isFahrenheit = useSettingsStore(s => s.settings.temperature_unit) === 'fahrenheit'
+  const is12h = useSettingsStore(s => s.settings.time_format) === '12h'
+  const fmtTime = (v) => formatTime12(v, is12h)
+  const unit = isFahrenheit ? '°F' : '°C'
+  const [weather, setWeather] = useState(null)
+  const [loading, setLoading] = useState(false)
+  const [accommodation, setAccommodation] = useState(null)
+  const [accommodations, setAccommodations] = useState([])
+  const [showHotelPicker, setShowHotelPicker] = useState(false)
+  const [hotelDayRange, setHotelDayRange] = useState({ start: day?.id, end: day?.id })
+  const [hotelCategoryFilter, setHotelCategoryFilter] = useState('')
+  const [hotelForm, setHotelForm] = useState({ check_in: '', check_out: '', confirmation: '' })
+
+  useEffect(() => {
+    if (!day?.date || !lat || !lng) { setWeather(null); return }
+    setLoading(true)
+    weatherApi.getDetailed(lat, lng, day.date, language)
+      .then(data => setWeather(data.error ? null : data))
+      .catch(() => setWeather(null))
+      .finally(() => setLoading(false))
+  }, [day?.date, lat, lng, language])
+
+  useEffect(() => {
+    if (!tripId) return
+    accommodationsApi.list(tripId)
+      .then(data => {
+        setAccommodations(data.accommodations || [])
+        const acc = (data.accommodations || []).find(a =>
+          days.some(d => d.id >= a.start_day_id && d.id <= a.end_day_id && d.id === day?.id)
+        )
+        setAccommodation(acc || null)
+      })
+      .catch(() => {})
+  }, [tripId, day?.id])
+
+  useEffect(() => { if (day) setHotelDayRange({ start: day.id, end: day.id }) }, [day?.id])
+
+  const handleSetAccommodation = async (placeId) => {
+    try {
+      const data = await accommodationsApi.create(tripId, {
+        place_id: placeId,
+        start_day_id: hotelDayRange.start,
+        end_day_id: hotelDayRange.end,
+        check_in: hotelForm.check_in || null,
+        check_out: hotelForm.check_out || null,
+        confirmation: hotelForm.confirmation || null,
+      })
+      setAccommodation(data.accommodation)
+      setAccommodations(prev => [...prev, data.accommodation])
+      setShowHotelPicker(false)
+      setHotelForm({ check_in: '', check_out: '', confirmation: '' })
+      onAccommodationChange?.()
+    } catch {}
+  }
+
+  const updateAccommodationField = async (field, value) => {
+    if (!accommodation) return
+    try {
+      const data = await accommodationsApi.update(tripId, accommodation.id, { [field]: value || null })
+      setAccommodation(data.accommodation)
+      onAccommodationChange?.()
+    } catch {}
+  }
+
+  const handleRemoveAccommodation = async () => {
+    if (!accommodation) return
+    try {
+      await accommodationsApi.delete(tripId, accommodation.id)
+      setAccommodations(prev => prev.filter(a => a.id !== accommodation.id))
+      setAccommodation(null)
+      onAccommodationChange?.()
+    } catch {}
+  }
+
+  if (!day) return null
+
+  const formattedDate = day.date ? new Date(day.date + 'T00:00:00').toLocaleDateString(
+    language === 'de' ? 'de-DE' : 'en-US',
+    { weekday: 'long', day: 'numeric', month: 'long' }
+  ) : null
+
+  const placesWithCoords = places.filter(p => p.lat && p.lng)
+  const font = { fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }
+
+  return (
+    <div style={{ position: 'fixed', bottom: 20, left: '50%', transform: 'translateX(-50%)', width: 'min(800px, calc(100vw - 32px))', zIndex: 50, ...font }}>
+      <div style={{
+        background: 'var(--bg-elevated)',
+        backdropFilter: 'blur(40px) saturate(180%)',
+        WebkitBackdropFilter: 'blur(40px) saturate(180%)',
+        borderRadius: 20,
+        boxShadow: '0 8px 40px rgba(0,0,0,0.14), 0 0 0 1px rgba(0,0,0,0.06)',
+        overflow: 'hidden', maxHeight: '60vh', display: 'flex', flexDirection: 'column',
+      }}>
+        {/* Header */}
+        <div style={{ display: 'flex', alignItems: 'center', gap: 14, padding: '18px 16px 14px 20px', borderBottom: '1px solid var(--border-faint)' }}>
+          <div style={{ width: 44, height: 44, borderRadius: 12, background: 'var(--bg-secondary)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+            <Calendar size={20} style={{ color: 'var(--text-primary)' }} />
+          </div>
+          <div style={{ flex: 1, minWidth: 0 }}>
+            <div style={{ fontSize: 15, fontWeight: 700, color: 'var(--text-primary)' }}>
+              {day.title || t('planner.dayN', { n: (days.indexOf(day) + 1) || '?' })}
+            </div>
+            {formattedDate && <div style={{ fontSize: 12, color: 'var(--text-muted)', marginTop: 1 }}>{formattedDate}</div>}
+          </div>
+          <button onClick={onClose} style={{ background: 'var(--bg-secondary)', border: 'none', borderRadius: 10, width: 32, height: 32, display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer', flexShrink: 0 }}>
+            <X size={14} style={{ color: 'var(--text-muted)' }} />
+          </button>
+        </div>
+
+        {/* Scrollable content */}
+        <div style={{ overflowY: 'auto', padding: '14px 20px 18px' }}>
+
+          {/* ── Weather ── */}
+          {day.date && lat && lng && (
+            loading ? (
+              <div style={{ textAlign: 'center', padding: 16, color: 'var(--text-faint)', fontSize: 12 }}>
+                <div style={{ width: 18, height: 18, border: '2px solid var(--border-primary)', borderTopColor: 'var(--text-primary)', borderRadius: '50%', animation: 'spin 0.8s linear infinite', margin: '0 auto 6px' }} />
+              </div>
+            ) : weather ? (
+              <div>
+                {/* Summary row */}
+                <div style={{ display: 'flex', alignItems: 'center', gap: 12, marginBottom: 10 }}>
+                  <div style={{ width: 40, height: 40, borderRadius: 12, background: 'var(--bg-secondary)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                    <WIcon main={weather.main} size={20} />
+                  </div>
+                  <div style={{ flex: 1, display: 'flex', alignItems: 'baseline', gap: 6, flexWrap: 'wrap' }}>
+                    <span style={{ fontSize: 20, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1 }}>
+                      {weather.type === 'climate' ? 'Ø ' : ''}{cTemp(weather.temp, isFahrenheit)}{unit}
+                    </span>
+                    {weather.temp_max != null && (
+                      <span style={{ fontSize: 12, color: 'var(--text-faint)' }}>
+                        {cTemp(weather.temp_min, isFahrenheit)}° / {cTemp(weather.temp_max, isFahrenheit)}°
+                      </span>
+                    )}
+                    {weather.description && (
+                      <span style={{ fontSize: 12, color: 'var(--text-muted)', textTransform: 'capitalize' }}>{weather.description}</span>
+                    )}
+                  </div>
+                </div>
+
+                {/* Chips row */}
+                <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6, marginBottom: weather.hourly ? 10 : 0 }}>
+                  {weather.precipitation_probability_max != null && (
+                    <Chip icon={Droplets} value={`${weather.precipitation_probability_max}%`} />
+                  )}
+                  {weather.precipitation_sum > 0 && (
+                    <Chip icon={CloudRain} value={`${weather.precipitation_sum.toFixed(1)} mm`} />
+                  )}
+                  {weather.wind_max != null && (
+                    <Chip icon={Wind} value={isFahrenheit ? `${Math.round(weather.wind_max * 0.621371)} mph` : `${Math.round(weather.wind_max)} km/h`} />
+                  )}
+                  {weather.sunrise && <Chip icon={Sunrise} value={weather.sunrise} />}
+                  {weather.sunset && <Chip icon={Sunset} value={weather.sunset} />}
+                </div>
+
+                {/* Hourly scroll */}
+                {weather.hourly?.length > 0 && (
+                  <div style={{ overflowX: 'auto', margin: '0 -6px', padding: '0 6px 4px' }}>
+                    <div style={{ display: 'inline-flex', gap: 2 }}>
+                      {weather.hourly.filter((_, i) => i % 2 === 0).map(h => (
+                        <div key={h.hour} style={{
+                          display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 3,
+                          width: 44, padding: '5px 2px', borderRadius: 8,
+                          background: h.precipitation_probability > 50 ? 'rgba(59,130,246,0.07)' : 'transparent',
+                        }}>
+                          <span style={{ fontSize: 9, color: 'var(--text-faint)', fontWeight: 500 }}>{String(h.hour).padStart(2, '0')}</span>
+                          <WIcon main={h.main} size={12} />
+                          <span style={{ fontSize: 10, fontWeight: 600, color: 'var(--text-primary)' }}>{cTemp(h.temp, isFahrenheit)}°</span>
+                          {h.precipitation_probability > 0 && (
+                            <span style={{ fontSize: 8, color: '#3b82f6', fontWeight: 500 }}>{h.precipitation_probability}%</span>
+                          )}
+                        </div>
+                      ))}
+                    </div>
+                  </div>
+                )}
+
+                {weather.type === 'climate' && (
+                  <div style={{ fontSize: 10, color: 'var(--text-faint)', marginTop: 6, fontStyle: 'italic' }}>{t('day.climateHint')}</div>
+                )}
+              </div>
+            ) : (
+              <div style={{ fontSize: 12, color: 'var(--text-faint)', textAlign: 'center', padding: 8 }}>{t('day.noWeather')}</div>
+            )
+          )}
+
+          {/* Divider */}
+          {day.date && lat && lng && <div style={{ height: 1, background: 'var(--border-faint)', margin: '12px 0' }} />}
+
+          {/* ── Reservations for this day's assignments ── */}
+          {(() => {
+            const dayAssignments = assignments[String(day.id)] || []
+            const dayReservations = reservations.filter(r => dayAssignments.some(a => a.id === r.assignment_id))
+            if (dayReservations.length === 0) return null
+            return (
+              <div style={{ marginBottom: 0 }}>
+                <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: 6 }}>{t('day.reservations')}</div>
+                <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+                  {dayReservations.map(r => {
+                    const linkedAssignment = dayAssignments.find(a => a.id === r.assignment_id)
+                    const confirmed = r.status === 'confirmed'
+                    return (
+                      <div key={r.id} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '5px 10px', borderRadius: 8, background: confirmed ? 'rgba(22,163,74,0.06)' : 'rgba(217,119,6,0.06)', border: `1px solid ${confirmed ? 'rgba(22,163,74,0.15)' : 'rgba(217,119,6,0.15)'}` }}>
+                        {(() => { const TIcon = RES_TYPE_ICONS[r.type] || FileText; return <TIcon size={12} style={{ color: RES_TYPE_COLORS[r.type] || 'var(--text-faint)', flexShrink: 0 }} /> })()}
+                        <div style={{ flex: 1, minWidth: 0, display: 'flex', alignItems: 'center', gap: 6, overflow: 'hidden' }}>
+                          <span style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>{r.title}</span>
+                          {linkedAssignment?.place && <span style={{ fontSize: 9, color: 'var(--text-faint)', whiteSpace: 'nowrap' }}>· {linkedAssignment.place.name}</span>}
+                        </div>
+                        {r.reservation_time && (
+                          <span style={{ fontSize: 10, color: 'var(--text-muted)', whiteSpace: 'nowrap', flexShrink: 0 }}>
+                            {new Date(r.reservation_time).toLocaleTimeString(language === 'de' ? 'de-DE' : 'en-US', { hour: '2-digit', minute: '2-digit', hour12: is12h })}
+                          </span>
+                        )}
+                      </div>
+                    )
+                  })}
+                </div>
+              </div>
+            )
+          })()}
+
+          {/* Divider before accommodation */}
+          <div style={{ height: 1, background: 'var(--border-faint)', margin: '12px 0' }} />
+
+          {/* ── Accommodation ── */}
+          <div>
+            <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: 8 }}>{t('day.accommodation')}</div>
+
+            {accommodation ? (
+              <div style={{ borderRadius: 12, background: 'var(--bg-secondary)', overflow: 'hidden' }}>
+                {/* Hotel header */}
+                <div style={{ display: 'flex', alignItems: 'center', gap: 10, padding: '10px 12px' }}>
+                  <div style={{ width: 36, height: 36, borderRadius: 10, background: 'var(--bg-tertiary)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                    {accommodation.place_image ? (
+                      <img src={accommodation.place_image} style={{ width: '100%', height: '100%', borderRadius: 10, objectFit: 'cover' }} />
+                    ) : (
+                      <Hotel size={16} style={{ color: 'var(--text-muted)' }} />
+                    )}
+                  </div>
+                  <div style={{ flex: 1, minWidth: 0 }}>
+                    <div style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{accommodation.place_name}</div>
+                    {accommodation.place_address && <div style={{ fontSize: 10, color: 'var(--text-faint)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{accommodation.place_address}</div>}
+                  </div>
+                  <button onClick={handleRemoveAccommodation} style={{ background: 'none', border: 'none', cursor: 'pointer', padding: 3, flexShrink: 0 }}>
+                    <X size={12} style={{ color: 'var(--text-faint)' }} />
+                  </button>
+                </div>
+                {/* Details row */}
+                {/* Details grid */}
+                <div style={{ display: 'flex', gap: 0, margin: '0 12px 10px', borderRadius: 10, overflow: 'hidden', border: '1px solid var(--border-faint)' }}>
+                  {accommodation.check_in && (
+                    <div style={{ flex: 1, padding: '8px 10px', borderRight: '1px solid var(--border-faint)', textAlign: 'center' }}>
+                      <div style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1.2 }}>{fmtTime(accommodation.check_in)}</div>
+                      <div style={{ fontSize: 9, color: 'var(--text-faint)', fontWeight: 500, marginTop: 2, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 3 }}>
+                        <LogIn size={8} /> {t('day.checkIn')}
+                      </div>
+                    </div>
+                  )}
+                  {accommodation.check_out && (
+                    <div style={{ flex: 1, padding: '8px 10px', borderRight: accommodation.confirmation ? '1px solid var(--border-faint)' : 'none', textAlign: 'center' }}>
+                      <div style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1.2 }}>{fmtTime(accommodation.check_out)}</div>
+                      <div style={{ fontSize: 9, color: 'var(--text-faint)', fontWeight: 500, marginTop: 2, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 3 }}>
+                        <LogOut size={8} /> {t('day.checkOut')}
+                      </div>
+                    </div>
+                  )}
+                  {accommodation.confirmation && (
+                    <div style={{ flex: 1, padding: '8px 10px', textAlign: 'center' }}>
+                      <div style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', lineHeight: 1.2 }}>{accommodation.confirmation}</div>
+                      <div style={{ fontSize: 9, color: 'var(--text-faint)', fontWeight: 500, marginTop: 2, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 3 }}>
+                        <Hash size={8} /> {t('day.confirmation')}
+                      </div>
+                    </div>
+                  )}
+                  <button onClick={() => { setHotelForm({ check_in: accommodation.check_in || '', check_out: accommodation.check_out || '', confirmation: accommodation.confirmation || '' }); setShowHotelPicker('edit') }}
+                    style={{ padding: '0 8px', background: 'none', border: 'none', borderLeft: '1px solid var(--border-faint)', cursor: 'pointer', display: 'flex', alignItems: 'center' }}>
+                    <Pencil size={10} style={{ color: 'var(--text-faint)' }} />
+                  </button>
+                </div>
+              </div>
+            ) : (
+              <button onClick={() => setShowHotelPicker(true)} style={{
+                width: '100%', padding: 10, border: '1.5px dashed var(--border-primary)', borderRadius: 10,
+                background: 'none', cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 5,
+                fontSize: 11, color: 'var(--text-faint)', fontFamily: 'inherit',
+              }}>
+                <Hotel size={12} /> {t('day.addAccommodation')}
+              </button>
+            )}
+
+            {/* Hotel Picker Popup — portal to body to escape transform stacking context */}
+            {showHotelPicker && ReactDOM.createPortal(
+              <div style={{ position: 'fixed', inset: 0, zIndex: 99999, background: 'rgba(0,0,0,0.4)', backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }}
+                onClick={() => setShowHotelPicker(false)}>
+                <div onClick={e => e.stopPropagation()} style={{
+                  width: '100%', maxWidth: 900, borderRadius: 16, overflow: 'hidden',
+                  background: 'var(--bg-card)', boxShadow: '0 20px 60px rgba(0,0,0,0.2)',
+                  ...font,
+                }}>
+                  {/* Popup Header */}
+                  <div style={{ padding: '16px 18px 12px', borderBottom: '1px solid var(--border-faint)', display: 'flex', alignItems: 'center', gap: 10 }}>
+                    <Hotel size={16} style={{ color: 'var(--text-primary)' }} />
+                    <span style={{ fontSize: 14, fontWeight: 700, color: 'var(--text-primary)', flex: 1 }}>{showHotelPicker === 'edit' ? t('day.editAccommodation') : t('day.addAccommodation')}</span>
+                    <button onClick={() => setShowHotelPicker(false)} style={{ background: 'var(--bg-secondary)', border: 'none', borderRadius: 8, width: 28, height: 28, display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer' }}>
+                      <X size={12} style={{ color: 'var(--text-muted)' }} />
+                    </button>
+                  </div>
+
+                  {/* Day Range (hidden in edit mode) */}
+                  {showHotelPicker !== 'edit' && <div style={{ padding: '12px 18px', borderBottom: '1px solid var(--border-faint)', background: 'var(--bg-secondary)' }}>
+                    <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-faint)', marginBottom: 8, textTransform: 'uppercase', letterSpacing: '0.04em' }}>{t('day.hotelDayRange')}</div>
+                    <div style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
+                      <div style={{ flex: 1, minWidth: 0 }}>
+                        <CustomSelect
+                          value={hotelDayRange.start}
+                          onChange={v => setHotelDayRange(prev => ({ start: v, end: Math.max(v, prev.end) }))}
+                          options={days.map((d, i) => ({
+                            value: d.id,
+                            label: `${d.title || t('planner.dayN', { n: i + 1 })}${d.date ? ` — ${new Date(d.date + 'T00:00:00').toLocaleDateString(language === 'de' ? 'de-DE' : 'en-US', { day: 'numeric', month: 'short' })}` : ''}`,
+                          }))}
+                          size="sm"
+                        />
+                      </div>
+                      <span style={{ fontSize: 11, color: 'var(--text-faint)', flexShrink: 0 }}>→</span>
+                      <div style={{ flex: 1, minWidth: 0 }}>
+                        <CustomSelect
+                          value={hotelDayRange.end}
+                          onChange={v => setHotelDayRange(prev => ({ start: Math.min(prev.start, v), end: v }))}
+                          options={days.map((d, i) => ({
+                            value: d.id,
+                            label: `${d.title || t('planner.dayN', { n: i + 1 })}${d.date ? ` — ${new Date(d.date + 'T00:00:00').toLocaleDateString(language === 'de' ? 'de-DE' : 'en-US', { day: 'numeric', month: 'short' })}` : ''}`,
+                          }))}
+                          size="sm"
+                        />
+                      </div>
+                      <button onClick={() => setHotelDayRange({ start: days[0]?.id, end: days[days.length - 1]?.id })} style={{
+                        padding: '6px 14px', borderRadius: 8, border: 'none', fontSize: 11, fontWeight: 600, cursor: 'pointer', flexShrink: 0,
+                        background: hotelDayRange.start === days[0]?.id && hotelDayRange.end === days[days.length - 1]?.id ? 'var(--text-primary)' : 'var(--bg-card)',
+                        color: hotelDayRange.start === days[0]?.id && hotelDayRange.end === days[days.length - 1]?.id ? 'var(--bg-card)' : 'var(--text-muted)',
+                      }}>
+                        {t('day.allDays')}
+                      </button>
+                    </div>
+                  </div>}
+
+                  {/* Check-in / Check-out / Confirmation */}
+                  <div style={{ padding: '10px 18px', borderBottom: '1px solid var(--border-faint)', display: 'flex', gap: 8, flexWrap: 'wrap' }}>
+                    <div style={{ flex: 1, minWidth: 100 }}>
+                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.checkIn')}</label>
+                      <CustomTimePicker value={hotelForm.check_in} onChange={v => setHotelForm(f => ({ ...f, check_in: v }))} placeholder="14:00" />
+                    </div>
+                    <div style={{ flex: 1, minWidth: 100 }}>
+                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.checkOut')}</label>
+                      <CustomTimePicker value={hotelForm.check_out} onChange={v => setHotelForm(f => ({ ...f, check_out: v }))} placeholder="11:00" />
+                    </div>
+                    <div style={{ flex: 2, minWidth: 120 }}>
+                      <label style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.04em', display: 'block', marginBottom: 3 }}>{t('day.confirmation')}</label>
+                      <input type="text" value={hotelForm.confirmation} onChange={e => setHotelForm(f => ({ ...f, confirmation: e.target.value }))}
+                        placeholder="ABC-12345" style={{ width: '100%', padding: '8px 10px', borderRadius: 10, border: '1px solid var(--border-primary)', background: 'var(--bg-card)', color: 'var(--text-primary)', fontSize: 13, fontFamily: 'inherit', boxSizing: 'border-box', height: 38 }} />
+                    </div>
+                  </div>
+
+                  {/* Edit mode: save button instead of place list */}
+                  {showHotelPicker === 'edit' ? (
+                    <div style={{ padding: '14px 18px', display: 'flex', justifyContent: 'flex-end' }}>
+                      <button onClick={async () => {
+                        await updateAccommodationField('check_in', hotelForm.check_in)
+                        await updateAccommodationField('check_out', hotelForm.check_out)
+                        await updateAccommodationField('confirmation', hotelForm.confirmation)
+                        setShowHotelPicker(false)
+                      }} style={{
+                        padding: '8px 20px', borderRadius: 10, border: 'none', fontSize: 12, fontWeight: 600, cursor: 'pointer',
+                        background: 'var(--text-primary)', color: 'var(--bg-card)',
+                      }}>
+                        {t('common.save')}
+                      </button>
+                    </div>
+                  ) : <>
+
+                  {/* Category Filter */}
+                  {categories.length > 0 && (
+                    <div style={{ padding: '8px 18px', borderBottom: '1px solid var(--border-faint)', display: 'flex', gap: 4, flexWrap: 'wrap' }}>
+                      <button onClick={() => setHotelCategoryFilter('')} style={{
+                        padding: '3px 10px', borderRadius: 6, border: 'none', fontSize: 10, fontWeight: 600, cursor: 'pointer',
+                        background: !hotelCategoryFilter ? 'var(--text-primary)' : 'var(--bg-secondary)',
+                        color: !hotelCategoryFilter ? 'var(--bg-card)' : 'var(--text-muted)',
+                      }}>{t('day.allDays')}</button>
+
+                      {categories.map(c => (
+                        <button key={c.id} onClick={() => setHotelCategoryFilter(c.id)} style={{
+                          padding: '3px 10px', borderRadius: 6, border: 'none', fontSize: 10, fontWeight: 600, cursor: 'pointer',
+                          background: hotelCategoryFilter === c.id ? c.color || 'var(--text-primary)' : 'var(--bg-secondary)',
+                          color: hotelCategoryFilter === c.id ? '#fff' : 'var(--text-muted)',
+                        }}>{c.name}</button>
+                      ))}
+                    </div>
+                  )}
+
+                  {/* Place List */}
+                  <div style={{ maxHeight: 250, overflowY: 'auto' }}>
+                    {(() => {
+                      const filtered = hotelCategoryFilter ? places.filter(p => p.category_id === hotelCategoryFilter) : places
+                      return filtered.length === 0 ? (
+                        <div style={{ padding: 20, textAlign: 'center', fontSize: 12, color: 'var(--text-faint)' }}>{t('day.noPlacesForHotel')}</div>
+                      ) : filtered.map(p => (
+                      <button key={p.id} onClick={() => handleSetAccommodation(p.id)} style={{
+                        display: 'flex', alignItems: 'center', gap: 10, width: '100%', padding: '10px 18px',
+                        border: 'none', borderBottom: '1px solid var(--border-faint)', background: 'none',
+                        cursor: 'pointer', fontFamily: 'inherit', textAlign: 'left',
+                        transition: 'background 0.1s',
+                      }}
+                        onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
+                        onMouseLeave={e => e.currentTarget.style.background = 'none'}
+                      >
+                        <div style={{ width: 32, height: 32, borderRadius: 8, background: 'var(--bg-secondary)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                          {p.image_url ? (
+                            <img src={p.image_url} style={{ width: '100%', height: '100%', borderRadius: 8, objectFit: 'cover' }} />
+                          ) : (
+                            <MapPin size={13} style={{ color: 'var(--text-faint)' }} />
+                          )}
+                        </div>
+                        <div style={{ flex: 1, minWidth: 0 }}>
+                          <div style={{ fontSize: 12, fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{p.name}</div>
+                          {p.address && <div style={{ fontSize: 10, color: 'var(--text-faint)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{p.address}</div>}
+                        </div>
+                      </button>
+                    ))
+                    })()}
+                  </div>
+                </>}
+                </div>
+              </div>,
+              document.body
+            )}
+          </div>
+        </div>
+      </div>
+      <style>{`@keyframes spin { to { transform: rotate(360deg) } }`}</style>
+    </div>
+  )
+}
+
+function Chip({ icon: Icon, value }) {
+  return (
+    <div style={{ display: 'inline-flex', alignItems: 'center', gap: 4, padding: '4px 8px', borderRadius: 8, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
+      <Icon size={11} style={{ flexShrink: 0, opacity: 0.6 }} />
+      <span style={{ fontWeight: 500 }}>{value}</span>
+    </div>
+  )
+}
+
+function InfoChip({ icon: Icon, label, value, placeholder, onEdit, type }) {
+  const [editing, setEditing] = React.useState(false)
+  const [val, setVal] = React.useState(value || '')
+  const inputRef = React.useRef(null)
+
+  React.useEffect(() => { setVal(value || '') }, [value])
+  React.useEffect(() => { if (editing && inputRef.current) inputRef.current.focus() }, [editing])
+
+  const save = () => {
+    setEditing(false)
+    if (val !== (value || '')) onEdit(val)
+  }
+
+  return (
+    <div
+      onClick={() => setEditing(true)}
+      style={{
+        display: 'flex', alignItems: 'center', gap: 5, padding: '5px 9px', borderRadius: 8,
+        background: 'var(--bg-card)', border: '1px solid var(--border-faint)',
+        cursor: 'pointer', minWidth: 0, flex: type === 'text' ? 1 : undefined,
+      }}
+    >
+      <Icon size={11} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+      <div style={{ minWidth: 0 }}>
+        <div style={{ fontSize: 8, color: 'var(--text-faint)', fontWeight: 600, textTransform: 'uppercase', letterSpacing: '0.04em', lineHeight: 1 }}>{label}</div>
+        {editing ? (
+          <input
+            ref={inputRef}
+            type={type}
+            value={val}
+            onChange={e => setVal(e.target.value)}
+            onBlur={save}
+            onKeyDown={e => { if (e.key === 'Enter') save(); if (e.key === 'Escape') { setVal(value || ''); setEditing(false) } }}
+            onClick={e => e.stopPropagation()}
+            style={{
+              border: 'none', outline: 'none', background: 'none', padding: 0, margin: 0,
+              fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', fontFamily: 'inherit',
+              width: type === 'time' ? 50 : '100%', lineHeight: 1.3,
+            }}
+          />
+        ) : (
+          <div style={{ fontSize: 11, fontWeight: 600, color: value ? 'var(--text-primary)' : 'var(--text-faint)', lineHeight: 1.3, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+            {value || placeholder}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
@@ -1,6 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react'
 import ReactDOM from 'react-dom'
-import { ChevronDown, ChevronRight, ChevronUp, Navigation, RotateCcw, ExternalLink, Clock, AlertCircle, CheckCircle2, Pencil, GripVertical, Ticket, Plus, FileText, Check, Trash2, Info, MapPin, Star, Heart, Camera, Lightbulb, Flag, Bookmark, Train, Bus, Plane, Car, Ship, Coffee, ShoppingBag, AlertTriangle, FileDown } from 'lucide-react'
+import { ChevronDown, ChevronRight, ChevronUp, Navigation, RotateCcw, ExternalLink, Clock, Pencil, GripVertical, Ticket, Plus, FileText, Check, Trash2, Info, MapPin, Star, Heart, Camera, Lightbulb, Flag, Bookmark, Train, Bus, Plane, Car, Ship, Coffee, ShoppingBag, AlertTriangle, FileDown, Lock, Hotel, Utensils, Users } from 'lucide-react'
+
+const RES_ICONS = { flight: Plane, hotel: Hotel, restaurant: Utensils, train: Train, car: Car, cruise: Ship, event: Ticket, tour: Users, other: FileText }
 import { downloadTripPDF } from '../PDF/TripPDF'
 import { calculateRoute, generateGoogleMapsUrl, optimizeRoute } from '../Map/RouteCalculator'
 import PlaceAvatar from '../shared/PlaceAvatar'
@@ -71,32 +73,28 @@ const TYPE_ICONS = {
 export default function DayPlanSidebar({
  tripId,
  trip, days, places, categories, assignments,
-  selectedDayId, selectedPlaceId,
-  onSelectDay, onPlaceClick,
+  selectedDayId, selectedPlaceId, selectedAssignmentId,
+  onSelectDay, onPlaceClick, onDayDetail, accommodations = [],
  onReorder, onUpdateDayTitle, onRouteCalculated,
  onAssignToDay,
  reservations = [],
  onAddReservation,
 }) {
  const toast = useToast()
-  const { t, locale } = useTranslation()
+  const { t, language, locale } = useTranslation()
  const timeFormat = useSettingsStore(s => s.settings.time_format) || '24h'
  const tripStore = useTripStore()

-  const TRANSPORT_MODES = [
-    { value: 'driving', label: t('dayplan.transport.car') },
-    { value: 'walking', label: t('dayplan.transport.walk') },
-    { value: 'cycling', label: t('dayplan.transport.bike') },
-  ]
  const dayNotes = tripStore.dayNotes || {}

  const [expandedDays, setExpandedDays] = useState(() => new Set(days.map(d => d.id)))
  const [editingDayId, setEditingDayId] = useState(null)
  const [editTitle, setEditTitle] = useState('')
-  const [transportMode, setTransportMode] = useState('driving')
  const [isCalculating, setIsCalculating] = useState(false)
  const [routeInfo, setRouteInfo] = useState(null)
  const [draggingId, setDraggingId] = useState(null)
+  const [lockedIds, setLockedIds] = useState(new Set())
+  const [lockHoverId, setLockHoverId] = useState(null)
  const [dropTargetKey, setDropTargetKey] = useState(null)
  const [dragOverDayId, setDragOverDayId] = useState(null)
  const [hoveredId, setHoveredId] = useState(null)
@@ -205,16 +203,17 @@ export default function DayPlanSidebar({
    catch (err) { toast.error(err.message) }
  }

-  const handleMergedDrop = async (dayId, fromType, fromId, toType, toId) => {
+  const handleMergedDrop = async (dayId, fromType, fromId, toType, toId, insertAfter = false) => {
    const m = getMergedItems(dayId)
    const fromIdx = m.findIndex(i => i.type === fromType && i.data.id === fromId)
    const toIdx = m.findIndex(i => i.type === toType && i.data.id === toId)
    if (fromIdx === -1 || toIdx === -1 || fromIdx === toIdx) return

-    // Neue Reihenfolge erstellen — VOR dem Ziel einfügen (Standardkonvention)
+    // Neue Reihenfolge erstellen — VOR dem Ziel einfügen (Standard), oder NACH dem Ziel wenn insertAfter
    const newOrder = [...m]
    const [moved] = newOrder.splice(fromIdx, 1)
-    const adjustedTo = fromIdx < toIdx ? toIdx - 1 : toIdx
+    let adjustedTo = fromIdx < toIdx ? toIdx - 1 : toIdx
+    if (insertAfter) adjustedTo += 1
    newOrder.splice(adjustedTo, 0, moved)

    // Orte: neuer order_index über onReorder
@@ -281,7 +280,7 @@ export default function DayPlanSidebar({
    if (waypoints.length < 2) { toast.error(t('dayplan.toast.needTwoPlaces')); return }
    setIsCalculating(true)
    try {
-      const result = await calculateRoute(waypoints, transportMode)
+      const result = await calculateRoute(waypoints, 'walking')
      // Luftlinien zwischen Wegpunkten anzeigen
      const lineCoords = waypoints.map(p => [p.lat, p.lng])
      setRouteInfo({ distance: result.distanceText, duration: result.durationText })
@@ -290,15 +289,45 @@ export default function DayPlanSidebar({
    finally { setIsCalculating(false) }
  }

+  const toggleLock = (assignmentId) => {
+    setLockedIds(prev => {
+      const next = new Set(prev)
+      if (next.has(assignmentId)) next.delete(assignmentId)
+      else next.add(assignmentId)
+      return next
+    })
+  }
+
  const handleOptimize = async () => {
    if (!selectedDayId) return
    const da = getDayAssignments(selectedDayId)
    if (da.length < 3) return
-    const withCoords = da.map(a => a.place).filter(p => p?.lat && p?.lng)
-    const optimized = optimizeRoute(withCoords)
-    const reorderedIds = optimized.map(p => da.find(a => a.place?.id === p.id)?.id).filter(Boolean)
-    for (const a of da) { if (!reorderedIds.includes(a.id)) reorderedIds.push(a.id) }
-    await onReorder(selectedDayId, reorderedIds)
+
+    // Separate locked (stay at their index) and unlocked assignments
+    const locked = new Map() // index -> assignment
+    const unlocked = []
+    da.forEach((a, i) => {
+      if (lockedIds.has(a.id)) locked.set(i, a)
+      else unlocked.push(a)
+    })
+
+    // Optimize only unlocked assignments (work on assignments, not places)
+    const unlockedWithCoords = unlocked.filter(a => a.place?.lat && a.place?.lng)
+    const unlockedNoCoords = unlocked.filter(a => !a.place?.lat || !a.place?.lng)
+    const optimizedAssignments = unlockedWithCoords.length >= 2
+      ? optimizeRoute(unlockedWithCoords.map(a => ({ ...a.place, _assignmentId: a.id }))).map(p => unlockedWithCoords.find(a => a.id === p._assignmentId)).filter(Boolean)
+      : unlockedWithCoords
+    const optimizedQueue = [...optimizedAssignments, ...unlockedNoCoords]
+
+    // Merge: locked stay at their index, fill gaps with optimized
+    const result = new Array(da.length)
+    locked.forEach((a, i) => { result[i] = a })
+    let qi = 0
+    for (let i = 0; i < result.length; i++) {
+      if (!result[i]) result[i] = optimizedQueue[qi++]
+    }
+
+    await onReorder(selectedDayId, result.map(a => a.id))
    toast.success(t('dayplan.toast.routeOptimized'))
  }

@@ -415,7 +444,7 @@ export default function DayPlanSidebar({
            <div key={day.id} style={{ borderBottom: '1px solid var(--border-faint)' }}>
              {/* Tages-Header — akzeptiert Drops aus der PlacesSidebar */}
              <div
-                onClick={() => onSelectDay(isSelected ? null : day.id)}
+                onClick={() => { onSelectDay(isSelected ? null : day.id); if (onDayDetail) onDayDetail(isSelected ? null : day) }}
                onDragOver={e => { e.preventDefault(); setDragOverDayId(day.id) }}
                onDragLeave={e => { if (!e.currentTarget.contains(e.relatedTarget)) setDragOverDayId(null) }}
                onDrop={e => handleDropOnDay(e, day.id)}
@@ -430,7 +459,7 @@ export default function DayPlanSidebar({
                  outlineOffset: -2,
                  borderRadius: isDragTarget ? 8 : 0,
                }}
-                onMouseEnter={e => { if (!isSelected && !isDragTarget) e.currentTarget.style.background = 'var(--bg-hover)' }}
+                onMouseEnter={e => { if (!isSelected && !isDragTarget) e.currentTarget.style.background = 'var(--bg-tertiary)' }}
                onMouseLeave={e => { if (!isSelected) e.currentTarget.style.background = isDragTarget ? 'rgba(17,24,39,0.07)' : 'transparent' }}
              >
                {/* Tages-Badge */}
@@ -461,8 +490,8 @@ export default function DayPlanSidebar({
                      }}
                    />
                  ) : (
-                    <div style={{ display: 'flex', alignItems: 'center', gap: 5 }}>
-                      <span style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                    <div style={{ display: 'flex', alignItems: 'center', gap: 5, minWidth: 0 }}>
+                      <span style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flexShrink: 1, minWidth: 0 }}>
                        {day.title || t('dayplan.dayN', { n: index + 1 })}
                      </span>
                      <button
@@ -471,11 +500,21 @@ export default function DayPlanSidebar({
                      >
                        <Pencil size={10} strokeWidth={1.8} color="var(--text-secondary)" />
                      </button>
+                      {(() => {
+                        const acc = accommodations.find(a => day.id >= a.start_day_id && day.id <= a.end_day_id)
+                        return acc ? (
+                          <span onClick={e => { e.stopPropagation(); onPlaceClick(acc.place_id) }} style={{ display: 'inline-flex', alignItems: 'center', gap: 3, padding: '2px 7px', borderRadius: 5, background: 'var(--bg-secondary)', border: '1px solid var(--border-primary)', flexShrink: 1, minWidth: 0, maxWidth: '40%', cursor: 'pointer' }}>
+                            <Hotel size={8} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
+                            <span style={{ fontSize: 9, color: 'var(--text-muted)', fontWeight: 600, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{acc.place_name}</span>
+                          </span>
+                        ) : null
+                      })()}
                    </div>
                  )}
                  <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 2, flexWrap: 'wrap' }}>
                    {formattedDate && <span style={{ fontSize: 11, color: 'var(--text-faint)' }}>{formattedDate}</span>}
                    {cost && <span style={{ fontSize: 11, color: '#059669' }}>{cost}</span>}
+                    {day.date && anyGeoPlace && <span style={{ width: 1, height: 10, background: 'var(--text-faint)', opacity: 0.3, flexShrink: 0 }} />}
                    {day.date && anyGeoPlace && (() => {
                      const wLat = loc?.place.lat ?? anyGeoPlace?.place?.lat ?? anyGeoPlace?.lat
                      const wLng = loc?.place.lng ?? anyGeoPlace?.place?.lng ?? anyGeoPlace?.lng
@@ -504,7 +543,7 @@ export default function DayPlanSidebar({
              {/* Aufgeklappte Orte + Notizen */}
              {isExpanded && (
                <div
-                  style={{ background: 'var(--bg-hover)' }}
+                  style={{ background: 'var(--bg-hover)', paddingTop: 6 }}
                  onDragOver={e => { e.preventDefault(); if (draggingId) setDropTargetKey(`end-${day.id}`) }}
                  onDrop={e => {
                    e.preventDefault()
@@ -522,9 +561,9 @@ export default function DayPlanSidebar({
                    if (m.length === 0) return
                    const lastItem = m[m.length - 1]
                    if (assignmentId && String(lastItem?.data?.id) !== assignmentId)
-                      handleMergedDrop(day.id, 'place', Number(assignmentId), lastItem.type, lastItem.data.id)
+                      handleMergedDrop(day.id, 'place', Number(assignmentId), lastItem.type, lastItem.data.id, true)
                    else if (noteId && String(lastItem?.data?.id) !== noteId)
-                      handleMergedDrop(day.id, 'note', Number(noteId), lastItem.type, lastItem.data.id)
+                      handleMergedDrop(day.id, 'note', Number(noteId), lastItem.type, lastItem.data.id, true)
                  }}
                >
                  {merged.length === 0 && !dayNoteUi ? (
@@ -548,9 +587,7 @@ export default function DayPlanSidebar({
                        const place = assignment.place
                        if (!place) return null
                        const cat = categories.find(c => c.id === place.category_id)
-                        const isPlaceSelected = place.id === selectedPlaceId
-                        const hasReservation = place.reservation_status && place.reservation_status !== 'none'
-                        const isConfirmed = place.reservation_status === 'confirmed'
+                        const isPlaceSelected = selectedAssignmentId ? assignment.id === selectedAssignmentId : place.id === selectedPlaceId
                        const isDraggingThis = draggingId === assignment.id
                        const isHovered = hoveredId === assignment.id
                        const placeIdx = placeItems.findIndex(i => i.data.id === assignment.id)
@@ -582,7 +619,7 @@ export default function DayPlanSidebar({
                              dragDataRef.current = { assignmentId: String(assignment.id), fromDayId: String(day.id) }
                              setDraggingId(assignment.id)
                            }}
-                            onDragOver={e => { e.preventDefault(); e.stopPropagation(); setDragOverDayId(null); setDropTargetKey(`place-${assignment.id}`) }}
+                            onDragOver={e => { e.preventDefault(); e.stopPropagation(); setDragOverDayId(null); if (dropTargetKey !== `place-${assignment.id}`) setDropTargetKey(`place-${assignment.id}`) }}
                            onDrop={e => {
                              e.preventDefault(); e.stopPropagation()
                              const { placeId, assignmentId: fromAssignmentId, noteId, fromDayId } = getDragData(e)
@@ -607,25 +644,59 @@ export default function DayPlanSidebar({
                              }
                            }}
                            onDragEnd={() => { setDraggingId(null); setDragOverDayId(null); setDropTargetKey(null); dragDataRef.current = null }}
-                            onClick={() => { onPlaceClick(isPlaceSelected ? null : place.id); if (!isPlaceSelected) onSelectDay(day.id) }}
+                            onClick={() => { onPlaceClick(isPlaceSelected ? null : place.id, isPlaceSelected ? null : assignment.id); if (!isPlaceSelected) onSelectDay(day.id, true) }}
                            onMouseEnter={() => setHoveredId(assignment.id)}
                            onMouseLeave={() => setHoveredId(null)}
                            style={{
                              display: 'flex', alignItems: 'center', gap: 8,
                              padding: '7px 8px 7px 10px',
                              cursor: 'pointer',
-                              background: isPlaceSelected ? 'var(--bg-hover)' : (isHovered ? 'var(--bg-hover)' : 'transparent'),
-                              borderLeft: hasReservation
-                                ? `3px solid ${isConfirmed ? '#10b981' : '#f59e0b'}`
+                              background: lockedIds.has(assignment.id)
+                                ? 'rgba(220,38,38,0.08)'
+                                : isPlaceSelected ? 'var(--bg-hover)' : (isHovered ? 'var(--bg-hover)' : 'transparent'),
+                              borderLeft: lockedIds.has(assignment.id)
+                                ? '3px solid #dc2626'
                                : '3px solid transparent',
-                              transition: 'background 0.1s',
+                              transition: 'background 0.15s, border-color 0.15s',
                              opacity: isDraggingThis ? 0.4 : 1,
                            }}
                          >
                            <div style={{ flexShrink: 0, color: 'var(--text-faint)', display: 'flex', alignItems: 'center', opacity: isHovered ? 1 : 0.3, transition: 'opacity 0.15s', cursor: 'grab' }}>
                              <GripVertical size={13} strokeWidth={1.8} />
                            </div>
-                            <PlaceAvatar place={place} category={cat} size={28} />
+                            <div
+                              onClick={e => { e.stopPropagation(); toggleLock(assignment.id) }}
+                              onMouseEnter={e => { e.stopPropagation(); setLockHoverId(assignment.id) }}
+                              onMouseLeave={() => setLockHoverId(null)}
+                              style={{ position: 'relative', flexShrink: 0, cursor: 'pointer' }}
+                            >
+                              <PlaceAvatar place={place} category={cat} size={28} />
+                              {/* Hover/locked overlay */}
+                              {(lockHoverId === assignment.id || lockedIds.has(assignment.id)) && (
+                                <div style={{
+                                  position: 'absolute', inset: 0, borderRadius: '50%',
+                                  background: lockedIds.has(assignment.id) ? 'rgba(220,38,38,0.6)' : 'rgba(220,38,38,0.4)',
+                                  display: 'flex', alignItems: 'center', justifyContent: 'center',
+                                  transition: 'background 0.15s',
+                                }}>
+                                  <Lock size={14} strokeWidth={2.5} style={{ color: 'white', filter: 'drop-shadow(0 1px 2px rgba(0,0,0,0.3))' }} />
+                                </div>
+                              )}
+                              {/* Custom tooltip */}
+                              {lockHoverId === assignment.id && (
+                                <div style={{
+                                  position: 'absolute', left: '100%', top: '50%', transform: 'translateY(-50%)',
+                                  marginLeft: 8, whiteSpace: 'nowrap', pointerEvents: 'none', zIndex: 50,
+                                  background: 'var(--bg-card, white)', color: 'var(--text-primary, #111827)',
+                                  fontSize: 11, fontWeight: 500, padding: '5px 10px', borderRadius: 8,
+                                  boxShadow: '0 4px 12px rgba(0,0,0,0.15)', border: '1px solid var(--border-faint, #e5e7eb)',
+                                }}>
+                                  {lockedIds.has(assignment.id)
+                                    ? t('planner.clickToUnlock')
+                                    : t('planner.keepPosition')}
+                                </div>
+                              )}
+                            </div>
                            <div style={{ flex: 1, minWidth: 0 }}>
                              <div style={{ display: 'flex', alignItems: 'center', gap: 4, overflow: 'hidden' }}>
                                {cat && (() => {
@@ -638,28 +709,36 @@ export default function DayPlanSidebar({
                                {place.place_time && (
                                  <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3, flexShrink: 0, fontSize: 10, color: 'var(--text-faint)', fontWeight: 400, marginLeft: 6 }}>
                                    <Clock size={9} strokeWidth={2} />
-                                    {formatTime(place.place_time, locale, timeFormat)}
+                                    {formatTime(place.place_time, locale, timeFormat)}{place.end_time ? ` – ${formatTime(place.end_time, locale, timeFormat)}` : ''}
                                  </span>
                                )}
                              </div>
-                              {(place.description || place.address || cat?.name) && !hasReservation && (
+                              {(place.description || place.address || cat?.name) && (
                                <div style={{ marginTop: 2 }}>
                                  <span style={{ fontSize: 10, color: 'var(--text-faint)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'block', lineHeight: 1.2 }}>
                                    {place.description || place.address || cat?.name}
                                  </span>
                                </div>
                              )}
-                              {hasReservation && (
-                                <div style={{ display: 'flex', alignItems: 'center', gap: 2, marginTop: 2 }}>
-                                  <span style={{ fontSize: 10, color: isConfirmed ? '#059669' : '#d97706', display: 'flex', alignItems: 'center', gap: 2, fontWeight: 600 }}>
-                                    {isConfirmed ? <><CheckCircle2 size={10} />
-                                      {place.reservation_datetime
-                                        ? `Res. ${formatTime(new Date(place.reservation_datetime).toTimeString().slice(0,5), locale, timeFormat)}`
-                                        : place.place_time ? `Res. ${formatTime(place.place_time, locale, timeFormat)}` : t('dayplan.confirmed')}
-                                    </> : <><AlertCircle size={10} />{t('dayplan.pendingRes')}</>}
-                                  </span>
-                                </div>
-                              )}
+                              {(() => {
+                                const res = reservations.find(r => r.assignment_id === assignment.id)
+                                if (!res) return null
+                                const confirmed = res.status === 'confirmed'
+                                return (
+                                  <div style={{ marginTop: 3, display: 'inline-flex', alignItems: 'center', gap: 3, padding: '1px 6px', borderRadius: 5, fontSize: 9, fontWeight: 600,
+                                    background: confirmed ? 'rgba(22,163,74,0.1)' : 'rgba(217,119,6,0.1)',
+                                    color: confirmed ? '#16a34a' : '#d97706',
+                                  }}>
+                                    {(() => { const RI = RES_ICONS[res.type] || Ticket; return <RI size={8} /> })()}
+                                    <span className="hidden sm:inline">{confirmed ? t('planner.resConfirmed') : t('planner.resPending')}</span>
+                                    {res.reservation_time && (
+                                      <span style={{ fontWeight: 400 }}>
+                                        {new Date(res.reservation_time).toLocaleTimeString(locale, { hour: '2-digit', minute: '2-digit', hour12: timeFormat === '12h' })}
+                                      </span>
+                                    )}
+                                  </div>
+                                )
+                              })()}
                            </div>
                            <div className="reorder-buttons" style={{ flexShrink: 0, display: 'flex', gap: 1, opacity: isHovered ? 1 : undefined, transition: 'opacity 0.15s' }}>
                              <button onClick={moveUp} disabled={placeIdx === 0} style={{ background: 'none', border: 'none', padding: '1px 2px', cursor: placeIdx === 0 ? 'default' : 'pointer', color: placeIdx === 0 ? 'var(--border-primary)' : 'var(--text-faint)', display: 'flex', lineHeight: 1 }}>
@@ -686,7 +765,7 @@ export default function DayPlanSidebar({
                          draggable
                          onDragStart={e => { e.dataTransfer.setData('noteId', String(note.id)); e.dataTransfer.setData('fromDayId', String(day.id)); e.dataTransfer.effectAllowed = 'move'; dragDataRef.current = { noteId: String(note.id), fromDayId: String(day.id) }; setDraggingId(`note-${note.id}`) }}
                          onDragEnd={() => { setDraggingId(null); setDropTargetKey(null); dragDataRef.current = null }}
-                          onDragOver={e => { e.preventDefault(); e.stopPropagation(); setDropTargetKey(`note-${note.id}`) }}
+                          onDragOver={e => { e.preventDefault(); e.stopPropagation(); if (dropTargetKey !== `note-${note.id}`) setDropTargetKey(`note-${note.id}`) }}
                          onDrop={e => {
                            e.preventDefault(); e.stopPropagation()
                            const { noteId: fromNoteId, assignmentId: fromAssignmentId, fromDayId } = getDragData(e)
@@ -749,26 +828,44 @@ export default function DayPlanSidebar({
                      )
                    })
                  )}
-                  {/* Drop-Indikator am Listenende */}
-                  {!!draggingId && dropTargetKey === `end-${day.id}` && (
-                    <div style={{ height: 2, background: 'var(--text-primary)', borderRadius: 1, margin: '2px 8px' }} />
-                  )}
+                  {/* Drop-Zone am Listenende — immer vorhanden als Drop-Target */}
+                  <div
+                    style={{ minHeight: 12, padding: '2px 8px' }}
+                    onDragOver={e => { e.preventDefault(); e.stopPropagation(); if (dropTargetKey !== `end-${day.id}`) setDropTargetKey(`end-${day.id}`) }}
+                    onDrop={e => {
+                      e.preventDefault(); e.stopPropagation()
+                      const { placeId, assignmentId, noteId, fromDayId } = getDragData(e)
+                      // Neuer Ort von der Orte-Liste
+                      if (placeId) {
+                        onAssignToDay?.(parseInt(placeId), day.id)
+                        setDropTargetKey(null); window.__dragData = null; return
+                      }
+                      if (!assignmentId && !noteId) { dragDataRef.current = null; window.__dragData = null; return }
+                      if (assignmentId && fromDayId !== day.id) {
+                        tripStore.moveAssignment(tripId, Number(assignmentId), fromDayId, day.id).catch(err => toast.error(err.message))
+                        setDraggingId(null); setDropTargetKey(null); dragDataRef.current = null; return
+                      }
+                      if (noteId && fromDayId !== day.id) {
+                        tripStore.moveDayNote(tripId, fromDayId, day.id, Number(noteId)).catch(err => toast.error(err.message))
+                        setDraggingId(null); setDropTargetKey(null); dragDataRef.current = null; return
+                      }
+                      const m = getMergedItems(day.id)
+                      if (m.length === 0) return
+                      const lastItem = m[m.length - 1]
+                      if (assignmentId && String(lastItem?.data?.id) !== assignmentId)
+                        handleMergedDrop(day.id, 'place', Number(assignmentId), lastItem.type, lastItem.data.id, true)
+                      else if (noteId && String(lastItem?.data?.id) !== noteId)
+                        handleMergedDrop(day.id, 'note', Number(noteId), lastItem.type, lastItem.data.id, true)
+                    }}
+                  >
+                    {dropTargetKey === `end-${day.id}` && (
+                      <div style={{ height: 2, background: 'var(--text-primary)', borderRadius: 1 }} />
+                    )}
+                  </div>

                  {/* Routen-Werkzeuge (ausgewählter Tag, 2+ Orte) */}
                  {isSelected && getDayAssignments(day.id).length >= 2 && (
                    <div style={{ padding: '10px 16px 12px', borderTop: '1px solid var(--border-faint)', display: 'flex', flexDirection: 'column', gap: 7 }}>
-                      <div style={{ display: 'flex', background: 'var(--bg-hover)', borderRadius: 8, padding: 2, gap: 2 }}>
-                        {TRANSPORT_MODES.map(m => (
-                          <button key={m.value} onClick={() => setTransportMode(m.value)} style={{
-                            flex: 1, padding: '4px 0', fontSize: 11, fontWeight: transportMode === m.value ? 600 : 400,
-                            background: transportMode === m.value ? 'var(--bg-card)' : 'transparent',
-                            border: 'none', borderRadius: 6, cursor: 'pointer', color: transportMode === m.value ? 'var(--text-primary)' : 'var(--text-muted)',
-                            boxShadow: transportMode === m.value ? '0 1px 3px rgba(0,0,0,0.1)' : 'none',
-                            fontFamily: 'inherit',
-                          }}>{m.label}</button>
-                        ))}
-                      </div>
-
                      {routeInfo && (
                        <div style={{ display: 'flex', justifyContent: 'center', gap: 12, fontSize: 12, color: 'var(--text-secondary)', background: 'var(--bg-hover)', borderRadius: 8, padding: '5px 10px' }}>
                          <span>{routeInfo.distance}</span>
@@ -778,15 +875,6 @@ export default function DayPlanSidebar({
                      )}

                      <div style={{ display: 'flex', gap: 6 }}>
-                        <button onClick={handleCalculateRoute} disabled={isCalculating} style={{
-                          flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 5,
-                          padding: '6px 0', fontSize: 11, fontWeight: 500, borderRadius: 8, border: 'none',
-                          background: 'var(--accent)', color: 'var(--accent-text)', cursor: 'pointer', fontFamily: 'inherit',
-                          opacity: isCalculating ? 0.6 : 1,
-                        }}>
-                          <Navigation size={12} strokeWidth={2} />
-                          {isCalculating ? t('dayplan.calculating') : t('dayplan.route')}
-                        </button>
                        <button onClick={handleOptimize} style={{
                          flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 5,
                          padding: '6px 0', fontSize: 11, fontWeight: 500, borderRadius: 8, border: 'none',
@@ -1,6 +1,7 @@
 import React from 'react'
 import { CalendarDays, MapPin, Plus } from 'lucide-react'
 import WeatherWidget from '../Weather/WeatherWidget'
+import { useTranslation } from '../../i18n'

 function formatDate(dateStr) {
  if (!dateStr) return null
@@ -20,6 +21,7 @@ function dayTotal(dayId, assignments) {
 }

 export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }) {
+  const { t } = useTranslation()
  const totalCost = days.reduce((sum, d) => sum + dayTotal(d.id, assignments), 0)
  const currency = trip?.currency || 'EUR'

@@ -27,8 +29,8 @@ export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }
    <div className="flex flex-col h-full">
      {/* Header */}
      <div className="px-4 py-3 border-b border-gray-100 flex-shrink-0">
-        <h2 className="text-sm font-semibold text-gray-700">Tagesplan</h2>
-        <p className="text-xs text-gray-400 mt-0.5">{days.length} Tage</p>
+        <h2 className="text-sm font-semibold text-gray-700">{t('planner.dayPlan')}</h2>
+        <p className="text-xs text-gray-400 mt-0.5">{t('planner.dayCount', { n: days.length })}</p>
      </div>

      {/* All places overview option */}
@@ -43,9 +45,9 @@ export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }
        <MapPin className={`w-4 h-4 flex-shrink-0 ${selectedDayId === null ? 'text-slate-900' : 'text-gray-400'}`} />
        <div>
          <p className={`text-sm font-medium ${selectedDayId === null ? 'text-slate-900' : 'text-gray-700'}`}>
-            Alle Orte
+            {t('planner.allPlaces')}
          </p>
-          <p className="text-xs text-gray-400">Gesamtübersicht</p>
+          <p className="text-xs text-gray-400">{t('planner.overview')}</p>
        </div>
      </button>

@@ -54,8 +56,8 @@ export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }
        {days.length === 0 ? (
          <div className="px-4 py-6 text-center">
            <CalendarDays className="w-8 h-8 text-gray-300 mx-auto mb-2" />
-            <p className="text-xs text-gray-400">Noch keine Tage</p>
-            <p className="text-xs text-gray-300 mt-1">Reise bearbeiten um Tage hinzuzufügen</p>
+            <p className="text-xs text-gray-400">{t('planner.noDays')}</p>
+            <p className="text-xs text-gray-300 mt-1">{t('planner.editTripToAddDays')}</p>
          </div>
        ) : (
          days.map((day, index) => {
@@ -96,7 +98,7 @@ export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }
                    <div className="flex items-center gap-3 mt-1.5">
                      {placeCount > 0 && (
                        <span className="text-xs text-gray-400">
-                          {placeCount} {placeCount === 1 ? 'Ort' : 'Orte'}
+                          {placeCount === 1 ? t('planner.placeOne') : t('planner.placeN', { n: placeCount })}
                        </span>
                      )}
                      {cost > 0 && (
@@ -124,7 +126,7 @@ export function DaysList({ days, selectedDayId, onSelectDay, assignments, trip }
      {totalCost > 0 && (
        <div className="flex-shrink-0 border-t border-gray-100 px-4 py-3 bg-gray-50">
          <div className="flex items-center justify-between">
-            <span className="text-xs text-gray-500">Gesamtkosten</span>
+            <span className="text-xs text-gray-500">{t('planner.totalCost')}</span>
            <span className="text-sm font-semibold text-gray-800">
              {totalCost.toFixed(2)} {currency}
            </span>
@@ -1,17 +1,13 @@
 import React, { useState, useEffect } from 'react'
 import { X, ExternalLink, Phone, MapPin, Clock, Euro, Edit2, Trash2, Plus, Minus } from 'lucide-react'
 import { mapsApi } from '../../api/client'
-
-const RESERVATION_STATUS = {
-  none: { label: 'Keine Reservierung', color: 'gray' },
-  pending: { label: 'Res. ausstehend', color: 'yellow' },
-  confirmed: { label: 'Bestätigt', color: 'green' },
-}
+import { useTranslation } from '../../i18n'

 export function PlaceDetailPanel({
  place, categories, tags, selectedDayId, dayAssignments,
  onClose, onEdit, onDelete, onAssignToDay, onRemoveAssignment,
 }) {
+  const { t } = useTranslation()
  const [googlePhoto, setGooglePhoto] = useState(null)
  const [photoAttribution, setPhotoAttribution] = useState(null)

@@ -40,8 +36,6 @@ export function PlaceDetailPanel({
    ? dayAssignments?.find(a => a.place?.id === place.id)
    : null

-  const status = RESERVATION_STATUS[place.reservation_status] || RESERVATION_STATUS.none
-
  return (
    <div className="bg-white">
      {/* Image */}
@@ -177,29 +171,6 @@ export function PlaceDetailPanel({
          </div>
        )}

-        {/* Reservation status */}
-        {place.reservation_status && place.reservation_status !== 'none' && (
-          <div className={`rounded-lg px-3 py-2 border ${
-            place.reservation_status === 'confirmed'
-              ? 'bg-emerald-50 border-emerald-200'
-              : 'bg-yellow-50 border-yellow-200'
-          }`}>
-            <div className={`text-xs font-semibold ${
-              place.reservation_status === 'confirmed' ? 'text-emerald-700' : 'text-yellow-700'
-            }`}>
-              {place.reservation_status === 'confirmed' ? '✅' : '⏳'} {status.label}
-            </div>
-            {place.reservation_datetime && (
-              <div className="text-xs text-gray-500 mt-0.5">
-                {formatDateTime(place.reservation_datetime)}
-              </div>
-            )}
-            {place.reservation_notes && (
-              <p className="text-xs text-gray-600 mt-1">{place.reservation_notes}</p>
-            )}
-          </div>
-        )}
-
        {/* Day assignment actions */}
        {selectedDayId && (
          <div className="pt-1">
@@ -209,7 +180,7 @@ export function PlaceDetailPanel({
                className="w-full flex items-center justify-center gap-2 py-2 text-sm text-red-600 border border-red-200 rounded-lg hover:bg-red-50"
              >
                <Minus className="w-4 h-4" />
-                Aus Tag entfernen
+                {t('planner.removeFromDay')}
              </button>
            ) : (
              <button
@@ -217,7 +188,7 @@ export function PlaceDetailPanel({
                className="w-full flex items-center justify-center gap-2 py-2 text-sm text-white bg-slate-900 rounded-lg hover:bg-slate-700"
              >
                <Plus className="w-4 h-4" />
-                Zum Tag hinzufügen
+                {t('planner.addToThisDay')}
              </button>
            )}
          </div>
@@ -230,7 +201,7 @@ export function PlaceDetailPanel({
            className="flex-1 flex items-center justify-center gap-1.5 py-2 text-xs text-gray-700 border border-gray-200 rounded-lg hover:bg-gray-50"
          >
            <Edit2 className="w-3.5 h-3.5" />
-            Bearbeiten
+            {t('common.edit')}
          </button>
          <button
            onClick={onDelete}
@@ -1,20 +1,12 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef } from 'react'
 import Modal from '../shared/Modal'
 import CustomSelect from '../shared/CustomSelect'
 import { mapsApi } from '../../api/client'
 import { useAuthStore } from '../../store/authStore'
 import { useToast } from '../shared/Toast'
-import { Search } from 'lucide-react'
+import { Search, Paperclip, X } from 'lucide-react'
 import { useTranslation } from '../../i18n'
 import CustomTimePicker from '../shared/CustomTimePicker'
-import { CustomDateTimePicker } from '../shared/CustomDateTimePicker'
-
-const TRANSPORT_MODES = [
-  { value: 'walking', labelKey: 'places.transport.walking' },
-  { value: 'driving', labelKey: 'places.transport.driving' },
-  { value: 'cycling', labelKey: 'places.transport.cycling' },
-  { value: 'transit', labelKey: 'places.transport.transit' },
-]

 const DEFAULT_FORM = {
  name: '',
@@ -24,11 +16,9 @@ const DEFAULT_FORM = {
  lng: '',
  category_id: '',
  place_time: '',
+  end_time: '',
  notes: '',
  transport_mode: 'walking',
-  reservation_status: 'none',
-  reservation_notes: '',
-  reservation_datetime: '',
  website: '',
 }

@@ -43,6 +33,8 @@ export default function PlaceFormModal({
  const [newCategoryName, setNewCategoryName] = useState('')
  const [showNewCategory, setShowNewCategory] = useState(false)
  const [isSaving, setIsSaving] = useState(false)
+  const [pendingFiles, setPendingFiles] = useState([])
+  const fileRef = useRef(null)
  const toast = useToast()
  const { t, language } = useTranslation()
  const { hasMapsKey } = useAuthStore()
@@ -57,16 +49,15 @@ export default function PlaceFormModal({
        lng: place.lng || '',
        category_id: place.category_id || '',
        place_time: place.place_time || '',
+        end_time: place.end_time || '',
        notes: place.notes || '',
        transport_mode: place.transport_mode || 'walking',
-        reservation_status: place.reservation_status || 'none',
-        reservation_notes: place.reservation_notes || '',
-        reservation_datetime: place.reservation_datetime || '',
        website: place.website || '',
      })
    } else {
      setForm(DEFAULT_FORM)
    }
+    setPendingFiles([])
  }, [place, isOpen])

  const handleChange = (field, value) => {
@@ -111,6 +102,30 @@ export default function PlaceFormModal({
    }
  }

+  const handleFileAdd = (e) => {
+    const files = Array.from(e.target.files || [])
+    setPendingFiles(prev => [...prev, ...files])
+    e.target.value = ''
+  }
+
+  const handleRemoveFile = (idx) => {
+    setPendingFiles(prev => prev.filter((_, i) => i !== idx))
+  }
+
+  // Paste support for files/images
+  const handlePaste = (e) => {
+    const items = e.clipboardData?.items
+    if (!items) return
+    for (const item of items) {
+      if (item.type.startsWith('image/') || item.type === 'application/pdf') {
+        e.preventDefault()
+        const file = item.getAsFile()
+        if (file) setPendingFiles(prev => [...prev, file])
+        return
+      }
+    }
+  }
+
  const handleSubmit = async (e) => {
    e.preventDefault()
    if (!form.name.trim()) {
@@ -124,6 +139,7 @@ export default function PlaceFormModal({
        lat: form.lat ? parseFloat(form.lat) : null,
        lng: form.lng ? parseFloat(form.lng) : null,
        category_id: form.category_id || null,
+        _pendingFiles: pendingFiles.length > 0 ? pendingFiles : undefined,
      })
      onClose()
    } catch (err) {
@@ -140,7 +156,7 @@ export default function PlaceFormModal({
      title={place ? t('places.editPlace') : t('places.addPlace')}
      size="lg"
    >
-      <form onSubmit={handleSubmit} className="space-y-4">
+      <form onSubmit={handleSubmit} className="space-y-4" onPaste={handlePaste}>
        {/* Place Search */}
        <div className="bg-slate-50 rounded-xl p-3 border border-slate-200">
          {!hasMapsKey && (
@@ -278,12 +294,21 @@ export default function PlaceFormModal({
        </div>

        {/* Time */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">{t('places.formTime')}</label>
-          <CustomTimePicker
-            value={form.place_time}
-            onChange={v => handleChange('place_time', v)}
-          />
+        <div className="grid grid-cols-2 gap-3">
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">{t('places.startTime')}</label>
+            <CustomTimePicker
+              value={form.place_time}
+              onChange={v => handleChange('place_time', v)}
+            />
+          </div>
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">{t('places.endTime')}</label>
+            <CustomTimePicker
+              value={form.end_time}
+              onChange={v => handleChange('end_time', v)}
+            />
+          </div>
        </div>

        {/* Website */}
@@ -298,45 +323,35 @@ export default function PlaceFormModal({
          />
        </div>

-        {/* Reservation */}
-        <div className="border border-gray-200 rounded-xl p-3 space-y-3">
-          <div className="flex items-center gap-3">
-            <label className="block text-sm font-medium text-gray-700">{t('places.formReservation')}</label>
-            <div className="flex gap-2">
-              {['none', 'pending', 'confirmed'].map(status => (
-                <button
-                  key={status}
-                  type="button"
-                  onClick={() => handleChange('reservation_status', status)}
-                  className={`text-xs px-2.5 py-1 rounded-full transition-colors ${
-                    form.reservation_status === status
-                      ? status === 'confirmed' ? 'bg-emerald-600 text-white'
-                        : status === 'pending' ? 'bg-yellow-500 text-white'
-                        : 'bg-gray-600 text-white'
-                      : 'bg-gray-100 text-gray-600 hover:bg-gray-200'
-                  }`}
-                >
-                  {status === 'none' ? t('common.none') : status === 'pending' ? t('reservations.pending') : t('reservations.confirmed')}
-                </button>
-              ))}
+        {/* File Attachments */}
+        {true && (
+          <div className="border border-gray-200 rounded-xl p-3 space-y-2">
+            <div className="flex items-center justify-between">
+              <label className="block text-sm font-medium text-gray-700">{t('files.title')}</label>
+              <button type="button" onClick={() => fileRef.current?.click()}
+                className="flex items-center gap-1 text-xs text-slate-500 hover:text-slate-700 transition-colors">
+                <Paperclip size={12} /> {t('files.attach')}
+              </button>
            </div>
+            <input ref={fileRef} type="file" multiple style={{ display: 'none' }} onChange={handleFileAdd} />
+            {pendingFiles.length > 0 && (
+              <div className="space-y-1">
+                {pendingFiles.map((file, idx) => (
+                  <div key={idx} className="flex items-center gap-2 px-2 py-1.5 rounded-lg bg-slate-50 text-xs">
+                    <Paperclip size={10} className="text-slate-400 shrink-0" />
+                    <span className="truncate flex-1 text-slate-600">{file.name}</span>
+                    <button type="button" onClick={() => handleRemoveFile(idx)} className="text-slate-400 hover:text-red-500 shrink-0">
+                      <X size={12} />
+                    </button>
+                  </div>
+                ))}
+              </div>
+            )}
+            {pendingFiles.length === 0 && (
+              <p className="text-xs text-slate-400">{t('files.pasteHint')}</p>
+            )}
          </div>
-          {form.reservation_status !== 'none' && (
-            <>
-              <CustomDateTimePicker
-                value={form.reservation_datetime}
-                onChange={v => handleChange('reservation_datetime', v)}
-              />
-              <textarea
-                value={form.reservation_notes}
-                onChange={e => handleChange('reservation_notes', e.target.value)}
-                rows={2}
-                placeholder={t('places.reservationNotesPlaceholder')}
-                className="form-input" style={{ resize: 'none' }}
-              />
-            </>
-          )}
-        </div>
+        )}

        {/* Actions */}
        <div className="flex justify-end gap-3 pt-2 border-t border-gray-100">
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react'
-import { X, Clock, MapPin, ExternalLink, Phone, Euro, Edit2, Trash2, Plus, Minus, CheckCircle2, AlertCircle, ChevronDown, ChevronUp, FileText, Upload, File, FileImage, Star, Navigation } from 'lucide-react'
+import { X, Clock, MapPin, ExternalLink, Phone, Euro, Edit2, Trash2, Plus, Minus, ChevronDown, ChevronUp, FileText, Upload, File, FileImage, Star, Navigation } from 'lucide-react'
 import PlaceAvatar from '../shared/PlaceAvatar'
 import { mapsApi } from '../../api/client'
 import { useSettingsStore } from '../../store/settingsStore'
@@ -86,16 +86,6 @@ function formatTime(timeStr, locale, timeFormat) {
  } catch { return timeStr }
 }

-function formatReservationDatetime(dt, locale, timeFormat) {
-  if (!dt) return null
-  try {
-    const d = new Date(dt)
-    if (isNaN(d)) return dt
-    const datePart = d.toLocaleDateString(locale, { weekday: 'short', day: 'numeric', month: 'short' })
-    const timePart = formatTime(`${String(d.getHours()).padStart(2,'0')}:${String(d.getMinutes()).padStart(2,'0')}`, locale, timeFormat)
-    return `${datePart}, ${timePart}`
-  } catch { return dt }
-}

 function formatFileSize(bytes) {
  if (!bytes) return ''
@@ -105,7 +95,7 @@ function formatFileSize(bytes) {
 }

 export default function PlaceInspector({
-  place, categories, days, selectedDayId, assignments,
+  place, categories, days, selectedDayId, selectedAssignmentId, assignments, reservations = [],
  onClose, onEdit, onDelete, onAssignToDay, onRemoveAssignment,
  files, onFileUpload,
 }) {
@@ -279,45 +269,72 @@ export default function PlaceInspector({
            </div>
          )}

-          {/* Description + Reservation in one box */}
-          {(place.description || place.notes || (place.reservation_status && place.reservation_status !== 'none')) && (
+          {/* Description */}
+          {(place.description || place.notes) && (
            <div style={{ background: 'var(--bg-hover)', borderRadius: 10, overflow: 'hidden' }}>
-              {(place.description || place.notes) && (
-                <p style={{ fontSize: 12, color: 'var(--text-muted)', margin: 0, lineHeight: '1.5', padding: '8px 12px',
-                  borderBottom: (place.reservation_status && place.reservation_status !== 'none') ? '1px solid var(--border-faint)' : 'none'
-                }}>
-                  {place.description || place.notes}
-                </p>
-              )}
-              {place.reservation_status && place.reservation_status !== 'none' && (
-                <div style={{ padding: '8px 12px', display: 'flex', flexDirection: 'column', gap: 3 }}>
-                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, flexWrap: 'wrap' }}>
-                    {place.reservation_status === 'confirmed'
-                      ? <CheckCircle2 size={12} color="#059669" />
-                      : <AlertCircle size={12} color="#d97706" />
-                    }
-                    <span style={{ fontSize: 12, fontWeight: 600, color: place.reservation_status === 'confirmed' ? '#059669' : '#d97706' }}>
-                      {place.reservation_status === 'confirmed' ? t('inspector.confirmedRes') : t('inspector.pendingRes')}
-                    </span>
-                    {(place.reservation_datetime || place.place_time) && (
-                      <>
-                        <span style={{ fontSize: 11, color: '#d1d5db' }}>·</span>
-                        <span style={{ fontSize: 12, color: 'var(--text-muted)' }}>
-                          {place.reservation_datetime
-                            ? formatReservationDatetime(place.reservation_datetime, locale, timeFormat)
-                            : formatTime(place.place_time, locale, timeFormat)}
-                        </span>
-                      </>
-                    )}
-                  </div>
-                  {place.reservation_notes && (
-                    <p style={{ fontSize: 12, color: 'var(--text-faint)', margin: 0, lineHeight: '1.5', paddingLeft: 17 }}>{place.reservation_notes}</p>
-                  )}
-                </div>
-              )}
+              <p style={{ fontSize: 12, color: 'var(--text-muted)', margin: 0, lineHeight: '1.5', padding: '8px 12px' }}>
+                {place.description || place.notes}
+              </p>
            </div>
          )}

+          {/* Reservation for this specific assignment */}
+          {(() => {
+            const res = selectedAssignmentId ? reservations.find(r => r.assignment_id === selectedAssignmentId) : null
+            if (!res) return null
+            const confirmed = res.status === 'confirmed'
+            const accentColor = confirmed ? '#16a34a' : '#d97706'
+            return (
+              <div style={{ borderRadius: 12, overflow: 'hidden', border: `1px solid ${confirmed ? 'rgba(22,163,74,0.2)' : 'rgba(217,119,6,0.2)'}` }}>
+                {/* Header bar */}
+                <div style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '8px 12px', background: confirmed ? 'rgba(22,163,74,0.08)' : 'rgba(217,119,6,0.08)' }}>
+                  <div style={{ width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: accentColor }} />
+                  <span style={{ fontSize: 11, fontWeight: 700, color: accentColor }}>{confirmed ? t('reservations.confirmed') : t('reservations.pending')}</span>
+                  <span style={{ flex: 1 }} />
+                  <span style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)' }}>{res.title}</span>
+                </div>
+                {/* Details grid */}
+                {(res.reservation_time || res.confirmation_number || res.location || res.notes) && (
+                  <div style={{ padding: '8px 12px', display: 'flex', flexDirection: 'column', gap: 6 }}>
+                    <div style={{ display: 'flex', gap: 16, flexWrap: 'wrap' }}>
+                      {res.reservation_time && (
+                        <div>
+                          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.date')}</div>
+                          <div style={{ fontSize: 11, fontWeight: 500, color: 'var(--text-primary)', marginTop: 1 }}>
+                            {new Date(res.reservation_time).toLocaleDateString(locale, { weekday: 'short', day: 'numeric', month: 'short' })}
+                          </div>
+                        </div>
+                      )}
+                      {res.reservation_time && (
+                        <div>
+                          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.time')}</div>
+                          <div style={{ fontSize: 11, fontWeight: 500, color: 'var(--text-primary)', marginTop: 1 }}>
+                            {new Date(res.reservation_time).toLocaleTimeString(locale, { hour: '2-digit', minute: '2-digit', hour12: timeFormat === '12h' })}
+                          </div>
+                        </div>
+                      )}
+                      {res.confirmation_number && (
+                        <div>
+                          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.confirmationCode')}</div>
+                          <div style={{ fontSize: 11, fontWeight: 500, color: 'var(--text-primary)', marginTop: 1 }}>{res.confirmation_number}</div>
+                        </div>
+                      )}
+                      {res.location && (
+                        <div>
+                          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.locationAddress')}</div>
+                          <div style={{ fontSize: 11, fontWeight: 500, color: 'var(--text-muted)', marginTop: 1 }}>{res.location}</div>
+                        </div>
+                      )}
+                    </div>
+                    {res.notes && (
+                      <div style={{ fontSize: 11, color: 'var(--text-faint)', lineHeight: 1.4, borderTop: '1px solid var(--border-faint)', paddingTop: 5 }}>{res.notes}</div>
+                    )}
+                  </div>
+                )}
+              </div>
+            )
+          })()}
+
          {/* Opening hours */}
          {openingHours && openingHours.length > 0 && (
            <div style={{ background: 'var(--bg-hover)', borderRadius: 10, overflow: 'hidden' }}>
@@ -204,19 +204,17 @@ export default function PlacesSidebar({
            </div>
            <div style={{ flex: 1, overflowY: 'auto', padding: '8px 12px 16px' }}>
              {days.map((day, i) => {
-                const alreadyAssigned = (assignments[String(day.id)] || []).some(a => a.place?.id === dayPickerPlace.id)
                return (
                  <button
                    key={day.id}
-                    disabled={alreadyAssigned}
                    onClick={() => { onAssignToDay(dayPickerPlace.id, day.id); setDayPickerPlace(null) }}
                    style={{
                      display: 'flex', alignItems: 'center', gap: 10, width: '100%',
-                      padding: '12px 14px', borderRadius: 12, border: 'none', cursor: alreadyAssigned ? 'default' : 'pointer',
+                      padding: '12px 14px', borderRadius: 12, border: 'none', cursor: 'pointer',
                      background: 'transparent', fontFamily: 'inherit', textAlign: 'left',
-                      opacity: alreadyAssigned ? 0.4 : 1, transition: 'background 0.1s',
+                      transition: 'background 0.1s',
                    }}
-                    onMouseEnter={e => { if (!alreadyAssigned) e.currentTarget.style.background = 'var(--bg-hover)' }}
+                    onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
                    onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
                  >
                    <div style={{
@@ -230,7 +228,7 @@ export default function PlacesSidebar({
                      </div>
                      {day.date && <div style={{ fontSize: 11, color: 'var(--text-faint)' }}>{new Date(day.date + 'T00:00:00').toLocaleDateString()}</div>}
                    </div>
-                    {alreadyAssigned && <span style={{ fontSize: 11, color: 'var(--text-faint)' }}>✓</span>}
+                    {(assignments[String(day.id)] || []).some(a => a.place?.id === dayPickerPlace.id) && <span style={{ fontSize: 11, color: 'var(--text-faint)' }}>✓</span>}
                  </button>
                )
              })}
@@ -13,20 +13,7 @@ import { PlaceDetailPanel } from './PlaceDetailPanel'
 import WeatherWidget from '../Weather/WeatherWidget'
 import { useTripStore } from '../../store/tripStore'
 import { useToast } from '../shared/Toast'
-
-const SEGMENTS = [
-  { id: 'plan', label: 'Plan' },
-  { id: 'orte', label: 'Orte' },
-  { id: 'reservierungen', label: 'Buchungen' },
-  { id: 'packliste', label: 'Packliste' },
-  { id: 'dokumente', label: 'Dokumente' },
-]
-
-const TRANSPORT_MODES = [
-  { value: 'driving', label: 'Auto', icon: '🚗' },
-  { value: 'walking', label: 'Fuß', icon: '🚶' },
-  { value: 'cycling', label: 'Rad', icon: '🚲' },
-]
+import { useTranslation } from '../../i18n'

 function formatShortDate(dateStr) {
  if (!dateStr) return ''
@@ -53,7 +40,6 @@ export default function PlannerSidebar({
  const [activeSegment, setActiveSegment] = useState('plan')
  const [search, setSearch] = useState('')
  const [categoryFilter, setCategoryFilter] = useState('')
-  const [transportMode, setTransportMode] = useState('driving')
  const [isCalculatingRoute, setIsCalculatingRoute] = useState(false)
  const [showReservationModal, setShowReservationModal] = useState(false)
  const [editingReservation, setEditingReservation] = useState(null)
@@ -65,6 +51,16 @@ export default function PlannerSidebar({

  const tripStore = useTripStore()
  const toast = useToast()
+  const { t } = useTranslation()
+
+  const SEGMENTS = [
+    { id: 'plan', label: 'Plan' },
+    { id: 'orte', label: t('planner.places') },
+    { id: 'reservierungen', label: t('planner.bookings') },
+    { id: 'packliste', label: t('planner.packingList') },
+    { id: 'dokumente', label: t('planner.documents') },
+  ]
+
  const dayNotes = tripStore.dayNotes || {}
  const placesListRef = useRef(null)
  const [placesListHeight, setPlacesListHeight] = useState(400)
@@ -135,17 +131,17 @@ export default function PlannerSidebar({
      .filter(p => p?.lat && p?.lng)
      .map(p => ({ lat: p.lat, lng: p.lng }))
    if (waypoints.length < 2) {
-      toast.error('Mindestens 2 Orte mit Koordinaten benötigt')
+      toast.error(t('planner.minTwoPlaces'))
      return
    }
    setIsCalculatingRoute(true)
    try {
-      const result = await calculateRoute(waypoints, transportMode)
+      const result = await calculateRoute(waypoints, 'walking')
      setRouteInfo({ distance: result.distanceText, duration: result.durationText })
      onRouteCalculated?.(result)
-      toast.success('Route berechnet')
+      toast.success(t('planner.routeCalculated'))
    } catch {
-      toast.error('Route konnte nicht berechnet werden')
+      toast.error(t('planner.routeCalcFailed'))
    } finally {
      setIsCalculatingRoute(false)
    }
@@ -163,14 +159,14 @@ export default function PlannerSidebar({
      if (!reorderedIds.includes(a.id)) reorderedIds.push(a.id)
    }
    await onReorder(selectedDayId, reorderedIds)
-    toast.success('Route optimiert')
+    toast.success(t('planner.routeOptimized'))
  }

  const handleOpenGoogleMaps = () => {
    const ps = selectedDayAssignments.map(a => a.place).filter(p => p?.lat && p?.lng)
    const url = generateGoogleMapsUrl(ps)
    if (url) window.open(url, '_blank')
-    else toast.error('Keine Orte mit Koordinaten vorhanden')
+    else toast.error(t('planner.noGeoPlaces'))
  }

  const handleMoveUp = async (dayId, idx) => {
@@ -270,10 +266,10 @@ export default function PlannerSidebar({
    try {
      if (editingReservation) {
        await tripStore.updateReservation(tripId, editingReservation.id, data)
-        toast.success('Reservierung aktualisiert')
+        toast.success(t('planner.reservationUpdated'))
      } else {
        await tripStore.addReservation(tripId, { ...data, day_id: selectedDayId || null })
-        toast.success('Reservierung hinzugefügt')
+        toast.success(t('planner.reservationAdded'))
      }
      setShowReservationModal(false)
    } catch (err) {
@@ -282,10 +278,10 @@ export default function PlannerSidebar({
  }

  const handleDeleteReservation = async (id) => {
-    if (!confirm('Reservierung löschen?')) return
+    if (!confirm(t('planner.confirmDeleteReservation'))) return
    try {
      await tripStore.deleteReservation(tripId, id)
-      toast.success('Reservierung gelöscht')
+      toast.success(t('planner.reservationDeleted'))
    } catch (err) {
      toast.error(err.message)
    }
@@ -306,7 +302,7 @@ export default function PlannerSidebar({
              {trip.start_date && formatShortDate(trip.start_date)}
              {trip.start_date && trip.end_date && ' – '}
              {trip.end_date && formatShortDate(trip.end_date)}
-              {days.length > 0 && ` · ${days.length} Tage`}
+              {days.length > 0 && ` · ${days.length} ${t('planner.days')}`}
            </p>
          )}
        </button>
@@ -348,18 +344,18 @@ export default function PlannerSidebar({
              </div>
              <div className="flex-1 min-w-0">
                <p className={`text-sm font-medium ${selectedDayId === null ? 'text-slate-900' : 'text-gray-700'}`}>
-                  Alle Orte
+                  {t('planner.allPlaces')}
                </p>
-                <p className="text-xs text-gray-400">{places.length} Orte gesamt</p>
+                <p className="text-xs text-gray-400">{t('planner.totalPlaces', { n: places.length })}</p>
              </div>
            </button>

            {days.length === 0 ? (
              <div className="px-4 py-10 text-center">
                <CalendarDays className="w-10 h-10 text-gray-200 mx-auto mb-3" />
-                <p className="text-sm text-gray-400">Noch keine Tage geplant</p>
+                <p className="text-sm text-gray-400">{t('planner.noDaysPlanned')}</p>
                <button onClick={onEditTrip} className="mt-2 text-slate-700 text-sm">
-                  Reise bearbeiten →
+                  {t('planner.editTrip')}
                </button>
              </div>
            ) : (
@@ -396,7 +392,7 @@ export default function PlannerSidebar({
                          </p>
                          {da.length > 0 && (
                            <span className="text-xs text-gray-400 flex-shrink-0">
-                              {da.length} {da.length === 1 ? 'Ort' : 'Orte'}
+                              {da.length === 1 ? t('planner.placeOne') : t('planner.placeN', { n: da.length })}
                            </span>
                          )}
                        </div>
@@ -410,7 +406,7 @@ export default function PlannerSidebar({
                      </div>
                      <button
                        onClick={e => { e.stopPropagation(); openAddNote(day.id); if (!isExpanded) toggleDay(day.id) }}
-                        title="Notiz hinzufügen"
+                        title={t('planner.addNote')}
                        className="p-1 text-gray-300 hover:text-amber-500 flex-shrink-0 transition-colors"
                      >
                        <FileText className="w-4 h-4" />
@@ -430,12 +426,12 @@ export default function PlannerSidebar({
                      <div className="bg-gray-50/40">
                        {merged.length === 0 && !dayNoteUi ? (
                          <div className="px-4 py-4 text-center">
-                            <p className="text-xs text-gray-400">Keine Einträge für diesen Tag</p>
+                            <p className="text-xs text-gray-400">{t('planner.noEntries')}</p>
                            <button
                              onClick={() => { onSelectDay(day.id); setActiveSegment('orte') }}
                              className="mt-1 text-xs text-slate-700"
                            >
-                              + Ort hinzufügen
+                              {t('planner.addPlaceShort')}
                            </button>
                          </div>
                        ) : (
@@ -478,20 +474,11 @@ export default function PlannerSidebar({
                                      )}
                                      <div className="flex items-center gap-2 mt-0.5 flex-wrap">
                                        {place.place_time && (
-                                          <span className="text-[11px] text-slate-600 font-medium">{place.place_time}</span>
+                                          <span className="text-[11px] text-slate-600 font-medium">{place.place_time}{place.end_time ? ` – ${place.end_time}` : ''}</span>
                                        )}
                                        {place.price > 0 && (
                                          <span className="text-[11px] text-gray-400">{place.price} {place.currency || currency}</span>
                                        )}
-                                        {place.reservation_status && place.reservation_status !== 'none' && (
-                                          <span className={`text-[10px] px-1.5 py-0.5 rounded-full font-medium ${
-                                            place.reservation_status === 'confirmed'
-                                              ? 'bg-emerald-50 text-emerald-600'
-                                              : 'bg-amber-50 text-amber-600'
-                                          }`}>
-                                            {place.reservation_status === 'confirmed' ? '✓ Bestätigt' : '⏳ Res. ausstehend'}
-                                          </span>
-                                        )}
                                      </div>
                                    </div>
                                    <div className="flex flex-col gap-0 flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity">
@@ -524,7 +511,7 @@ export default function PlannerSidebar({
                                        type="text"
                                        value={dayNoteUi.time}
                                        onChange={e => setNoteUi(prev => ({ ...prev, [day.id]: { ...prev[day.id], time: e.target.value } }))}
-                                        placeholder="Zeit (optional)"
+                                        placeholder={t('planner.noteTimePlaceholder')}
                                        className="w-24 text-[11px] border border-amber-200 rounded-lg px-2 py-1 bg-white focus:outline-none focus:ring-1 focus:ring-amber-300"
                                      />
                                    </div>
@@ -533,16 +520,16 @@ export default function PlannerSidebar({
                                      value={dayNoteUi.text}
                                      onChange={e => setNoteUi(prev => ({ ...prev, [day.id]: { ...prev[day.id], text: e.target.value } }))}
                                      onKeyDown={e => { if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); saveNote(day.id) } if (e.key === 'Escape') cancelNote(day.id) }}
-                                      placeholder="Notiz…"
+                                      placeholder={t('planner.notePlaceholder')}
                                      rows={2}
                                      className="w-full text-[12px] border border-amber-200 rounded-lg px-2 py-1.5 bg-white focus:outline-none focus:ring-1 focus:ring-amber-300 resize-none"
                                    />
                                    <div className="flex gap-1.5 mt-1.5">
                                      <button onClick={() => saveNote(day.id)} className="flex items-center gap-1 text-[11px] bg-amber-500 text-white px-2.5 py-1 rounded-lg hover:bg-amber-600">
-                                        <Check className="w-3 h-3" /> Speichern
+                                        <Check className="w-3 h-3" /> {t('common.save')}
                                      </button>
                                      <button onClick={() => cancelNote(day.id)} className="text-[11px] text-gray-500 px-2.5 py-1 rounded-lg hover:bg-gray-100">
-                                        Abbrechen
+                                        {t('common.cancel')}
                                      </button>
                                    </div>
                                  </div>
@@ -587,7 +574,7 @@ export default function PlannerSidebar({
                                type="text"
                                value={dayNoteUi.time}
                                onChange={e => setNoteUi(prev => ({ ...prev, [day.id]: { ...prev[day.id], time: e.target.value } }))}
-                                placeholder="Zeit (optional)"
+                                placeholder={t('planner.noteTimePlaceholder')}
                                className="w-24 text-[11px] border border-amber-200 rounded-lg px-2 py-1 bg-white focus:outline-none focus:ring-1 focus:ring-amber-300"
                              />
                            </div>
@@ -596,16 +583,16 @@ export default function PlannerSidebar({
                              value={dayNoteUi.text}
                              onChange={e => setNoteUi(prev => ({ ...prev, [day.id]: { ...prev[day.id], text: e.target.value } }))}
                              onKeyDown={e => { if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); saveNote(day.id) } if (e.key === 'Escape') cancelNote(day.id) }}
-                              placeholder="z.B. S3 um 14:30 ab Hauptbahnhof, Fähre ab Pier 7, Mittagspause…"
+                              placeholder={t('planner.noteExamplePlaceholder')}
                              rows={2}
                              className="w-full text-[12px] border border-amber-200 rounded-lg px-2 py-1.5 bg-white focus:outline-none focus:ring-1 focus:ring-amber-300 resize-none"
                            />
                            <div className="flex gap-1.5 mt-1.5">
                              <button onClick={() => saveNote(day.id)} className="flex items-center gap-1 text-[11px] bg-amber-500 text-white px-2.5 py-1 rounded-lg hover:bg-amber-600">
-                                <Check className="w-3 h-3" /> Hinzufügen
+                                <Check className="w-3 h-3" /> {t('common.add')}
                              </button>
                              <button onClick={() => cancelNote(day.id)} className="text-[11px] text-gray-500 px-2.5 py-1 rounded-lg hover:bg-gray-100">
-                                Abbrechen
+                                {t('common.cancel')}
                              </button>
                            </div>
                          </div>
@@ -618,7 +605,7 @@ export default function PlannerSidebar({
                              className="flex items-center gap-1 text-[11px] text-amber-600 hover:text-amber-700 py-1"
                            >
                              <FileText className="w-3 h-3" />
-                              Notiz hinzufügen
+                              {t('planner.addNote')}
                            </button>
                          </div>
                        )}
@@ -626,21 +613,6 @@ export default function PlannerSidebar({
                        {/* Route tools — only for the selected day */}
                        {isSelected && da.length >= 2 && (
                          <div className="px-4 py-3 space-y-2 border-t border-gray-100/60">
-                            <div className="flex bg-gray-100 rounded-[8px] p-0.5 gap-0.5">
-                              {TRANSPORT_MODES.map(m => (
-                                <button
-                                  key={m.value}
-                                  onClick={() => setTransportMode(m.value)}
-                                  className={`flex-1 py-1 text-[11px] rounded-[6px] transition-all ${
-                                    transportMode === m.value
-                                      ? 'bg-white shadow-sm text-gray-900 font-medium'
-                                      : 'text-gray-500'
-                                  }`}
-                                >
-                                  {m.icon} {m.label}
-                                </button>
-                              ))}
-                            </div>
                            {routeInfo && (
                              <div className="flex items-center justify-center gap-3 text-xs bg-slate-50 rounded-lg px-3 py-2">
                                <span className="text-slate-900">🛣️ {routeInfo.distance}</span>
@@ -655,14 +627,14 @@ export default function PlannerSidebar({
                                className="flex items-center justify-center gap-1.5 bg-slate-900 text-white text-xs py-2 rounded-lg hover:bg-slate-700 disabled:opacity-60 transition-colors"
                              >
                                <Navigation className="w-3.5 h-3.5" />
-                                {isCalculatingRoute ? 'Berechne...' : 'Route'}
+                                {isCalculatingRoute ? t('planner.calculating') : t('planner.route')}
                              </button>
                              <button
                                onClick={handleOptimizeRoute}
                                className="flex items-center justify-center gap-1.5 bg-emerald-600 text-white text-xs py-2 rounded-lg hover:bg-emerald-700 transition-colors"
                              >
                                <RotateCcw className="w-3.5 h-3.5" />
-                                Optimieren
+                                {t('planner.optimize')}
                              </button>
                            </div>
                            <button
@@ -670,7 +642,7 @@ export default function PlannerSidebar({
                              className="w-full flex items-center justify-center gap-1.5 border border-gray-200 text-gray-600 text-xs py-2 rounded-lg hover:bg-gray-50 transition-colors"
                            >
                              <ExternalLink className="w-3.5 h-3.5" />
-                              In Google Maps öffnen
+                              {t('planner.openGoogleMaps')}
                            </button>
                          </div>
                        )}
@@ -683,7 +655,7 @@ export default function PlannerSidebar({

            {totalCost > 0 && (
              <div className="px-4 py-3 border-t border-gray-100 flex items-center justify-between">
-                <span className="text-xs text-gray-500">Gesamtkosten</span>
+                <span className="text-xs text-gray-500">{t('planner.totalCost')}</span>
                <span className="text-sm font-semibold text-gray-800">{totalCost.toFixed(2)} {currency}</span>
              </div>
            )}
@@ -700,7 +672,7 @@ export default function PlannerSidebar({
                  type="text"
                  value={search}
                  onChange={e => setSearch(e.target.value)}
-                  placeholder="Orte suchen…"
+                  placeholder={t('planner.searchPlaces')}
                  className="w-full pl-8 pr-8 py-2 bg-gray-100 rounded-[10px] text-sm focus:outline-none focus:bg-white focus:ring-2 focus:ring-slate-400 transition-colors"
                />
                {search && (
@@ -715,7 +687,7 @@ export default function PlannerSidebar({
                  onChange={e => setCategoryFilter(e.target.value)}
                  className="flex-1 bg-gray-100 rounded-lg text-xs py-2 px-2 focus:outline-none text-gray-600"
                >
-                  <option value="">Alle Kategorien</option>
+                  <option value="">{t('planner.allCategories')}</option>
                  {categories.map(c => (
                    <option key={c.id} value={c.id}>{c.icon} {c.name}</option>
                  ))}
@@ -725,7 +697,7 @@ export default function PlannerSidebar({
                  className="flex items-center gap-1 bg-slate-900 text-white text-xs px-3 py-2 rounded-lg hover:bg-slate-700 whitespace-nowrap transition-colors"
                >
                  <Plus className="w-3.5 h-3.5" />
-                  Neu
+                  {t('planner.new')}
                </button>
              </div>
            </div>
@@ -733,9 +705,9 @@ export default function PlannerSidebar({
            {filteredPlaces.length === 0 ? (
              <div className="flex flex-col items-center justify-center py-12 text-gray-400">
                <span className="text-3xl mb-2">📍</span>
-                <p className="text-sm">Keine Orte gefunden</p>
+                <p className="text-sm">{t('planner.noPlacesFound')}</p>
                <button onClick={onAddPlace} className="mt-3 text-slate-700 text-sm">
-                  Ersten Ort hinzufügen
+                  {t('planner.addFirstPlace')}
                </button>
              </div>
            ) : (
@@ -782,7 +754,7 @@ export default function PlannerSidebar({
                                    onClick={e => { e.stopPropagation(); onAssignToDay(place.id) }}
                                    className="text-[11px] text-slate-700 bg-slate-50 px-1.5 py-0.5 rounded hover:bg-slate-100 transition-colors"
                                  >
-                                    + Tag
+                                    {t('planner.addToDay')}
                                  </button>
                                )
                              }
@@ -805,7 +777,7 @@ export default function PlannerSidebar({
          <div>
            <div className="px-4 py-3 flex items-center justify-between border-b border-gray-100">
              <h3 className="font-medium text-sm text-gray-900">
-                Reservierungen
+                {t('planner.reservations')}
                {selectedDay && <span className="text-gray-400 font-normal"> · Tag {selectedDay.day_number}</span>}
              </h3>
              <button
@@ -813,13 +785,13 @@ export default function PlannerSidebar({
                className="flex items-center gap-1 bg-slate-900 text-white text-xs px-2.5 py-1.5 rounded-lg hover:bg-slate-700 transition-colors"
              >
                <Plus className="w-3.5 h-3.5" />
-                Hinzufügen
+                {t('common.add')}
              </button>
            </div>
            {filteredReservations.length === 0 ? (
              <div className="flex flex-col items-center justify-center py-12 text-gray-400">
                <span className="text-3xl mb-2">🎫</span>
-                <p className="text-sm">Keine Reservierungen</p>
+                <p className="text-sm">{t('planner.noReservations')}</p>
              </div>
            ) : (
              <div className="p-3 space-y-2.5">
@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useRef } from 'react'
+import React, { useState, useEffect, useRef, useMemo } from 'react'
 import Modal from '../shared/Modal'
 import CustomSelect from '../shared/CustomSelect'
-import { Plane, Hotel, Utensils, Train, Car, Ship, Ticket, FileText, Users, Paperclip, X, ExternalLink } from 'lucide-react'
+import { Plane, Hotel, Utensils, Train, Car, Ship, Ticket, FileText, Users, Paperclip, X, ExternalLink, Link2 } from 'lucide-react'
 import { useToast } from '../shared/Toast'
 import { useTranslation } from '../../i18n'
 import { CustomDateTimePicker } from '../shared/CustomDateTimePicker'
@@ -18,19 +18,46 @@ const TYPE_OPTIONS = [
  { value: 'other',      labelKey: 'reservations.type.other',      Icon: FileText },
 ]

-export function ReservationModal({ isOpen, onClose, onSave, reservation, days, places, selectedDayId, files = [], onFileUpload, onFileDelete }) {
+function buildAssignmentOptions(days, assignments, t, locale) {
+  const options = []
+  for (const day of (days || [])) {
+    const da = (assignments?.[String(day.id)] || []).slice().sort((a, b) => a.order_index - b.order_index)
+    if (da.length === 0) continue
+    const dayLabel = day.title || t('dayplan.dayN', { n: day.day_number })
+    const dateStr = day.date ? ` · ${formatDate(day.date, locale)}` : ''
+    // Group header (non-selectable)
+    options.push({ value: `_header_${day.id}`, label: `${dayLabel}${dateStr}`, disabled: true, isHeader: true })
+    for (let i = 0; i < da.length; i++) {
+      const place = da[i].place
+      if (!place) continue
+      const timeStr = place.place_time ? ` · ${place.place_time}${place.end_time ? ' – ' + place.end_time : ''}` : ''
+      options.push({
+        value: da[i].id,
+        label: `  ${i + 1}. ${place.name}${timeStr}`,
+      })
+    }
+  }
+  return options
+}
+
+export function ReservationModal({ isOpen, onClose, onSave, reservation, days, places, assignments, selectedDayId, files = [], onFileUpload, onFileDelete }) {
  const toast = useToast()
-  const { t } = useTranslation()
+  const { t, locale } = useTranslation()
  const fileInputRef = useRef(null)

  const [form, setForm] = useState({
    title: '', type: 'other', status: 'pending',
    reservation_time: '', location: '', confirmation_number: '',
-    notes: '', day_id: '', place_id: '',
+    notes: '', assignment_id: '',
  })
  const [isSaving, setIsSaving] = useState(false)
  const [uploadingFile, setUploadingFile] = useState(false)
-  const [pendingFiles, setPendingFiles] = useState([]) // for new reservations
+  const [pendingFiles, setPendingFiles] = useState([])
+
+  const assignmentOptions = useMemo(
+    () => buildAssignmentOptions(days, assignments, t, locale),
+    [days, assignments, t, locale]
+  )

  useEffect(() => {
    if (reservation) {
@@ -42,14 +69,13 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
        location: reservation.location || '',
        confirmation_number: reservation.confirmation_number || '',
        notes: reservation.notes || '',
-        day_id: reservation.day_id || '',
-        place_id: reservation.place_id || '',
+        assignment_id: reservation.assignment_id || '',
      })
    } else {
      setForm({
        title: '', type: 'other', status: 'pending',
        reservation_time: '', location: '', confirmation_number: '',
-        notes: '', day_id: selectedDayId || '', place_id: '',
+        notes: '', assignment_id: '',
      })
      setPendingFiles([])
    }
@@ -64,10 +90,8 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
    try {
      const saved = await onSave({
        ...form,
-        day_id: form.day_id || null,
-        place_id: form.place_id || null,
+        assignment_id: form.assignment_id || null,
      })
-      // Upload pending files for newly created reservations
      if (!reservation?.id && saved?.id && pendingFiles.length > 0) {
        for (const file of pendingFiles) {
          const fd = new FormData()
@@ -86,7 +110,6 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
    const file = e.target.files?.[0]
    if (!file) return
    if (reservation?.id) {
-      // Existing reservation — upload immediately
      setUploadingFile(true)
      try {
        const fd = new FormData()
@@ -102,7 +125,6 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
        e.target.value = ''
      }
    } else {
-      // New reservation — stage locally
      setPendingFiles(prev => [...prev, file])
      e.target.value = ''
    }
@@ -112,29 +134,29 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p

  const inputStyle = {
    width: '100%', border: '1px solid var(--border-primary)', borderRadius: 10,
-    padding: '8px 14px', fontSize: 13, fontFamily: 'inherit',
+    padding: '8px 12px', fontSize: 13, fontFamily: 'inherit',
    outline: 'none', boxSizing: 'border-box', color: 'var(--text-primary)', background: 'var(--bg-input)',
  }
-  const labelStyle = { display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 5 }
+  const labelStyle = { display: 'block', fontSize: 11, fontWeight: 600, color: 'var(--text-faint)', marginBottom: 5, textTransform: 'uppercase', letterSpacing: '0.03em' }

  return (
-    <Modal isOpen={isOpen} onClose={onClose} title={reservation ? t('reservations.editTitle') : t('reservations.newTitle')} size="md">
-      <form onSubmit={handleSubmit} style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
+    <Modal isOpen={isOpen} onClose={onClose} title={reservation ? t('reservations.editTitle') : t('reservations.newTitle')} size="2xl">
+      <form onSubmit={handleSubmit} style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>

        {/* Type selector */}
        <div>
          <label style={labelStyle}>{t('reservations.bookingType')}</label>
-          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6 }}>
+          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 5 }}>
            {TYPE_OPTIONS.map(({ value, labelKey, Icon }) => (
              <button key={value} type="button" onClick={() => set('type', value)} style={{
-                display: 'flex', alignItems: 'center', gap: 5,
-                padding: '6px 11px', borderRadius: 99, border: '1px solid',
-                fontSize: 12, fontWeight: 500, cursor: 'pointer', fontFamily: 'inherit', transition: 'all 0.12s',
+                display: 'flex', alignItems: 'center', gap: 4,
+                padding: '5px 10px', borderRadius: 99, border: '1px solid',
+                fontSize: 11, fontWeight: 500, cursor: 'pointer', fontFamily: 'inherit', transition: 'all 0.12s',
                background: form.type === value ? 'var(--text-primary)' : 'var(--bg-card)',
                borderColor: form.type === value ? 'var(--text-primary)' : 'var(--border-primary)',
                color: form.type === value ? 'var(--bg-primary)' : 'var(--text-muted)',
              }}>
-                <Icon size={12} /> {t(labelKey)}
+                <Icon size={11} /> {t(labelKey)}
              </button>
            ))}
          </div>
@@ -147,8 +169,29 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
            placeholder={t('reservations.titlePlaceholder')} style={inputStyle} />
        </div>

+        {/* Assignment Picker */}
+        {assignmentOptions.length > 0 && (
+          <div>
+            <label style={labelStyle}>
+              <Link2 size={10} style={{ display: 'inline', verticalAlign: '-1px', marginRight: 3 }} />
+              {t('reservations.linkAssignment')}
+            </label>
+            <CustomSelect
+              value={form.assignment_id}
+              onChange={value => set('assignment_id', value)}
+              placeholder={t('reservations.pickAssignment')}
+              options={[
+                { value: '', label: t('reservations.noAssignment') },
+                ...assignmentOptions,
+              ]}
+              searchable
+              size="sm"
+            />
+          </div>
+        )}
+
        {/* Date/Time + Status */}
-        <div style={{ display: 'grid', gridTemplateColumns: '2fr 1fr', gap: 10 }}>
+        <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
          <div>
            <label style={labelStyle}>{t('reservations.datetime')}</label>
            <CustomDateTimePicker value={form.reservation_time} onChange={v => set('reservation_time', v)} />
@@ -167,108 +210,61 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
          </div>
        </div>

-        {/* Location */}
-        <div>
-          <label style={labelStyle}>{t('reservations.locationAddress')}</label>
-          <input type="text" value={form.location} onChange={e => set('location', e.target.value)}
-            placeholder={t('reservations.locationPlaceholder')} style={inputStyle} />
-        </div>
-
-        {/* Confirmation number */}
-        <div>
-          <label style={labelStyle}>{t('reservations.confirmationCode')}</label>
-          <input type="text" value={form.confirmation_number} onChange={e => set('confirmation_number', e.target.value)}
-            placeholder={t('reservations.confirmationPlaceholder')} style={inputStyle} />
-        </div>
-
-        {/* Linked day + place */}
-        <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 10 }}>
+        {/* Location + Booking Code */}
+        <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
          <div>
-            <label style={labelStyle}>{t('reservations.day')}</label>
-            <CustomSelect
-              value={form.day_id}
-              onChange={value => set('day_id', value)}
-              placeholder={t('reservations.noDay')}
-              options={[
-                { value: '', label: t('reservations.noDay') },
-                ...(days || []).map(day => ({
-                  value: day.id,
-                  label: `${t('reservations.day')} ${day.day_number}${day.date ? ` · ${formatDate(day.date)}` : ''}`,
-                })),
-              ]}
-              size="sm"
-            />
+            <label style={labelStyle}>{t('reservations.locationAddress')}</label>
+            <input type="text" value={form.location} onChange={e => set('location', e.target.value)}
+              placeholder={t('reservations.locationPlaceholder')} style={inputStyle} />
          </div>
          <div>
-            <label style={labelStyle}>{t('reservations.place')}</label>
-            <CustomSelect
-              value={form.place_id}
-              onChange={value => set('place_id', value)}
-              placeholder={t('reservations.noPlace')}
-              options={[
-                { value: '', label: t('reservations.noPlace') },
-                ...(places || []).map(place => ({
-                  value: place.id,
-                  label: place.name,
-                })),
-              ]}
-              searchable
-              size="sm"
-            />
+            <label style={labelStyle}>{t('reservations.confirmationCode')}</label>
+            <input type="text" value={form.confirmation_number} onChange={e => set('confirmation_number', e.target.value)}
+              placeholder={t('reservations.confirmationPlaceholder')} style={inputStyle} />
          </div>
        </div>

        {/* Notes */}
        <div>
          <label style={labelStyle}>{t('reservations.notes')}</label>
-          <textarea value={form.notes} onChange={e => set('notes', e.target.value)} rows={3}
+          <textarea value={form.notes} onChange={e => set('notes', e.target.value)} rows={2}
            placeholder={t('reservations.notesPlaceholder')}
            style={{ ...inputStyle, resize: 'none', lineHeight: 1.5 }} />
        </div>

-        {/* File upload — always visible */}
+        {/* Files */}
        <div>
          <label style={labelStyle}>{t('files.title')}</label>
-          <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+          <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
            {attachedFiles.map(f => (
-              <div key={f.id} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '6px 10px', background: 'var(--bg-secondary)', borderRadius: 8, border: '1px solid var(--border-primary)' }}>
-                <FileText size={13} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
-                <span style={{ flex: 1, fontSize: 12.5, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
-                <a href={f.url} target="_blank" rel="noreferrer" style={{ color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }} title={t('common.open')}>
-                  <ExternalLink size={12} />
-                </a>
+              <div key={f.id} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '5px 10px', background: 'var(--bg-secondary)', borderRadius: 8 }}>
+                <FileText size={12} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
+                <span style={{ flex: 1, fontSize: 12, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
+                <a href={f.url} target="_blank" rel="noreferrer" style={{ color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}><ExternalLink size={11} /></a>
                {onFileDelete && (
-                  <button type="button" onClick={() => onFileDelete(f.id)} style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', padding: 0, flexShrink: 0 }}
-                    onMouseEnter={e => e.currentTarget.style.color = '#ef4444'}
-                    onMouseLeave={e => e.currentTarget.style.color = '#9ca3af'}>
-                    <X size={12} />
+                  <button type="button" onClick={() => onFileDelete(f.id)} style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', padding: 0, flexShrink: 0 }}>
+                    <X size={11} />
                  </button>
                )}
              </div>
            ))}
            {pendingFiles.map((f, i) => (
-              <div key={i} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '6px 10px', background: 'var(--bg-secondary)', borderRadius: 8, border: '1px solid var(--border-primary)' }}>
-                <FileText size={13} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
-                <span style={{ flex: 1, fontSize: 12.5, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.name}</span>
-                <span style={{ fontSize: 11, color: 'var(--text-faint)', flexShrink: 0 }}>{t('reservations.pendingSave')}</span>
+              <div key={i} style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '5px 10px', background: 'var(--bg-secondary)', borderRadius: 8 }}>
+                <FileText size={12} style={{ color: 'var(--text-muted)', flexShrink: 0 }} />
+                <span style={{ flex: 1, fontSize: 12, color: 'var(--text-secondary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.name}</span>
                <button type="button" onClick={() => setPendingFiles(prev => prev.filter((_, j) => j !== i))}
-                  style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', padding: 0, flexShrink: 0 }}
-                  onMouseEnter={e => e.currentTarget.style.color = '#ef4444'}
-                  onMouseLeave={e => e.currentTarget.style.color = '#9ca3af'}>
-                  <X size={12} />
+                  style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', padding: 0, flexShrink: 0 }}>
+                  <X size={11} />
                </button>
              </div>
            ))}
            <input ref={fileInputRef} type="file" accept=".pdf,.doc,.docx,.txt,image/*" style={{ display: 'none' }} onChange={handleFileChange} />
            <button type="button" onClick={() => fileInputRef.current?.click()} disabled={uploadingFile} style={{
-              display: 'flex', alignItems: 'center', gap: 6, padding: '7px 12px',
-              border: '1px dashed var(--border-primary)', borderRadius: 8, background: 'var(--bg-card)',
-              fontSize: 12.5, color: 'var(--text-muted)', cursor: uploadingFile ? 'default' : 'pointer',
-              fontFamily: 'inherit', transition: 'all 0.12s',
-            }}
-              onMouseEnter={e => { if (!uploadingFile) { e.currentTarget.style.borderColor = 'var(--text-faint)'; e.currentTarget.style.color = 'var(--text-secondary)' } }}
-              onMouseLeave={e => { e.currentTarget.style.borderColor = 'var(--border-primary)'; e.currentTarget.style.color = 'var(--text-muted)' }}>
-              <Paperclip size={13} />
+              display: 'flex', alignItems: 'center', gap: 5, padding: '6px 10px',
+              border: '1px dashed var(--border-primary)', borderRadius: 8, background: 'none',
+              fontSize: 11, color: 'var(--text-faint)', cursor: uploadingFile ? 'default' : 'pointer', fontFamily: 'inherit',
+            }}>
+              <Paperclip size={11} />
              {uploadingFile ? t('reservations.uploading') : t('reservations.attachFile')}
            </button>
          </div>
@@ -276,10 +272,10 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p

        {/* Actions */}
        <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 8, paddingTop: 4, borderTop: '1px solid var(--border-secondary)' }}>
-          <button type="button" onClick={onClose} style={{ padding: '8px 16px', borderRadius: 10, border: '1px solid var(--border-primary)', background: 'var(--bg-card)', fontSize: 13, cursor: 'pointer', fontFamily: 'inherit', color: 'var(--text-secondary)' }}>
+          <button type="button" onClick={onClose} style={{ padding: '8px 16px', borderRadius: 10, border: '1px solid var(--border-primary)', background: 'none', fontSize: 12, cursor: 'pointer', fontFamily: 'inherit', color: 'var(--text-muted)' }}>
            {t('common.cancel')}
          </button>
-          <button type="submit" disabled={isSaving || !form.title.trim()} style={{ padding: '8px 20px', borderRadius: 10, border: 'none', background: 'var(--text-primary)', color: 'var(--bg-primary)', fontSize: 13, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit', opacity: isSaving || !form.title.trim() ? 0.5 : 1 }}>
+          <button type="submit" disabled={isSaving || !form.title.trim()} style={{ padding: '8px 20px', borderRadius: 10, border: 'none', background: 'var(--text-primary)', color: 'var(--bg-primary)', fontSize: 12, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit', opacity: isSaving || !form.title.trim() ? 0.5 : 1 }}>
            {isSaving ? t('common.saving') : reservation ? t('common.update') : t('common.add')}
          </button>
        </div>
@@ -288,8 +284,8 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
  )
 }

-function formatDate(dateStr) {
+function formatDate(dateStr, locale) {
  if (!dateStr) return ''
  const d = new Date(dateStr + 'T00:00:00')
-  return d.toLocaleDateString('de-DE', { day: 'numeric', month: 'short' })
+  return d.toLocaleDateString(locale || 'de-DE', { day: 'numeric', month: 'short' })
 }
@@ -1,160 +1,52 @@
 import React, { useState, useMemo } from 'react'
-import ReactDOM from 'react-dom'
 import { useTripStore } from '../../store/tripStore'
 import { useSettingsStore } from '../../store/settingsStore'
 import { useToast } from '../shared/Toast'
 import { useTranslation } from '../../i18n'
-import { CustomDateTimePicker } from '../shared/CustomDateTimePicker'
-import CustomSelect from '../shared/CustomSelect'
 import {
  Plane, Hotel, Utensils, Train, Car, Ship, Ticket, FileText, MapPin,
-  Calendar, Hash, CheckCircle2, Circle, Pencil, Trash2, Plus, ChevronDown, ChevronRight, MapPinned, X, Users,
-  ExternalLink, BookMarked, Lightbulb,
+  Calendar, Hash, CheckCircle2, Circle, Pencil, Trash2, Plus, ChevronDown, ChevronRight, Users,
+  ExternalLink, BookMarked, Lightbulb, Link2, Clock,
 } from 'lucide-react'

 const TYPE_OPTIONS = [
-  { value: 'flight',      labelKey: 'reservations.type.flight',      Icon: Plane },
-  { value: 'hotel',       labelKey: 'reservations.type.hotel',       Icon: Hotel },
-  { value: 'restaurant',  labelKey: 'reservations.type.restaurant',  Icon: Utensils },
-  { value: 'train',       labelKey: 'reservations.type.train',       Icon: Train },
-  { value: 'car',         labelKey: 'reservations.type.car',         Icon: Car },
-  { value: 'cruise',      labelKey: 'reservations.type.cruise',      Icon: Ship },
-  { value: 'event',       labelKey: 'reservations.type.event',       Icon: Ticket },
-  { value: 'tour',        labelKey: 'reservations.type.tour',        Icon: Users },
-  { value: 'other',       labelKey: 'reservations.type.other',       Icon: FileText },
+  { value: 'flight',      labelKey: 'reservations.type.flight',      Icon: Plane, color: '#3b82f6' },
+  { value: 'hotel',       labelKey: 'reservations.type.hotel',       Icon: Hotel, color: '#8b5cf6' },
+  { value: 'restaurant',  labelKey: 'reservations.type.restaurant',  Icon: Utensils, color: '#ef4444' },
+  { value: 'train',       labelKey: 'reservations.type.train',       Icon: Train, color: '#06b6d4' },
+  { value: 'car',         labelKey: 'reservations.type.car',         Icon: Car, color: '#6b7280' },
+  { value: 'cruise',      labelKey: 'reservations.type.cruise',      Icon: Ship, color: '#0ea5e9' },
+  { value: 'event',       labelKey: 'reservations.type.event',       Icon: Ticket, color: '#f59e0b' },
+  { value: 'tour',        labelKey: 'reservations.type.tour',        Icon: Users, color: '#10b981' },
+  { value: 'other',       labelKey: 'reservations.type.other',       Icon: FileText, color: '#6b7280' },
 ]

-function typeIcon(type) {
-  return (TYPE_OPTIONS.find(t => t.value === type) || TYPE_OPTIONS[TYPE_OPTIONS.length - 1]).Icon
-}
-function typeLabelKey(type) {
-  return (TYPE_OPTIONS.find(t => t.value === type) || TYPE_OPTIONS[TYPE_OPTIONS.length - 1]).labelKey
+function getType(type) {
+  return TYPE_OPTIONS.find(t => t.value === type) || TYPE_OPTIONS[TYPE_OPTIONS.length - 1]
 }

-function formatDateTimeWithLocale(str, locale, timeFormat) {
-  if (!str) return null
-  const d = new Date(str)
-  if (isNaN(d)) return str
-  const datePart = d.toLocaleDateString(locale, { weekday: 'short', day: 'numeric', month: 'long' })
-  const h = d.getHours(), m = d.getMinutes()
-  let timePart
-  if (timeFormat === '12h') {
-    const period = h >= 12 ? 'PM' : 'AM'
-    const h12 = h === 0 ? 12 : h > 12 ? h - 12 : h
-    timePart = `${h12}:${String(m).padStart(2, '0')} ${period}`
-  } else {
-    timePart = `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`
-    if (locale?.startsWith('de')) timePart += ' Uhr'
-  }
-  return `${datePart} · ${timePart}`
-}
-
-const inputStyle = {
-  width: '100%', border: '1px solid var(--border-primary)', borderRadius: 10,
-  padding: '8px 12px', fontSize: 13.5, fontFamily: 'inherit',
-  outline: 'none', boxSizing: 'border-box', color: 'var(--text-primary)', background: 'var(--bg-card)',
-}
-const labelStyle = { display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 5 }
-
-function PlaceReservationEditModal({ item, tripId, onClose }) {
-  const { updatePlace } = useTripStore()
-  const toast = useToast()
-  const { t } = useTranslation()
-  const [form, setForm] = useState({
-    reservation_status: item.status === 'confirmed' ? 'confirmed' : 'pending',
-    reservation_datetime: item.reservation_time ? item.reservation_time.slice(0, 16) : '',
-    place_time: item.place_time || '',
-    reservation_notes: item.notes || '',
-  })
-  const [saving, setSaving] = useState(false)
-
-  const set = (f, v) => setForm(p => ({ ...p, [f]: v }))
-
-  const handleSave = async () => {
-    setSaving(true)
-    try {
-      await updatePlace(tripId, item.placeId, {
-        reservation_status: form.reservation_status,
-        reservation_datetime: form.reservation_datetime || null,
-        place_time: form.place_time || null,
-        reservation_notes: form.reservation_notes || null,
-      })
-      toast.success(t('reservations.toast.updated'))
-      onClose()
-    } catch {
-      toast.error(t('reservations.toast.saveError'))
-    } finally {
-      setSaving(false)
+function buildAssignmentLookup(days, assignments) {
+  const map = {}
+  for (const day of (days || [])) {
+    const da = (assignments?.[String(day.id)] || []).slice().sort((a, b) => a.order_index - b.order_index)
+    for (const a of da) {
+      if (!a.place) continue
+      map[a.id] = { dayNumber: day.day_number, dayTitle: day.title, dayDate: day.date, placeName: a.place.name, startTime: a.place.place_time, endTime: a.place.end_time }
    }
  }
-
-  return ReactDOM.createPortal(
-    <div style={{
-      position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.4)', zIndex: 9000,
-      display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16,
-    }} onClick={onClose}>
-      <div style={{
-        background: 'var(--bg-card)', borderRadius: 18, padding: 24, width: '100%', maxWidth: 420,
-        boxShadow: '0 20px 60px rgba(0,0,0,0.2)',
-        fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif",
-      }} onClick={e => e.stopPropagation()}>
-        <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 20 }}>
-          <div>
-            <h3 style={{ margin: 0, fontSize: 16, fontWeight: 700, color: 'var(--text-primary)' }}>{t('reservations.editTitle')}</h3>
-            <p style={{ margin: '3px 0 0', fontSize: 12, color: 'var(--text-faint)' }}>{item.title}</p>
-          </div>
-          <button onClick={onClose} style={{ background: 'var(--bg-tertiary)', border: 'none', borderRadius: '50%', width: 30, height: 30, cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-            <X size={14} />
-          </button>
-        </div>
-
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
-          <div>
-            <label style={labelStyle}>{t('reservations.status')}</label>
-            <CustomSelect
-              value={form.reservation_status}
-              onChange={v => set('reservation_status', v)}
-              options={[
-                { value: 'pending', label: t('reservations.pending') },
-                { value: 'confirmed', label: t('reservations.confirmed') },
-              ]}
-            />
-          </div>
-
-          <div>
-            <label style={labelStyle}>{t('reservations.datetime')}</label>
-            <CustomDateTimePicker value={form.reservation_datetime} onChange={v => set('reservation_datetime', v)} />
-          </div>
-
-
-          <div>
-            <label style={labelStyle}>{t('reservations.notes')}</label>
-            <textarea value={form.reservation_notes} onChange={e => set('reservation_notes', e.target.value)} rows={3} placeholder={t('reservations.notesPlaceholder')} style={{ ...inputStyle, resize: 'none', lineHeight: 1.5 }} />
-          </div>
-        </div>
-
-        <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 8, marginTop: 20, paddingTop: 16, borderTop: '1px solid var(--border-secondary)' }}>
-          <button onClick={onClose} style={{ padding: '8px 16px', borderRadius: 10, border: '1px solid var(--border-primary)', background: 'var(--bg-card)', fontSize: 13, cursor: 'pointer', fontFamily: 'inherit', color: 'var(--text-secondary)' }}>
-            {t('common.cancel')}
-          </button>
-          <button onClick={handleSave} disabled={saving} style={{ padding: '8px 20px', borderRadius: 10, border: 'none', background: 'var(--accent)', color: 'white', fontSize: 13, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit', opacity: saving ? 0.6 : 1 }}>
-            {saving ? t('common.saving') : t('common.save')}
-          </button>
-        </div>
-      </div>
-    </div>,
-    document.body
-  )
+  return map
 }

-function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateToFiles }) {
+function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateToFiles, assignmentLookup }) {
  const { toggleReservationStatus } = useTripStore()
  const toast = useToast()
  const { t, locale } = useTranslation()
  const timeFormat = useSettingsStore(s => s.settings.time_format) || '24h'
-  const TypeIcon = typeIcon(r.type)
+  const typeInfo = getType(r.type)
+  const TypeIcon = typeInfo.Icon
  const confirmed = r.status === 'confirmed'
  const attachedFiles = files.filter(f => f.reservation_id === r.id)
+  const linked = r.assignment_id ? assignmentLookup[r.assignment_id] : null

  const handleToggle = async () => {
    try { await toggleReservationStatus(tripId, r.id) }
@@ -165,184 +57,137 @@ function ReservationCard({ r, tripId, onEdit, onDelete, files = [], onNavigateTo
    try { await onDelete(r.id) } catch { toast.error(t('reservations.toast.deleteError')) }
  }

-  return (
-    <div style={{ background: 'var(--bg-card)', borderRadius: 14, border: '1px solid var(--border-faint)', boxShadow: '0 1px 6px rgba(0,0,0,0.05)', overflow: 'hidden' }}>
-      <div style={{ display: 'flex', alignItems: 'stretch' }}>
-        <div style={{
-          width: 44, flexShrink: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
-          background: confirmed ? 'rgba(22,163,74,0.1)' : 'rgba(161,98,7,0.1)',
-          borderRight: `1px solid ${confirmed ? 'rgba(22,163,74,0.2)' : 'rgba(161,98,7,0.2)'}`,
-        }}>
-          <TypeIcon size={16} style={{ color: confirmed ? '#16a34a' : '#a16207' }} />
-        </div>
-
-        <div style={{ flex: 1, padding: '11px 13px', minWidth: 0 }}>
-          <div style={{ display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', gap: 8 }}>
-            <div style={{ minWidth: 0 }}>
-              <div style={{ fontWeight: 600, fontSize: 13.5, color: 'var(--text-primary)', lineHeight: 1.3 }}>{r.title}</div>
-              <div style={{ fontSize: 11, color: 'var(--text-faint)', marginTop: 1 }}>{t(typeLabelKey(r.type))}</div>
-            </div>
-            <div style={{ display: 'flex', gap: 3, flexShrink: 0 }}>
-              <button onClick={handleToggle} style={{
-                display: 'flex', alignItems: 'center', gap: 3, padding: '3px 8px', borderRadius: 99,
-                border: 'none', cursor: 'pointer', fontSize: 11, fontWeight: 500,
-                background: confirmed ? 'rgba(22,163,74,0.12)' : 'rgba(161,98,7,0.12)',
-                color: confirmed ? '#16a34a' : '#a16207',
-              }}>
-                {confirmed ? <><CheckCircle2 size={11} /> {t('reservations.confirmed')}</> : <><Circle size={11} /> {t('reservations.pending')}</>}
-              </button>
-              <button onClick={() => onEdit(r)} style={{ padding: 5, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', borderRadius: 6, display: 'flex' }}><Pencil size={12} /></button>
-              <button onClick={handleDelete} style={{ padding: 5, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', borderRadius: 6, display: 'flex' }}><Trash2 size={12} /></button>
-            </div>
-          </div>
-
-          <div style={{ marginTop: 7, display: 'flex', flexWrap: 'wrap', gap: '3px 10px' }}>
-            {r.reservation_time && (
-              <div style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 11.5, color: 'var(--text-secondary)' }}>
-                <Calendar size={10} style={{ color: 'var(--text-faint)' }} />{formatDateTimeWithLocale(r.reservation_time, locale, timeFormat)}
-              </div>
-            )}
-            {r.location && (
-              <div style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 11.5, color: 'var(--text-secondary)' }}>
-                <MapPin size={10} style={{ color: 'var(--text-faint)' }} />
-                <span style={{ maxWidth: 200, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.location}</span>
-              </div>
-            )}
-          </div>
-
-          <div style={{ marginTop: 5, display: 'flex', flexWrap: 'wrap', gap: 4 }}>
-            {r.confirmation_number && (
-              <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3, fontSize: 10.5, color: '#16a34a', background: 'rgba(22,163,74,0.1)', border: '1px solid rgba(22,163,74,0.2)', borderRadius: 99, padding: '1px 7px', fontWeight: 600 }}>
-                <Hash size={8} />{r.confirmation_number}
-              </span>
-            )}
-            {r.day_number != null && <span style={{ fontSize: 10.5, color: 'var(--text-muted)', background: 'var(--bg-tertiary)', borderRadius: 99, padding: '1px 7px' }}>{t('dayplan.dayN', { n: r.day_number })}</span>}
-            {r.place_name && <span style={{ fontSize: 10.5, color: 'var(--text-muted)', background: 'var(--bg-tertiary)', borderRadius: 99, padding: '1px 7px' }}>{r.place_name}</span>}
-          </div>
-
-          {r.notes && <p style={{ margin: '7px 0 0', fontSize: 11.5, color: 'var(--text-muted)', lineHeight: 1.5, borderTop: '1px solid var(--border-secondary)', paddingTop: 7 }}>{r.notes}</p>}
-
-          {/* Attached files — read-only, upload only via edit modal */}
-          {attachedFiles.length > 0 && (
-            <div style={{ marginTop: 8, borderTop: '1px solid var(--border-secondary)', paddingTop: 8, display: 'flex', flexDirection: 'column', gap: 4 }}>
-              {attachedFiles.map(f => (
-                <div key={f.id} style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
-                  <FileText size={11} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-                  <span style={{ fontSize: 11.5, color: 'var(--text-secondary)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
-                  <a href={f.url} target="_blank" rel="noreferrer" style={{ display: 'flex', color: 'var(--text-faint)', flexShrink: 0 }} title={t('common.open')}>
-                    <ExternalLink size={11} />
-                  </a>
-                </div>
-              ))}
-              <button onClick={onNavigateToFiles} style={{ alignSelf: 'flex-start', fontSize: 11, color: 'var(--text-muted)', background: 'none', border: 'none', cursor: 'pointer', padding: 0, textDecoration: 'underline', fontFamily: 'inherit' }}>
-                {t('reservations.showFiles')}
-              </button>
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function PlaceReservationCard({ item, tripId }) {
-  const { updatePlace } = useTripStore()
-  const toast = useToast()
-  const { t, locale } = useTranslation()
-  const timeFormat = useSettingsStore(s => s.settings.time_format) || '24h'
-  const [editing, setEditing] = useState(false)
-  const confirmed = item.status === 'confirmed'
-
-  const handleDelete = async () => {
-    if (!confirm(t('reservations.confirm.remove', { name: item.title }))) return
-    try {
-      await updatePlace(tripId, item.placeId, {
-        reservation_status: 'none',
-        reservation_datetime: null,
-        place_time: null,
-        reservation_notes: null,
-      })
-      toast.success(t('reservations.toast.removed'))
-    } catch { toast.error(t('reservations.toast.deleteError')) }
+  const fmtDate = (str) => {
+    const d = new Date(str)
+    return d.toLocaleDateString(locale, { weekday: 'short', day: 'numeric', month: 'short' })
+  }
+  const fmtTime = (str) => {
+    const d = new Date(str)
+    return d.toLocaleTimeString(locale, { hour: '2-digit', minute: '2-digit', hour12: timeFormat === '12h' })
  }

  return (
-    <>
-      {editing && <PlaceReservationEditModal item={item} tripId={tripId} onClose={() => setEditing(false)} />}
-      <div style={{ background: 'var(--bg-card)', borderRadius: 14, border: '1px solid var(--border-faint)', boxShadow: '0 1px 6px rgba(0,0,0,0.05)', overflow: 'hidden' }}>
-        <div style={{ display: 'flex', alignItems: 'stretch' }}>
-          <div style={{
-            width: 44, flexShrink: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
-            background: confirmed ? 'rgba(22,163,74,0.1)' : 'rgba(161,98,7,0.1)',
-            borderRight: `1px solid ${confirmed ? 'rgba(22,163,74,0.2)' : 'rgba(161,98,7,0.2)'}`,
-          }}>
-            <MapPinned size={16} style={{ color: confirmed ? '#16a34a' : '#a16207' }} />
-          </div>
+    <div style={{ borderRadius: 12, overflow: 'hidden', border: `1px solid ${confirmed ? 'rgba(22,163,74,0.2)' : 'rgba(217,119,6,0.2)'}` }}>
+      {/* Header bar */}
+      <div style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '8px 12px', background: confirmed ? 'rgba(22,163,74,0.06)' : 'rgba(217,119,6,0.06)' }}>
+        <div style={{ width: 7, height: 7, borderRadius: '50%', flexShrink: 0, background: confirmed ? '#16a34a' : '#d97706' }} />
+        <button onClick={handleToggle} style={{ fontSize: 10, fontWeight: 700, color: confirmed ? '#16a34a' : '#d97706', background: 'none', border: 'none', cursor: 'pointer', padding: 0, fontFamily: 'inherit' }}>
+          {confirmed ? t('reservations.confirmed') : t('reservations.pending')}
+        </button>
+        <div style={{ width: 1, height: 10, background: 'var(--border-faint)' }} />
+        <TypeIcon size={11} style={{ color: typeInfo.color, flexShrink: 0 }} />
+        <span style={{ fontSize: 10, color: 'var(--text-faint)' }}>{t(typeInfo.labelKey)}</span>
+        <span style={{ flex: 1 }} />
+        <span style={{ fontSize: 12, fontWeight: 700, color: 'var(--text-primary)', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.title}</span>
+        <button onClick={() => onEdit(r)} title={t('common.edit')} style={{ padding: 3, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}
+          onMouseEnter={e => e.currentTarget.style.color = 'var(--text-primary)'}
+          onMouseLeave={e => e.currentTarget.style.color = 'var(--text-faint)'}>
+          <Pencil size={11} />
+        </button>
+        <button onClick={handleDelete} title={t('common.delete')} style={{ padding: 3, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', display: 'flex', flexShrink: 0 }}
+          onMouseEnter={e => e.currentTarget.style.color = '#ef4444'}
+          onMouseLeave={e => e.currentTarget.style.color = 'var(--text-faint)'}>
+          <Trash2 size={11} />
+        </button>
+      </div>

-          <div style={{ flex: 1, padding: '11px 13px', minWidth: 0 }}>
-            <div style={{ display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', gap: 8 }}>
-              <div style={{ minWidth: 0 }}>
-                <div style={{ fontWeight: 600, fontSize: 13.5, color: 'var(--text-primary)', lineHeight: 1.3 }}>{item.title}</div>
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4, marginTop: 2, flexWrap: 'nowrap', overflow: 'hidden' }}>
-                  <span className="hidden sm:inline" style={{ fontSize: 10.5, color: 'var(--text-faint)', flexShrink: 0 }}>{t('reservations.fromPlan')}</span>
-                  {item.dayLabel && <span style={{ fontSize: 10.5, color: 'var(--text-muted)', background: 'var(--bg-tertiary)', borderRadius: 99, padding: '0 6px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>{item.dayLabel}</span>}
-                </div>
-              </div>
-              <div style={{ display: 'flex', gap: 3, flexShrink: 0 }}>
-                <span style={{
-                  display: 'flex', alignItems: 'center', gap: 3, padding: '3px 8px', borderRadius: 99,
-                  fontSize: 11, fontWeight: 500,
-                  background: confirmed ? 'rgba(22,163,74,0.12)' : 'rgba(161,98,7,0.12)',
-                  color: confirmed ? '#16a34a' : '#a16207',
-                }}>
-                  {confirmed ? <><CheckCircle2 size={11} /> {t('reservations.confirmed')}</> : <><Circle size={11} /> {t('reservations.pending')}</>}
-                </span>
-                <button onClick={() => setEditing(true)} style={{ padding: 5, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', borderRadius: 6, display: 'flex' }}><Pencil size={12} /></button>
-                <button onClick={handleDelete} style={{ padding: 5, background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-faint)', borderRadius: 6, display: 'flex' }}><Trash2 size={12} /></button>
-              </div>
-            </div>
-
-            <div style={{ marginTop: 7, display: 'flex', flexWrap: 'wrap', gap: '3px 10px' }}>
-              {item.reservation_time && (
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 11.5, color: 'var(--text-secondary)' }}>
-                  <Calendar size={10} style={{ color: 'var(--text-faint)' }} />{formatDateTimeWithLocale(item.reservation_time, locale, timeFormat)}
+      {/* Details */}
+      {(r.reservation_time || r.confirmation_number || r.location || linked) && (
+        <div style={{ padding: '8px 12px', display: 'flex', flexDirection: 'column', gap: 6 }}>
+          {/* Row 1: Date, Time, Code */}
+          {(r.reservation_time || r.confirmation_number) && (
+            <div style={{ display: 'flex', gap: 0, borderRadius: 8, overflow: 'hidden', background: 'var(--bg-secondary)', boxShadow: '0 1px 6px rgba(0,0,0,0.08)' }}>
+              {r.reservation_time && (
+                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center', borderRight: '1px solid var(--border-faint)' }}>
+                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.date')}</div>
+                  <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>{fmtDate(r.reservation_time)}</div>
                </div>
              )}
-              {item.place_time && !item.reservation_time && (
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 11.5, color: 'var(--text-secondary)' }}>
-                  <Calendar size={10} style={{ color: 'var(--text-faint)' }} />{item.place_time}
+              {r.reservation_time && (
+                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center', borderRight: '1px solid var(--border-faint)' }}>
+                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.time')}</div>
+                  <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>{fmtTime(r.reservation_time)}</div>
                </div>
              )}
-              {item.location && (
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 11.5, color: 'var(--text-secondary)' }}>
-                  <MapPin size={10} style={{ color: 'var(--text-faint)' }} />
-                  <span style={{ maxWidth: 200, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{item.location}</span>
+              {r.confirmation_number && (
+                <div style={{ flex: 1, padding: '5px 10px', textAlign: 'center' }}>
+                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{t('reservations.confirmationCode')}</div>
+                  <div style={{ fontSize: 11, fontWeight: 600, color: 'var(--text-primary)', marginTop: 1 }}>{r.confirmation_number}</div>
                </div>
              )}
            </div>
+          )}
+          {/* Row 2: Location + Assignment */}
+          {(r.location || linked) && (
+            <div style={{ display: 'grid', gridTemplateColumns: r.location && linked ? '1fr 1fr' : '1fr', gap: 8, paddingTop: 6, borderTop: '1px solid var(--border-faint)' }}>
+              {r.location && (
+                <div>
+                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.locationAddress')}</div>
+                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
+                    <MapPin size={10} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+                    <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{r.location}</span>
+                  </div>
+                </div>
+              )}
+              {linked && (
+                <div>
+                  <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.linkAssignment')}</div>
+                  <div style={{ display: 'flex', alignItems: 'center', gap: 5, padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)' }}>
+                    <Link2 size={10} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+                    <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                      {linked.dayTitle || t('dayplan.dayN', { n: linked.dayNumber })} — {linked.placeName}
+                      {linked.startTime ? ` · ${linked.startTime}${linked.endTime ? ' – ' + linked.endTime : ''}` : ''}
+                    </span>
+                  </div>
+                </div>
+              )}
+            </div>
+          )}
+        </div>
+      )}

-            {item.notes && <p style={{ margin: '7px 0 0', fontSize: 11.5, color: 'var(--text-muted)', lineHeight: 1.5, borderTop: '1px solid var(--border-secondary)', paddingTop: 7 }}>{item.notes}</p>}
+      {/* Notes */}
+      {r.notes && (
+        <div style={{ padding: '0 12px 8px' }}>
+          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('reservations.notes')}</div>
+          <div style={{ padding: '5px 8px', borderRadius: 7, background: 'var(--bg-secondary)', fontSize: 11, color: 'var(--text-muted)', lineHeight: 1.5 }}>
+            {r.notes}
          </div>
        </div>
-      </div>
-    </>
+      )}
+
+      {/* Files */}
+      {attachedFiles.length > 0 && (
+        <div style={{ padding: '0 12px 8px' }}>
+          <div style={{ fontSize: 9, fontWeight: 600, color: 'var(--text-faint)', textTransform: 'uppercase', letterSpacing: '0.03em', marginBottom: 3 }}>{t('files.title')}</div>
+          <div style={{ padding: '4px 8px', borderRadius: 7, background: 'var(--bg-secondary)', display: 'flex', flexDirection: 'column', gap: 3 }}>
+            {attachedFiles.map(f => (
+              <a key={f.id} href={f.url} target="_blank" rel="noreferrer" style={{ display: 'flex', alignItems: 'center', gap: 4, textDecoration: 'none', cursor: 'pointer' }}>
+                <FileText size={9} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
+                <span style={{ fontSize: 10, color: 'var(--text-muted)', flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{f.original_name}</span>
+              </a>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
  )
 }

 function Section({ title, count, children, defaultOpen = true, accent }) {
  const [open, setOpen] = useState(defaultOpen)
  return (
-    <div style={{ marginBottom: 24 }}>
+    <div style={{ marginBottom: 16 }}>
      <button onClick={() => setOpen(o => !o)} style={{
        display: 'flex', alignItems: 'center', gap: 8, width: '100%',
-        background: 'none', border: 'none', cursor: 'pointer', padding: '4px 0', marginBottom: 10,
+        background: 'none', border: 'none', cursor: 'pointer', padding: '4px 0', marginBottom: 8, fontFamily: 'inherit',
      }}>
-        {open ? <ChevronDown size={15} style={{ color: 'var(--text-faint)' }} /> : <ChevronRight size={15} style={{ color: 'var(--text-faint)' }} />}
-        <span style={{ fontWeight: 600, fontSize: 13, color: 'var(--text-primary)' }}>{title}</span>
+        {open ? <ChevronDown size={14} style={{ color: 'var(--text-faint)' }} /> : <ChevronRight size={14} style={{ color: 'var(--text-faint)' }} />}
+        <span style={{ fontWeight: 700, fontSize: 12, color: 'var(--text-primary)', textTransform: 'uppercase', letterSpacing: '0.03em' }}>{title}</span>
        <span style={{
-          fontSize: 11, fontWeight: 600, padding: '1px 8px', borderRadius: 99,
-          background: accent === 'green' ? 'rgba(22,163,74,0.12)' : 'var(--bg-tertiary)',
-          color: accent === 'green' ? '#16a34a' : 'var(--text-muted)',
+          fontSize: 10, fontWeight: 700, padding: '1px 7px', borderRadius: 99,
+          background: accent === 'green' ? 'rgba(22,163,74,0.1)' : 'var(--bg-tertiary)',
+          color: accent === 'green' ? '#16a34a' : 'var(--text-faint)',
        }}>{count}</span>
      </button>
      {open && <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>{children}</div>}
@@ -354,98 +199,66 @@ export default function ReservationsPanel({ tripId, reservations, days, assignme
  const { t, locale } = useTranslation()
  const [showHint, setShowHint] = useState(() => !localStorage.getItem('hideReservationHint'))

-  const placeReservations = useMemo(() => {
-    const result = []
-    for (const day of (days || [])) {
-      const da = (assignments?.[String(day.id)] || []).slice().sort((a, b) => a.order_index - b.order_index)
-      for (const assignment of da) {
-        const place = assignment.place
-        if (!place || !place.reservation_status || place.reservation_status === 'none') continue
-        const dayLabel = day.title
-          ? day.title
-          : day.date
-            ? `${t('dayplan.dayN', { n: day.day_number })} · ${new Date(day.date + 'T00:00:00').toLocaleDateString(locale, { day: 'numeric', month: 'short' })}`
-            : t('dayplan.dayN', { n: day.day_number })
-        result.push({
-          _placeRes: true,
-          id: `place_${day.id}_${place.id}`,
-          placeId: place.id,
-          title: place.name,
-          status: place.reservation_status === 'confirmed' ? 'confirmed' : 'pending',
-          reservation_time: place.reservation_datetime || null,
-          place_time: place.place_time || null,
-          location: place.address || null,
-          notes: place.reservation_notes || null,
-          dayLabel,
-        })
-      }
-    }
-    return result
-  }, [days, assignments, locale])
+  const assignmentLookup = useMemo(() => buildAssignmentLookup(days, assignments), [days, assignments])

-  const allPending   = [...reservations.filter(r => r.status !== 'confirmed'), ...placeReservations.filter(r => r.status !== 'confirmed')]
-  const allConfirmed = [...reservations.filter(r => r.status === 'confirmed'),  ...placeReservations.filter(r => r.status === 'confirmed')]
-  const total = allPending.length + allConfirmed.length
-
-  function renderCard(r) {
-    if (r._placeRes) return <PlaceReservationCard key={r.id} item={r} tripId={tripId} />
-    return <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} />
-  }
+  const allPending = reservations.filter(r => r.status !== 'confirmed')
+  const allConfirmed = reservations.filter(r => r.status === 'confirmed')
+  const total = reservations.length

  return (
    <div style={{ height: '100%', display: 'flex', flexDirection: 'column', fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }}>
-      <div style={{ padding: '20px 24px 16px', borderBottom: '1px solid rgba(0,0,0,0.06)', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
+      {/* Header */}
+      <div style={{ padding: '20px 24px 16px', borderBottom: '1px solid var(--border-faint)', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
        <div>
          <h2 style={{ margin: 0, fontSize: 18, fontWeight: 700, color: 'var(--text-primary)' }}>{t('reservations.title')}</h2>
-          <p style={{ margin: '2px 0 0', fontSize: 12.5, color: 'var(--text-faint)' }}>
+          <p style={{ margin: '2px 0 0', fontSize: 12, color: 'var(--text-faint)' }}>
            {total === 0 ? t('reservations.empty') : t('reservations.summary', { confirmed: allConfirmed.length, pending: allPending.length })}
          </p>
        </div>
        <button onClick={onAdd} style={{
-          display: 'flex', alignItems: 'center', gap: 6, padding: '7px 14px', borderRadius: 99,
+          display: 'flex', alignItems: 'center', gap: 5, padding: '7px 14px', borderRadius: 99,
          border: 'none', background: 'var(--accent)', color: 'var(--accent-text)',
-          fontSize: 12.5, fontWeight: 500, cursor: 'pointer', fontFamily: 'inherit',
+          fontSize: 12, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit',
        }}>
          <Plus size={13} /> <span className="hidden sm:inline">{t('reservations.addManual')}</span>
        </button>
      </div>

-      {/* Hinweis — einmalig wegklickbar */}
+      {/* Hint */}
      {showHint && (
-        <div style={{ margin: '12px 24px 8px', padding: '8px 12px', borderRadius: 10, background: 'var(--bg-hover)', display: 'flex', alignItems: 'flex-start', gap: 8 }}>
-          <Lightbulb size={13} style={{ flexShrink: 0, marginTop: 1, color: 'var(--text-faint)' }} />
-          <p style={{ fontSize: 11.5, color: 'var(--text-muted)', margin: 0, lineHeight: 1.5, flex: 1 }}>
-            {t('reservations.placeHint')}
-          </p>
-          <button
-            onClick={() => { setShowHint(false); localStorage.setItem('hideReservationHint', '1') }}
-            style={{ background: 'none', border: 'none', cursor: 'pointer', padding: '0 4px', color: 'var(--text-faint)', fontSize: 16, lineHeight: 1, flexShrink: 0 }}
-            onMouseEnter={e => e.currentTarget.style.color = 'var(--text-primary)'}
-            onMouseLeave={e => e.currentTarget.style.color = 'var(--text-faint)'}
-          >×</button>
+        <div style={{ margin: '12px 24px 4px', padding: '8px 12px', borderRadius: 10, background: 'var(--bg-hover)', display: 'flex', alignItems: 'flex-start', gap: 8 }}>
+          <Lightbulb size={12} style={{ flexShrink: 0, marginTop: 1, color: 'var(--text-faint)' }} />
+          <p style={{ fontSize: 11, color: 'var(--text-muted)', margin: 0, lineHeight: 1.5, flex: 1 }}>{t('reservations.placeHint')}</p>
+          <button onClick={() => { setShowHint(false); localStorage.setItem('hideReservationHint', '1') }}
+            style={{ background: 'none', border: 'none', cursor: 'pointer', padding: '0 4px', color: 'var(--text-faint)', fontSize: 14, lineHeight: 1, flexShrink: 0 }}>×</button>
        </div>
      )}

-      <div style={{ flex: 1, overflowY: 'auto', padding: '20px 24px' }}>
+      {/* Content */}
+      <div style={{ flex: 1, overflowY: 'auto', padding: '16px 24px' }}>
        {total === 0 ? (
          <div style={{ textAlign: 'center', padding: '60px 20px' }}>
-            <BookMarked size={40} style={{ marginBottom: 12, color: 'var(--text-faint)', display: 'block', margin: '0 auto 12px' }} />
+            <BookMarked size={36} style={{ color: 'var(--text-faint)', display: 'block', margin: '0 auto 12px' }} />
            <p style={{ fontSize: 14, fontWeight: 600, color: 'var(--text-secondary)', margin: '0 0 4px' }}>{t('reservations.empty')}</p>
-            <p style={{ fontSize: 13, color: 'var(--text-faint)', margin: 0 }}>{t('reservations.emptyHint')}</p>
+            <p style={{ fontSize: 12, color: 'var(--text-faint)', margin: 0 }}>{t('reservations.emptyHint')}</p>
          </div>
        ) : (
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+          <>
            {allPending.length > 0 && (
-              <Section title={t('reservations.pending')} count={allPending.length} defaultOpen={true} accent="gray">
-                {allPending.map(renderCard)}
+              <Section title={t('reservations.pending')} count={allPending.length} accent="gray">
+                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
+                  {allPending.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} />)}
+                </div>
              </Section>
            )}
            {allConfirmed.length > 0 && (
-              <Section title={t('reservations.confirmed')} count={allConfirmed.length} defaultOpen={true} accent="green">
-                {allConfirmed.map(renderCard)}
+              <Section title={t('reservations.confirmed')} count={allConfirmed.length} accent="green">
+                <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
+                  {allConfirmed.map(r => <ReservationCard key={r.id} r={r} tripId={tripId} onEdit={onEdit} onDelete={onDelete} files={files} onNavigateToFiles={onNavigateToFiles} assignmentLookup={assignmentLookup} />)}
+                </div>
              </Section>
            )}
-          </div>
+          </>
        )}
      </div>
    </div>
@@ -6,19 +6,7 @@ import { ReservationModal } from './ReservationModal'
 import { PlaceDetailPanel } from './PlaceDetailPanel'
 import { useTripStore } from '../../store/tripStore'
 import { useToast } from '../shared/Toast'
-
-const TABS = [
-  { id: 'orte', label: 'Orte', icon: '📍' },
-  { id: 'tagesplan', label: 'Tagesplan', icon: '📅' },
-  { id: 'reservierungen', label: 'Reservierungen', icon: '🎫' },
-  { id: 'packliste', label: 'Packliste', icon: '🎒' },
-]
-
-const TRANSPORT_MODES = [
-  { value: 'driving', label: 'Auto', icon: '🚗' },
-  { value: 'walking', label: 'Fuß', icon: '🚶' },
-  { value: 'cycling', label: 'Rad', icon: '🚲' },
-]
+import { useTranslation } from '../../i18n'

 export function RightPanel({
  trip, days, places, categories, tags,
@@ -31,7 +19,6 @@ export function RightPanel({
  const [activeTab, setActiveTab] = useState('orte')
  const [search, setSearch] = useState('')
  const [categoryFilter, setCategoryFilter] = useState('')
-  const [transportMode, setTransportMode] = useState('driving')
  const [isCalculatingRoute, setIsCalculatingRoute] = useState(false)
  const [showReservationModal, setShowReservationModal] = useState(false)
  const [editingReservation, setEditingReservation] = useState(null)
@@ -39,6 +26,14 @@ export function RightPanel({

  const tripStore = useTripStore()
  const toast = useToast()
+  const { t } = useTranslation()
+
+  const TABS = [
+    { id: 'orte', label: t('planner.places'), icon: '📍' },
+    { id: 'tagesplan', label: t('planner.dayPlan'), icon: '📅' },
+    { id: 'reservierungen', label: t('planner.reservations'), icon: '🎫' },
+    { id: 'packliste', label: t('planner.packingList'), icon: '🎒' },
+  ]

  // Filtered places for Orte tab
  const filteredPlaces = places.filter(p => {
@@ -83,22 +78,22 @@ export function RightPanel({
      .map(p => ({ lat: p.lat, lng: p.lng }))

    if (waypoints.length < 2) {
-      toast.error('Mindestens 2 Orte mit Koordinaten benötigt')
+      toast.error(t('planner.minTwoPlaces'))
      return
    }

    setIsCalculatingRoute(true)
    try {
-      const result = await calculateRoute(waypoints, transportMode)
+      const result = await calculateRoute(waypoints, 'walking')
      if (result) {
        setRouteInfo({ distance: result.distanceText, duration: result.durationText })
        onRouteCalculated?.(result)
-        toast.success('Route berechnet')
+        toast.success(t('planner.routeCalculated'))
      } else {
-        toast.error('Route konnte nicht berechnet werden')
+        toast.error(t('planner.routeCalcFailed'))
      }
    } catch (err) {
-      toast.error('Fehler bei der Routenberechnung')
+      toast.error(t('planner.routeError'))
    } finally {
      setIsCalculatingRoute(false)
    }
@@ -113,14 +108,14 @@ export function RightPanel({
      return a?.id
    }).filter(Boolean)
    await onReorder(selectedDayId, optimizedIds)
-    toast.success('Route optimiert')
+    toast.success(t('planner.routeOptimized'))
  }

  const handleOpenGoogleMaps = () => {
    const places = dayAssignments.map(a => a.place).filter(p => p?.lat && p?.lng)
    const url = generateGoogleMapsUrl(places)
    if (url) window.open(url, '_blank')
-    else toast.error('Keine Orte mit Koordinaten vorhanden')
+    else toast.error(t('planner.noGeoPlaces'))
  }

  const handleMoveUp = async (idx) => {
@@ -146,10 +141,10 @@ export function RightPanel({
    try {
      if (editingReservation) {
        await tripStore.updateReservation(tripId, editingReservation.id, data)
-        toast.success('Reservierung aktualisiert')
+        toast.success(t('planner.reservationUpdated'))
      } else {
        await tripStore.addReservation(tripId, { ...data, day_id: selectedDayId || null })
-        toast.success('Reservierung hinzugefügt')
+        toast.success(t('planner.reservationAdded'))
      }
      setShowReservationModal(false)
    } catch (err) {
@@ -158,10 +153,10 @@ export function RightPanel({
  }

  const handleDeleteReservation = async (id) => {
-    if (!confirm('Reservierung löschen?')) return
+    if (!confirm(t('planner.confirmDeleteReservation'))) return
    try {
      await tripStore.deleteReservation(tripId, id)
-      toast.success('Reservierung gelöscht')
+      toast.success(t('planner.reservationDeleted'))
    } catch (err) {
      toast.error(err.message)
    }
@@ -226,7 +221,7 @@ export function RightPanel({
                  type="text"
                  value={search}
                  onChange={e => setSearch(e.target.value)}
-                  placeholder="Orte suchen..."
+                  placeholder={t('planner.searchPlaces')}
                  className="w-full pl-8 pr-3 py-2 border border-gray-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-slate-900"
                />
                {search && (
@@ -241,7 +236,7 @@ export function RightPanel({
                  onChange={e => setCategoryFilter(e.target.value)}
                  className="flex-1 border border-gray-200 rounded-lg text-xs py-1.5 px-2 focus:outline-none focus:ring-1 focus:ring-slate-900 text-gray-600"
                >
-                  <option value="">Alle Kategorien</option>
+                  <option value="">{t('planner.allCategories')}</option>
                  {categories.map(c => (
                    <option key={c.id} value={c.id}>{c.icon} {c.name}</option>
                  ))}
@@ -251,7 +246,7 @@ export function RightPanel({
                  className="flex items-center gap-1 bg-slate-700 text-white text-xs px-3 py-1.5 rounded-lg hover:bg-slate-900 whitespace-nowrap"
                >
                  <Plus className="w-3.5 h-3.5" />
-                  Ort hinzufügen
+                  {t('planner.addPlace')}
                </button>
              </div>
            </div>
@@ -261,9 +256,9 @@ export function RightPanel({
              {filteredPlaces.length === 0 ? (
                <div className="flex flex-col items-center justify-center py-12 text-gray-400">
                  <span className="text-3xl mb-2">📍</span>
-                  <p className="text-sm">Keine Orte gefunden</p>
+                  <p className="text-sm">{t('planner.noPlacesFound')}</p>
                  <button onClick={onAddPlace} className="mt-3 text-slate-700 text-sm hover:underline">
-                    Ersten Ort hinzufügen
+                    {t('planner.addFirstPlace')}
                  </button>
                </div>
              ) : (
@@ -299,7 +294,7 @@ export function RightPanel({
                                    onClick={e => { e.stopPropagation(); onAssignToDay(place.id) }}
                                    className="text-xs text-slate-700 bg-slate-50 px-1.5 py-0.5 rounded hover:bg-slate-100"
                                  >
-                                    + Tag
+                                    {t('planner.addToDay')}
                                  </button>
                                )}
                              </div>
@@ -312,7 +307,7 @@ export function RightPanel({
                            )}
                            <div className="flex items-center gap-2 mt-1">
                              {place.place_time && (
-                                <span className="text-xs text-gray-500">🕐 {place.place_time}</span>
+                                <span className="text-xs text-gray-500">🕐 {place.place_time}{place.end_time ? ` – ${place.end_time}` : ''}</span>
                              )}
                              {place.price > 0 && (
                                <span className="text-xs text-gray-500">
@@ -337,7 +332,7 @@ export function RightPanel({
            {!selectedDayId ? (
              <div className="flex flex-col items-center justify-center py-16 text-gray-400 px-6">
                <span className="text-4xl mb-3">📅</span>
-                <p className="text-sm text-center">Wähle einen Tag aus der linken Liste um den Tagesplan zu sehen</p>
+                <p className="text-sm text-center">{t('planner.selectDayHint')}</p>
              </div>
            ) : (
              <>
@@ -352,39 +347,22 @@ export function RightPanel({
                    )}
                  </h3>
                  <p className="text-xs text-slate-700 mt-0.5">
-                    {dayAssignments.length} Ort{dayAssignments.length !== 1 ? 'e' : ''}
-                    {dayAssignments.length > 0 && ` · ${dayAssignments.reduce((s, a) => s + (a.place?.duration_minutes || 60), 0)} Min. gesamt`}
+                    {dayAssignments.length === 1 ? t('planner.placeOne') : t('planner.placeN', { n: dayAssignments.length })}
+                    {dayAssignments.length > 0 && ` · ${dayAssignments.reduce((s, a) => s + (a.place?.duration_minutes || 60), 0)} ${t('planner.minTotal')}`}
                  </p>
                </div>

-                {/* Transport mode */}
-                <div className="px-3 py-2 border-b border-gray-100 flex items-center gap-1 flex-shrink-0">
-                  {TRANSPORT_MODES.map(m => (
-                    <button
-                      key={m.value}
-                      onClick={() => setTransportMode(m.value)}
-                      className={`flex-1 py-1.5 text-xs rounded-lg flex items-center justify-center gap-1 transition-colors ${
-                        transportMode === m.value
-                          ? 'bg-slate-100 text-slate-900 font-medium'
-                          : 'text-gray-500 hover:bg-gray-100'
-                      }`}
-                    >
-                      {m.icon} {m.label}
-                    </button>
-                  ))}
-                </div>
-
                {/* Places list with order */}
                <div className="flex-1 overflow-y-auto">
                  {dayAssignments.length === 0 ? (
                    <div className="flex flex-col items-center justify-center py-12 text-gray-400">
                      <span className="text-3xl mb-2">🗺️</span>
-                      <p className="text-sm">Noch keine Orte für diesen Tag</p>
+                      <p className="text-sm">{t('planner.noPlacesForDay')}</p>
                      <button
                        onClick={() => setActiveTab('orte')}
                        className="mt-3 text-slate-700 text-sm hover:underline"
                      >
-                        Orte hinzufügen →
+                        {t('planner.addPlacesLink')}
                      </button>
                    </div>
                  ) : (
@@ -475,14 +453,14 @@ export function RightPanel({
                        className="flex items-center justify-center gap-1.5 bg-slate-700 text-white text-xs py-2 rounded-lg hover:bg-slate-900 disabled:opacity-60"
                      >
                        <Navigation className="w-3.5 h-3.5" />
-                        {isCalculatingRoute ? 'Berechne...' : 'Route berechnen'}
+                        {isCalculatingRoute ? t('planner.calculating') : t('planner.route')}
                      </button>
                      <button
                        onClick={handleOptimizeRoute}
                        className="flex items-center justify-center gap-1.5 bg-emerald-600 text-white text-xs py-2 rounded-lg hover:bg-emerald-700"
                      >
                        <RotateCcw className="w-3.5 h-3.5" />
-                        Optimieren
+                        {t('planner.optimize')}
                      </button>
                    </div>
                    <button
@@ -490,7 +468,7 @@ export function RightPanel({
                      className="w-full flex items-center justify-center gap-1.5 bg-white border border-gray-200 text-gray-700 text-xs py-2 rounded-lg hover:bg-gray-50"
                    >
                      <ExternalLink className="w-3.5 h-3.5" />
-                      In Google Maps öffnen
+                      {t('planner.openGoogleMaps')}
                    </button>
                  </div>
                )}
@@ -504,7 +482,7 @@ export function RightPanel({
          <div className="flex flex-col h-full">
            <div className="p-3 flex items-center justify-between border-b border-gray-100 flex-shrink-0">
              <h3 className="font-medium text-sm text-gray-900">
-                Reservierungen
+                {t('planner.reservations')}
                {selectedDay && <span className="text-gray-500 font-normal"> · Tag {selectedDay.day_number}</span>}
              </h3>
              <button
@@ -512,7 +490,7 @@ export function RightPanel({
                className="flex items-center gap-1 bg-slate-700 text-white text-xs px-2.5 py-1.5 rounded-lg hover:bg-slate-900"
              >
                <Plus className="w-3.5 h-3.5" />
-                Hinzufügen
+                {t('common.add')}
              </button>
            </div>

@@ -520,9 +498,9 @@ export function RightPanel({
              {filteredReservations.length === 0 ? (
                <div className="flex flex-col items-center justify-center py-12 text-gray-400">
                  <span className="text-3xl mb-2">🎫</span>
-                  <p className="text-sm">Keine Reservierungen</p>
+                  <p className="text-sm">{t('planner.noReservations')}</p>
                  <button onClick={handleAddReservation} className="mt-3 text-slate-700 text-sm hover:underline">
-                    Erste Reservierung hinzufügen
+                    {t('planner.addFirstReservation')}
                  </button>
                </div>
              ) : (
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react'
 import Modal from '../shared/Modal'
-import { Calendar, Camera, X } from 'lucide-react'
+import { Calendar, Camera, X, Clipboard } from 'lucide-react'
 import { tripsApi } from '../../api/client'
 import { useToast } from '../shared/Toast'
 import { useTranslation } from '../../i18n'
@@ -21,6 +21,7 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
  const [error, setError] = useState('')
  const [isLoading, setIsLoading] = useState(false)
  const [coverPreview, setCoverPreview] = useState(null)
+  const [pendingCoverFile, setPendingCoverFile] = useState(null)
  const [uploadingCover, setUploadingCover] = useState(false)

  useEffect(() => {
@@ -36,6 +37,7 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
      setFormData({ title: '', description: '', start_date: '', end_date: '' })
      setCoverPreview(null)
    }
+    setPendingCoverFile(null)
    setError('')
  }, [trip, isOpen])

@@ -48,12 +50,23 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
    }
    setIsLoading(true)
    try {
-      await onSave({
+      const result = await onSave({
        title: formData.title.trim(),
        description: formData.description.trim() || null,
        start_date: formData.start_date || null,
        end_date: formData.end_date || null,
      })
+      // Upload pending cover for newly created trips
+      if (pendingCoverFile && result?.trip?.id) {
+        try {
+          const fd = new FormData()
+          fd.append('cover', pendingCoverFile)
+          const data = await tripsApi.uploadCover(result.trip.id, fd)
+          onCoverUpdate?.(result.trip.id, data.cover_image)
+        } catch {
+          // Cover upload failed but trip was created
+        }
+      }
      onClose()
    } catch (err) {
      setError(err.message || t('places.saveError'))
@@ -62,9 +75,24 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
    }
  }

-  const handleCoverChange = async (e) => {
-    const file = e.target.files?.[0]
-    if (!file || !trip?.id) return
+  const handleCoverSelect = (file) => {
+    if (!file) return
+    if (isEditing && trip?.id) {
+      // Existing trip: upload immediately
+      uploadCoverNow(file)
+    } else {
+      // New trip: stage for upload after creation
+      setPendingCoverFile(file)
+      setCoverPreview(URL.createObjectURL(file))
+    }
+  }
+
+  const handleCoverChange = (e) => {
+    handleCoverSelect(e.target.files?.[0])
+    e.target.value = ''
+  }
+
+  const uploadCoverNow = async (file) => {
    setUploadingCover(true)
    try {
      const fd = new FormData()
@@ -77,11 +105,15 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
      toast.error(t('dashboard.coverUploadError'))
    } finally {
      setUploadingCover(false)
-      e.target.value = ''
    }
  }

  const handleRemoveCover = async () => {
+    if (pendingCoverFile) {
+      setPendingCoverFile(null)
+      setCoverPreview(null)
+      return
+    }
    if (!trip?.id) return
    try {
      await tripsApi.update(trip.id, { cover_image: null })
@@ -92,15 +124,26 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
    }
  }

+  // Paste support for cover image
+  const handlePaste = (e) => {
+    const items = e.clipboardData?.items
+    if (!items) return
+    for (const item of items) {
+      if (item.type.startsWith('image/')) {
+        e.preventDefault()
+        const file = item.getAsFile()
+        if (file) handleCoverSelect(file)
+        return
+      }
+    }
+  }
+
  const update = (field, value) => setFormData(prev => {
    const next = { ...prev, [field]: value }
-    // Auto-adjust end date when start date changes
    if (field === 'start_date' && value) {
      if (!prev.end_date || prev.end_date < value) {
-        // If no end date or end date is before new start, set end = start
        next.end_date = value
      } else if (prev.start_date) {
-        // Preserve trip duration: shift end date by same delta
        const oldStart = new Date(prev.start_date + 'T00:00:00')
        const oldEnd = new Date(prev.end_date + 'T00:00:00')
        const duration = Math.round((oldEnd - oldStart) / 86400000)
@@ -135,40 +178,38 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
        </div>
      }
    >
-      <form onSubmit={handleSubmit} className="space-y-4">
+      <form onSubmit={handleSubmit} className="space-y-4" onPaste={handlePaste}>
        {error && (
          <div className="p-3 bg-red-50 border border-red-200 rounded-lg text-sm text-red-600">{error}</div>
        )}

-        {/* Cover image — only for existing trips */}
-        {isEditing && (
-          <div>
-            <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('dashboard.coverImage')}</label>
-            <input ref={fileRef} type="file" accept="image/*" style={{ display: 'none' }} onChange={handleCoverChange} />
-            {coverPreview ? (
-              <div style={{ position: 'relative', borderRadius: 10, overflow: 'hidden', height: 130 }}>
-                <img src={coverPreview} alt="" style={{ width: '100%', height: '100%', objectFit: 'cover' }} />
-                <div style={{ position: 'absolute', bottom: 8, right: 8, display: 'flex', gap: 6 }}>
-                  <button type="button" onClick={() => fileRef.current?.click()} disabled={uploadingCover}
-                    style={{ display: 'flex', alignItems: 'center', gap: 4, padding: '5px 10px', borderRadius: 8, background: 'rgba(0,0,0,0.55)', border: 'none', color: 'white', fontSize: 11.5, fontWeight: 600, cursor: 'pointer', backdropFilter: 'blur(4px)' }}>
-                    <Camera size={12} /> {uploadingCover ? t('common.uploading') : t('common.change')}
-                  </button>
-                  <button type="button" onClick={handleRemoveCover}
-                    style={{ display: 'flex', alignItems: 'center', padding: '5px 8px', borderRadius: 8, background: 'rgba(0,0,0,0.55)', border: 'none', color: 'white', cursor: 'pointer', backdropFilter: 'blur(4px)' }}>
-                    <X size={12} />
-                  </button>
-                </div>
+        {/* Cover image — available for both create and edit */}
+        <div>
+          <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('dashboard.coverImage')}</label>
+          <input ref={fileRef} type="file" accept="image/*" style={{ display: 'none' }} onChange={handleCoverChange} />
+          {coverPreview ? (
+            <div style={{ position: 'relative', borderRadius: 10, overflow: 'hidden', height: 130 }}>
+              <img src={coverPreview} alt="" style={{ width: '100%', height: '100%', objectFit: 'cover' }} />
+              <div style={{ position: 'absolute', bottom: 8, right: 8, display: 'flex', gap: 6 }}>
+                <button type="button" onClick={() => fileRef.current?.click()} disabled={uploadingCover}
+                  style={{ display: 'flex', alignItems: 'center', gap: 4, padding: '5px 10px', borderRadius: 8, background: 'rgba(0,0,0,0.55)', border: 'none', color: 'white', fontSize: 11.5, fontWeight: 600, cursor: 'pointer', backdropFilter: 'blur(4px)' }}>
+                  <Camera size={12} /> {uploadingCover ? t('common.uploading') : t('common.change')}
+                </button>
+                <button type="button" onClick={handleRemoveCover}
+                  style={{ display: 'flex', alignItems: 'center', padding: '5px 8px', borderRadius: 8, background: 'rgba(0,0,0,0.55)', border: 'none', color: 'white', cursor: 'pointer', backdropFilter: 'blur(4px)' }}>
+                  <X size={12} />
+                </button>
              </div>
-            ) : (
-              <button type="button" onClick={() => fileRef.current?.click()} disabled={uploadingCover}
-                style={{ width: '100%', padding: '18px', border: '2px dashed #e5e7eb', borderRadius: 10, background: 'none', cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 6, fontSize: 13, color: '#9ca3af', fontFamily: 'inherit' }}
-                onMouseEnter={e => { e.currentTarget.style.borderColor = '#d1d5db'; e.currentTarget.style.color = '#6b7280' }}
-                onMouseLeave={e => { e.currentTarget.style.borderColor = '#e5e7eb'; e.currentTarget.style.color = '#9ca3af' }}>
-                <Camera size={15} /> {uploadingCover ? t('common.uploading') : t('dashboard.addCoverImage')}
-              </button>
-            )}
-          </div>
-        )}
+            </div>
+          ) : (
+            <button type="button" onClick={() => fileRef.current?.click()} disabled={uploadingCover}
+              style={{ width: '100%', padding: '18px', border: '2px dashed #e5e7eb', borderRadius: 10, background: 'none', cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', gap: 6, fontSize: 13, color: '#9ca3af', fontFamily: 'inherit' }}
+              onMouseEnter={e => { e.currentTarget.style.borderColor = '#d1d5db'; e.currentTarget.style.color = '#6b7280' }}
+              onMouseLeave={e => { e.currentTarget.style.borderColor = '#e5e7eb'; e.currentTarget.style.color = '#9ca3af' }}>
+              <Camera size={15} /> {uploadingCover ? t('common.uploading') : t('dashboard.addCoverImage')}
+            </button>
+          )}
+        </div>

        <div>
          <label className="block text-sm font-medium text-slate-700 mb-1.5">
@@ -0,0 +1,96 @@
+import React, { useMemo, useState, useCallback } from 'react'
+import { useVacayStore } from '../../store/vacayStore'
+import { useTranslation } from '../../i18n'
+import { isWeekend } from './holidays'
+import VacayMonthCard from './VacayMonthCard'
+import { Building2, MousePointer2 } from 'lucide-react'
+
+export default function VacayCalendar() {
+  const { t } = useTranslation()
+  const { selectedYear, selectedUserId, entries, companyHolidays, toggleEntry, toggleCompanyHoliday, plan, users, holidays } = useVacayStore()
+  const [companyMode, setCompanyMode] = useState(false)
+
+  const companyHolidaySet = useMemo(() => {
+    const s = new Set()
+    companyHolidays.forEach(h => s.add(h.date))
+    return s
+  }, [companyHolidays])
+
+  const entryMap = useMemo(() => {
+    const map = {}
+    entries.forEach(e => {
+      if (!map[e.date]) map[e.date] = []
+      map[e.date].push(e)
+    })
+    return map
+  }, [entries])
+
+  const blockWeekends = plan?.block_weekends !== false
+  const companyHolidaysEnabled = plan?.company_holidays_enabled !== false
+
+  const handleCellClick = useCallback(async (dateStr) => {
+    if (companyMode) {
+      if (!companyHolidaysEnabled) return
+      await toggleCompanyHoliday(dateStr)
+      return
+    }
+    if (holidays[dateStr]) return
+    if (blockWeekends && isWeekend(dateStr)) return
+    if (companyHolidaysEnabled && companyHolidaySet.has(dateStr)) return
+    await toggleEntry(dateStr, selectedUserId || undefined)
+  }, [companyMode, toggleEntry, toggleCompanyHoliday, holidays, companyHolidaySet, blockWeekends, companyHolidaysEnabled, selectedUserId])
+
+  const selectedUser = users.find(u => u.id === selectedUserId)
+
+  return (
+    <div>
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-3">
+        {Array.from({ length: 12 }, (_, i) => (
+          <VacayMonthCard
+            key={i}
+            year={selectedYear}
+            month={i}
+            holidays={holidays}
+            companyHolidaySet={companyHolidaySet}
+            companyHolidaysEnabled={companyHolidaysEnabled}
+            entryMap={entryMap}
+            onCellClick={handleCellClick}
+            companyMode={companyMode}
+            blockWeekends={blockWeekends}
+          />
+        ))}
+      </div>
+
+      {/* Floating toolbar */}
+      <div className="sticky bottom-3 sm:bottom-4 mt-3 sm:mt-4 flex items-center justify-center z-30 px-2">
+        <div className="flex items-center gap-1.5 sm:gap-2 px-2 sm:px-3 py-1.5 sm:py-2 rounded-xl border" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)', boxShadow: '0 8px 32px rgba(0,0,0,0.12)' }}>
+          <button
+            onClick={() => setCompanyMode(false)}
+            className="flex items-center gap-1 sm:gap-1.5 px-2 sm:px-3 py-1.5 rounded-lg text-[11px] sm:text-xs font-medium transition-all"
+            style={{
+              background: !companyMode ? 'var(--text-primary)' : 'transparent',
+              color: !companyMode ? 'var(--bg-card)' : 'var(--text-muted)',
+              border: companyMode ? '1px solid var(--border-primary)' : '1px solid transparent',
+            }}>
+            <MousePointer2 size={13} />
+            {selectedUser && <span className="w-2.5 h-2.5 rounded-full shrink-0" style={{ backgroundColor: selectedUser.color }} />}
+            {selectedUser ? selectedUser.username : t('vacay.modeVacation')}
+          </button>
+          {companyHolidaysEnabled && (
+            <button
+              onClick={() => setCompanyMode(true)}
+              className="flex items-center gap-1 sm:gap-1.5 px-2 sm:px-3 py-1.5 rounded-lg text-[11px] sm:text-xs font-medium transition-all"
+              style={{
+                background: companyMode ? '#d97706' : 'transparent',
+                color: companyMode ? '#fff' : 'var(--text-muted)',
+                border: !companyMode ? '1px solid var(--border-primary)' : '1px solid transparent',
+              }}>
+              <Building2 size={13} />
+              {t('vacay.modeCompany')}
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
@@ -0,0 +1,118 @@
+import React, { useMemo } from 'react'
+import { useTranslation } from '../../i18n'
+import { isWeekend } from './holidays'
+
+const WEEKDAYS_EN = ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su']
+const WEEKDAYS_DE = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']
+const MONTHS_EN = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+const MONTHS_DE = ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember']
+
+export default function VacayMonthCard({
+  year, month, holidays, companyHolidaySet, companyHolidaysEnabled = true, entryMap,
+  onCellClick, companyMode, blockWeekends
+}) {
+  const { language } = useTranslation()
+  const weekdays = language === 'de' ? WEEKDAYS_DE : WEEKDAYS_EN
+  const monthNames = language === 'de' ? MONTHS_DE : MONTHS_EN
+
+  const weeks = useMemo(() => {
+    const firstDay = new Date(year, month, 1)
+    const daysInMonth = new Date(year, month + 1, 0).getDate()
+    let startDow = firstDay.getDay() - 1
+    if (startDow < 0) startDow = 6
+    const cells = []
+    for (let i = 0; i < startDow; i++) cells.push(null)
+    for (let d = 1; d <= daysInMonth; d++) cells.push(d)
+    while (cells.length % 7 !== 0) cells.push(null)
+    const w = []
+    for (let i = 0; i < cells.length; i += 7) w.push(cells.slice(i, i + 7))
+    return w
+  }, [year, month])
+
+  const pad = (n) => String(n).padStart(2, '0')
+
+  return (
+    <div className="rounded-xl border overflow-hidden" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+      <div className="px-3 py-2 border-b" style={{ borderColor: 'var(--border-secondary)' }}>
+        <span className="text-xs font-semibold" style={{ color: 'var(--text-primary)' }}>{monthNames[month]}</span>
+      </div>
+
+      <div className="grid grid-cols-7 border-b" style={{ borderColor: 'var(--border-secondary)' }}>
+        {weekdays.map((wd, i) => (
+          <div key={wd} className="text-center text-[10px] font-medium py-1" style={{ color: i >= 5 ? 'var(--text-faint)' : 'var(--text-muted)' }}>
+            {wd}
+          </div>
+        ))}
+      </div>
+
+      <div>
+        {weeks.map((week, wi) => (
+          <div key={wi} className="grid grid-cols-7">
+            {week.map((day, di) => {
+              if (day === null) return <div key={di} style={{ height: 28 }} />
+
+              const dateStr = `${year}-${pad(month + 1)}-${pad(day)}`
+              const weekend = di >= 5
+              const holiday = holidays[dateStr]
+              const isCompany = companyHolidaysEnabled && companyHolidaySet.has(dateStr)
+              const dayEntries = entryMap[dateStr] || []
+              const isBlocked = !!holiday || (weekend && blockWeekends) || (isCompany && !companyMode)
+
+              return (
+                <div
+                  key={di}
+                  className="relative flex items-center justify-center cursor-pointer transition-colors"
+                  style={{
+                    height: 28,
+                    background: weekend ? 'var(--bg-secondary)' : 'transparent',
+                    borderTop: '1px solid var(--border-secondary)',
+                    borderRight: '1px solid var(--border-secondary)',
+                    cursor: isBlocked ? 'default' : 'pointer',
+                  }}
+                  onClick={() => onCellClick(dateStr)}
+                  onMouseEnter={e => { if (!isBlocked) e.currentTarget.style.background = 'var(--bg-hover)' }}
+                  onMouseLeave={e => { e.currentTarget.style.background = weekend ? 'var(--bg-secondary)' : 'transparent' }}
+                >
+                  {holiday && <div className="absolute inset-0.5 rounded" style={{ background: 'rgba(239,68,68,0.12)' }} />}
+                  {isCompany && <div className="absolute inset-0.5 rounded" style={{ background: 'rgba(245,158,11,0.15)' }} />}
+
+                  {dayEntries.length === 1 && (
+                    <div className="absolute inset-0.5 rounded" style={{ backgroundColor: dayEntries[0].person_color, opacity: 0.4 }} />
+                  )}
+                  {dayEntries.length === 2 && (
+                    <div className="absolute inset-0.5 rounded" style={{
+                      background: `linear-gradient(135deg, ${dayEntries[0].person_color} 50%, ${dayEntries[1].person_color} 50%)`,
+                      opacity: 0.4,
+                    }} />
+                  )}
+                  {dayEntries.length === 3 && (
+                    <div className="absolute inset-0.5 rounded overflow-hidden" style={{ opacity: 0.4 }}>
+                      <div className="absolute top-0 left-0 w-1/2 h-full" style={{ backgroundColor: dayEntries[0].person_color }} />
+                      <div className="absolute top-0 right-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[1].person_color }} />
+                      <div className="absolute bottom-0 right-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[2].person_color }} />
+                    </div>
+                  )}
+                  {dayEntries.length >= 4 && (
+                    <div className="absolute inset-0.5 rounded overflow-hidden" style={{ opacity: 0.4 }}>
+                      <div className="absolute top-0 left-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[0].person_color }} />
+                      <div className="absolute top-0 right-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[1].person_color }} />
+                      <div className="absolute bottom-0 left-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[2].person_color }} />
+                      <div className="absolute bottom-0 right-0 w-1/2 h-1/2" style={{ backgroundColor: dayEntries[3].person_color }} />
+                    </div>
+                  )}
+
+                  <span className="relative z-[1] text-[11px] font-medium" style={{
+                    color: holiday ? '#dc2626' : weekend ? 'var(--text-faint)' : 'var(--text-primary)',
+                    fontWeight: dayEntries.length > 0 ? 700 : 500,
+                  }}>
+                    {day}
+                  </span>
+                </div>
+              )
+            })}
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
@@ -0,0 +1,190 @@
+import React, { useState, useEffect } from 'react'
+import ReactDOM from 'react-dom'
+import { UserPlus, Unlink, Check, Loader2, Clock, X } from 'lucide-react'
+import { useVacayStore } from '../../store/vacayStore'
+import { useAuthStore } from '../../store/authStore'
+import { useTranslation } from '../../i18n'
+import { useToast } from '../shared/Toast'
+import CustomSelect from '../shared/CustomSelect'
+import apiClient from '../../api/client'
+
+const PRESET_COLORS = [
+  '#6366f1', '#ec4899', '#14b8a6', '#8b5cf6', '#ef4444',
+  '#3b82f6', '#22c55e', '#06b6d4', '#f43f5e', '#a855f7',
+  '#10b981', '#0ea5e9', '#64748b', '#be185d', '#0d9488',
+]
+
+export default function VacayPersons() {
+  const { t } = useTranslation()
+  const toast = useToast()
+  const { users, pendingInvites, invite, cancelInvite, updateColor, selectedUserId, setSelectedUserId, isFused } = useVacayStore()
+  const { user: currentUser } = useAuthStore()
+
+  // Default selectedUserId to current user
+  useEffect(() => {
+    if (!selectedUserId && currentUser) setSelectedUserId(currentUser.id)
+  }, [currentUser, selectedUserId])
+  const [showInvite, setShowInvite] = useState(false)
+  const [showColorPicker, setShowColorPicker] = useState(false)
+  const [colorEditUserId, setColorEditUserId] = useState(null)
+  const [availableUsers, setAvailableUsers] = useState([])
+  const [selectedInviteUser, setSelectedInviteUser] = useState(null)
+  const [inviting, setInviting] = useState(false)
+
+  const loadAvailable = async () => {
+    try {
+      const data = await apiClient.get('/addons/vacay/available-users').then(r => r.data)
+      setAvailableUsers(data.users)
+    } catch { /* */ }
+  }
+
+  const handleInvite = async () => {
+    if (!selectedInviteUser) return
+    setInviting(true)
+    try {
+      await invite(selectedInviteUser)
+      toast.success(t('vacay.inviteSent'))
+      setShowInvite(false)
+      setSelectedInviteUser(null)
+    } catch (err) {
+      toast.error(err.response?.data?.error || t('vacay.inviteError'))
+    } finally {
+      setInviting(false)
+    }
+  }
+
+  const handleColorChange = async (color) => {
+    await updateColor(color, colorEditUserId)
+    setShowColorPicker(false)
+    setColorEditUserId(null)
+  }
+
+  const editingUserColor = users.find(u => u.id === colorEditUserId)?.color || '#6366f1'
+
+  return (
+    <div className="rounded-xl border p-3" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+      <div className="flex items-center justify-between mb-2">
+        <span className="text-[11px] font-medium uppercase tracking-wider" style={{ color: 'var(--text-faint)' }}>{t('vacay.persons')}</span>
+        <button onClick={() => { setShowInvite(true); loadAvailable() }}
+          className="p-0.5 rounded transition-colors" style={{ color: 'var(--text-faint)' }}>
+          <UserPlus size={14} />
+        </button>
+      </div>
+
+      <div className="flex flex-col gap-0.5">
+        {users.map(u => {
+          const isSelected = selectedUserId === u.id
+          return (
+            <div key={u.id}
+              onClick={() => { if (isFused) setSelectedUserId(u.id) }}
+              className="flex items-center gap-2 px-2.5 py-1.5 rounded-lg group transition-all"
+              style={{
+                background: isSelected ? 'var(--bg-hover)' : 'transparent',
+                border: isSelected ? '1px solid var(--border-primary)' : '1px solid transparent',
+                cursor: isFused ? 'pointer' : 'default',
+              }}>
+              <button
+                onClick={(e) => { e.stopPropagation(); setColorEditUserId(u.id); setShowColorPicker(true) }}
+                className="w-3.5 h-3.5 rounded-full shrink-0 transition-transform hover:scale-125"
+                style={{ backgroundColor: u.color, cursor: 'pointer' }}
+                title={t('vacay.changeColor')}
+              />
+              <span className="text-xs font-medium flex-1 truncate" style={{ color: 'var(--text-primary)' }}>
+                {u.username}
+                {u.id === currentUser?.id && <span style={{ color: 'var(--text-faint)' }}> ({t('vacay.you')})</span>}
+              </span>
+              {isSelected && isFused && (
+                <Check size={12} style={{ color: 'var(--text-primary)' }} />
+              )}
+            </div>
+          )
+        })}
+
+        {/* Pending invites */}
+        {pendingInvites.map(inv => (
+          <div key={inv.id} className="flex items-center gap-2 px-2.5 py-1.5 rounded-lg group"
+            style={{ background: 'var(--bg-secondary)', opacity: 0.7 }}>
+            <Clock size={12} style={{ color: 'var(--text-faint)' }} />
+            <span className="text-xs flex-1 truncate" style={{ color: 'var(--text-muted)' }}>
+              {inv.username} <span className="text-[10px]">({t('vacay.pending')})</span>
+            </span>
+            <button onClick={() => cancelInvite(inv.user_id)}
+              className="opacity-0 group-hover:opacity-100 text-[10px] px-1.5 py-0.5 rounded transition-all"
+              style={{ color: 'var(--text-faint)' }}>
+              {t('common.cancel')}
+            </button>
+          </div>
+        ))}
+      </div>
+
+      {/* Invite Modal — Portal to body to avoid z-index issues */}
+      {showInvite && ReactDOM.createPortal(
+        <div className="fixed inset-0 flex items-center justify-center px-4" style={{ zIndex: 99990, backgroundColor: 'rgba(15,23,42,0.5)', paddingTop: 70 }}
+          onClick={() => setShowInvite(false)}>
+          <div className="rounded-2xl shadow-2xl w-full max-w-sm" style={{ background: 'var(--bg-card)', animation: 'modalIn 0.2s ease-out' }}
+            onClick={e => e.stopPropagation()}>
+            <div className="flex items-center justify-between p-5" style={{ borderBottom: '1px solid var(--border-secondary)' }}>
+              <h2 className="text-base font-semibold" style={{ color: 'var(--text-primary)' }}>{t('vacay.inviteUser')}</h2>
+              <button onClick={() => setShowInvite(false)} className="p-1.5 rounded-lg transition-colors" style={{ color: 'var(--text-faint)' }}>
+                <X size={16} />
+              </button>
+            </div>
+            <div className="p-5 space-y-4">
+              <p className="text-xs" style={{ color: 'var(--text-muted)' }}>{t('vacay.inviteHint')}</p>
+              {availableUsers.length === 0 ? (
+                <p className="text-xs text-center py-4" style={{ color: 'var(--text-faint)' }}>{t('vacay.noUsersAvailable')}</p>
+              ) : (
+                <CustomSelect
+                  value={selectedInviteUser}
+                  onChange={setSelectedInviteUser}
+                  options={availableUsers.map(u => ({ value: u.id, label: `${u.username} (${u.email})` }))}
+                  placeholder={t('vacay.selectUser')}
+                  searchable
+                />
+              )}
+              <div className="flex gap-3 justify-end pt-2">
+                <button onClick={() => setShowInvite(false)} className="px-4 py-2 text-sm rounded-lg"
+                  style={{ color: 'var(--text-muted)', border: '1px solid var(--border-primary)' }}>
+                  {t('common.cancel')}
+                </button>
+                <button onClick={handleInvite} disabled={!selectedInviteUser || inviting}
+                  className="px-4 py-2 text-sm rounded-lg transition-colors flex items-center gap-1.5 disabled:opacity-40"
+                  style={{ background: 'var(--text-primary)', color: 'var(--bg-card)' }}>
+                  {inviting && <Loader2 size={13} className="animate-spin" />}
+                  {t('vacay.sendInvite')}
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>,
+        document.body
+      )}
+
+      {/* Color Picker Modal — Portal to body */}
+      {showColorPicker && ReactDOM.createPortal(
+        <div className="fixed inset-0 flex items-center justify-center px-4" style={{ zIndex: 99990, backgroundColor: 'rgba(15,23,42,0.5)', paddingTop: 70 }}
+          onClick={() => { setShowColorPicker(false); setColorEditUserId(null) }}>
+          <div className="rounded-2xl shadow-2xl w-full max-w-xs" style={{ background: 'var(--bg-card)', animation: 'modalIn 0.2s ease-out' }}
+            onClick={e => e.stopPropagation()}>
+            <div className="flex items-center justify-between p-5" style={{ borderBottom: '1px solid var(--border-secondary)' }}>
+              <h2 className="text-base font-semibold" style={{ color: 'var(--text-primary)' }}>{t('vacay.changeColor')}</h2>
+              <button onClick={() => { setShowColorPicker(false); setColorEditUserId(null) }} className="p-1.5 rounded-lg transition-colors" style={{ color: 'var(--text-faint)' }}>
+                <X size={16} />
+              </button>
+            </div>
+            <div className="p-5">
+              <div className="flex flex-wrap gap-2 justify-center">
+                {PRESET_COLORS.map(c => (
+                  <button key={c} onClick={() => handleColorChange(c)}
+                    className={`w-8 h-8 rounded-full transition-all ${editingUserColor === c ? 'ring-2 ring-offset-2 scale-110' : 'hover:scale-110'}`}
+                    style={{ backgroundColor: c }} />
+                ))}
+              </div>
+            </div>
+          </div>
+        </div>,
+        document.body
+      )}
+    </div>
+  )
+}
@@ -0,0 +1,213 @@
+import React, { useState, useEffect } from 'react'
+import { MapPin, CalendarOff, AlertCircle, Building2, Unlink, ArrowRightLeft, Globe } from 'lucide-react'
+import { useVacayStore } from '../../store/vacayStore'
+import { useTranslation } from '../../i18n'
+import { useToast } from '../shared/Toast'
+import CustomSelect from '../shared/CustomSelect'
+import apiClient from '../../api/client'
+
+export default function VacaySettings({ onClose }) {
+  const { t } = useTranslation()
+  const toast = useToast()
+  const { plan, updatePlan, isFused, dissolve, users } = useVacayStore()
+  const [countries, setCountries] = useState([])
+  const [regions, setRegions] = useState([])
+  const [loadingRegions, setLoadingRegions] = useState(false)
+
+  const { language } = useTranslation()
+
+  // Load available countries with localized names
+  useEffect(() => {
+    apiClient.get('/addons/vacay/holidays/countries').then(r => {
+      let displayNames
+      try { displayNames = new Intl.DisplayNames([language === 'de' ? 'de' : 'en'], { type: 'region' }) } catch { /* */ }
+      const list = r.data.map(c => ({
+        value: c.countryCode,
+        label: displayNames ? (displayNames.of(c.countryCode) || c.name) : c.name,
+      }))
+      list.sort((a, b) => a.label.localeCompare(b.label))
+      setCountries(list)
+    }).catch(() => {})
+  }, [language])
+
+  // When country changes, check if it has regions
+  const selectedCountry = plan?.holidays_region?.split('-')[0] || ''
+  const selectedRegion = plan?.holidays_region?.includes('-') ? plan.holidays_region : ''
+
+  useEffect(() => {
+    if (!selectedCountry || !plan?.holidays_enabled) { setRegions([]); return }
+    setLoadingRegions(true)
+    const year = new Date().getFullYear()
+    apiClient.get(`/addons/vacay/holidays/${year}/${selectedCountry}`).then(r => {
+      const allCounties = new Set()
+      r.data.forEach(h => {
+        if (h.counties) h.counties.forEach(c => allCounties.add(c))
+      })
+      if (allCounties.size > 0) {
+        let subdivisionNames
+        try { subdivisionNames = new Intl.DisplayNames([language === 'de' ? 'de' : 'en'], { type: 'region' }) } catch { /* */ }
+        const regionList = [...allCounties].sort().map(c => {
+          let label = c.split('-')[1] || c
+          // Try Intl for full subdivision name (not all browsers support subdivision codes)
+          // Fallback: use known mappings for DE
+          if (c.startsWith('DE-')) {
+            const deRegions = { BW:'Baden-Württemberg',BY:'Bayern',BE:'Berlin',BB:'Brandenburg',HB:'Bremen',HH:'Hamburg',HE:'Hessen',MV:'Mecklenburg-Vorpommern',NI:'Niedersachsen',NW:'Nordrhein-Westfalen',RP:'Rheinland-Pfalz',SL:'Saarland',SN:'Sachsen',ST:'Sachsen-Anhalt',SH:'Schleswig-Holstein',TH:'Thüringen' }
+            label = deRegions[c.split('-')[1]] || label
+          } else if (c.startsWith('CH-')) {
+            const chRegions = { AG:'Aargau',AI:'Appenzell Innerrhoden',AR:'Appenzell Ausserrhoden',BE:'Bern',BL:'Basel-Landschaft',BS:'Basel-Stadt',FR:'Freiburg',GE:'Genf',GL:'Glarus',GR:'Graubünden',JU:'Jura',LU:'Luzern',NE:'Neuenburg',NW:'Nidwalden',OW:'Obwalden',SG:'St. Gallen',SH:'Schaffhausen',SO:'Solothurn',SZ:'Schwyz',TG:'Thurgau',TI:'Tessin',UR:'Uri',VD:'Waadt',VS:'Wallis',ZG:'Zug',ZH:'Zürich' }
+            label = chRegions[c.split('-')[1]] || label
+          }
+          return { value: c, label }
+        })
+        setRegions(regionList)
+      } else {
+        setRegions([])
+        // If no regions, just set country code as region
+        if (plan.holidays_region !== selectedCountry) {
+          updatePlan({ holidays_region: selectedCountry })
+        }
+      }
+    }).catch(() => setRegions([])).finally(() => setLoadingRegions(false))
+  }, [selectedCountry, plan?.holidays_enabled])
+
+  if (!plan) return null
+
+  const toggle = (key) => updatePlan({ [key]: !plan[key] })
+
+  const handleCountryChange = (countryCode) => {
+    updatePlan({ holidays_region: countryCode })
+  }
+
+  const handleRegionChange = (regionCode) => {
+    updatePlan({ holidays_region: regionCode })
+  }
+
+  return (
+    <div className="space-y-5">
+      {/* Block weekends */}
+      <SettingToggle
+        icon={CalendarOff}
+        label={t('vacay.blockWeekends')}
+        hint={t('vacay.blockWeekendsHint')}
+        value={plan.block_weekends}
+        onChange={() => toggle('block_weekends')}
+      />
+
+      {/* Carry-over */}
+      <SettingToggle
+        icon={ArrowRightLeft}
+        label={t('vacay.carryOver')}
+        hint={t('vacay.carryOverHint')}
+        value={plan.carry_over_enabled}
+        onChange={() => toggle('carry_over_enabled')}
+      />
+
+      {/* Company holidays */}
+      <div>
+        <SettingToggle
+          icon={Building2}
+          label={t('vacay.companyHolidays')}
+          hint={t('vacay.companyHolidaysHint')}
+          value={plan.company_holidays_enabled}
+          onChange={() => toggle('company_holidays_enabled')}
+        />
+        {plan.company_holidays_enabled && (
+          <div className="ml-7 mt-2">
+            <div className="flex items-center gap-1.5 px-2 py-1.5 rounded-md" style={{ background: 'var(--bg-secondary)' }}>
+              <AlertCircle size={12} style={{ color: 'var(--text-faint)' }} />
+              <span className="text-[10px]" style={{ color: 'var(--text-faint)' }}>{t('vacay.companyHolidaysNoDeduct')}</span>
+            </div>
+          </div>
+        )}
+      </div>
+
+      {/* Public holidays */}
+      <div>
+        <SettingToggle
+          icon={Globe}
+          label={t('vacay.publicHolidays')}
+          hint={t('vacay.publicHolidaysHint')}
+          value={plan.holidays_enabled}
+          onChange={() => toggle('holidays_enabled')}
+        />
+        {plan.holidays_enabled && (
+          <div className="ml-7 mt-2 space-y-2">
+            <CustomSelect
+              value={selectedCountry}
+              onChange={handleCountryChange}
+              options={countries}
+              placeholder={t('vacay.selectCountry')}
+              searchable
+            />
+            {regions.length > 0 && (
+              <CustomSelect
+                value={selectedRegion}
+                onChange={handleRegionChange}
+                options={regions}
+                placeholder={t('vacay.selectRegion')}
+                searchable
+              />
+            )}
+          </div>
+        )}
+      </div>
+
+      {/* Dissolve fusion */}
+      {isFused && (
+        <div className="pt-4 mt-2 border-t" style={{ borderColor: 'var(--border-secondary)' }}>
+          <div className="rounded-xl overflow-hidden" style={{ border: '1px solid rgba(239,68,68,0.2)' }}>
+            <div className="px-4 py-3 flex items-center gap-3" style={{ background: 'rgba(239,68,68,0.06)' }}>
+              <div className="w-8 h-8 rounded-lg flex items-center justify-center" style={{ background: 'rgba(239,68,68,0.1)' }}>
+                <Unlink size={16} className="text-red-500" />
+              </div>
+              <div>
+                <p className="text-sm font-semibold" style={{ color: 'var(--text-primary)' }}>{t('vacay.dissolve')}</p>
+                <p className="text-[11px]" style={{ color: 'var(--text-faint)' }}>{t('vacay.dissolveHint')}</p>
+              </div>
+            </div>
+            <div className="px-4 py-3 flex items-center gap-2 flex-wrap" style={{ borderTop: '1px solid rgba(239,68,68,0.1)' }}>
+              {users.map(u => (
+                <div key={u.id} className="flex items-center gap-1.5 px-2 py-1 rounded-md" style={{ background: 'var(--bg-secondary)' }}>
+                  <span className="w-2 h-2 rounded-full" style={{ backgroundColor: u.color || '#6366f1' }} />
+                  <span className="text-xs font-medium" style={{ color: 'var(--text-primary)' }}>{u.username}</span>
+                </div>
+              ))}
+            </div>
+            <div className="px-4 py-3" style={{ borderTop: '1px solid rgba(239,68,68,0.1)' }}>
+              <button
+                onClick={async () => {
+                  await dissolve()
+                  toast.success(t('vacay.dissolved'))
+                  onClose()
+                }}
+                className="w-full px-3 py-2 text-xs font-medium bg-red-500 hover:bg-red-600 text-white rounded-lg transition-colors"
+              >
+                {t('vacay.dissolveAction')}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
+
+function SettingToggle({ icon: Icon, label, hint, value, onChange }) {
+  return (
+    <div className="flex items-center justify-between gap-3">
+      <div className="flex items-center gap-2 min-w-0">
+        <Icon size={15} className="shrink-0" style={{ color: 'var(--text-muted)' }} />
+        <div className="min-w-0">
+          <p className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>{label}</p>
+          <p className="text-[11px]" style={{ color: 'var(--text-faint)' }}>{hint}</p>
+        </div>
+      </div>
+      <button onClick={onChange}
+        className="relative shrink-0 inline-flex h-6 w-11 items-center rounded-full transition-colors"
+        style={{ background: value ? 'var(--text-primary)' : 'var(--border-primary)' }}>
+        <span className="absolute left-1 h-4 w-4 rounded-full transition-transform duration-200"
+          style={{ background: 'var(--bg-card)', transform: value ? 'translateX(20px)' : 'translateX(0)' }} />
+      </button>
+    </div>
+  )
+}
@@ -0,0 +1,124 @@
+import React, { useEffect, useState } from 'react'
+import { Briefcase, Pencil } from 'lucide-react'
+import { useVacayStore } from '../../store/vacayStore'
+import { useAuthStore } from '../../store/authStore'
+import { useTranslation } from '../../i18n'
+
+export default function VacayStats() {
+  const { t } = useTranslation()
+  const { stats, selectedYear, loadStats, updateVacationDays, isFused } = useVacayStore()
+  const { user: currentUser } = useAuthStore()
+
+  useEffect(() => { loadStats(selectedYear) }, [selectedYear])
+
+  return (
+    <div className="rounded-xl border p-3" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+      <div className="flex items-center gap-1.5 mb-3">
+        <Briefcase size={13} style={{ color: 'var(--text-faint)' }} />
+        <span className="text-[11px] font-medium uppercase tracking-wider" style={{ color: 'var(--text-faint)' }}>
+          {t('vacay.entitlement')} {selectedYear}
+        </span>
+      </div>
+
+      {stats.length === 0 ? (
+        <p className="text-[11px] text-center py-3" style={{ color: 'var(--text-faint)' }}>{t('vacay.noData')}</p>
+      ) : (
+        <div className="space-y-2">
+          {stats.map(s => (
+            <StatCard
+              key={s.user_id}
+              stat={s}
+              isMe={s.user_id === currentUser?.id}
+              canEdit={s.user_id === currentUser?.id || isFused}
+              selectedYear={selectedYear}
+              onSave={updateVacationDays}
+              t={t}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
+
+function StatCard({ stat: s, isMe, canEdit, selectedYear, onSave, t }) {
+  const [editing, setEditing] = useState(false)
+  const [localDays, setLocalDays] = useState(s.vacation_days)
+  const pct = s.total_available > 0 ? Math.min(100, (s.used / s.total_available) * 100) : 0
+
+  // Sync local state when stats reload from server
+  useEffect(() => {
+    if (!editing) setLocalDays(s.vacation_days)
+  }, [s.vacation_days, editing])
+
+  const handleSave = () => {
+    setEditing(false)
+    const days = parseInt(localDays)
+    if (!isNaN(days) && days >= 0 && days <= 365 && days !== s.vacation_days) {
+      onSave(selectedYear, days, s.user_id)
+    }
+  }
+
+  return (
+    <div className="rounded-lg p-2.5 space-y-2" style={{ border: '1px solid var(--border-secondary)' }}>
+      <div className="flex items-center gap-2">
+        <span className="w-2.5 h-2.5 rounded-full shrink-0" style={{ backgroundColor: s.person_color }} />
+        <span className="text-xs font-semibold flex-1 truncate" style={{ color: 'var(--text-primary)' }}>
+          {s.person_name}
+          {isMe && <span style={{ color: 'var(--text-faint)' }}> ({t('vacay.you')})</span>}
+        </span>
+        <span className="text-[10px] tabular-nums" style={{ color: 'var(--text-faint)' }}>{s.used}/{s.total_available}</span>
+      </div>
+      <div className="h-1.5 rounded-full overflow-hidden" style={{ background: 'var(--bg-secondary)' }}>
+        <div className="h-full rounded-full transition-all duration-500" style={{ width: `${pct}%`, backgroundColor: s.person_color }} />
+      </div>
+      <div className="grid grid-cols-3 gap-1.5">
+        {/* Days — editable */}
+        <div
+          className="rounded-md px-2 py-2 group/days"
+          style={{
+            background: canEdit ? 'var(--bg-card)' : 'var(--bg-secondary)',
+            border: canEdit ? '1px solid var(--border-primary)' : '1px solid transparent',
+            cursor: canEdit ? 'pointer' : 'default',
+          }}
+          onClick={() => { if (canEdit && !editing) setEditing(true) }}
+        >
+          <div className="text-[10px] mb-1" style={{ color: 'var(--text-faint)', height: 14, lineHeight: '14px' }}>
+            {t('vacay.entitlementDays')} {canEdit && !editing && <Pencil size={9} className="inline opacity-0 group-hover/days:opacity-100 transition-opacity" style={{ color: 'var(--text-faint)', verticalAlign: 'middle' }} />}
+          </div>
+          {editing ? (
+            <input
+              type="number"
+              value={localDays}
+              onChange={e => setLocalDays(e.target.value)}
+              onBlur={handleSave}
+              onKeyDown={e => { if (e.key === 'Enter') handleSave(); if (e.key === 'Escape') { setEditing(false); setLocalDays(s.vacation_days) } }}
+              autoFocus
+              className="w-full bg-transparent text-sm font-bold outline-none p-0 m-0 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none"
+              style={{ color: 'var(--text-primary)', height: 18, lineHeight: '18px' }}
+            />
+          ) : (
+            <div className="text-sm font-bold" style={{ color: 'var(--text-primary)', height: 18, lineHeight: '18px' }}>{s.vacation_days}</div>
+          )}
+        </div>
+        {/* Used */}
+        <div className="rounded-md px-2 py-2" style={{ background: 'var(--bg-secondary)' }}>
+          <div className="text-[10px] mb-1" style={{ color: 'var(--text-faint)', height: 14, lineHeight: '14px' }}>{t('vacay.used')}</div>
+          <div className="text-sm font-bold" style={{ color: 'var(--text-primary)', height: 18, lineHeight: '18px' }}>{s.used}</div>
+        </div>
+        {/* Remaining */}
+        <div className="rounded-md px-2 py-2" style={{ background: 'var(--bg-secondary)' }}>
+          <div className="text-[10px] mb-1" style={{ color: 'var(--text-faint)', height: 14, lineHeight: '14px' }}>{t('vacay.remaining')}</div>
+          <div className="text-sm font-bold" style={{ color: s.remaining < 0 ? '#ef4444' : s.remaining <= 3 ? '#f59e0b' : '#22c55e', height: 18, lineHeight: '18px' }}>
+            {s.remaining}
+          </div>
+        </div>
+      </div>
+      {s.carried_over > 0 && (
+        <div className="flex items-center gap-1.5 px-2 py-1 rounded-md" style={{ background: 'rgba(245,158,11,0.08)', border: '1px solid rgba(245,158,11,0.15)' }}>
+          <span className="text-[10px]" style={{ color: '#d97706' }}>+{s.carried_over} {t('vacay.carriedOver', { year: selectedYear - 1 })}</span>
+        </div>
+      )}
+    </div>
+  )
+}
@@ -0,0 +1,146 @@
+// German public holidays (Feiertage) calculation per Bundesland
+// Includes fixed and Easter-dependent movable holidays
+
+const BUNDESLAENDER = {
+  BW: 'Baden-Württemberg',
+  BY: 'Bayern',
+  BE: 'Berlin',
+  BB: 'Brandenburg',
+  HB: 'Bremen',
+  HH: 'Hamburg',
+  HE: 'Hessen',
+  MV: 'Mecklenburg-Vorpommern',
+  NI: 'Niedersachsen',
+  NW: 'Nordrhein-Westfalen',
+  RP: 'Rheinland-Pfalz',
+  SL: 'Saarland',
+  SN: 'Sachsen',
+  ST: 'Sachsen-Anhalt',
+  SH: 'Schleswig-Holstein',
+  TH: 'Thüringen',
+};
+
+// Gauss Easter algorithm
+function easterSunday(year) {
+  const a = year % 19;
+  const b = Math.floor(year / 100);
+  const c = year % 100;
+  const d = Math.floor(b / 4);
+  const e = b % 4;
+  const f = Math.floor((b + 8) / 25);
+  const g = Math.floor((b - f + 1) / 3);
+  const h = (19 * a + b - d - g + 15) % 30;
+  const i = Math.floor(c / 4);
+  const k = c % 4;
+  const l = (32 + 2 * e + 2 * i - h - k) % 7;
+  const m = Math.floor((a + 11 * h + 22 * l) / 451);
+  const month = Math.floor((h + l - 7 * m + 114) / 31);
+  const day = ((h + l - 7 * m + 114) % 31) + 1;
+  return new Date(year, month - 1, day);
+}
+
+function addDays(date, days) {
+  const d = new Date(date);
+  d.setDate(d.getDate() + days);
+  return d;
+}
+
+function fmt(date) {
+  const y = date.getFullYear();
+  const m = String(date.getMonth() + 1).padStart(2, '0');
+  const d = String(date.getDate()).padStart(2, '0');
+  return `${y}-${m}-${d}`;
+}
+
+export function getHolidays(year, bundesland = 'NW') {
+  const easter = easterSunday(year);
+  const holidays = {};
+
+  // Fixed holidays (nationwide)
+  holidays[`${year}-01-01`] = 'Neujahr';
+  holidays[`${year}-05-01`] = 'Tag der Arbeit';
+  holidays[`${year}-10-03`] = 'Tag der Deutschen Einheit';
+  holidays[`${year}-12-25`] = '1. Weihnachtsfeiertag';
+  holidays[`${year}-12-26`] = '2. Weihnachtsfeiertag';
+
+  // Easter-dependent (nationwide)
+  holidays[fmt(addDays(easter, -2))] = 'Karfreitag';
+  holidays[fmt(addDays(easter, 1))] = 'Ostermontag';
+  holidays[fmt(addDays(easter, 39))] = 'Christi Himmelfahrt';
+  holidays[fmt(addDays(easter, 50))] = 'Pfingstmontag';
+
+  // State-specific
+  const bl = bundesland.toUpperCase();
+
+  // Heilige Drei Könige (6. Jan) — BW, BY, ST
+  if (['BW', 'BY', 'ST'].includes(bl)) {
+    holidays[`${year}-01-06`] = 'Heilige Drei Könige';
+  }
+
+  // Internationaler Frauentag (8. März) — BE, MV
+  if (['BE', 'MV'].includes(bl)) {
+    holidays[`${year}-03-08`] = 'Internationaler Frauentag';
+  }
+
+  // Fronleichnam — BW, BY, HE, NW, RP, SL, SN (teilweise), TH (teilweise)
+  if (['BW', 'BY', 'HE', 'NW', 'RP', 'SL'].includes(bl)) {
+    holidays[fmt(addDays(easter, 60))] = 'Fronleichnam';
+  }
+
+  // Mariä Himmelfahrt (15. Aug) — SL, BY (teilweise)
+  if (['SL'].includes(bl)) {
+    holidays[`${year}-08-15`] = 'Mariä Himmelfahrt';
+  }
+
+  // Weltkindertag (20. Sep) — TH
+  if (bl === 'TH') {
+    holidays[`${year}-09-20`] = 'Weltkindertag';
+  }
+
+  // Reformationstag (31. Okt) — BB, HB, HH, MV, NI, SN, ST, SH, TH
+  if (['BB', 'HB', 'HH', 'MV', 'NI', 'SN', 'ST', 'SH', 'TH'].includes(bl)) {
+    holidays[`${year}-10-31`] = 'Reformationstag';
+  }
+
+  // Allerheiligen (1. Nov) — BW, BY, NW, RP, SL
+  if (['BW', 'BY', 'NW', 'RP', 'SL'].includes(bl)) {
+    holidays[`${year}-11-01`] = 'Allerheiligen';
+  }
+
+  // Buß- und Bettag — SN (Mittwoch vor dem 23. November)
+  if (bl === 'SN') {
+    const nov23 = new Date(year, 10, 23);
+    let bbt = new Date(nov23);
+    while (bbt.getDay() !== 3) bbt.setDate(bbt.getDate() - 1);
+    holidays[fmt(bbt)] = 'Buß- und Bettag';
+  }
+
+  return holidays;
+}
+
+export function isWeekend(dateStr) {
+  const d = new Date(dateStr + 'T00:00:00');
+  const day = d.getDay();
+  return day === 0 || day === 6;
+}
+
+export function getWeekday(dateStr) {
+  const d = new Date(dateStr + 'T00:00:00');
+  return ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'][d.getDay()];
+}
+
+export function getWeekdayFull(dateStr) {
+  const d = new Date(dateStr + 'T00:00:00');
+  return ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'][d.getDay()];
+}
+
+export function daysInMonth(year, month) {
+  return new Date(year, month, 0).getDate();
+}
+
+export function formatDate(dateStr) {
+  const d = new Date(dateStr + 'T00:00:00');
+  return d.toLocaleDateString('de-DE', { weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric' });
+}
+
+export { BUNDESLAENDER };
@@ -46,21 +46,35 @@ export default function WeatherWidget({ lat, lng, date, compact = false }) {
    const cached = getWeatherCache(cacheKey)
    if (cached !== undefined) {
      if (cached === null) setFailed(true)
-      else setWeather(cached)
+      // Climate data: use from cache but re-fetch in background to upgrade to forecast
+      else if (cached.type === 'climate') {
+        setWeather(cached)
+        weatherApi.get(lat, lng, date)
+          .then(data => {
+            if (!data.error && data.temp !== undefined && data.type === 'forecast') {
+              setWeatherCache(cacheKey, data)
+              setWeather(data)
+            }
+          })
+          .catch(() => {})
+        return
+      } else {
+        setWeather(cached)
+        return
+      }
      return
    }
    setLoading(true)
    weatherApi.get(lat, lng, date)
      .then(data => {
        if (data.error || data.temp === undefined) {
-          setWeatherCache(cacheKey, null)
          setFailed(true)
        } else {
          setWeatherCache(cacheKey, data)
          setWeather(data)
        }
      })
-      .catch(() => { setWeatherCache(cacheKey, null); setFailed(true) })
+      .catch(() => { setFailed(true) })
      .finally(() => setLoading(false))
  }, [lat, lng, date])

@@ -83,20 +97,21 @@ export default function WeatherWidget({ lat, lng, date, compact = false }) {
  const rawTemp = weather.temp
  const temp = rawTemp !== undefined ? Math.round(isFahrenheit ? rawTemp * 9/5 + 32 : rawTemp) : null
  const unit = isFahrenheit ? '°F' : '°C'
+  const isClimate = weather.type === 'climate'

  if (compact) {
    return (
-      <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3, fontSize: 11, color: '#6b7280', ...fontStyle }}>
+      <span style={{ display: 'inline-flex', alignItems: 'center', gap: 3, fontSize: 11, color: isClimate ? '#a1a1aa' : '#6b7280', ...fontStyle }}>
        <WeatherIcon main={weather.main} size={12} />
-        {temp !== null && <span>{temp}{unit}</span>}
+        {temp !== null && <span>{isClimate ? 'Ø ' : ''}{temp}{unit}</span>}
      </span>
    )
  }

  return (
-    <div style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13, color: '#374151', background: 'rgba(0,0,0,0.04)', borderRadius: 8, padding: '5px 10px', ...fontStyle }}>
+    <div style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13, color: isClimate ? '#71717a' : '#374151', background: 'rgba(0,0,0,0.04)', borderRadius: 8, padding: '5px 10px', ...fontStyle }}>
      <WeatherIcon main={weather.main} size={15} />
-      {temp !== null && <span style={{ fontWeight: 500 }}>{temp}{unit}</span>}
+      {temp !== null && <span style={{ fontWeight: 500 }}>{isClimate ? 'Ø ' : ''}{temp}{unit}</span>}
      {weather.description && <span style={{ fontSize: 11, color: '#9ca3af', textTransform: 'capitalize' }}>{weather.description}</span>}
    </div>
  )
@@ -67,7 +67,7 @@ export function CustomDatePicker({ value, onChange, placeholder, style = {} }) {
        onMouseEnter={e => e.currentTarget.style.borderColor = 'var(--text-faint)'}
        onMouseLeave={e => { if (!open) e.currentTarget.style.borderColor = 'var(--border-primary)' }}>
        <Calendar size={14} style={{ color: 'var(--text-faint)', flexShrink: 0 }} />
-        <span>{displayValue || placeholder || t('common.date')}</span>
+        <span style={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>{displayValue || placeholder || t('common.date')}</span>
      </button>

      {open && ReactDOM.createPortal(
@@ -51,7 +51,7 @@ export default function CustomSelect({
          background: 'var(--bg-input)', color: 'var(--text-primary)',
          fontSize: 13, fontWeight: 500, fontFamily: 'inherit',
          cursor: 'pointer', outline: 'none', textAlign: 'left',
-          transition: 'border-color 0.15s',
+          transition: 'border-color 0.15s', overflow: 'hidden', minWidth: 0,
        }}
        onMouseEnter={e => e.currentTarget.style.borderColor = 'var(--text-faint)'}
        onMouseLeave={e => { if (!open) e.currentTarget.style.borderColor = 'var(--border-primary)' }}
@@ -105,6 +105,17 @@ export default function CustomSelect({
              <div style={{ padding: '10px 12px', fontSize: 12, color: 'var(--text-faint)', textAlign: 'center' }}>—</div>
            ) : (
              filtered.map(option => {
+                if (option.isHeader) {
+                  return (
+                    <div key={option.value} style={{
+                      padding: '5px 10px', fontSize: 10, fontWeight: 700, color: 'var(--text-faint)',
+                      textTransform: 'uppercase', letterSpacing: '0.03em',
+                      background: 'var(--bg-tertiary)', borderRadius: 4, margin: '2px 0',
+                    }}>
+                      {option.label}
+                    </div>
+                  )
+                }
                const isSelected = option.value === value
                return (
                  <button
@@ -39,8 +39,8 @@ export default function Modal({

  return (
    <div
-      className="fixed inset-0 z-50 flex items-center justify-center px-4 modal-backdrop"
-      style={{ backgroundColor: 'rgba(15, 23, 42, 0.5)', paddingTop: 70, paddingBottom: 20 }}
+      className="fixed inset-0 z-50 flex items-start sm:items-center justify-center px-4 modal-backdrop"
+      style={{ backgroundColor: 'rgba(15, 23, 42, 0.5)', paddingTop: 70, paddingBottom: 20, overflow: 'hidden' }}
      onMouseDown={e => { mouseDownTarget.current = e.target }}
      onClick={e => {
        if (e.target === e.currentTarget && mouseDownTarget.current === e.currentTarget) onClose()
@@ -50,7 +50,7 @@ export default function Modal({
      <div
        className={`
          rounded-2xl shadow-2xl w-full ${sizeClasses[size] || sizeClasses.md}
-          flex flex-col max-h-[90vh]
+          flex flex-col max-h-[calc(100vh-90px)]
          animate-in fade-in zoom-in-95 duration-200
        `}
        style={{
@@ -25,17 +25,17 @@ export const CATEGORY_ICON_MAP = {
 }

 export const ICON_LABELS = {
-  MapPin: 'Pin', Building2: 'Gebäude', BedDouble: 'Hotel', UtensilsCrossed: 'Restaurant',
-  Landmark: 'Sehenswürdigkeit', ShoppingBag: 'Shopping', Bus: 'Bus', Train: 'Zug',
-  Car: 'Auto', Plane: 'Flugzeug', Ship: 'Schiff', Bike: 'Fahrrad',
-  Activity: 'Aktivität', Dumbbell: 'Fitness', Mountain: 'Berg', Tent: 'Camping',
-  Anchor: 'Hafen', Coffee: 'Café', Beer: 'Bar', Wine: 'Wein', Utensils: 'Essen',
-  Camera: 'Foto', Music: 'Musik', Theater: 'Theater', Ticket: 'Events',
-  TreePine: 'Natur', Waves: 'Strand', Leaf: 'Grün', Flower2: 'Garten', Sun: 'Sonne',
-  Globe: 'Welt', Compass: 'Erkundung', Flag: 'Flagge', Navigation: 'Navigation', Map: 'Karte',
-  Church: 'Kirche', Library: 'Museum', Store: 'Markt', Home: 'Unterkunft', Cross: 'Medizin',
-  Heart: 'Favorit', Star: 'Top', CreditCard: 'Bank', Wifi: 'Internet',
-  Luggage: 'Gepäck', Backpack: 'Rucksack', Zap: 'Abenteuer',
+  MapPin: 'Pin', Building2: 'Building', BedDouble: 'Hotel', UtensilsCrossed: 'Restaurant',
+  Landmark: 'Attraction', ShoppingBag: 'Shopping', Bus: 'Bus', Train: 'Train',
+  Car: 'Car', Plane: 'Plane', Ship: 'Ship', Bike: 'Bicycle',
+  Activity: 'Activity', Dumbbell: 'Fitness', Mountain: 'Mountain', Tent: 'Camping',
+  Anchor: 'Harbor', Coffee: 'Cafe', Beer: 'Bar', Wine: 'Wine', Utensils: 'Food',
+  Camera: 'Photo', Music: 'Music', Theater: 'Theater', Ticket: 'Events',
+  TreePine: 'Nature', Waves: 'Beach', Leaf: 'Green', Flower2: 'Garden', Sun: 'Sun',
+  Globe: 'World', Compass: 'Explore', Flag: 'Flag', Navigation: 'Navigation', Map: 'Map',
+  Church: 'Church', Library: 'Museum', Store: 'Market', Home: 'Accommodation', Cross: 'Medicine',
+  Heart: 'Favorite', Star: 'Top', CreditCard: 'Bank', Wifi: 'Internet',
+  Luggage: 'Luggage', Backpack: 'Backpack', Zap: 'Adventure',
 }

 export function getCategoryIcon(iconName) {
@@ -28,6 +28,8 @@ const de = {
  'common.update': 'Aktualisieren',
  'common.change': 'Ändern',
  'common.uploading': 'Hochladen…',
+  'common.backToPlanning': 'Zurück zur Planung',
+  'common.reset': 'Zurücksetzen',

  // Navbar
  'nav.trip': 'Reise',
@@ -37,6 +39,7 @@ const de = {
  'nav.logout': 'Abmelden',
  'nav.lightMode': 'Heller Modus',
  'nav.darkMode': 'Dunkler Modus',
+  'nav.autoMode': 'Automatischer Modus',
  'nav.administrator': 'Administrator',

  // Dashboard
@@ -48,6 +51,9 @@ const de = {
  'dashboard.subtitle.activeMany': '{count} aktive Reisen',
  'dashboard.subtitle.archivedSuffix': ' · {count} archiviert',
  'dashboard.newTrip': 'Neue Reise',
+  'dashboard.currency': 'Währung',
+  'dashboard.timezone': 'Zeitzonen',
+  'dashboard.localTime': 'Lokal',
  'dashboard.emptyTitle': 'Noch keine Reisen',
  'dashboard.emptyText': 'Erstelle deine erste Reise und beginne mit der Planung von Orten, Tagesabläufen und Packlisten.',
  'dashboard.emptyButton': 'Erste Reise erstellen',
@@ -117,6 +123,7 @@ const de = {
  'settings.colorMode': 'Farbmodus',
  'settings.light': 'Hell',
  'settings.dark': 'Dunkel',
+  'settings.auto': 'Automatisch',
  'settings.language': 'Sprache',
  'settings.temperature': 'Temperatureinheit',
  'settings.timeFormat': 'Zeitformat',
@@ -135,14 +142,14 @@ const de = {
  'settings.passwordTooShort': 'Passwort muss mindestens 8 Zeichen lang sein',
  'settings.passwordMismatch': 'Passwörter stimmen nicht überein',
  'settings.passwordChanged': 'Passwort erfolgreich geändert',
-  'settings.deleteAccount': 'Account löschen',
+  'settings.deleteAccount': 'Löschen',
  'settings.deleteAccountTitle': 'Account wirklich löschen?',
  'settings.deleteAccountWarning': 'Dein Account und alle deine Reisen, Orte und Dateien werden unwiderruflich gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.',
  'settings.deleteAccountConfirm': 'Endgültig löschen',
  'settings.deleteBlockedTitle': 'Löschung nicht möglich',
  'settings.deleteBlockedMessage': 'Du bist der einzige Administrator. Ernenne zuerst einen anderen Benutzer zum Admin, bevor du deinen Account löschen kannst.',
  'settings.roleUser': 'Benutzer',
-  'settings.saveProfile': 'Profil speichern',
+  'settings.saveProfile': 'Speichern',
  'settings.toast.mapSaved': 'Karteneinstellungen gespeichert',
  'settings.toast.keysSaved': 'API-Schlüssel gespeichert',
  'settings.toast.displaySaved': 'Anzeigeeinstellungen gespeichert',
@@ -188,6 +195,35 @@ const de = {
  'login.register': 'Registrieren',
  'login.emailPlaceholder': 'deine@email.de',
  'login.username': 'Benutzername',
+  'login.oidc.registrationDisabled': 'Registrierung ist deaktiviert. Kontaktiere den Administrator.',
+  'login.oidc.noEmail': 'Keine E-Mail vom Provider erhalten.',
+  'login.oidc.tokenFailed': 'Authentifizierung fehlgeschlagen.',
+  'login.oidc.invalidState': 'Ungültige Sitzung. Bitte erneut versuchen.',
+  'login.demoFailed': 'Demo-Login fehlgeschlagen',
+  'login.oidcSignIn': 'Anmelden mit {name}',
+  'login.demoHint': 'Demo ausprobieren — ohne Registrierung',
+
+  // Register
+  'register.passwordMismatch': 'Passwörter stimmen nicht überein',
+  'register.passwordTooShort': 'Passwort muss mindestens 6 Zeichen lang sein',
+  'register.failed': 'Registrierung fehlgeschlagen',
+  'register.getStarted': 'Jetzt starten',
+  'register.subtitle': 'Erstellen Sie ein Konto und beginnen Sie, Ihre Traumreisen zu planen.',
+  'register.feature1': 'Unbegrenzte Reisepläne',
+  'register.feature2': 'Interaktive Kartenansicht',
+  'register.feature3': 'Orte und Kategorien verwalten',
+  'register.feature4': 'Reservierungen tracken',
+  'register.feature5': 'Packlisten erstellen',
+  'register.feature6': 'Fotos und Dateien speichern',
+  'register.createAccount': 'Konto erstellen',
+  'register.startPlanning': 'Beginnen Sie Ihre Reiseplanung',
+  'register.minChars': 'Mind. 6 Zeichen',
+  'register.confirmPassword': 'Passwort bestätigen',
+  'register.repeatPassword': 'Passwort wiederholen',
+  'register.registering': 'Registrieren...',
+  'register.register': 'Registrieren',
+  'register.hasAccount': 'Bereits ein Konto?',
+  'register.signIn': 'Anmelden',

  // Admin
  'admin.title': 'Administration',
@@ -227,6 +263,7 @@ const de = {
  'admin.allowRegistration': 'Registrierung erlauben',
  'admin.allowRegistrationHint': 'Neue Benutzer können sich selbst registrieren',
  'admin.apiKeys': 'API-Schlüssel',
+  'admin.apiKeysHint': 'Optional. Aktiviert erweiterte Ortsdaten wie Fotos und Wetter.',
  'admin.mapsKey': 'Google Maps API Key',
  'admin.mapsKeyHint': 'Für Ortsuche benötigt. Erstellen unter console.cloud.google.com',
  'admin.mapsKeyHintLong': 'Ohne API Key wird OpenStreetMap für die Ortssuche genutzt. Mit Google API Key können zusätzlich Bilder, Bewertungen und Öffnungszeiten geladen werden. Erstellen unter console.cloud.google.com.',
@@ -244,11 +281,181 @@ const de = {
  'admin.oidcIssuerHint': 'Die OpenID Connect Issuer URL des Anbieters. z.B. https://accounts.google.com',
  'admin.oidcSaved': 'OIDC-Konfiguration gespeichert',

+  // Addons
+  'admin.tabs.addons': 'Addons',
+  'admin.addons.title': 'Addons',
+  'admin.addons.subtitle': 'Aktiviere oder deaktiviere Funktionen, um NOMAD nach deinen Wünschen anzupassen.',
+  'admin.addons.subtitleBefore': 'Aktiviere oder deaktiviere Funktionen, um ',
+  'admin.addons.subtitleAfter': ' nach deinen Wünschen anzupassen.',
+  'admin.addons.enabled': 'Aktiviert',
+  'admin.addons.disabled': 'Deaktiviert',
+  'admin.addons.type.trip': 'Trip',
+  'admin.addons.type.global': 'Global',
+  'admin.addons.tripHint': 'Verfügbar als Tab innerhalb jedes Trips',
+  'admin.addons.globalHint': 'Verfügbar als eigenständiger Bereich in der Navigation',
+  'admin.addons.toast.updated': 'Addon aktualisiert',
+  'admin.addons.toast.error': 'Addon konnte nicht aktualisiert werden',
+  'admin.addons.noAddons': 'Keine Addons verfügbar',
+  // Weather info
+  'admin.weather.title': 'Wetterdaten',
+  'admin.weather.badge': 'Seit 24. März 2026',
+  'admin.weather.description': 'NOMAD nutzt Open-Meteo als Wetterdatenquelle. Open-Meteo ist ein kostenloser, quelloffener Wetterdienst — es wird kein API-Schlüssel benötigt.',
+  'admin.weather.forecast': '16-Tage-Vorhersage',
+  'admin.weather.forecastDesc': 'Statt bisher 5 Tage (OpenWeatherMap)',
+  'admin.weather.climate': 'Historische Klimadaten',
+  'admin.weather.climateDesc': 'Durchschnittswerte der letzten 85 Jahre für Tage jenseits der 16-Tage-Vorhersage',
+  'admin.weather.requests': '10.000 Anfragen / Tag',
+  'admin.weather.requestsDesc': 'Kostenlos, kein API-Schlüssel erforderlich',
+  'admin.weather.locationHint': 'Das Wetter wird anhand des ersten Ortes mit Koordinaten im jeweiligen Tag berechnet. Ist kein Ort am Tag eingeplant, wird ein beliebiger Ort aus der Ortsliste als Referenz verwendet.',
+
+  // GitHub
+  'admin.tabs.github': 'GitHub',
+  'admin.github.title': 'Update-Verlauf',
+  'admin.github.subtitle': 'Neueste Updates von {repo}',
+  'admin.github.latest': 'Aktuell',
+  'admin.github.prerelease': 'Vorabversion',
+  'admin.github.showDetails': 'Details anzeigen',
+  'admin.github.hideDetails': 'Details ausblenden',
+  'admin.github.loadMore': 'Mehr laden',
+  'admin.github.loading': 'Wird geladen...',
+  'admin.github.error': 'Releases konnten nicht geladen werden',
+  'admin.github.by': 'von',
+
+  'admin.update.available': 'Update verfügbar',
+  'admin.update.text': 'NOMAD {version} ist verfügbar. Du verwendest {current}.',
+  'admin.update.button': 'Auf GitHub ansehen',
+  'admin.update.install': 'Update installieren',
+  'admin.update.confirmTitle': 'Update installieren?',
+  'admin.update.confirmText': 'NOMAD wird von {current} auf {version} aktualisiert. Der Server startet danach automatisch neu.',
+  'admin.update.dataInfo': 'Alle Daten (Reisen, Benutzer, API-Schlüssel, Uploads, Vacay, Atlas, Budgets) bleiben erhalten.',
+  'admin.update.warning': 'Die App ist während des Neustarts kurz nicht erreichbar.',
+  'admin.update.confirm': 'Jetzt aktualisieren',
+  'admin.update.installing': 'Wird aktualisiert…',
+  'admin.update.success': 'Update installiert! Server startet neu…',
+  'admin.update.failed': 'Update fehlgeschlagen',
+  'admin.update.backupHint': 'Wir empfehlen, vor dem Update ein Backup zu erstellen und herunterzuladen.',
+  'admin.update.backupLink': 'Zum Backup',
+  'admin.update.howTo': 'Update-Anleitung',
+  'admin.update.dockerText': 'Deine NOMAD-Instanz läuft in Docker. Um auf {version} zu aktualisieren, führe folgende Befehle auf deinem Server aus:',
+  'admin.update.reloadHint': 'Bitte lade die Seite in wenigen Sekunden neu.',
+
+  // Vacay addon
+  'vacay.subtitle': 'Urlaubstage planen und verwalten',
+  'vacay.settings': 'Einstellungen',
+  'vacay.year': 'Jahr',
+  'vacay.addYear': 'Jahr hinzufügen',
+  'vacay.removeYear': 'Jahr entfernen',
+  'vacay.removeYearConfirm': '{year} entfernen?',
+  'vacay.removeYearHint': 'Alle Urlaubseinträge und Betriebsferien für dieses Jahr werden unwiderruflich gelöscht.',
+  'vacay.remove': 'Entfernen',
+  'vacay.persons': 'Personen',
+  'vacay.noPersons': 'Keine Personen angelegt',
+  'vacay.addPerson': 'Person hinzufügen',
+  'vacay.editPerson': 'Person bearbeiten',
+  'vacay.removePerson': 'Person entfernen',
+  'vacay.removePersonConfirm': '{name} wirklich entfernen?',
+  'vacay.removePersonHint': 'Alle Urlaubseinträge dieser Person werden unwiderruflich gelöscht.',
+  'vacay.personName': 'Name',
+  'vacay.personNamePlaceholder': 'Name eingeben',
+  'vacay.color': 'Farbe',
+  'vacay.add': 'Hinzufügen',
+  'vacay.legend': 'Legende',
+  'vacay.publicHoliday': 'Feiertag',
+  'vacay.companyHoliday': 'Betriebsferien',
+  'vacay.weekend': 'Wochenende',
+  'vacay.modeVacation': 'Urlaub',
+  'vacay.modeCompany': 'Betriebsferien',
+  'vacay.entitlement': 'Urlaubsanspruch',
+  'vacay.entitlementDays': 'Tage',
+  'vacay.used': 'Weg',
+  'vacay.remaining': 'Rest',
+  'vacay.carriedOver': 'aus {year}',
+  'vacay.blockWeekends': 'Wochenenden sperren',
+  'vacay.blockWeekendsHint': 'Verhindert Urlaubseinträge an Samstagen und Sonntagen',
+  'vacay.publicHolidays': 'Feiertage',
+  'vacay.publicHolidaysHint': 'Feiertage im Kalender markieren',
+  'vacay.selectCountry': 'Land wählen',
+  'vacay.selectRegion': 'Region wählen (optional)',
+  'vacay.companyHolidays': 'Betriebsferien',
+  'vacay.companyHolidaysHint': 'Erlaubt das Markieren von unternehmensweiten Feiertagen',
+  'vacay.companyHolidaysNoDeduct': 'Betriebsferien werden nicht vom Urlaubskontingent abgezogen.',
+  'vacay.carryOver': 'Urlaubsmitnahme',
+  'vacay.carryOverHint': 'Resturlaub automatisch ins Folgejahr übertragen',
+  'vacay.sharing': 'Teilen',
+  'vacay.sharingHint': 'Teile deinen Urlaubsplan mit anderen NOMAD-Benutzern',
+  'vacay.owner': 'Besitzer',
+  'vacay.shareEmailPlaceholder': 'E-Mail des NOMAD-Benutzers',
+  'vacay.shareSuccess': 'Plan erfolgreich geteilt',
+  'vacay.shareError': 'Plan konnte nicht geteilt werden',
+  'vacay.dissolve': 'Fusion auflösen',
+  'vacay.dissolveHint': 'Kalender wieder trennen. Deine Einträge bleiben erhalten.',
+  'vacay.dissolveAction': 'Auflösen',
+  'vacay.dissolved': 'Kalender getrennt',
+  'vacay.fusedWith': 'Fusioniert mit',
+  'vacay.you': 'du',
+  'vacay.noData': 'Keine Daten',
+  'vacay.changeColor': 'Farbe ändern',
+  'vacay.inviteUser': 'Benutzer einladen',
+  'vacay.inviteHint': 'Lade einen anderen NOMAD-Benutzer ein, um einen gemeinsamen Urlaubskalender zu teilen.',
+  'vacay.selectUser': 'Benutzer wählen',
+  'vacay.sendInvite': 'Einladung senden',
+  'vacay.inviteSent': 'Einladung gesendet',
+  'vacay.inviteError': 'Einladung konnte nicht gesendet werden',
+  'vacay.pending': 'ausstehend',
+  'vacay.noUsersAvailable': 'Keine Benutzer verfügbar',
+  'vacay.accept': 'Annehmen',
+  'vacay.decline': 'Ablehnen',
+  'vacay.acceptFusion': 'Annehmen & Fusionieren',
+  'vacay.inviteTitle': 'Fusionsanfrage',
+  'vacay.inviteWantsToFuse': 'möchte einen Urlaubskalender mit dir teilen.',
+  'vacay.fuseInfo1': 'Beide sehen alle Urlaubseinträge in einem gemeinsamen Kalender.',
+  'vacay.fuseInfo2': 'Beide können Einträge für den jeweils anderen erstellen und bearbeiten.',
+  'vacay.fuseInfo3': 'Beide können Einträge löschen und den Urlaubsanspruch ändern.',
+  'vacay.fuseInfo4': 'Einstellungen wie Feiertage und Betriebsferien werden geteilt.',
+  'vacay.fuseInfo5': 'Die Fusion kann jederzeit von beiden Seiten aufgelöst werden. Einträge bleiben erhalten.',
+  'nav.myTrips': 'Meine Trips',
+
+  // Atlas addon
+  'atlas.subtitle': 'Dein Reise-Fußabdruck auf der Welt',
+  'atlas.countries': 'Länder',
+  'atlas.trips': 'Reisen',
+  'atlas.places': 'Orte',
+  'atlas.days': 'Tage',
+  'atlas.visitedCountries': 'Besuchte Länder',
+  'atlas.cities': 'Städte',
+  'atlas.noData': 'Noch keine Reisedaten',
+  'atlas.noDataHint': 'Erstelle einen Trip und füge Orte hinzu',
+  'atlas.lastTrip': 'Letzter Trip',
+  'atlas.nextTrip': 'Nächster Trip',
+  'atlas.daysLeft': 'Tage',
+  'atlas.streak': 'Streak',
+  'atlas.year': 'Jahr',
+  'atlas.years': 'Jahre',
+  'atlas.yearInRow': 'Jahr in Folge',
+  'atlas.yearsInRow': 'Jahre in Folge',
+  'atlas.tripIn': 'Reise in',
+  'atlas.tripsIn': 'Reisen in',
+  'atlas.since': 'seit',
+  'atlas.europe': 'Europa',
+  'atlas.asia': 'Asien',
+  'atlas.northAmerica': 'N-Amerika',
+  'atlas.southAmerica': 'S-Amerika',
+  'atlas.africa': 'Afrika',
+  'atlas.oceania': 'Ozeanien',
+  'atlas.other': 'Andere',
+  'atlas.firstVisit': 'Erste Reise',
+  'atlas.lastVisitLabel': 'Letzte Reise',
+  'atlas.tripSingular': 'Reise',
+  'atlas.tripPlural': 'Reisen',
+  'atlas.placeVisited': 'Ort besucht',
+  'atlas.placesVisited': 'Orte besucht',
+
  // Trip Planner
-  'trip.tabs.plan': 'Planung',
+  'trip.tabs.plan': 'Karte',
  'trip.tabs.reservations': 'Buchungen',
-  'trip.tabs.packing': 'Packliste',
-  'trip.tabs.packingShort': 'Packliste',
+  'trip.tabs.reservationsShort': 'Buchung',
+  'trip.tabs.packing': 'Liste',
+  'trip.tabs.packingShort': 'Liste',
  'trip.tabs.budget': 'Budget',
  'trip.tabs.files': 'Dateien',
  'trip.loading': 'Reise wird geladen...',
@@ -266,9 +473,6 @@ const de = {
  'trip.confirm.deletePlace': 'Möchtest du diesen Ort wirklich löschen?',

  // Day Plan Sidebar
-  'dayplan.transport.car': 'Auto',
-  'dayplan.transport.walk': 'Zu Fuß',
-  'dayplan.transport.bike': 'Fahrrad',
  'dayplan.emptyDay': 'Keine Orte für diesen Tag geplant',
  'dayplan.addNote': 'Notiz hinzufügen',
  'dayplan.editNote': 'Notiz bearbeiten',
@@ -284,6 +488,9 @@ const de = {
  'dayplan.optimize': 'Optimieren',
  'dayplan.optimized': 'Route optimiert',
  'dayplan.routeError': 'Fehler bei der Routenberechnung',
+  'dayplan.toast.needTwoPlaces': 'Mindestens zwei Orte für Routenoptimierung nötig',
+  'dayplan.toast.routeOptimized': 'Route optimiert',
+  'dayplan.toast.noGeoPlaces': 'Keine Orte mit Koordinaten für Routenberechnung gefunden',
  'dayplan.confirmed': 'Bestätigt',
  'dayplan.pendingRes': 'Ausstehend',
  'dayplan.pdf': 'PDF',
@@ -314,6 +521,8 @@ const de = {
  'places.noCategory': 'Keine Kategorie',
  'places.categoryNamePlaceholder': 'Kategoriename',
  'places.formTime': 'Uhrzeit',
+  'places.startTime': 'Start',
+  'places.endTime': 'Ende',
  'places.formWebsite': 'Website',
  'places.formNotesPlaceholder': 'Persönliche Notizen...',
  'places.formReservation': 'Reservierung',
@@ -325,11 +534,6 @@ const de = {
  'places.categoryCreateError': 'Fehler beim Erstellen der Kategorie',
  'places.nameRequired': 'Bitte einen Namen eingeben',
  'places.saveError': 'Fehler beim Speichern',
-  'places.transport.walking': '🚶 Zu Fuß',
-  'places.transport.driving': '🚗 Auto',
-  'places.transport.cycling': '🚲 Fahrrad',
-  'places.transport.transit': '🚌 ÖPNV',
-
  // Place Inspector
  'inspector.opened': 'Geöffnet',
  'inspector.closed': 'Geschlossen',
@@ -343,6 +547,8 @@ const de = {
  'inspector.pendingRes': 'Ausstehende Reservierung',
  'inspector.google': 'In Google Maps öffnen',
  'inspector.website': 'Webseite öffnen',
+  'inspector.addRes': 'Reservierung',
+  'inspector.editRes': 'Reservierung bearbeiten',

  // Reservations
  'reservations.title': 'Buchungen',
@@ -359,6 +565,8 @@ const de = {
  'reservations.editTitle': 'Reservierung bearbeiten',
  'reservations.status': 'Status',
  'reservations.datetime': 'Datum & Uhrzeit',
+  'reservations.date': 'Datum',
+  'reservations.time': 'Uhrzeit',
  'reservations.timeAlt': 'Uhrzeit (alternativ, z.B. 19:30)',
  'reservations.notes': 'Notizen',
  'reservations.notesPlaceholder': 'Zusätzliche Notizen...',
@@ -386,7 +594,7 @@ const de = {
  'reservations.titlePlaceholder': 'z.B. Lufthansa LH123, Hotel Adlon, ...',
  'reservations.locationAddress': 'Ort / Adresse',
  'reservations.locationPlaceholder': 'Adresse, Flughafen, Hotel...',
-  'reservations.confirmationCode': 'Bestätigungsnummer / Buchungscode',
+  'reservations.confirmationCode': 'Buchungscode',
  'reservations.confirmationPlaceholder': 'z.B. ABC12345',
  'reservations.day': 'Tag',
  'reservations.noDay': 'Kein Tag',
@@ -395,6 +603,9 @@ const de = {
  'reservations.pendingSave': 'wird gespeichert…',
  'reservations.uploading': 'Wird hochgeladen...',
  'reservations.attachFile': 'Datei anhängen',
+  'reservations.linkAssignment': 'Mit Tagesplanung verknüpfen',
+  'reservations.pickAssignment': 'Zuordnung aus dem Plan wählen...',
+  'reservations.noAssignment': 'Keine Verknüpfung',

  // Budget
  'budget.title': 'Budget',
@@ -443,6 +654,8 @@ const de = {
  'files.toast.deleteError': 'Fehler beim Löschen der Datei',
  'files.sourcePlan': 'Tagesplan',
  'files.sourceBooking': 'Buchung',
+  'files.attach': 'Anhängen',
+  'files.pasteHint': 'Du kannst auch Bilder aus der Zwischenablage einfügen (Strg+V)',

  // Packing
  'packing.title': 'Packliste',
@@ -595,6 +808,21 @@ const de = {
  'backup.keep.30days': '30 Tage',
  'backup.keep.forever': 'Immer behalten',

+  // Photos
+  'photos.allDays': 'Alle Tage',
+  'photos.noPhotos': 'Noch keine Fotos',
+  'photos.uploadHint': 'Lade deine Reisefotos hoch',
+  'photos.clickToSelect': 'oder klicken zum Auswählen',
+  'photos.linkPlace': 'Ort verknüpfen',
+  'photos.noPlace': 'Kein Ort',
+  'photos.uploadN': '{n} Foto(s) hochladen',
+
+  // Backup restore modal
+  'backup.restoreConfirmTitle': 'Backup wiederherstellen?',
+  'backup.restoreWarning': 'Alle aktuellen Daten (Reisen, Orte, Benutzer, Uploads) werden unwiderruflich durch das Backup ersetzt. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+  'backup.restoreTip': 'Tipp: Erstelle zuerst ein Backup des aktuellen Stands, bevor du wiederherstellst.',
+  'backup.restoreConfirm': 'Ja, wiederherstellen',
+
  // PDF
  'pdf.travelPlan': 'Reiseplan',
  'pdf.planned': 'Eingeplant',
@@ -602,6 +830,68 @@ const de = {
  'pdf.preview': 'PDF Vorschau',
  'pdf.saveAsPdf': 'Als PDF speichern',

+  // Planner
+  'planner.places': 'Orte',
+  'planner.bookings': 'Buchungen',
+  'planner.packingList': 'Packliste',
+  'planner.documents': 'Dokumente',
+  'planner.dayPlan': 'Tagesplan',
+  'planner.reservations': 'Reservierungen',
+  'planner.minTwoPlaces': 'Mindestens 2 Orte mit Koordinaten benötigt',
+  'planner.noGeoPlaces': 'Keine Orte mit Koordinaten vorhanden',
+  'planner.routeCalculated': 'Route berechnet',
+  'planner.routeCalcFailed': 'Route konnte nicht berechnet werden',
+  'planner.routeError': 'Fehler bei der Routenberechnung',
+  'planner.routeOptimized': 'Route optimiert',
+  'planner.reservationUpdated': 'Reservierung aktualisiert',
+  'planner.reservationAdded': 'Reservierung hinzugefügt',
+  'planner.confirmDeleteReservation': 'Reservierung löschen?',
+  'planner.reservationDeleted': 'Reservierung gelöscht',
+  'planner.days': 'Tage',
+  'planner.allPlaces': 'Alle Orte',
+  'planner.totalPlaces': '{n} Orte gesamt',
+  'planner.noDaysPlanned': 'Noch keine Tage geplant',
+  'planner.editTrip': 'Reise bearbeiten \u2192',
+  'planner.placeOne': '1 Ort',
+  'planner.placeN': '{n} Orte',
+  'planner.addNote': 'Notiz hinzufügen',
+  'planner.noEntries': 'Keine Einträge für diesen Tag',
+  'planner.addPlace': 'Ort hinzufügen',
+  'planner.addPlaceShort': '+ Ort hinzufügen',
+  'planner.resPending': 'Reservierung ausstehend · ',
+  'planner.resConfirmed': 'Reservierung bestätigt · ',
+  'planner.notePlaceholder': 'Notiz\u2026',
+  'planner.noteTimePlaceholder': 'Zeit (optional)',
+  'planner.noteExamplePlaceholder': 'z.B. S3 um 14:30 ab Hauptbahnhof, Fähre ab Pier 7, Mittagspause\u2026',
+  'planner.totalCost': 'Gesamtkosten',
+  'planner.searchPlaces': 'Orte suchen\u2026',
+  'planner.allCategories': 'Alle Kategorien',
+  'planner.noPlacesFound': 'Keine Orte gefunden',
+  'planner.addFirstPlace': 'Ersten Ort hinzufügen',
+  'planner.noReservations': 'Keine Reservierungen',
+  'planner.addFirstReservation': 'Erste Reservierung hinzufügen',
+  'planner.new': 'Neu',
+  'planner.addToDay': '+ Tag',
+  'planner.calculating': 'Berechne\u2026',
+  'planner.route': 'Route',
+  'planner.optimize': 'Optimieren',
+  'planner.openGoogleMaps': 'In Google Maps öffnen',
+  'planner.selectDayHint': 'Wähle einen Tag aus der linken Liste um den Tagesplan zu sehen',
+  'planner.noPlacesForDay': 'Noch keine Orte für diesen Tag',
+  'planner.addPlacesLink': 'Orte hinzufügen \u2192',
+  'planner.minTotal': 'Min. gesamt',
+  'planner.noReservation': 'Keine Reservierung',
+  'planner.removeFromDay': 'Aus Tag entfernen',
+  'planner.addToThisDay': 'Zum Tag hinzufügen',
+  'planner.overview': 'Gesamtübersicht',
+  'planner.noDays': 'Noch keine Tage',
+  'planner.editTripToAddDays': 'Reise bearbeiten um Tage hinzuzufügen',
+  'planner.dayCount': '{n} Tage',
+  'planner.clickToUnlock': 'Klicken zum Entsperren',
+  'planner.keepPosition': 'Position bei Routenoptimierung beibehalten',
+  'planner.dayDetails': 'Tagesdetails',
+  'planner.dayN': 'Tag {n}',
+
  // Dashboard Stats
  'stats.countries': 'Länder',
  'stats.cities': 'Städte',
@@ -611,6 +901,26 @@ const de = {
  'stats.visited': 'besucht',
  'stats.remaining': 'verbleibend',
  'stats.visitedCountries': 'Besuchte Länder',
+
+  // Day Detail Panel
+  'day.precipProb': 'Regenwahrscheinlichkeit',
+  'day.precipitation': 'Niederschlag',
+  'day.wind': 'Wind',
+  'day.sunrise': 'Sonnenaufgang',
+  'day.sunset': 'Sonnenuntergang',
+  'day.hourlyForecast': 'Stündliche Vorhersage',
+  'day.climateHint': 'Historische Durchschnittswerte — echte Vorhersage verfügbar innerhalb von 16 Tagen vor diesem Datum.',
+  'day.noWeather': 'Keine Wetterdaten verfügbar. Füge einen Ort mit Koordinaten hinzu.',
+  'day.accommodation': 'Unterkunft',
+  'day.addAccommodation': 'Unterkunft hinzufügen',
+  'day.hotelDayRange': 'Auf Tage anwenden',
+  'day.noPlacesForHotel': 'Füge zuerst Orte zu deiner Reise hinzu',
+  'day.allDays': 'Alle',
+  'day.checkIn': 'Check-in',
+  'day.checkOut': 'Check-out',
+  'day.confirmation': 'Bestätigung',
+  'day.editAccommodation': 'Unterkunft bearbeiten',
+  'day.reservations': 'Reservierungen',
 }

 export default de
@@ -28,6 +28,8 @@ const en = {
  'common.update': 'Update',
  'common.change': 'Change',
  'common.uploading': 'Uploading…',
+  'common.backToPlanning': 'Back to Planning',
+  'common.reset': 'Reset',

  // Navbar
  'nav.trip': 'Trip',
@@ -37,6 +39,7 @@ const en = {
  'nav.logout': 'Log out',
  'nav.lightMode': 'Light Mode',
  'nav.darkMode': 'Dark Mode',
+  'nav.autoMode': 'Auto Mode',
  'nav.administrator': 'Administrator',

  // Dashboard
@@ -48,6 +51,9 @@ const en = {
  'dashboard.subtitle.activeMany': '{count} active trips',
  'dashboard.subtitle.archivedSuffix': ' · {count} archived',
  'dashboard.newTrip': 'New Trip',
+  'dashboard.currency': 'Currency',
+  'dashboard.timezone': 'Timezones',
+  'dashboard.localTime': 'Local',
  'dashboard.emptyTitle': 'No trips yet',
  'dashboard.emptyText': 'Create your first trip and start planning!',
  'dashboard.emptyButton': 'Create First Trip',
@@ -117,6 +123,7 @@ const en = {
  'settings.colorMode': 'Color Mode',
  'settings.light': 'Light',
  'settings.dark': 'Dark',
+  'settings.auto': 'Auto',
  'settings.language': 'Language',
  'settings.temperature': 'Temperature Unit',
  'settings.timeFormat': 'Time Format',
@@ -188,6 +195,35 @@ const en = {
  'login.register': 'Register',
  'login.emailPlaceholder': 'your@email.com',
  'login.username': 'Username',
+  'login.oidc.registrationDisabled': 'Registration is disabled. Contact your administrator.',
+  'login.oidc.noEmail': 'No email received from provider.',
+  'login.oidc.tokenFailed': 'Authentication failed.',
+  'login.oidc.invalidState': 'Invalid session. Please try again.',
+  'login.demoFailed': 'Demo login failed',
+  'login.oidcSignIn': 'Sign in with {name}',
+  'login.demoHint': 'Try the demo — no registration needed',
+
+  // Register
+  'register.passwordMismatch': 'Passwords do not match',
+  'register.passwordTooShort': 'Password must be at least 6 characters',
+  'register.failed': 'Registration failed',
+  'register.getStarted': 'Get Started',
+  'register.subtitle': 'Create an account and start planning your dream trips.',
+  'register.feature1': 'Unlimited trip plans',
+  'register.feature2': 'Interactive map view',
+  'register.feature3': 'Manage places and categories',
+  'register.feature4': 'Track reservations',
+  'register.feature5': 'Create packing lists',
+  'register.feature6': 'Store photos and files',
+  'register.createAccount': 'Create Account',
+  'register.startPlanning': 'Start your trip planning',
+  'register.minChars': 'Min. 6 characters',
+  'register.confirmPassword': 'Confirm Password',
+  'register.repeatPassword': 'Repeat password',
+  'register.registering': 'Registering...',
+  'register.register': 'Register',
+  'register.hasAccount': 'Already have an account?',
+  'register.signIn': 'Sign In',

  // Admin
  'admin.title': 'Administration',
@@ -227,6 +263,7 @@ const en = {
  'admin.allowRegistration': 'Allow Registration',
  'admin.allowRegistrationHint': 'New users can register themselves',
  'admin.apiKeys': 'API Keys',
+  'admin.apiKeysHint': 'Optional. Enables extended place data like photos and weather.',
  'admin.mapsKey': 'Google Maps API Key',
  'admin.mapsKeyHint': 'Required for place search. Get at console.cloud.google.com',
  'admin.mapsKeyHintLong': 'Without an API key, OpenStreetMap is used for place search. With a Google API key, photos, ratings, and opening hours can be loaded as well. Get one at console.cloud.google.com.',
@@ -244,9 +281,179 @@ const en = {
  'admin.oidcIssuerHint': 'The OpenID Connect Issuer URL of the provider. e.g. https://accounts.google.com',
  'admin.oidcSaved': 'OIDC configuration saved',

+  // Addons
+  'admin.tabs.addons': 'Addons',
+  'admin.addons.title': 'Addons',
+  'admin.addons.subtitle': 'Enable or disable features to customize your NOMAD experience.',
+  'admin.addons.subtitleBefore': 'Enable or disable features to customize your ',
+  'admin.addons.subtitleAfter': ' experience.',
+  'admin.addons.enabled': 'Enabled',
+  'admin.addons.disabled': 'Disabled',
+  'admin.addons.type.trip': 'Trip',
+  'admin.addons.type.global': 'Global',
+  'admin.addons.tripHint': 'Available as a tab within each trip',
+  'admin.addons.globalHint': 'Available as a standalone section in the main navigation',
+  'admin.addons.toast.updated': 'Addon updated',
+  'admin.addons.toast.error': 'Failed to update addon',
+  'admin.addons.noAddons': 'No addons available',
+  // Weather info
+  'admin.weather.title': 'Weather Data',
+  'admin.weather.badge': 'Since March 24, 2026',
+  'admin.weather.description': 'NOMAD uses Open-Meteo as its weather data source. Open-Meteo is a free, open-source weather service — no API key required.',
+  'admin.weather.forecast': '16-day forecast',
+  'admin.weather.forecastDesc': 'Previously 5 days (OpenWeatherMap)',
+  'admin.weather.climate': 'Historical climate data',
+  'admin.weather.climateDesc': 'Averages from the last 85 years for days beyond the 16-day forecast',
+  'admin.weather.requests': '10,000 requests / day',
+  'admin.weather.requestsDesc': 'Free, no API key required',
+  'admin.weather.locationHint': 'Weather is based on the first place with coordinates in each day. If no place is assigned to a day, any place from the place list is used as a reference.',
+
+  // GitHub
+  'admin.tabs.github': 'GitHub',
+  'admin.github.title': 'Release History',
+  'admin.github.subtitle': 'Latest updates from {repo}',
+  'admin.github.latest': 'Latest',
+  'admin.github.prerelease': 'Pre-release',
+  'admin.github.showDetails': 'Show details',
+  'admin.github.hideDetails': 'Hide details',
+  'admin.github.loadMore': 'Load more',
+  'admin.github.loading': 'Loading...',
+  'admin.github.error': 'Failed to load releases',
+  'admin.github.by': 'by',
+
+  'admin.update.available': 'Update available',
+  'admin.update.text': 'NOMAD {version} is available. You are running {current}.',
+  'admin.update.button': 'View on GitHub',
+  'admin.update.install': 'Install Update',
+  'admin.update.confirmTitle': 'Install Update?',
+  'admin.update.confirmText': 'NOMAD will be updated from {current} to {version}. The server will restart automatically afterwards.',
+  'admin.update.dataInfo': 'All your data (trips, users, API keys, uploads, Vacay, Atlas, budgets) will be preserved.',
+  'admin.update.warning': 'The app will be briefly unavailable during the restart.',
+  'admin.update.confirm': 'Update Now',
+  'admin.update.installing': 'Updating…',
+  'admin.update.success': 'Update installed! Server is restarting…',
+  'admin.update.failed': 'Update failed',
+  'admin.update.backupHint': 'We recommend creating a backup before updating.',
+  'admin.update.backupLink': 'Go to Backup',
+  'admin.update.howTo': 'How to Update',
+  'admin.update.dockerText': 'Your NOMAD instance runs in Docker. To update to {version}, run the following commands on your server:',
+  'admin.update.reloadHint': 'Please reload the page in a few seconds.',
+
+  // Vacay addon
+  'vacay.subtitle': 'Plan and manage vacation days',
+  'vacay.settings': 'Settings',
+  'vacay.year': 'Year',
+  'vacay.addYear': 'Add year',
+  'vacay.removeYear': 'Remove year',
+  'vacay.removeYearConfirm': 'Remove {year}?',
+  'vacay.removeYearHint': 'All vacation entries and company holidays for this year will be permanently deleted.',
+  'vacay.remove': 'Remove',
+  'vacay.persons': 'Persons',
+  'vacay.noPersons': 'No persons added',
+  'vacay.addPerson': 'Add Person',
+  'vacay.editPerson': 'Edit Person',
+  'vacay.removePerson': 'Remove Person',
+  'vacay.removePersonConfirm': 'Remove {name}?',
+  'vacay.removePersonHint': 'All vacation entries for this person will be permanently deleted.',
+  'vacay.personName': 'Name',
+  'vacay.personNamePlaceholder': 'Enter name',
+  'vacay.color': 'Color',
+  'vacay.add': 'Add',
+  'vacay.legend': 'Legend',
+  'vacay.publicHoliday': 'Public Holiday',
+  'vacay.companyHoliday': 'Company Holiday',
+  'vacay.weekend': 'Weekend',
+  'vacay.modeVacation': 'Vacation',
+  'vacay.modeCompany': 'Company Holiday',
+  'vacay.entitlement': 'Entitlement',
+  'vacay.entitlementDays': 'Days',
+  'vacay.used': 'Used',
+  'vacay.remaining': 'Left',
+  'vacay.carriedOver': 'from {year}',
+  'vacay.blockWeekends': 'Block Weekends',
+  'vacay.blockWeekendsHint': 'Prevent vacation entries on Saturdays and Sundays',
+  'vacay.publicHolidays': 'Public Holidays',
+  'vacay.publicHolidaysHint': 'Mark public holidays in the calendar',
+  'vacay.selectCountry': 'Select country',
+  'vacay.selectRegion': 'Select region (optional)',
+  'vacay.companyHolidays': 'Company Holidays',
+  'vacay.companyHolidaysHint': 'Allow marking company-wide holiday days',
+  'vacay.companyHolidaysNoDeduct': 'Company holidays do not count towards vacation days.',
+  'vacay.carryOver': 'Carry Over',
+  'vacay.carryOverHint': 'Automatically carry remaining vacation days into the next year',
+  'vacay.sharing': 'Sharing',
+  'vacay.sharingHint': 'Share your vacation plan with other NOMAD users',
+  'vacay.owner': 'Owner',
+  'vacay.shareEmailPlaceholder': 'Email of NOMAD user',
+  'vacay.shareSuccess': 'Plan shared successfully',
+  'vacay.shareError': 'Could not share plan',
+  'vacay.dissolve': 'Dissolve Fusion',
+  'vacay.dissolveHint': 'Separate calendars again. Your entries will be kept.',
+  'vacay.dissolveAction': 'Dissolve',
+  'vacay.dissolved': 'Calendar separated',
+  'vacay.fusedWith': 'Fused with',
+  'vacay.you': 'you',
+  'vacay.noData': 'No data',
+  'vacay.changeColor': 'Change color',
+  'vacay.inviteUser': 'Invite User',
+  'vacay.inviteHint': 'Invite another NOMAD user to share a combined vacation calendar.',
+  'vacay.selectUser': 'Select user',
+  'vacay.sendInvite': 'Send Invite',
+  'vacay.inviteSent': 'Invite sent',
+  'vacay.inviteError': 'Could not send invite',
+  'vacay.pending': 'pending',
+  'vacay.noUsersAvailable': 'No users available',
+  'vacay.accept': 'Accept',
+  'vacay.decline': 'Decline',
+  'vacay.acceptFusion': 'Accept & Fuse',
+  'vacay.inviteTitle': 'Fusion Request',
+  'vacay.inviteWantsToFuse': 'wants to share a vacation calendar with you.',
+  'vacay.fuseInfo1': 'Both of you will see all vacation entries in one shared calendar.',
+  'vacay.fuseInfo2': 'Both parties can create and edit entries for each other.',
+  'vacay.fuseInfo3': 'Both parties can delete entries and change vacation entitlements.',
+  'vacay.fuseInfo4': 'Settings like public holidays and company holidays are shared.',
+  'vacay.fuseInfo5': 'The fusion can be dissolved at any time by either party. Your entries will be preserved.',
+  'nav.myTrips': 'My Trips',
+
+  // Atlas addon
+  'atlas.subtitle': 'Your travel footprint around the world',
+  'atlas.countries': 'Countries',
+  'atlas.trips': 'Trips',
+  'atlas.places': 'Places',
+  'atlas.days': 'Days',
+  'atlas.visitedCountries': 'Visited Countries',
+  'atlas.cities': 'Cities',
+  'atlas.noData': 'No travel data yet',
+  'atlas.noDataHint': 'Create a trip and add places to see your world map',
+  'atlas.lastTrip': 'Last trip',
+  'atlas.nextTrip': 'Next trip',
+  'atlas.daysLeft': 'days left',
+  'atlas.streak': 'Streak',
+  'atlas.year': 'year',
+  'atlas.years': 'years',
+  'atlas.yearInRow': 'year in a row',
+  'atlas.yearsInRow': 'years in a row',
+  'atlas.tripIn': 'trip in',
+  'atlas.tripsIn': 'trips in',
+  'atlas.since': 'since',
+  'atlas.europe': 'Europe',
+  'atlas.asia': 'Asia',
+  'atlas.northAmerica': 'N. America',
+  'atlas.southAmerica': 'S. America',
+  'atlas.africa': 'Africa',
+  'atlas.oceania': 'Oceania',
+  'atlas.other': 'Other',
+  'atlas.firstVisit': 'First trip',
+  'atlas.lastVisitLabel': 'Last trip',
+  'atlas.tripSingular': 'Trip',
+  'atlas.tripPlural': 'Trips',
+  'atlas.placeVisited': 'Place visited',
+  'atlas.placesVisited': 'Places visited',
+
  // Trip Planner
  'trip.tabs.plan': 'Plan',
  'trip.tabs.reservations': 'Bookings',
+  'trip.tabs.reservationsShort': 'Book',
  'trip.tabs.packing': 'Packing List',
  'trip.tabs.packingShort': 'Packing',
  'trip.tabs.budget': 'Budget',
@@ -266,9 +473,6 @@ const en = {
  'trip.confirm.deletePlace': 'Are you sure you want to delete this place?',

  // Day Plan Sidebar
-  'dayplan.transport.car': 'Car',
-  'dayplan.transport.walk': 'Walk',
-  'dayplan.transport.bike': 'Bike',
  'dayplan.emptyDay': 'No places planned for this day',
  'dayplan.addNote': 'Add Note',
  'dayplan.editNote': 'Edit Note',
@@ -284,6 +488,9 @@ const en = {
  'dayplan.optimize': 'Optimize',
  'dayplan.optimized': 'Route optimized',
  'dayplan.routeError': 'Failed to calculate route',
+  'dayplan.toast.needTwoPlaces': 'At least two places needed for route optimization',
+  'dayplan.toast.routeOptimized': 'Route optimized',
+  'dayplan.toast.noGeoPlaces': 'No places with coordinates found for route calculation',
  'dayplan.confirmed': 'Confirmed',
  'dayplan.pendingRes': 'Pending',
  'dayplan.pdf': 'PDF',
@@ -314,6 +521,8 @@ const en = {
  'places.noCategory': 'No Category',
  'places.categoryNamePlaceholder': 'Category name',
  'places.formTime': 'Time',
+  'places.startTime': 'Start',
+  'places.endTime': 'End',
  'places.formWebsite': 'Website',
  'places.formNotesPlaceholder': 'Personal notes...',
  'places.formReservation': 'Reservation',
@@ -325,11 +534,6 @@ const en = {
  'places.categoryCreateError': 'Failed to create category',
  'places.nameRequired': 'Please enter a name',
  'places.saveError': 'Failed to save',
-  'places.transport.walking': '🚶 Walking',
-  'places.transport.driving': '🚗 Driving',
-  'places.transport.cycling': '🚲 Cycling',
-  'places.transport.transit': '🚌 Transit',
-
  // Place Inspector
  'inspector.opened': 'Open',
  'inspector.closed': 'Closed',
@@ -343,6 +547,8 @@ const en = {
  'inspector.pendingRes': 'Pending Reservation',
  'inspector.google': 'Open in Google Maps',
  'inspector.website': 'Open Website',
+  'inspector.addRes': 'Reservation',
+  'inspector.editRes': 'Edit Reservation',

  // Reservations
  'reservations.title': 'Bookings',
@@ -359,6 +565,8 @@ const en = {
  'reservations.editTitle': 'Edit Reservation',
  'reservations.status': 'Status',
  'reservations.datetime': 'Date & Time',
+  'reservations.date': 'Date',
+  'reservations.time': 'Time',
  'reservations.timeAlt': 'Time (alternative, e.g. 19:30)',
  'reservations.notes': 'Notes',
  'reservations.notesPlaceholder': 'Additional notes...',
@@ -382,7 +590,7 @@ const en = {
  'reservations.titlePlaceholder': 'e.g. Lufthansa LH123, Hotel Adlon, ...',
  'reservations.locationAddress': 'Location / Address',
  'reservations.locationPlaceholder': 'Address, Airport, Hotel...',
-  'reservations.confirmationCode': 'Confirmation Number / Booking Code',
+  'reservations.confirmationCode': 'Booking Code',
  'reservations.confirmationPlaceholder': 'e.g. ABC12345',
  'reservations.day': 'Day',
  'reservations.noDay': 'No Day',
@@ -395,6 +603,9 @@ const en = {
  'reservations.toast.updateError': 'Failed to update',
  'reservations.toast.deleteError': 'Failed to delete',
  'reservations.confirm.remove': 'Remove reservation for "{name}"?',
+  'reservations.linkAssignment': 'Link to day assignment',
+  'reservations.pickAssignment': 'Select an assignment from your plan...',
+  'reservations.noAssignment': 'No link (standalone)',

  // Budget
  'budget.title': 'Budget',
@@ -443,6 +654,8 @@ const en = {
  'files.toast.deleteError': 'Failed to delete file',
  'files.sourcePlan': 'Day Plan',
  'files.sourceBooking': 'Booking',
+  'files.attach': 'Attach',
+  'files.pasteHint': 'You can also paste images from clipboard (Ctrl+V)',

  // Packing
  'packing.title': 'Packing List',
@@ -595,6 +808,21 @@ const en = {
  'backup.keep.30days': '30 days',
  'backup.keep.forever': 'Keep forever',

+  // Photos
+  'photos.allDays': 'All Days',
+  'photos.noPhotos': 'No photos yet',
+  'photos.uploadHint': 'Upload your travel photos',
+  'photos.clickToSelect': 'or click to select',
+  'photos.linkPlace': 'Link Place',
+  'photos.noPlace': 'No Place',
+  'photos.uploadN': '{n} photo(s) upload',
+
+  // Backup restore modal
+  'backup.restoreConfirmTitle': 'Restore Backup?',
+  'backup.restoreWarning': 'All current data (trips, places, users, uploads) will be permanently replaced by the backup. This action cannot be undone.',
+  'backup.restoreTip': 'Tip: Create a backup of the current state before restoring.',
+  'backup.restoreConfirm': 'Yes, restore',
+
  // PDF
  'pdf.travelPlan': 'Travel Plan',
  'pdf.planned': 'Planned',
@@ -602,6 +830,68 @@ const en = {
  'pdf.preview': 'PDF Preview',
  'pdf.saveAsPdf': 'Save as PDF',

+  // Planner
+  'planner.places': 'Places',
+  'planner.bookings': 'Bookings',
+  'planner.packingList': 'Packing List',
+  'planner.documents': 'Documents',
+  'planner.dayPlan': 'Day Plan',
+  'planner.reservations': 'Reservations',
+  'planner.minTwoPlaces': 'At least 2 places with coordinates needed',
+  'planner.noGeoPlaces': 'No places with coordinates available',
+  'planner.routeCalculated': 'Route calculated',
+  'planner.routeCalcFailed': 'Route could not be calculated',
+  'planner.routeError': 'Error calculating route',
+  'planner.routeOptimized': 'Route optimized',
+  'planner.reservationUpdated': 'Reservation updated',
+  'planner.reservationAdded': 'Reservation added',
+  'planner.confirmDeleteReservation': 'Delete reservation?',
+  'planner.reservationDeleted': 'Reservation deleted',
+  'planner.days': 'Days',
+  'planner.allPlaces': 'All Places',
+  'planner.totalPlaces': '{n} places total',
+  'planner.noDaysPlanned': 'No days planned yet',
+  'planner.editTrip': 'Edit trip \u2192',
+  'planner.placeOne': '1 place',
+  'planner.placeN': '{n} places',
+  'planner.addNote': 'Add note',
+  'planner.noEntries': 'No entries for this day',
+  'planner.addPlace': 'Add place',
+  'planner.addPlaceShort': '+ Add place',
+  'planner.resPending': 'Reservation pending · ',
+  'planner.resConfirmed': 'Reservation confirmed · ',
+  'planner.notePlaceholder': 'Note\u2026',
+  'planner.noteTimePlaceholder': 'Time (optional)',
+  'planner.noteExamplePlaceholder': 'e.g. S3 at 14:30 from central station, ferry from pier 7, lunch break\u2026',
+  'planner.totalCost': 'Total cost',
+  'planner.searchPlaces': 'Search places\u2026',
+  'planner.allCategories': 'All Categories',
+  'planner.noPlacesFound': 'No places found',
+  'planner.addFirstPlace': 'Add first place',
+  'planner.noReservations': 'No reservations',
+  'planner.addFirstReservation': 'Add first reservation',
+  'planner.new': 'New',
+  'planner.addToDay': '+ Day',
+  'planner.calculating': 'Calculating\u2026',
+  'planner.route': 'Route',
+  'planner.optimize': 'Optimize',
+  'planner.openGoogleMaps': 'Open in Google Maps',
+  'planner.selectDayHint': 'Select a day from the left list to see the day plan',
+  'planner.noPlacesForDay': 'No places for this day yet',
+  'planner.addPlacesLink': 'Add places \u2192',
+  'planner.minTotal': 'min. total',
+  'planner.noReservation': 'No reservation',
+  'planner.removeFromDay': 'Remove from day',
+  'planner.addToThisDay': 'Add to day',
+  'planner.overview': 'Overview',
+  'planner.noDays': 'No days yet',
+  'planner.editTripToAddDays': 'Edit trip to add days',
+  'planner.dayCount': '{n} Days',
+  'planner.clickToUnlock': 'Click to unlock',
+  'planner.keepPosition': 'Keep position during route optimization',
+  'planner.dayDetails': 'Day details',
+  'planner.dayN': 'Day {n}',
+
  // Dashboard Stats
  'stats.countries': 'Countries',
  'stats.cities': 'Cities',
@@ -611,6 +901,26 @@ const en = {
  'stats.visited': 'visited',
  'stats.remaining': 'remaining',
  'stats.visitedCountries': 'Visited Countries',
+
+  // Day Detail Panel
+  'day.precipProb': 'Rain probability',
+  'day.precipitation': 'Precipitation',
+  'day.wind': 'Wind',
+  'day.sunrise': 'Sunrise',
+  'day.sunset': 'Sunset',
+  'day.hourlyForecast': 'Hourly Forecast',
+  'day.climateHint': 'Historical averages — real forecast available within 16 days of this date.',
+  'day.noWeather': 'No weather data available. Add a place with coordinates.',
+  'day.accommodation': 'Accommodation',
+  'day.addAccommodation': 'Add accommodation',
+  'day.hotelDayRange': 'Apply to days',
+  'day.noPlacesForHotel': 'Add places to your trip first',
+  'day.allDays': 'All',
+  'day.checkIn': 'Check-in',
+  'day.checkOut': 'Check-out',
+  'day.confirmation': 'Confirmation',
+  'day.editAccommodation': 'Edit accommodation',
+  'day.reservations': 'Reservations',
 }

 export default en
@@ -2,6 +2,100 @@
@tailwind components;
@tailwind utilities;

+html { height: 100%; overflow: hidden; background-color: var(--bg-primary); }
+body { height: 100%; overflow: auto; overscroll-behavior: none; -webkit-overflow-scrolling: touch; }
+
+
+.atlas-tooltip {
+  background: rgba(10, 10, 20, 0.6) !important;
+  backdrop-filter: blur(20px) saturate(180%) !important;
+  -webkit-backdrop-filter: blur(20px) saturate(180%) !important;
+  color: #f1f5f9 !important;
+  border: 1px solid rgba(255,255,255,0.1) !important;
+  border-radius: 14px !important;
+  padding: 10px 14px !important;
+  font-size: 12px !important;
+  font-family: inherit !important;
+  box-shadow: 0 8px 32px rgba(0,0,0,0.25) !important;
+  transition: none !important;
+}
+.atlas-tooltip::before { border-top-color: rgba(10, 10, 20, 0.6) !important; }
+html:not(.dark) .atlas-tooltip {
+  background: rgba(255, 255, 255, 0.75) !important;
+  color: #0f172a !important;
+  border: 1px solid rgba(0,0,0,0.08) !important;
+  box-shadow: 0 8px 32px rgba(0,0,0,0.1) !important;
+}
+html:not(.dark) .atlas-tooltip::before { border-top-color: rgba(255, 255, 255, 0.75) !important; }
+.leaflet-tooltip.atlas-tooltip { opacity: 1 !important; }
+.leaflet-tooltip-pane { transition: none !important; }
+.leaflet-fade-anim .leaflet-tooltip { transition: none !important; opacity: 1 !important; }
+
+.dark .leaflet-control-zoom a {
+  background: rgba(10, 10, 20, 0.7) !important;
+  color: #e2e8f0 !important;
+  border-color: rgba(255, 255, 255, 0.1) !important;
+  backdrop-filter: blur(12px);
+}
+.dark .leaflet-control-zoom a:hover {
+  background: rgba(30, 30, 40, 0.8) !important;
+}
+@media (max-width: 767px) {
+  .leaflet-control-zoom { display: none !important; }
+}
+
+/* Dark mode overrides for pages using hardcoded slate-* Tailwind classes */
+html.dark .bg-slate-50 { background-color: var(--bg-secondary) !important; }
+html.dark .bg-white { background-color: var(--bg-card) !important; }
+html.dark .bg-slate-100 { background-color: var(--bg-secondary) !important; }
+html.dark .bg-slate-900.text-white { background-color: #e2e8f0 !important; color: #0f172a !important; }
+html.dark .border-slate-200, html.dark .border-slate-300 { border-color: var(--border-primary) !important; }
+html.dark .border-slate-100, html.dark .border-b-slate-100 { border-color: var(--border-secondary) !important; }
+html.dark .text-slate-900 { color: var(--text-primary) !important; }
+html.dark .text-slate-700 { color: var(--text-secondary) !important; }
+html.dark .text-slate-600 { color: var(--text-muted) !important; }
+html.dark .text-slate-500 { color: var(--text-muted) !important; }
+html.dark .text-slate-400 { color: var(--text-faint) !important; }
+html.dark .hover\:bg-slate-50:hover, html.dark .hover\:bg-slate-100:hover { background-color: var(--bg-hover) !important; }
+html.dark .hover\:text-slate-900:hover { color: var(--text-primary) !important; }
+html.dark .hover\:bg-slate-700:hover { background-color: var(--bg-hover) !important; }
+html.dark .divide-slate-100 > :not([hidden]) ~ :not([hidden]) { border-color: var(--border-secondary) !important; }
+html.dark .focus\:ring-slate-400:focus { --tw-ring-color: var(--text-faint) !important; }
+html.dark input[class*="border-slate"], html.dark input[class*="text-slate"] { background: var(--bg-secondary) !important; color: var(--text-primary) !important; border-color: var(--border-primary) !important; }
+html.dark .text-amber-900 { color: #fbbf24 !important; }
+html.dark .text-amber-700 { color: #f59e0b !important; }
+html.dark .bg-amber-50 { background-color: rgba(245,158,11,0.1) !important; }
+html.dark .border-amber-200 { border-color: rgba(245,158,11,0.2) !important; }
+html.dark .disabled\:bg-slate-400:disabled { background-color: var(--text-faint) !important; }
+html.dark button.bg-slate-900 { background-color: #e2e8f0 !important; color: #0f172a !important; opacity: 1 !important; }
+html.dark button.bg-slate-900:hover { background-color: #cbd5e1 !important; }
+html.dark button.bg-slate-900:disabled { background-color: #ffffff !important; color: #000000 !important; opacity: 0.4 !important; }
+html.dark span.bg-slate-900 { background-color: #e2e8f0 !important; color: #0f172a !important; }
+html.dark span.bg-slate-100 { background-color: var(--bg-secondary) !important; color: var(--text-muted) !important; }
+html.dark .border-b { border-bottom-color: var(--border-secondary) !important; }
+/* Gray variants (CategoryManager, BackupPanel) */
+html.dark .bg-gray-50 { background-color: var(--bg-secondary) !important; }
+html.dark .bg-gray-100 { background-color: var(--bg-secondary) !important; }
+html.dark .border-gray-200, html.dark .border-gray-300 { border-color: var(--border-primary) !important; }
+html.dark .border-gray-100 { border-color: var(--border-secondary) !important; }
+html.dark .text-gray-900 { color: var(--text-primary) !important; }
+html.dark .text-gray-700 { color: var(--text-secondary) !important; }
+html.dark .text-gray-600 { color: var(--text-muted) !important; }
+html.dark .text-gray-500 { color: var(--text-muted) !important; }
+html.dark .text-gray-400 { color: var(--text-faint) !important; }
+html.dark .text-gray-300 { color: var(--text-faint) !important; }
+html.dark .hover\:bg-gray-50:hover, html.dark .hover\:bg-gray-200:hover { background-color: var(--bg-hover) !important; }
+html.dark .hover\:border-gray-200:hover, html.dark .hover\:border-gray-400:hover { border-color: var(--border-primary) !important; }
+html.dark input.bg-white, html.dark input[class*="bg-white"] { background: var(--bg-secondary) !important; color: var(--text-primary) !important; }
+html.dark .bg-gray-200 { background-color: var(--border-primary) !important; }
+html.dark .border-gray-300.border-t-slate-600 { border-color: var(--border-primary) !important; border-top-color: var(--text-primary) !important; }
+/* Modal buttons */
+html.dark button[class*="text-slate-600"][class*="border-slate-200"] { color: var(--text-muted) !important; border-color: var(--border-primary) !important; }
+html.dark button[class*="text-slate-600"][class*="border-slate-200"]:hover { background: var(--bg-hover) !important; }
+/* Dashed borders */
+html.dark .border-dashed.border-gray-300 { border-color: var(--border-primary) !important; }
+html.dark .bg-slate-50\/60, html.dark [class*="bg-slate-50/"] { background-color: transparent !important; }
+
 /* Reorder buttons: desktop = original style; mobile = always visible, larger touch targets */
 .reorder-buttons {
  flex-direction: column;
@@ -45,6 +139,8 @@

 /* ── Design tokens ─────────────────────────────── */
 :root {
+  --safe-top: env(safe-area-inset-top, 0px);
+  --nav-h: calc(56px + var(--safe-top));
  --font-system: -apple-system, BlinkMacSystemFont, 'SF Pro Text', 'Segoe UI', system-ui, sans-serif;
  --sp-1: 4px;
  --sp-2: 8px;
@@ -230,6 +326,15 @@ body {
  color: var(--text-faint);
 }

+/* Brand images: no save/copy/drag */
+img[alt="NOMAD"] {
+  pointer-events: none;
+  user-select: none;
+  -webkit-user-select: none;
+  -webkit-user-drag: none;
+  -webkit-touch-callout: none;
+}
+
 /* Weiche Übergänge */
 .transition-smooth {
  transition: all 0.2s ease;
@@ -9,7 +9,9 @@ import Modal from '../components/shared/Modal'
 import { useToast } from '../components/shared/Toast'
 import CategoryManager from '../components/Admin/CategoryManager'
 import BackupPanel from '../components/Admin/BackupPanel'
-import { Users, Map, Briefcase, Shield, Trash2, Edit2, Camera, FileText, Eye, EyeOff, Save, CheckCircle, XCircle, Loader2, UserPlus } from 'lucide-react'
+import GitHubPanel from '../components/Admin/GitHubPanel'
+import AddonManager from '../components/Admin/AddonManager'
+import { Users, Map, Briefcase, Shield, Trash2, Edit2, Camera, FileText, Eye, EyeOff, Save, CheckCircle, XCircle, Loader2, UserPlus, ArrowUpCircle, ExternalLink, Download, AlertTriangle, RefreshCw, GitBranch, Sun } from 'lucide-react'
 import CustomSelect from '../components/shared/CustomSelect'

 export default function AdminPage() {
@@ -19,8 +21,10 @@ export default function AdminPage() {
  const TABS = [
    { id: 'users', label: t('admin.tabs.users') },
    { id: 'categories', label: t('admin.tabs.categories') },
+    { id: 'addons', label: t('admin.tabs.addons') },
    { id: 'settings', label: t('admin.tabs.settings') },
    { id: 'backup', label: t('admin.tabs.backup') },
+    { id: 'github', label: t('admin.tabs.github') },
  ]

  const [activeTab, setActiveTab] = useState('users')
@@ -47,6 +51,12 @@ export default function AdminPage() {
  const [validating, setValidating] = useState({})
  const [validation, setValidation] = useState({})

+  // Version check & update
+  const [updateInfo, setUpdateInfo] = useState(null)
+  const [showUpdateModal, setShowUpdateModal] = useState(false)
+  const [updating, setUpdating] = useState(false)
+  const [updateResult, setUpdateResult] = useState(null) // 'success' | 'error'
+
  const { user: currentUser, updateApiKeys } = useAuthStore()
  const navigate = useNavigate()
  const toast = useToast()
@@ -56,6 +66,9 @@ export default function AdminPage() {
    loadAppConfig()
    loadApiKeys()
    adminApi.getOidc().then(setOidcConfig).catch(() => {})
+    adminApi.checkVersion().then(data => {
+      if (data.update_available) setUpdateInfo(data)
+    }).catch(() => {})
  }, [])

  const loadData = async () => {
@@ -93,6 +106,26 @@ export default function AdminPage() {
    }
  }

+  const handleInstallUpdate = async () => {
+    setUpdating(true)
+    setUpdateResult(null)
+    try {
+      await adminApi.installUpdate()
+      setUpdateResult('success')
+      // Server is restarting — poll until it comes back, then reload
+      const poll = setInterval(async () => {
+        try {
+          await authApi.getAppConfig()
+          clearInterval(poll)
+          window.location.reload()
+        } catch { /* still restarting */ }
+      }, 2000)
+    } catch {
+      setUpdateResult('error')
+      setUpdating(false)
+    }
+  }
+
  const handleToggleRegistration = async (value) => {
    setAllowRegistration(value)
    try {
@@ -204,10 +237,10 @@ export default function AdminPage() {
  }

  return (
-    <div className="min-h-screen bg-slate-50">
+    <div className="min-h-screen" style={{ background: 'var(--bg-secondary)' }}>
      <Navbar />

-      <div className="pt-14">
+      <div style={{ paddingTop: 'var(--nav-h)' }}>
        <div className="max-w-6xl mx-auto px-4 py-8">
          {/* Header */}
          <div className="flex items-center gap-3 mb-6">
@@ -220,6 +253,53 @@ export default function AdminPage() {
            </div>
          </div>

+          {/* Update Banner */}
+          {updateInfo && (
+            <div className="mb-6 p-4 rounded-xl border flex flex-col sm:flex-row items-start sm:items-center gap-4 bg-amber-50 dark:bg-amber-950/40 border-amber-300 dark:border-amber-700">
+              <div className="flex items-center gap-4 flex-1 min-w-0">
+                <div className="flex-shrink-0 w-10 h-10 rounded-full flex items-center justify-center bg-amber-500 dark:bg-amber-600">
+                  <ArrowUpCircle className="w-5 h-5 text-white" />
+                </div>
+                <div>
+                  <p className="text-sm font-semibold text-amber-900 dark:text-amber-200">{t('admin.update.available')}</p>
+                  <p className="text-xs text-amber-700 dark:text-amber-400 mt-0.5">
+                    {t('admin.update.text').replace('{version}', `v${updateInfo.latest}`).replace('{current}', `v${updateInfo.current}`)}
+                  </p>
+                </div>
+              </div>
+              <div className="flex items-center gap-2 flex-shrink-0">
+                {updateInfo.release_url && (
+                  <a
+                    href={updateInfo.release_url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="flex items-center gap-1.5 px-3 py-2 rounded-lg text-xs font-medium transition-colors text-amber-800 dark:text-amber-300 border border-amber-300 dark:border-amber-600 hover:bg-amber-100 dark:hover:bg-amber-900/50"
+                  >
+                    <ExternalLink className="w-3.5 h-3.5" />
+                    {t('admin.update.button')}
+                  </a>
+                )}
+                {updateInfo.is_docker ? (
+                  <button
+                    onClick={() => setShowUpdateModal(true)}
+                    className="flex items-center gap-1.5 px-4 py-2 rounded-lg text-sm font-semibold transition-colors bg-slate-900 dark:bg-white text-white dark:text-slate-900 hover:bg-slate-700 dark:hover:bg-gray-200"
+                  >
+                    <Download className="w-4 h-4" />
+                    {t('admin.update.howTo')}
+                  </button>
+                ) : (
+                  <button
+                    onClick={() => setShowUpdateModal(true)}
+                    className="flex items-center gap-1.5 px-4 py-2 rounded-lg text-sm font-semibold transition-colors bg-slate-900 dark:bg-white text-white dark:text-slate-900 hover:bg-slate-700 dark:hover:bg-gray-200"
+                  >
+                    <Download className="w-4 h-4" />
+                    {t('admin.update.install')}
+                  </button>
+                )}
+              </div>
+            </div>
+          )}
+
          {/* Demo Baseline Button */}
          {demoMode && (
            <div className="mb-6 p-4 bg-amber-50 border border-amber-200 rounded-xl flex items-center justify-between">
@@ -266,12 +346,12 @@ export default function AdminPage() {
          )}

          {/* Tabs */}
-          <div className="flex gap-1 mb-6 bg-white border border-slate-200 rounded-xl p-1 w-fit">
+          <div className="grid grid-cols-3 sm:flex gap-1 mb-6 rounded-xl p-1" style={{ background: 'var(--bg-card)', border: '1px solid var(--border-primary)' }}>
            {TABS.map(tab => (
              <button
                key={tab.id}
                onClick={() => setActiveTab(tab.id)}
-                className={`px-4 py-2 text-sm font-medium rounded-lg transition-colors ${
+                className={`px-3 sm:px-4 py-2 text-xs sm:text-sm font-medium rounded-lg transition-colors ${
                  activeTab === tab.id
                    ? 'bg-slate-900 text-white'
                    : 'text-slate-600 hover:text-slate-900 hover:bg-slate-50'
@@ -286,7 +366,10 @@ export default function AdminPage() {
          {activeTab === 'users' && (
            <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
              <div className="p-5 border-b border-slate-100 flex items-center justify-between">
-                <h2 className="font-semibold text-slate-900">{t('admin.tabs.users')} ({users.length})</h2>
+                <div>
+                  <h2 className="font-semibold text-slate-900">{t('admin.tabs.users')}</h2>
+                  <p className="text-xs text-slate-400 mt-1">{users.length} {t('admin.stats.users')}</p>
+                </div>
                <button
                  onClick={() => setShowCreateUser(true)}
                  className="flex items-center gap-1.5 px-3 py-1.5 text-sm bg-slate-900 text-white rounded-lg hover:bg-slate-700 transition-colors"
@@ -318,8 +401,11 @@ export default function AdminPage() {
                        <tr key={u.id} className={`hover:bg-slate-50 transition-colors ${u.id === currentUser?.id ? 'bg-slate-50/60' : ''}`}>
                          <td className="px-5 py-3">
                            <div className="flex items-center gap-2">
-                              <div className="w-8 h-8 rounded-full bg-slate-100 flex items-center justify-center text-sm font-medium text-slate-700">
-                                {u.username.charAt(0).toUpperCase()}
+                              <div className="relative">
+                                <div className="w-8 h-8 rounded-full bg-slate-100 flex items-center justify-center text-sm font-medium text-slate-700">
+                                  {u.username.charAt(0).toUpperCase()}
+                                </div>
+                                <span className="absolute -bottom-0.5 -right-0.5 w-3 h-3 rounded-full border-2" style={{ borderColor: 'var(--bg-card)', background: u.online ? '#22c55e' : '#94a3b8' }} />
                              </div>
                              <div>
                                <p className="text-sm font-medium text-slate-900">{u.username}</p>
@@ -376,6 +462,8 @@ export default function AdminPage() {

          {activeTab === 'categories' && <CategoryManager />}

+          {activeTab === 'addons' && <AddonManager />}
+
          {activeTab === 'settings' && (
            <div className="space-y-6">
              {/* Registration Toggle */}
@@ -409,13 +497,14 @@ export default function AdminPage() {
              <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
                <div className="px-6 py-4 border-b border-slate-100">
                  <h2 className="font-semibold text-slate-900">{t('admin.apiKeys')}</h2>
+                  <p className="text-xs text-slate-400 mt-1">{t('admin.apiKeysHint')}</p>
                </div>
                <div className="p-6 space-y-4">
                  {/* Google Maps Key */}
                  <div>
                    <label className="flex items-center gap-2 text-sm font-medium text-slate-700 mb-1.5">
                      {t('admin.mapsKey')}
-                      <span style={{ fontSize: 10, fontWeight: 500, padding: '1px 7px', borderRadius: 99, background: '#dbeafe', color: '#1d4ed8' }}>{t('admin.recommended')}</span>
+                      <span className="text-[9px] font-medium px-1.5 py-px rounded-full bg-emerald-200 dark:bg-emerald-800 text-emerald-800 dark:text-emerald-200">{t('admin.recommended')}</span>
                    </label>
                    <div className="flex gap-2">
                      <div className="relative flex-1">
@@ -464,54 +553,35 @@ export default function AdminPage() {
                    )}
                  </div>

-                  {/* OpenWeatherMap Key */}
-                  <div>
-                    <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('admin.weatherKey')}</label>
-                    <div className="flex gap-2">
-                      <div className="relative flex-1">
-                        <input
-                          type={showKeys.weather ? 'text' : 'password'}
-                          value={weatherKey}
-                          onChange={e => setWeatherKey(e.target.value)}
-                          placeholder={t('settings.keyPlaceholder')}
-                          className="w-full pr-10 px-3 py-2 border border-slate-300 rounded-lg text-sm focus:ring-2 focus:ring-slate-400 focus:border-transparent"
-                        />
-                        <button
-                          type="button"
-                          onClick={() => toggleKey('weather')}
-                          className="absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600"
-                        >
-                          {showKeys.weather ? <EyeOff className="w-4 h-4" /> : <Eye className="w-4 h-4" />}
-                        </button>
+                  {/* Open-Meteo Weather Info */}
+                  <div className="rounded-lg border border-emerald-200 bg-emerald-50 dark:bg-emerald-950/30 dark:border-emerald-800 overflow-hidden">
+                    <div className="px-4 py-3 flex items-center justify-between">
+                      <div className="flex items-center gap-2">
+                        <div className="w-7 h-7 rounded-lg bg-emerald-500 flex items-center justify-center flex-shrink-0">
+                          <Sun className="w-3.5 h-3.5 text-white" />
+                        </div>
+                        <span className="text-sm font-semibold text-emerald-900 dark:text-emerald-200">{t('admin.weather.title')}</span>
+                      </div>
+                      <span className="text-[10px] font-medium px-2 py-0.5 rounded-full bg-emerald-200 dark:bg-emerald-800 text-emerald-800 dark:text-emerald-200">{t('admin.weather.badge')}</span>
+                    </div>
+                    <div className="px-4 pb-3">
+                      <p className="text-xs text-emerald-800 dark:text-emerald-300 leading-relaxed">{t('admin.weather.description')}</p>
+                      <p className="text-[11px] text-emerald-600 dark:text-emerald-400 mt-1.5 leading-relaxed">{t('admin.weather.locationHint')}</p>
+                      <div className="mt-3 grid grid-cols-1 sm:grid-cols-3 gap-2">
+                        <div className="rounded-md bg-white dark:bg-emerald-900/40 px-3 py-2 border border-emerald-100 dark:border-emerald-800">
+                          <p className="text-xs font-semibold text-emerald-900 dark:text-emerald-200">{t('admin.weather.forecast')}</p>
+                          <p className="text-[11px] text-emerald-600 dark:text-emerald-400 mt-0.5">{t('admin.weather.forecastDesc')}</p>
+                        </div>
+                        <div className="rounded-md bg-white dark:bg-emerald-900/40 px-3 py-2 border border-emerald-100 dark:border-emerald-800">
+                          <p className="text-xs font-semibold text-emerald-900 dark:text-emerald-200">{t('admin.weather.climate')}</p>
+                          <p className="text-[11px] text-emerald-600 dark:text-emerald-400 mt-0.5">{t('admin.weather.climateDesc')}</p>
+                        </div>
+                        <div className="rounded-md bg-white dark:bg-emerald-900/40 px-3 py-2 border border-emerald-100 dark:border-emerald-800">
+                          <p className="text-xs font-semibold text-emerald-900 dark:text-emerald-200">{t('admin.weather.requests')}</p>
+                          <p className="text-[11px] text-emerald-600 dark:text-emerald-400 mt-0.5">{t('admin.weather.requestsDesc')}</p>
+                        </div>
                      </div>
-                      <button
-                        onClick={() => handleValidateKey('weather')}
-                        disabled={!weatherKey || validating.weather}
-                        className="px-3 py-2 text-sm border border-slate-300 rounded-lg hover:bg-slate-50 disabled:opacity-40 disabled:cursor-not-allowed flex items-center gap-1.5"
-                      >
-                        {validating.weather ? (
-                          <Loader2 className="w-4 h-4 animate-spin" />
-                        ) : validation.weather === true ? (
-                          <CheckCircle className="w-4 h-4 text-emerald-500" />
-                        ) : validation.weather === false ? (
-                          <XCircle className="w-4 h-4 text-red-500" />
-                        ) : null}
-                        {t('admin.validateKey')}
-                      </button>
                    </div>
-                    <p className="text-xs text-slate-400 mt-1">{t('admin.weatherKeyHint')}</p>
-                    {validation.weather === true && (
-                      <p className="text-xs text-emerald-600 mt-1 flex items-center gap-1">
-                        <span className="w-2 h-2 bg-emerald-500 rounded-full inline-block"></span>
-                        {t('admin.keyValid')}
-                      </p>
-                    )}
-                    {validation.weather === false && (
-                      <p className="text-xs text-red-500 mt-1 flex items-center gap-1">
-                        <span className="w-2 h-2 bg-red-500 rounded-full inline-block"></span>
-                        {t('admin.keyInvalid')}
-                      </p>
-                    )}
                  </div>

                  <button
@@ -529,7 +599,7 @@ export default function AdminPage() {
              <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
                <div className="px-6 py-4 border-b border-slate-100">
                  <h2 className="font-semibold text-slate-900">{t('admin.oidcTitle')}</h2>
-                  <p className="text-xs text-slate-400 mt-0.5">{t('admin.oidcSubtitle')}</p>
+                  <p className="text-xs text-slate-400 mt-1">{t('admin.oidcSubtitle')}</p>
                </div>
                <div className="p-6 space-y-4">
                  <div>
@@ -595,6 +665,8 @@ export default function AdminPage() {
          )}

          {activeTab === 'backup' && <BackupPanel />}
+
+          {activeTab === 'github' && <GitHubPanel />}
        </div>
      </div>

@@ -733,6 +805,171 @@ export default function AdminPage() {
          </div>
        )}
      </Modal>
+
+      {/* Update confirmation popup — matches backup restore style */}
+      {showUpdateModal && (
+        <div
+          style={{ position: 'fixed', inset: 0, zIndex: 9999, background: 'rgba(0,0,0,0.5)', backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 16 }}
+          onClick={() => { if (!updating) setShowUpdateModal(false) }}
+        >
+          <div
+            onClick={e => e.stopPropagation()}
+            style={{ width: '100%', maxWidth: 440, borderRadius: 16, overflow: 'hidden' }}
+            className="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700"
+          >
+            {updateResult === 'success' ? (
+              <>
+                <div style={{ background: 'linear-gradient(135deg, #16a34a, #15803d)', padding: '20px 24px', display: 'flex', alignItems: 'center', gap: 12 }}>
+                  <div style={{ width: 40, height: 40, borderRadius: 10, background: 'rgba(255,255,255,0.2)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                    <CheckCircle size={20} style={{ color: 'white' }} />
+                  </div>
+                  <div>
+                    <h3 style={{ margin: 0, fontSize: 16, fontWeight: 700, color: 'white' }}>{t('admin.update.success')}</h3>
+                  </div>
+                </div>
+                <div style={{ padding: '20px 24px', textAlign: 'center' }}>
+                  <RefreshCw className="w-5 h-5 animate-spin mx-auto mb-2" style={{ color: 'var(--text-muted)' }} />
+                  <p style={{ fontSize: 13, color: 'var(--text-muted)' }}>{t('admin.update.reloadHint')}</p>
+                </div>
+              </>
+            ) : updateResult === 'error' ? (
+              <>
+                <div style={{ background: 'linear-gradient(135deg, #dc2626, #b91c1c)', padding: '20px 24px', display: 'flex', alignItems: 'center', gap: 12 }}>
+                  <div style={{ width: 40, height: 40, borderRadius: 10, background: 'rgba(255,255,255,0.2)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                    <XCircle size={20} style={{ color: 'white' }} />
+                  </div>
+                  <div>
+                    <h3 style={{ margin: 0, fontSize: 16, fontWeight: 700, color: 'white' }}>{t('admin.update.failed')}</h3>
+                  </div>
+                </div>
+                <div style={{ padding: '0 24px 20px', display: 'flex', justifyContent: 'flex-end', marginTop: 16 }}>
+                  <button
+                    onClick={() => { setShowUpdateModal(false); setUpdateResult(null) }}
+                    className="bg-slate-900 dark:bg-white text-white dark:text-slate-900 hover:bg-slate-700 dark:hover:bg-gray-200"
+                    style={{ padding: '9px 20px', borderRadius: 10, fontSize: 13, fontWeight: 600, border: 'none', cursor: 'pointer', fontFamily: 'inherit' }}
+                  >
+                    {t('common.cancel')}
+                  </button>
+                </div>
+              </>
+            ) : (
+              <>
+                {/* Red header */}
+                <div style={{ background: 'linear-gradient(135deg, #dc2626, #b91c1c)', padding: '20px 24px', display: 'flex', alignItems: 'center', gap: 12 }}>
+                  <div style={{ width: 40, height: 40, borderRadius: 10, background: 'rgba(255,255,255,0.2)', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                    <AlertTriangle size={20} style={{ color: 'white' }} />
+                  </div>
+                  <div>
+                    <h3 style={{ margin: 0, fontSize: 16, fontWeight: 700, color: 'white' }}>{t('admin.update.confirmTitle')}</h3>
+                    <p style={{ margin: '2px 0 0', fontSize: 12, color: 'rgba(255,255,255,0.8)' }}>
+                      v{updateInfo?.current} → v{updateInfo?.latest}
+                    </p>
+                  </div>
+                </div>
+
+                {/* Body */}
+                <div style={{ padding: '20px 24px' }}>
+                  {updateInfo?.is_docker ? (
+                    <>
+                      <p className="text-gray-700 dark:text-gray-300" style={{ fontSize: 13, lineHeight: 1.6, margin: 0 }}>
+                        {t('admin.update.dockerText').replace('{version}', `v${updateInfo.latest}`)}
+                      </p>
+
+                      <div style={{ marginTop: 14, padding: '12px 14px', borderRadius: 10, fontSize: 12, lineHeight: 1.8, fontFamily: 'monospace', whiteSpace: 'pre-wrap', wordBreak: 'break-all' }}
+                        className="bg-gray-900 dark:bg-gray-950 text-gray-100 border border-gray-700"
+                      >
+{`docker pull mauriceboe/nomad:latest
+docker stop nomad && docker rm nomad
+docker run -d --name nomad \\
+  -p 3000:3000 \\
+  -v /opt/nomad/data:/app/data \\
+  -v /opt/nomad/uploads:/app/uploads \\
+  --restart unless-stopped \\
+  mauriceboe/nomad:latest`}
+                      </div>
+
+                      <div style={{ marginTop: 10, padding: '10px 12px', borderRadius: 10, fontSize: 12, lineHeight: 1.5 }}
+                        className="bg-emerald-50 dark:bg-emerald-900/30 text-emerald-700 dark:text-emerald-300 border border-emerald-200 dark:border-emerald-800"
+                      >
+                        <div className="flex items-start gap-2">
+                          <CheckCircle className="w-3.5 h-3.5 mt-0.5 flex-shrink-0" />
+                          <span>{t('admin.update.dataInfo')}</span>
+                        </div>
+                      </div>
+                    </>
+                  ) : (
+                    <>
+                      <p className="text-gray-700 dark:text-gray-300" style={{ fontSize: 13, lineHeight: 1.6, margin: 0 }}>
+                        {updateInfo && t('admin.update.confirmText').replace('{current}', `v${updateInfo.current}`).replace('{version}', `v${updateInfo.latest}`)}
+                      </p>
+
+                      <div style={{ marginTop: 14, padding: '10px 12px', borderRadius: 10, fontSize: 12, lineHeight: 1.5 }}
+                        className="bg-emerald-50 dark:bg-emerald-900/30 text-emerald-700 dark:text-emerald-300 border border-emerald-200 dark:border-emerald-800"
+                      >
+                        <div className="flex items-start gap-2">
+                          <CheckCircle className="w-3.5 h-3.5 mt-0.5 flex-shrink-0" />
+                          <span>{t('admin.update.dataInfo')}</span>
+                        </div>
+                      </div>
+
+                      <div style={{ marginTop: 10, padding: '10px 12px', borderRadius: 10, fontSize: 12, lineHeight: 1.5 }}
+                        className="bg-blue-50 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300 border border-blue-200 dark:border-blue-800"
+                      >
+                        <div className="flex items-start gap-2">
+                          <Download className="w-3.5 h-3.5 mt-0.5 flex-shrink-0" />
+                          <span>
+                            {t('admin.update.backupHint')}{' '}
+                            <button
+                              onClick={() => { setShowUpdateModal(false); setActiveTab('backup') }}
+                              className="underline font-semibold hover:text-blue-950 dark:hover:text-blue-100"
+                            >{t('admin.update.backupLink')}</button>
+                          </span>
+                        </div>
+                      </div>
+
+                      <div style={{ marginTop: 10, padding: '10px 12px', borderRadius: 10, fontSize: 12, lineHeight: 1.5 }}
+                        className="bg-red-50 dark:bg-red-900/30 text-red-700 dark:text-red-300 border border-red-200 dark:border-red-800"
+                      >
+                        <div className="flex items-start gap-2">
+                          <AlertTriangle className="w-3.5 h-3.5 mt-0.5 flex-shrink-0" />
+                          <span>{t('admin.update.warning')}</span>
+                        </div>
+                      </div>
+                    </>
+                  )}
+                </div>
+
+                {/* Footer */}
+                <div style={{ padding: '0 24px 20px', display: 'flex', gap: 10, justifyContent: 'flex-end' }}>
+                  <button
+                    onClick={() => setShowUpdateModal(false)}
+                    disabled={updating}
+                    className="text-gray-600 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-40"
+                    style={{ padding: '9px 20px', borderRadius: 10, fontSize: 13, fontWeight: 600, border: 'none', cursor: 'pointer', fontFamily: 'inherit' }}
+                  >
+                    {t('common.cancel')}
+                  </button>
+                  {!updateInfo?.is_docker && (
+                    <button
+                      onClick={handleInstallUpdate}
+                      disabled={updating}
+                      className="bg-slate-900 dark:bg-white text-white dark:text-slate-900 hover:bg-slate-700 dark:hover:bg-gray-200 disabled:opacity-60 flex items-center gap-2"
+                      style={{ padding: '9px 20px', borderRadius: 10, fontSize: 13, fontWeight: 600, border: 'none', cursor: 'pointer', fontFamily: 'inherit' }}
+                    >
+                      {updating ? (
+                        <Loader2 size={14} className="animate-spin" />
+                      ) : (
+                        <Download size={14} />
+                      )}
+                      {updating ? t('admin.update.installing') : t('admin.update.confirm')}
+                    </button>
+                  )}
+                </div>
+              </>
+            )}
+          </div>
+        </div>
+      )}
    </div>
  )
 }
@@ -0,0 +1,471 @@
+import React, { useEffect, useState, useRef } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { useTranslation } from '../i18n'
+import { useSettingsStore } from '../store/settingsStore'
+import Navbar from '../components/Layout/Navbar'
+import apiClient from '../api/client'
+import { Globe, MapPin, Briefcase, Calendar, Flag, ChevronRight, PanelLeftOpen, PanelLeftClose, X } from 'lucide-react'
+import L from 'leaflet'
+
+// Convert country code to flag emoji
+function MobileStats({ data, stats, countries, resolveName, t, dark }) {
+  const tp = dark ? '#f1f5f9' : '#0f172a'
+  const tf = dark ? '#475569' : '#94a3b8'
+  const { continents, lastTrip, nextTrip, streak, firstYear, tripsThisYear } = data || {}
+  const CL = { 'Europe': t('atlas.europe'), 'Asia': t('atlas.asia'), 'North America': t('atlas.northAmerica'), 'South America': t('atlas.southAmerica'), 'Africa': t('atlas.africa'), 'Oceania': t('atlas.oceania') }
+  const thisYear = new Date().getFullYear()
+
+  return (
+    <div className="space-y-4">
+      {/* Stats grid */}
+      <div className="grid grid-cols-5 gap-2">
+        {[[stats.totalCountries, t('atlas.countries')], [stats.totalTrips, t('atlas.trips')], [stats.totalPlaces, t('atlas.places')], [stats.totalCities || 0, t('atlas.cities')], [stats.totalDays, t('atlas.days')]].map(([v, l], i) => (
+          <div key={i} className="text-center py-2">
+            <p className="text-xl font-black tabular-nums" style={{ color: tp }}>{v}</p>
+            <p className="text-[9px] font-semibold uppercase tracking-wide" style={{ color: tf }}>{l}</p>
+          </div>
+        ))}
+      </div>
+      {/* Continents */}
+      <div className="grid grid-cols-6 gap-1">
+        {['Europe', 'Asia', 'North America', 'South America', 'Africa', 'Oceania'].map(cont => {
+          const count = continents?.[cont] || 0
+          return (
+            <div key={cont} className="text-center py-1">
+              <p className="text-base font-bold tabular-nums" style={{ color: count > 0 ? tp : (dark ? 'rgba(255,255,255,0.15)' : 'rgba(0,0,0,0.12)') }}>{count}</p>
+              <p className="text-[8px] font-semibold uppercase" style={{ color: count > 0 ? tf : (dark ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.08)') }}>{CL[cont]}</p>
+            </div>
+          )
+        })}
+      </div>
+      {/* Highlights */}
+      <div className="flex gap-3">
+        {streak > 0 && (
+          <div className="text-center flex-1 py-2">
+            <p className="text-xl font-black tabular-nums" style={{ color: tp }}>{streak}</p>
+            <p className="text-[9px] font-semibold uppercase tracking-wide" style={{ color: tf }}>{streak === 1 ? t('atlas.yearInRow') : t('atlas.yearsInRow')}</p>
+          </div>
+        )}
+        {tripsThisYear > 0 && (
+          <div className="text-center flex-1 py-2">
+            <p className="text-xl font-black tabular-nums" style={{ color: tp }}>{tripsThisYear}</p>
+            <p className="text-[9px] font-semibold uppercase tracking-wide" style={{ color: tf }}>{tripsThisYear === 1 ? t('atlas.tripIn') : t('atlas.tripsIn')} {thisYear}</p>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+function countryCodeToFlag(code) {
+  if (!code || code.length !== 2) return ''
+  return String.fromCodePoint(...[...code.toUpperCase()].map(c => 0x1F1E6 + c.charCodeAt(0) - 65))
+}
+
+function useCountryNames(language) {
+  const [resolver, setResolver] = useState(() => (code) => code)
+  useEffect(() => {
+    try {
+      const dn = new Intl.DisplayNames([language === 'de' ? 'de' : 'en'], { type: 'region' })
+      setResolver(() => (code) => { try { return dn.of(code) } catch { return code } })
+    } catch { /* */ }
+  }, [language])
+  return resolver
+}
+
+// Map visited country codes to ISO-3166 alpha3 (GeoJSON uses alpha3)
+const A2_TO_A3 = {"AF":"AFG","AL":"ALB","DZ":"DZA","AD":"AND","AO":"AGO","AR":"ARG","AM":"ARM","AU":"AUS","AT":"AUT","AZ":"AZE","BR":"BRA","BE":"BEL","BG":"BGR","CA":"CAN","CL":"CHL","CN":"CHN","CO":"COL","HR":"HRV","CZ":"CZE","DK":"DNK","EG":"EGY","EE":"EST","FI":"FIN","FR":"FRA","DE":"DEU","GR":"GRC","HU":"HUN","IS":"ISL","IN":"IND","ID":"IDN","IR":"IRN","IQ":"IRQ","IE":"IRL","IL":"ISR","IT":"ITA","JP":"JPN","KE":"KEN","KR":"KOR","LV":"LVA","LT":"LTU","LU":"LUX","MY":"MYS","MX":"MEX","MA":"MAR","NL":"NLD","NZ":"NZL","NO":"NOR","PK":"PAK","PE":"PER","PH":"PHL","PL":"POL","PT":"PRT","RO":"ROU","RU":"RUS","SA":"SAU","RS":"SRB","SK":"SVK","SI":"SVN","ZA":"ZAF","ES":"ESP","SE":"SWE","CH":"CHE","TH":"THA","TR":"TUR","UA":"UKR","AE":"ARE","GB":"GBR","US":"USA","VN":"VNM","NG":"NGA"}
+
+export default function AtlasPage() {
+  const { t, language } = useTranslation()
+  const { settings } = useSettingsStore()
+  const navigate = useNavigate()
+  const resolveName = useCountryNames(language)
+  const dm = settings.dark_mode
+  const dark = dm === true || dm === 'dark' || (dm === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  const mapRef = useRef(null)
+  const mapInstance = useRef(null)
+  const geoLayerRef = useRef(null)
+  const glareRef = useRef(null)
+  const borderGlareRef = useRef(null)
+  const panelRef = useRef(null)
+
+  const handlePanelMouseMove = (e) => {
+    if (!panelRef.current || !glareRef.current || !borderGlareRef.current) return
+    const rect = panelRef.current.getBoundingClientRect()
+    const x = e.clientX - rect.left
+    const y = e.clientY - rect.top
+    // Subtle inner glow
+    glareRef.current.style.background = `radial-gradient(circle 300px at ${x}px ${y}px, ${dark ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.25)'} 0%, transparent 70%)`
+    glareRef.current.style.opacity = '1'
+    // Border glow that follows cursor
+    borderGlareRef.current.style.opacity = '1'
+    borderGlareRef.current.style.maskImage = `radial-gradient(circle 150px at ${x}px ${y}px, black 0%, transparent 100%)`
+    borderGlareRef.current.style.WebkitMaskImage = `radial-gradient(circle 150px at ${x}px ${y}px, black 0%, transparent 100%)`
+  }
+  const handlePanelMouseLeave = () => {
+    if (glareRef.current) glareRef.current.style.opacity = '0'
+    if (borderGlareRef.current) borderGlareRef.current.style.opacity = '0'
+  }
+
+  const [data, setData] = useState(null)
+  const [loading, setLoading] = useState(true)
+  const [sidebarOpen, setSidebarOpen] = useState(true)
+  const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false)
+  const [selectedCountry, setSelectedCountry] = useState(null)
+  const [countryDetail, setCountryDetail] = useState(null)
+  const [geoData, setGeoData] = useState(null)
+
+  // Load atlas data
+  useEffect(() => {
+    apiClient.get('/addons/atlas/stats').then(r => {
+      setData(r.data)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [])
+
+  // Load GeoJSON world data (direct GeoJSON, no conversion needed)
+  useEffect(() => {
+    fetch('https://raw.githubusercontent.com/nvkelso/natural-earth-vector/master/geojson/ne_110m_admin_0_countries.geojson')
+      .then(r => r.json())
+      .then(geo => setGeoData(geo))
+      .catch(() => {})
+  }, [])
+
+  // Initialize map — runs after loading is done and mapRef is available
+  useEffect(() => {
+    if (loading || !mapRef.current) return
+    if (mapInstance.current) { mapInstance.current.remove(); mapInstance.current = null }
+
+    const map = L.map(mapRef.current, {
+      center: [25, 0],
+      zoom: 3,
+      minZoom: 3,
+      maxZoom: 7,
+      zoomControl: false,
+      attributionControl: false,
+      maxBounds: [[-90, -220], [90, 220]],
+      maxBoundsViscosity: 1.0,
+      fadeAnimation: false,
+      preferCanvas: true,
+    })
+
+    L.control.zoom({ position: 'bottomright' }).addTo(map)
+
+    const tileUrl = dark
+      ? 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}{r}.png'
+      : 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}{r}.png'
+
+    L.tileLayer(tileUrl, {
+      maxZoom: 8,
+      keepBuffer: 25,
+      updateWhenZooming: true,
+      updateWhenIdle: false,
+      tileSize: 256,
+      zoomOffset: 0,
+      crossOrigin: true,
+      loading: true,
+    }).addTo(map)
+
+    // Preload adjacent zoom level tiles
+    L.tileLayer(tileUrl, {
+      maxZoom: 8,
+      keepBuffer: 10,
+      opacity: 0,
+      tileSize: 256,
+      crossOrigin: true,
+    }).addTo(map)
+
+    mapInstance.current = map
+    return () => { map.remove(); mapInstance.current = null }
+  }, [dark, loading])
+
+  // Render GeoJSON countries
+  useEffect(() => {
+    if (!mapInstance.current || !geoData || !data) return
+
+    const visitedA3 = new Set(data.countries.map(c => A2_TO_A3[c.code]).filter(Boolean))
+    const countryMap = {}
+    data.countries.forEach(c => { if (A2_TO_A3[c.code]) countryMap[A2_TO_A3[c.code]] = c })
+
+    if (geoLayerRef.current) {
+      mapInstance.current.removeLayer(geoLayerRef.current)
+    }
+
+    // Generate deterministic color per country code
+    const VISITED_COLORS = ['#6366f1','#ec4899','#14b8a6','#f97316','#8b5cf6','#ef4444','#3b82f6','#22c55e','#06b6d4','#f43f5e','#a855f7','#10b981','#0ea5e9','#e11d48','#0d9488','#7c3aed','#2563eb','#dc2626','#059669','#d946ef']
+    // Assign colors in order of visit (by index in countries array) so no two neighbors share a color easily
+    const visitedA3List = [...visitedA3]
+    const colorMap = {}
+    visitedA3List.forEach((a3, i) => { colorMap[a3] = VISITED_COLORS[i % VISITED_COLORS.length] })
+    const colorForCode = (a3) => colorMap[a3] || VISITED_COLORS[0]
+
+    const canvasRenderer = L.canvas({ padding: 0.5, tolerance: 5 })
+
+    geoLayerRef.current = L.geoJSON(geoData, {
+      renderer: canvasRenderer,
+      interactive: true,
+      bubblingMouseEvents: false,
+      style: (feature) => {
+        const a3 = feature.properties?.ISO_A3 || feature.properties?.ADM0_A3 || feature.properties?.['ISO3166-1-Alpha-3'] || feature.id
+        const visited = visitedA3.has(a3)
+        return {
+          fillColor: visited ? colorForCode(a3) : (dark ? '#1e1e2e' : '#e2e8f0'),
+          fillOpacity: visited ? 0.7 : 0.3,
+          color: dark ? '#333' : '#cbd5e1',
+          weight: 0.5,
+        }
+      },
+      onEachFeature: (feature, layer) => {
+        const a3 = feature.properties?.ISO_A3 || feature.properties?.ADM0_A3 || feature.properties?.['ISO3166-1-Alpha-3'] || feature.id
+        const c = countryMap[a3]
+        if (c) {
+          const name = resolveName(c.code)
+          const formatDate = (d) => { if (!d) return '—'; const dt = new Date(d); return dt.toLocaleDateString(language === 'de' ? 'de-DE' : 'en-US', { month: 'short', year: 'numeric' }) }
+          const tooltipHtml = `
+            <div style="display:flex;flex-direction:column;gap:8px;min-width:160px">
+              <div style="font-size:13px;font-weight:600;text-transform:uppercase;letter-spacing:0.1em;padding-bottom:6px;border-bottom:1px solid ${dark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.08)'}">${name}</div>
+              <div style="display:flex;gap:14px">
+                <div><span style="font-size:16px;font-weight:800">${c.tripCount}</span> <span style="font-size:10px;opacity:0.5;text-transform:uppercase;letter-spacing:0.05em">${c.tripCount === 1 ? t('atlas.tripSingular') : t('atlas.tripPlural')}</span></div>
+                <div><span style="font-size:16px;font-weight:800">${c.placeCount}</span> <span style="font-size:10px;opacity:0.5;text-transform:uppercase;letter-spacing:0.05em">${c.placeCount === 1 ? t('atlas.placeVisited') : t('atlas.placesVisited')}</span></div>
+              </div>
+              <div style="display:flex;gap:2px;border-top:1px solid ${dark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.08)'};padding-top:8px">
+                <div style="flex:1;display:flex;flex-direction:column;gap:2px">
+                  <span style="font-size:9px;text-transform:uppercase;letter-spacing:0.08em;opacity:0.4">${t('atlas.firstVisit')}</span>
+                  <span style="font-size:12px;font-weight:700">${formatDate(c.firstVisit)}</span>
+                </div>
+                <div style="flex:1;display:flex;flex-direction:column;gap:2px">
+                  <span style="font-size:9px;text-transform:uppercase;letter-spacing:0.08em;opacity:0.4">${t('atlas.lastVisitLabel')}</span>
+                  <span style="font-size:12px;font-weight:700">${formatDate(c.lastVisit)}</span>
+                </div>
+              </div>
+              </div>
+            </div>`
+          layer.bindTooltip(tooltipHtml, {
+            sticky: false, permanent: false, className: 'atlas-tooltip', direction: 'top', offset: [0, -10], opacity: 1
+          })
+          layer.on('click', () => loadCountryDetail(c.code))
+          layer.on('mouseover', (e) => {
+            e.target.setStyle({ fillOpacity: 0.9, weight: 2, color: dark ? '#818cf8' : '#4f46e5' })
+          })
+          layer.on('mouseout', (e) => {
+            geoLayerRef.current.resetStyle(e.target)
+          })
+        }
+      }
+    }).addTo(mapInstance.current)
+  }, [geoData, data, dark])
+
+  const loadCountryDetail = async (code) => {
+    setSelectedCountry(code)
+    try {
+      const r = await apiClient.get(`/addons/atlas/country/${code}`)
+      setCountryDetail(r.data)
+    } catch { /* */ }
+  }
+
+  const stats = data?.stats || { totalTrips: 0, totalPlaces: 0, totalCountries: 0, totalDays: 0 }
+  const countries = data?.countries || []
+
+  if (loading) {
+    return (
+      <div className="min-h-screen" style={{ background: 'var(--bg-primary)' }}>
+        <Navbar />
+        <div className="flex items-center justify-center" style={{ paddingTop: 'var(--nav-h)', minHeight: 'calc(100vh - var(--nav-h))' }}>
+          <div className="w-8 h-8 border-2 rounded-full animate-spin" style={{ borderColor: 'var(--border-primary)', borderTopColor: 'var(--text-primary)' }} />
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="min-h-screen" style={{ background: 'var(--bg-primary)' }}>
+      <Navbar />
+      <div style={{ position: 'fixed', top: 'var(--nav-h)', left: 0, right: 0, bottom: 0 }}>
+        {/* Map */}
+        <div ref={mapRef} style={{ position: 'absolute', inset: 0, zIndex: 1, background: dark ? '#1a1a2e' : '#f0f0f0' }} />
+
+        {/* Mobile: Bottom bar */}
+        <div className="md:hidden absolute bottom-3 left-0 right-0 z-10 flex justify-center" style={{ touchAction: 'manipulation' }}>
+          <div className="flex items-center gap-4 px-5 py-4 rounded-2xl"
+            style={{ background: dark ? 'rgba(0,0,0,0.45)' : 'rgba(255,255,255,0.5)', backdropFilter: 'blur(16px)' }}>
+            {/* Countries highlighted */}
+            <div className="text-center px-3 py-1.5 rounded-xl" style={{ background: dark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.05)' }}>
+              <p className="text-3xl font-black tabular-nums leading-none" style={{ color: 'var(--text-primary)' }}>{stats.totalCountries}</p>
+              <p className="text-[9px] font-semibold uppercase tracking-wide mt-1" style={{ color: 'var(--text-faint)' }}>{t('atlas.countries')}</p>
+            </div>
+            {[[stats.totalTrips, t('atlas.trips')], [stats.totalPlaces, t('atlas.places')], [stats.totalCities || 0, t('atlas.cities')], [stats.totalDays, t('atlas.days')]].map(([v, l], i) => (
+              <div key={i} className="text-center px-1">
+                <p className="text-xl font-black tabular-nums leading-none" style={{ color: 'var(--text-primary)' }}>{v}</p>
+                <p className="text-[9px] font-semibold uppercase tracking-wide mt-1" style={{ color: 'var(--text-faint)' }}>{l}</p>
+              </div>
+            ))}
+          </div>
+        </div>
+
+        {/* Desktop Panel — bottom center, glass effect */}
+        <div
+          ref={panelRef}
+          onMouseMove={handlePanelMouseMove}
+          onMouseLeave={handlePanelMouseLeave}
+          className="hidden md:flex flex-col absolute z-10 overflow-hidden transition-all duration-300"
+          style={{
+            bottom: 16,
+            left: '50%',
+            transform: 'translateX(-50%)',
+            width: 'fit-content',
+            background: dark ? 'rgba(10,10,15,0.55)' : 'rgba(255,255,255,0.2)',
+            backdropFilter: 'blur(24px) saturate(180%)',
+            WebkitBackdropFilter: 'blur(24px) saturate(180%)',
+            border: '1px solid ' + (dark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'),
+            borderRadius: 20,
+            boxShadow: dark
+              ? '0 8px 32px rgba(0,0,0,0.3)'
+              : '0 8px 32px rgba(0,0,0,0.08)',
+          }}
+        >
+          {/* Liquid glass glare effect */}
+          <div ref={glareRef} className="absolute inset-0 pointer-events-none" style={{ opacity: 0, transition: 'opacity 0.3s ease', borderRadius: 20 }} />
+          {/* Border glow that follows cursor */}
+          <div ref={borderGlareRef} className="absolute inset-0 pointer-events-none" style={{
+            opacity: 0, transition: 'opacity 0.3s ease', borderRadius: 20,
+            border: dark ? '1.5px solid rgba(255,255,255,0.5)' : '2px solid rgba(0,0,0,0.15)',
+          }} />
+          <SidebarContent
+            data={data} stats={stats} countries={countries} selectedCountry={selectedCountry}
+            countryDetail={countryDetail} resolveName={resolveName}
+            onCountryClick={loadCountryDetail} onTripClick={(id) => navigate(`/trips/${id}`)}
+            t={t} dark={dark}
+          />
+        </div>
+
+
+      </div>
+    </div>
+  )
+}
+
+function SidebarContent({ data, stats, countries, selectedCountry, countryDetail, resolveName, onCountryClick, onTripClick, t, dark }) {
+  const bg = (o) => dark ? `rgba(255,255,255,${o})` : `rgba(0,0,0,${o})`
+  const tp = dark ? '#f1f5f9' : '#0f172a'
+  const tm = dark ? '#94a3b8' : '#64748b'
+  const tf = dark ? '#475569' : '#94a3b8'
+  const accent = '#818cf8'
+
+  const { mostVisited, continents, lastTrip, nextTrip, streak, firstYear, tripsThisYear } = data || {}
+  const contEntries = continents ? Object.entries(continents).sort((a, b) => b[1] - a[1]) : []
+  const maxCont = contEntries.length > 0 ? contEntries[0][1] : 1
+  const CL = { 'Europe': t('atlas.europe'), 'Asia': t('atlas.asia'), 'North America': t('atlas.northAmerica'), 'South America': t('atlas.southAmerica'), 'Africa': t('atlas.africa'), 'Oceania': t('atlas.oceania') }
+  const contColors = ['#818cf8', '#f472b6', '#34d399', '#fbbf24', '#fb923c', '#22d3ee']
+
+  if (countries.length === 0 && !lastTrip) {
+    return (
+      <div className="p-8 text-center">
+        <Globe size={28} className="mx-auto mb-2" style={{ color: tf, opacity: 0.4 }} />
+        <p className="text-sm font-medium" style={{ color: tm }}>{t('atlas.noData')}</p>
+        <p className="text-xs mt-1" style={{ color: tf }}>{t('atlas.noDataHint')}</p>
+      </div>
+    )
+  }
+
+  const thisYear = new Date().getFullYear()
+  const divider = `2px solid ${bg(0.08)}`
+
+  return (
+    <div className="flex items-stretch justify-center">
+
+      {/* ═══ SECTION 1: Numbers ═══ */}
+      {/* Countries hero */}
+      <div className="flex items-baseline gap-1.5 px-5 py-4 mx-2 my-2 rounded-xl" style={{ background: bg(0.08) }}>
+        <span className="text-5xl font-black tabular-nums leading-none" style={{ color: tp }}>{stats.totalCountries}</span>
+        <span className="text-sm font-medium" style={{ color: tm }}>{t('atlas.countries')}</span>
+      </div>
+      {/* Other stats */}
+      {[[stats.totalTrips, t('atlas.trips')], [stats.totalPlaces, t('atlas.places')], [stats.totalCities || 0, t('atlas.cities')], [stats.totalDays, t('atlas.days')]].map(([v, l], i) => (
+        <div key={i} className="flex flex-col items-center justify-center px-3 py-5 shrink-0">
+          <span className="text-2xl font-black tabular-nums leading-none" style={{ color: tp }}>{v}</span>
+          <span className="text-[9px] font-semibold mt-1.5 uppercase tracking-wide whitespace-nowrap" style={{ color: tf }}>{l}</span>
+        </div>
+      ))}
+
+      {/* ═══ DIVIDER ═══ */}
+      <div style={{ width: 2, background: bg(0.08), margin: '12px 14px' }} />
+
+      {/* ═══ SECTION 2: Continents ═══ */}
+      <div className="flex items-center gap-4 px-3 py-4 shrink-0">
+        {['Europe', 'Asia', 'North America', 'South America', 'Africa', 'Oceania'].map((cont) => {
+          const count = continents?.[cont] || 0
+          const active = count > 0
+          return (
+            <div key={cont} className="flex flex-col items-center shrink-0">
+              <span className="text-2xl font-black tabular-nums leading-none" style={{ color: active ? tp : bg(0.15) }}>{count}</span>
+              <span className="text-[9px] font-semibold mt-1.5 uppercase tracking-wide whitespace-nowrap" style={{ color: active ? tf : bg(0.1) }}>{CL[cont]}</span>
+            </div>
+          )
+        })}
+      </div>
+
+      {/* ═══ DIVIDER ═══ */}
+      <div style={{ width: 2, background: bg(0.08), margin: '12px 14px' }} />
+
+      {/* ═══ SECTION 3: Highlights & Streaks ═══ */}
+      <div className="flex items-center gap-5 px-3 py-4">
+        {/* Last trip */}
+        {lastTrip && (
+          <button onClick={() => onTripClick(lastTrip.id)} className="flex items-center gap-2.5 text-left transition-opacity hover:opacity-75">
+            <div className="w-10 h-10 rounded-xl flex items-center justify-center text-lg shrink-0" style={{ background: bg(0.06) }}>
+              {lastTrip.countryCode ? countryCodeToFlag(lastTrip.countryCode) : <MapPin size={16} style={{ color: tm }} />}
+            </div>
+            <div className="min-w-0">
+              <p className="text-[9px] uppercase tracking-wider font-semibold" style={{ color: tf }}>{t('atlas.lastTrip')}</p>
+              <p className="text-[13px] font-bold truncate" style={{ color: tp }}>{lastTrip.title}</p>
+            </div>
+          </button>
+        )}
+        {/* Streak */}
+        {streak > 0 && (
+          <div className="flex flex-col items-center justify-center px-3">
+            <span className="text-2xl font-black tabular-nums leading-none" style={{ color: tp }}>{streak}</span>
+            <span className="text-[9px] font-semibold mt-1.5 uppercase tracking-wide text-center leading-tight whitespace-nowrap" style={{ color: tf }}>
+              {streak === 1 ? t('atlas.yearInRow') : t('atlas.yearsInRow')}
+            </span>
+          </div>
+        )}
+        {/* This year */}
+        {tripsThisYear > 0 && (
+          <div className="flex flex-col items-center justify-center px-3">
+            <span className="text-2xl font-black tabular-nums leading-none" style={{ color: tp }}>{tripsThisYear}</span>
+            <span className="text-[9px] font-semibold mt-1.5 uppercase tracking-wide text-center leading-tight whitespace-nowrap" style={{ color: tf }}>
+              {tripsThisYear === 1 ? t('atlas.tripIn') : t('atlas.tripsIn')} {thisYear}
+            </span>
+          </div>
+        )}
+      </div>
+
+      {/* ═══ Country detail overlay ═══ */}
+      {selectedCountry && countryDetail && (
+        <>
+          <div style={{ width: 2, background: bg(0.08), margin: '12px 0' }} />
+          <div className="flex items-center gap-3 px-6 py-4">
+            <span className="text-3xl">{countryCodeToFlag(selectedCountry)}</span>
+            <div>
+              <p className="text-sm font-bold" style={{ color: tp }}>{resolveName(selectedCountry)}</p>
+              <p className="text-[10px] mb-1" style={{ color: tf }}>{countryDetail.places.length} {t('atlas.places')} · {countryDetail.trips.length} Trips</p>
+              <div className="flex flex-wrap gap-1">
+                {countryDetail.trips.slice(0, 3).map(trip => (
+                  <button key={trip.id} onClick={() => onTripClick(trip.id)}
+                    className="flex items-center gap-1 px-2 py-0.5 rounded text-[10px] font-semibold transition-opacity hover:opacity-75"
+                    style={{ background: bg(0.08), color: tp }}>
+                    <Briefcase size={9} style={{ color: tm }} />
+                    {trip.title}
+                  </button>
+                ))}
+              </div>
+            </div>
+          </div>
+        </>
+      )}
+    </div>
+  )
+}
+
@@ -2,15 +2,17 @@ import React, { useEffect, useState, useRef } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { tripsApi } from '../api/client'
 import { useAuthStore } from '../store/authStore'
+import { useSettingsStore } from '../store/settingsStore'
 import { useTranslation } from '../i18n'
 import Navbar from '../components/Layout/Navbar'
 import DemoBanner from '../components/Layout/DemoBanner'
-import TravelStats from '../components/Dashboard/TravelStats'
+import CurrencyWidget from '../components/Dashboard/CurrencyWidget'
+import TimezoneWidget from '../components/Dashboard/TimezoneWidget'
 import TripFormModal from '../components/Trips/TripFormModal'
 import { useToast } from '../components/shared/Toast'
 import {
  Plus, Calendar, Trash2, Edit2, Map, ChevronDown, ChevronUp,
-  Archive, ArchiveRestore, Clock, MapPin,
+  Archive, ArchiveRestore, Clock, MapPin, Settings, X, ArrowRightLeft,
 } from 'lucide-react'

 const font = { fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif" }
@@ -72,8 +74,42 @@ const GRADIENTS = [
 ]
 function tripGradient(id) { return GRADIENTS[id % GRADIENTS.length] }

+// ── Liquid Glass hover effect ────────────────────────────────────────────────
+function LiquidGlass({ children, dark, style, className = '', onClick }) {
+  const ref = useRef(null)
+  const glareRef = useRef(null)
+  const borderRef = useRef(null)
+
+  const onMove = (e) => {
+    if (!ref.current || !glareRef.current || !borderRef.current) return
+    const rect = ref.current.getBoundingClientRect()
+    const x = e.clientX - rect.left
+    const y = e.clientY - rect.top
+    glareRef.current.style.background = `radial-gradient(circle 250px at ${x}px ${y}px, ${dark ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'} 0%, transparent 70%)`
+    glareRef.current.style.opacity = '1'
+    borderRef.current.style.opacity = '1'
+    borderRef.current.style.maskImage = `radial-gradient(circle 120px at ${x}px ${y}px, black 0%, transparent 100%)`
+    borderRef.current.style.WebkitMaskImage = `radial-gradient(circle 120px at ${x}px ${y}px, black 0%, transparent 100%)`
+  }
+  const onLeave = () => {
+    if (glareRef.current) glareRef.current.style.opacity = '0'
+    if (borderRef.current) borderRef.current.style.opacity = '0'
+  }
+
+  return (
+    <div ref={ref} onMouseMove={onMove} onMouseLeave={onLeave} onClick={onClick} className={className}
+      style={{ position: 'relative', overflow: 'hidden', ...style }}>
+      <div ref={glareRef} style={{ position: 'absolute', inset: 0, pointerEvents: 'none', opacity: 0, transition: 'opacity 0.3s', borderRadius: 'inherit', zIndex: 1 }} />
+      <div ref={borderRef} style={{ position: 'absolute', inset: 0, pointerEvents: 'none', opacity: 0, transition: 'opacity 0.3s', borderRadius: 'inherit', zIndex: 1,
+        border: dark ? '1.5px solid rgba(255,255,255,0.4)' : '1.5px solid rgba(0,0,0,0.12)',
+      }} />
+      {children}
+    </div>
+  )
+}
+
 // ── Spotlight Card (next upcoming trip) ─────────────────────────────────────
-function SpotlightCard({ trip, onEdit, onDelete, onArchive, onClick, t, locale }) {
+function SpotlightCard({ trip, onEdit, onDelete, onArchive, onClick, t, locale, dark }) {
  const status = getTripStatus(trip)

  const coverBg = trip.cover_image
@@ -81,7 +117,7 @@ function SpotlightCard({ trip, onEdit, onDelete, onArchive, onClick, t, locale }
    : tripGradient(trip.id)

  return (
-    <div style={{ marginBottom: 32, borderRadius: 20, overflow: 'hidden', boxShadow: '0 8px 40px rgba(0,0,0,0.13)', position: 'relative', cursor: 'pointer' }}
+    <LiquidGlass dark={dark} style={{ marginBottom: 32, borderRadius: 20, boxShadow: '0 8px 40px rgba(0,0,0,0.13)', cursor: 'pointer' }}
      onClick={() => onClick(trip)}>
      {/* Cover / Background */}
      <div style={{ height: 300, background: coverBg, position: 'relative' }}>
@@ -149,7 +185,7 @@ function SpotlightCard({ trip, onEdit, onDelete, onArchive, onClick, t, locale }
          </div>
        </div>
      </div>
-    </div>
+    </LiquidGlass>
  )
 }

@@ -168,9 +204,9 @@ function TripCard({ trip, onEdit, onDelete, onArchive, onClick, t, locale }) {
      onMouseLeave={() => setHovered(false)}
      onClick={() => onClick(trip)}
      style={{
-        background: 'var(--bg-card)', borderRadius: 16, overflow: 'hidden', cursor: 'pointer',
-        border: '1px solid var(--border-primary)', transition: 'all 0.18s',
-        boxShadow: hovered ? '0 8px 28px rgba(0,0,0,0.10)' : '0 1px 4px rgba(0,0,0,0.04)',
+        background: hovered ? 'var(--bg-tertiary)' : 'var(--bg-card)', borderRadius: 16, overflow: 'hidden', cursor: 'pointer',
+        border: `1px solid ${hovered ? 'var(--text-faint)' : 'var(--border-primary)'}`, transition: 'all 0.18s',
+        boxShadow: hovered ? '0 8px 28px rgba(0,0,0,0.15)' : '0 1px 4px rgba(0,0,0,0.04)',
        transform: hovered ? 'translateY(-2px)' : 'none',
      }}
    >
@@ -345,11 +381,27 @@ export default function DashboardPage() {
  const [showForm, setShowForm] = useState(false)
  const [editingTrip, setEditingTrip] = useState(null)
  const [showArchived, setShowArchived] = useState(false)
+  const [showWidgetSettings, setShowWidgetSettings] = useState(false)

  const navigate = useNavigate()
  const toast = useToast()
  const { t, locale } = useTranslation()
  const { demoMode } = useAuthStore()
+  const { settings, updateSetting } = useSettingsStore()
+  const dm = settings.dark_mode
+  const dark = dm === true || dm === 'dark' || (dm === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  const showCurrency = settings.dashboard_currency !== 'off'
+  const showTimezone = settings.dashboard_timezone !== 'off'
+  const showSidebar = showCurrency || showTimezone
+
+  useEffect(() => {
+    if (showWidgetSettings === 'mobile') {
+      document.body.style.overflow = 'hidden'
+    } else {
+      document.body.style.overflow = ''
+    }
+    return () => { document.body.style.overflow = '' }
+  }, [showWidgetSettings])

  useEffect(() => { loadTrips() }, [])

@@ -374,6 +426,7 @@ export default function DashboardPage() {
      const data = await tripsApi.create(tripData)
      setTrips(prev => sortTrips([data.trip, ...prev]))
      toast.success(t('dashboard.toast.created'))
+      return data
    } catch (err) {
      throw new Error(err.response?.data?.error || t('dashboard.toast.createError'))
    }
@@ -437,10 +490,10 @@ export default function DashboardPage() {
  const rest = spotlight ? trips.filter(t => t.id !== spotlight.id) : trips

  return (
-    <div style={{ minHeight: '100vh', background: 'var(--bg-secondary)', ...font }}>
+    <div style={{ position: 'fixed', inset: 0, display: 'flex', flexDirection: 'column', background: 'var(--bg-secondary)', ...font }}>
      <Navbar />
      {demoMode && <DemoBanner />}
-      <div style={{ paddingTop: 56 }}>
+      <div style={{ flex: 1, overflow: 'auto', overscrollBehavior: 'contain', marginTop: 'var(--nav-h)' }}>
        <div style={{ maxWidth: 1300, margin: '0 auto', padding: '32px 20px 60px' }}>

          {/* Header */}
@@ -453,21 +506,75 @@ export default function DashboardPage() {
                  : t('dashboard.subtitle.empty')}
              </p>
            </div>
-            <button
-              onClick={() => { setEditingTrip(null); setShowForm(true) }}
-              style={{
-                display: 'flex', alignItems: 'center', gap: 7, padding: '9px 18px',
-                background: 'var(--accent)', color: 'var(--accent-text)', border: 'none', borderRadius: 12,
-                fontSize: 13, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit',
-                boxShadow: '0 2px 8px rgba(0,0,0,0.15)',
-              }}
-              onMouseEnter={e => e.currentTarget.style.opacity = '0.85'}
+            <div style={{ display: 'flex', gap: 8, alignItems: 'stretch' }}>
+              {/* Widget settings */}
+              <button
+                onClick={() => setShowWidgetSettings(s => s ? false : true)}
+                style={{
+                  display: 'flex', alignItems: 'center', justifyContent: 'center',
+                  padding: '0 14px',
+                  background: 'var(--bg-card)', border: '1px solid var(--border-primary)', borderRadius: 12,
+                  cursor: 'pointer', color: 'var(--text-faint)', fontFamily: 'inherit',
+                  transition: 'background 0.15s, border-color 0.15s',
+                }}
+                onMouseEnter={e => { e.currentTarget.style.background = 'var(--bg-hover)'; e.currentTarget.style.borderColor = 'var(--text-faint)' }}
+                onMouseLeave={e => { e.currentTarget.style.background = 'var(--bg-card)'; e.currentTarget.style.borderColor = 'var(--border-primary)' }}
+              >
+                <Settings size={15} />
+              </button>
+              <button
+                onClick={() => { setEditingTrip(null); setShowForm(true) }}
+                style={{
+                  display: 'flex', alignItems: 'center', gap: 7, padding: '9px 18px',
+                  background: 'var(--accent)', color: 'var(--accent-text)', border: 'none', borderRadius: 12,
+                  fontSize: 13, fontWeight: 600, cursor: 'pointer', fontFamily: 'inherit',
+                  boxShadow: '0 2px 8px rgba(0,0,0,0.15)',
+                }}
+                onMouseEnter={e => e.currentTarget.style.opacity = '0.85'}
              onMouseLeave={e => e.currentTarget.style.opacity = '1'}
            >
              <Plus size={15} /> {t('dashboard.newTrip')}
-            </button>
+              </button>
+            </div>
          </div>

+          {/* Widget settings dropdown */}
+          {showWidgetSettings && (
+            <div className="rounded-xl border p-3 mb-4 flex items-center gap-4" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+              <span className="text-xs font-semibold" style={{ color: 'var(--text-muted)' }}>Widgets:</span>
+              <label className="flex items-center gap-2 cursor-pointer">
+                <button onClick={() => updateSetting('dashboard_currency', showCurrency ? 'off' : 'on')}
+                  className="relative inline-flex h-5 w-9 items-center rounded-full transition-colors"
+                  style={{ background: showCurrency ? 'var(--text-primary)' : 'var(--border-primary)' }}>
+                  <span className="absolute left-0.5 h-4 w-4 rounded-full transition-transform duration-200"
+                    style={{ background: 'var(--bg-card)', transform: showCurrency ? 'translateX(16px)' : 'translateX(0)' }} />
+                </button>
+                <span className="text-xs" style={{ color: 'var(--text-primary)' }}>{t('dashboard.currency')}</span>
+              </label>
+              <label className="flex items-center gap-2 cursor-pointer">
+                <button onClick={() => updateSetting('dashboard_timezone', showTimezone ? 'off' : 'on')}
+                  className="relative inline-flex h-5 w-9 items-center rounded-full transition-colors"
+                  style={{ background: showTimezone ? 'var(--text-primary)' : 'var(--border-primary)' }}>
+                  <span className="absolute left-0.5 h-4 w-4 rounded-full transition-transform duration-200"
+                    style={{ background: 'var(--bg-card)', transform: showTimezone ? 'translateX(16px)' : 'translateX(0)' }} />
+                </button>
+                <span className="text-xs" style={{ color: 'var(--text-primary)' }}>{t('dashboard.timezone')}</span>
+              </label>
+            </div>
+          )}
+
+          {/* Mobile widgets button */}
+          {showSidebar && (
+            <button
+              onClick={() => setShowWidgetSettings('mobile')}
+              className="lg:hidden flex items-center justify-center gap-2 w-full py-2.5 rounded-xl text-xs font-semibold mb-4"
+              style={{ background: 'var(--bg-card)', border: '1px solid var(--border-primary)', color: 'var(--text-primary)' }}
+            >
+              <ArrowRightLeft size={13} style={{ color: 'var(--text-faint)' }} />
+              {showCurrency && showTimezone ? `${t('dashboard.currency')} & ${t('dashboard.timezone')}` : showCurrency ? t('dashboard.currency') : t('dashboard.timezone')}
+            </button>
+          )}
+
          <div style={{ display: 'flex', gap: 24, alignItems: 'flex-start' }}>
          {/* Main content */}
          <div style={{ flex: 1, minWidth: 0 }}>
@@ -505,7 +612,7 @@ export default function DashboardPage() {
          {!isLoading && spotlight && (
            <SpotlightCard
              trip={spotlight}
-              t={t} locale={locale}
+              t={t} locale={locale} dark={dark}
              onEdit={tr => { setEditingTrip(tr); setShowForm(true) }}
              onDelete={handleDelete}
              onArchive={handleArchive}
@@ -562,14 +669,37 @@ export default function DashboardPage() {
          )}
          </div>

-          {/* Stats sidebar */}
-          <div className="hidden lg:block" style={{ position: 'sticky', top: 80, flexShrink: 0 }}>
-            <TravelStats />
-          </div>
+          {/* Widgets sidebar */}
+          {showSidebar && (
+            <div className="hidden lg:flex flex-col gap-4" style={{ position: 'sticky', top: 80, flexShrink: 0, width: 280 }}>
+              {showCurrency && <LiquidGlass dark={dark} style={{ borderRadius: 16 }}><CurrencyWidget /></LiquidGlass>}
+              {showTimezone && <LiquidGlass dark={dark} style={{ borderRadius: 16 }}><TimezoneWidget /></LiquidGlass>}
+            </div>
+          )}
          </div>
        </div>
      </div>

+      {/* Mobile widgets bottom sheet */}
+      {showWidgetSettings === 'mobile' && (
+        <div className="lg:hidden fixed inset-0 z-50" style={{ background: 'rgba(0,0,0,0.3)', touchAction: 'none' }} onClick={() => setShowWidgetSettings(false)}>
+          <div className="absolute bottom-0 left-0 right-0 flex flex-col overflow-hidden"
+            style={{ maxHeight: '80vh', background: 'var(--bg-card)', borderRadius: '20px 20px 0 0', overscrollBehavior: 'contain' }}
+            onClick={e => e.stopPropagation()}>
+            <div className="flex items-center justify-between px-4 py-3" style={{ borderBottom: '1px solid var(--border-secondary)' }}>
+              <span className="text-sm font-semibold" style={{ color: 'var(--text-primary)' }}>Widgets</span>
+              <button onClick={() => setShowWidgetSettings(false)} className="w-7 h-7 rounded-full flex items-center justify-center" style={{ background: 'var(--bg-secondary)' }}>
+                <X size={14} style={{ color: 'var(--text-primary)' }} />
+              </button>
+            </div>
+            <div className="flex-1 overflow-auto p-4 space-y-4">
+              {showCurrency && <CurrencyWidget />}
+              {showTimezone && <TimezoneWidget />}
+            </div>
+          </div>
+        </div>
+      )}
+
      <TripFormModal
        isOpen={showForm}
        onClose={() => { setShowForm(false); setEditingTrip(null) }}
@@ -5,8 +5,10 @@ import { tripsApi, placesApi } from '../api/client'
 import Navbar from '../components/Layout/Navbar'
 import FileManager from '../components/Files/FileManager'
 import { ArrowLeft } from 'lucide-react'
+import { useTranslation } from '../i18n'

 export default function FilesPage() {
+  const { t } = useTranslation()
  const { id: tripId } = useParams()
  const navigate = useNavigate()
  const tripStore = useTripStore()
@@ -61,7 +63,7 @@ export default function FilesPage() {
    <div className="min-h-screen bg-slate-50">
      <Navbar tripTitle={trip?.title} tripId={tripId} showBack onBack={() => navigate(`/trips/${tripId}`)} />

-      <div className="pt-14">
+      <div style={{ paddingTop: 'var(--nav-h)' }}>
        <div className="max-w-5xl mx-auto px-4 py-6">
          <div className="flex items-center gap-3 mb-6">
            <Link
@@ -69,7 +71,7 @@ export default function FilesPage() {
              className="flex items-center gap-1 text-sm text-gray-500 hover:text-gray-700"
            >
              <ArrowLeft className="w-4 h-4" />
-              Zurück zur Planung
+              {t('common.backToPlanning')}
            </Link>
          </div>

@@ -29,9 +29,11 @@ export default function LoginPage() {
      }
    })

-    // Handle OIDC callback token
+    // Handle OIDC callback token (via URL fragment to avoid logging)
+    const hash = window.location.hash.substring(1)
+    const hashParams = new URLSearchParams(hash)
+    const token = hashParams.get('token')
    const params = new URLSearchParams(window.location.search)
-    const token = params.get('token')
    const oidcError = params.get('oidc_error')
    if (token) {
      localStorage.setItem('auth_token', token)
@@ -42,10 +44,10 @@ export default function LoginPage() {
    }
    if (oidcError) {
      const errorMessages = {
-        registration_disabled: language === 'de' ? 'Registrierung ist deaktiviert. Kontaktiere den Administrator.' : 'Registration is disabled. Contact your administrator.',
-        no_email: language === 'de' ? 'Keine E-Mail vom Provider erhalten.' : 'No email received from provider.',
-        token_failed: language === 'de' ? 'Authentifizierung fehlgeschlagen.' : 'Authentication failed.',
-        invalid_state: language === 'de' ? 'Ungueltige Sitzung. Bitte erneut versuchen.' : 'Invalid session. Please try again.',
+        registration_disabled: t('login.oidc.registrationDisabled'),
+        no_email: t('login.oidc.noEmail'),
+        token_failed: t('login.oidc.tokenFailed'),
+        invalid_state: t('login.oidc.invalidState'),
      }
      setError(errorMessages[oidcError] || oidcError)
      window.history.replaceState({}, '', '/login')
@@ -57,14 +59,17 @@ export default function LoginPage() {
    setIsLoading(true)
    try {
      await demoLogin()
-      navigate('/dashboard')
+      setShowTakeoff(true)
+      setTimeout(() => navigate('/dashboard'), 2600)
    } catch (err) {
-      setError(err.message || 'Demo-Login fehlgeschlagen')
+      setError(err.message || t('login.demoFailed'))
    } finally {
      setIsLoading(false)
    }
  }

+  const [showTakeoff, setShowTakeoff] = useState(false)
+
  const handleSubmit = async (e) => {
    e.preventDefault()
    setError('')
@@ -77,10 +82,10 @@ export default function LoginPage() {
      } else {
        await login(email, password)
      }
-      navigate('/dashboard')
+      setShowTakeoff(true)
+      setTimeout(() => navigate('/dashboard'), 2600)
    } catch (err) {
      setError(err.message || t('login.error'))
-    } finally {
      setIsLoading(false)
    }
  }
@@ -93,6 +98,157 @@ export default function LoginPage() {
    color: '#111827', background: 'white', boxSizing: 'border-box', transition: 'border-color 0.15s',
  }

+  if (showTakeoff) {
+    return (
+      <div className="takeoff-overlay" style={{ position: 'fixed', inset: 0, zIndex: 99999, overflow: 'hidden' }}>
+        {/* Sky gradient */}
+        <div className="takeoff-sky" style={{ position: 'absolute', inset: 0 }} />
+
+        {/* Stars */}
+        {Array.from({ length: 60 }, (_, i) => (
+          <div key={i} className="takeoff-star" style={{
+            position: 'absolute',
+            width: Math.random() > 0.7 ? 3 : 1.5,
+            height: Math.random() > 0.7 ? 3 : 1.5,
+            borderRadius: '50%',
+            background: 'white',
+            top: `${Math.random() * 100}%`,
+            left: `${Math.random() * 100}%`,
+            animationDelay: `${0.3 + Math.random() * 0.5}s, ${Math.random() * 1}s`,
+          }} />
+        ))}
+
+        {/* Clouds rushing past */}
+        {[0, 1, 2, 3, 4].map(i => (
+          <div key={i} className="takeoff-cloud" style={{
+            position: 'absolute',
+            width: 120 + i * 40,
+            height: 40 + i * 10,
+            borderRadius: '50%',
+            background: 'rgba(255,255,255,0.15)',
+            filter: 'blur(8px)',
+            right: -200,
+            top: `${25 + i * 12}%`,
+            animationDelay: `${0.3 + i * 0.25}s`,
+          }} />
+        ))}
+
+        {/* Speed lines */}
+        {Array.from({ length: 12 }, (_, i) => (
+          <div key={i} className="takeoff-speedline" style={{
+            position: 'absolute',
+            width: 80 + Math.random() * 120,
+            height: 1.5,
+            background: 'linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent)',
+            top: `${10 + Math.random() * 80}%`,
+            right: -200,
+            animationDelay: `${0.5 + i * 0.12}s`,
+          }} />
+        ))}
+
+        {/* Plane */}
+        <div className="takeoff-plane" style={{ position: 'absolute', left: '50%', bottom: '10%', transform: 'translate(-50%, 0)' }}>
+          <svg viewBox="0 0 480 120" style={{ width: 200, filter: 'drop-shadow(0 0 20px rgba(255,255,255,0.3))' }}>
+            <g fill="white" transform="translate(240,60) rotate(-12)">
+              <ellipse cx="0" cy="0" rx="120" ry="12" />
+              <path d="M-20,-10 L-60,-55 L-40,-55 L0,-15 Z" />
+              <path d="M-20,10 L-60,55 L-40,55 L0,15 Z" />
+              <path d="M-100,-5 L-120,-30 L-108,-30 L-90,-8 Z" />
+              <path d="M-100,5 L-120,30 L-108,30 L-90,8 Z" />
+              <ellipse cx="60" cy="0" rx="18" ry="8" />
+            </g>
+          </svg>
+        </div>
+
+        {/* Contrail */}
+        <div className="takeoff-trail" style={{
+          position: 'absolute', left: '50%', bottom: '8%',
+          width: 3, height: 0, background: 'linear-gradient(to top, transparent, rgba(255,255,255,0.5))',
+          transformOrigin: 'bottom center',
+        }} />
+
+        {/* Logo fade in + burst */}
+        <div className="takeoff-logo" style={{
+          position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)',
+          display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 8,
+        }}>
+          <img src="/logo-light.svg" alt="NOMAD" style={{ height: 72 }} />
+          <p style={{ margin: 0, fontSize: 20, color: 'rgba(255,255,255,0.6)', fontFamily: "'MuseoModerno', sans-serif", textTransform: 'lowercase', whiteSpace: 'nowrap' }}>{t('login.tagline')}</p>
+        </div>
+
+
+        <style>{`
+          .takeoff-sky {
+            background: linear-gradient(to top, #1a1a2e 0%, #16213e 30%, #0f3460 60%, #0a0a23 100%);
+            animation: skyShift 2.6s ease-in-out forwards;
+          }
+          @keyframes skyShift {
+            0%   { background: linear-gradient(to top, #0a0a23 0%, #0f172a 40%, #111827 100%); }
+            100% { background: linear-gradient(to top, #000011 0%, #000016 50%, #000011 100%); }
+          }
+
+          .takeoff-star {
+            opacity: 0;
+            animation: starAppear 0.5s ease-out forwards, starTwinkle 2s ease-in-out infinite alternate;
+          }
+          @keyframes starAppear {
+            0%   { opacity: 0; transform: scale(0); }
+            100% { opacity: 0.7; transform: scale(1); }
+          }
+          @keyframes starTwinkle {
+            0%   { opacity: 0.3; }
+            100% { opacity: 0.9; }
+          }
+
+          .takeoff-cloud {
+            animation: cloudRush 0.6s ease-in forwards;
+          }
+          @keyframes cloudRush {
+            0%   { right: -200px; opacity: 0; }
+            20%  { opacity: 0.4; }
+            100% { right: 120%; opacity: 0; }
+          }
+
+          .takeoff-speedline {
+            animation: speedRush 0.4s ease-in forwards;
+          }
+          @keyframes speedRush {
+            0%   { right: -200px; opacity: 0; }
+            30%  { opacity: 0.6; }
+            100% { right: 120%; opacity: 0; }
+          }
+
+          .takeoff-plane {
+            animation: planeUp 1s ease-in forwards;
+          }
+          @keyframes planeUp {
+            0%   { transform: translate(-50%, 0) rotate(0deg) scale(1); bottom: 8%; left: 50%; opacity: 1; }
+            100% { transform: translate(-50%, 0) rotate(-22deg) scale(0.15); bottom: 120%; left: 58%; opacity: 0; }
+          }
+
+          .takeoff-trail {
+            animation: trailGrow 0.9s ease-out 0.15s forwards;
+          }
+          @keyframes trailGrow {
+            0%   { height: 0; opacity: 0; transform: translateX(-50%) rotate(-5deg); }
+            30%  { height: 150px; opacity: 0.6; }
+            60%  { height: 350px; opacity: 0.4; }
+            100% { height: 600px; opacity: 0; transform: translateX(-50%) rotate(-8deg); }
+          }
+
+          .takeoff-logo {
+            opacity: 0;
+            animation: logoReveal 0.5s ease-out 0.9s forwards;
+          }
+          @keyframes logoReveal {
+            0%   { opacity: 0; transform: translate(-50%, -40%) scale(0.9); }
+            100% { opacity: 1; transform: translate(-50%, -50%) scale(1); }
+          }
+        `}</style>
+      </div>
+    )
+  }
+
  return (
    <div style={{ minHeight: '100vh', display: 'flex', fontFamily: "-apple-system, BlinkMacSystemFont, 'SF Pro Text', system-ui, sans-serif", position: 'relative' }}>

@@ -213,14 +369,11 @@ export default function LoginPage() {

        <div style={{ position: 'relative', zIndex: 1, maxWidth: 560, textAlign: 'center' }}>
          {/* Logo */}
-          <div style={{ display: 'flex', alignItems: 'center', gap: 12, marginBottom: 48, justifyContent: 'center' }}>
-            <div style={{ width: 48, height: 48, background: 'white', borderRadius: 14, display: 'flex', alignItems: 'center', justifyContent: 'center', boxShadow: '0 0 30px rgba(255,255,255,0.1)' }}>
-              <Plane size={24} style={{ color: '#0f172a' }} />
-            </div>
-            <span style={{ fontSize: 28, fontWeight: 800, color: 'white', letterSpacing: '-0.02em' }}>NOMAD</span>
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', marginBottom: 48 }}>
+            <img src="/logo-light.svg" alt="NOMAD" style={{ height: 64 }} />
          </div>

-          <h2 style={{ margin: '0 0 12px', fontSize: 36, fontWeight: 800, color: 'white', lineHeight: 1.15, letterSpacing: '-0.02em' }}>
+          <h2 style={{ margin: '0 0 12px', fontSize: 36, fontWeight: 700, color: 'white', lineHeight: 1.15, letterSpacing: '-0.02em', fontFamily: "'MuseoModerno', sans-serif", textTransform: 'lowercase' }}>
            {t('login.tagline')}
          </h2>
          <p style={{ margin: '0 0 44px', fontSize: 15, color: 'rgba(255,255,255,0.5)', lineHeight: 1.7 }}>
@@ -259,13 +412,11 @@ export default function LoginPage() {
        <div style={{ width: '100%', maxWidth: 400 }}>

          {/* Mobile logo */}
-          <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 36, justifyContent: 'center' }}
+          <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 6, marginBottom: 36 }}
            className="mobile-logo">
            <style>{`@media(min-width:1024px){.mobile-logo{display:none!important}}`}</style>
-            <div style={{ width: 36, height: 36, background: '#111827', borderRadius: 10, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-              <Plane size={18} style={{ color: 'white' }} />
-            </div>
-            <span style={{ fontSize: 22, fontWeight: 800, color: '#111827', letterSpacing: '-0.02em' }}>NOMAD</span>
+            <img src="/logo-dark.svg" alt="NOMAD" style={{ height: 48 }} />
+            <p style={{ margin: 0, fontSize: 16, color: '#9ca3af', fontFamily: "'MuseoModerno', sans-serif", textTransform: 'lowercase', whiteSpace: 'nowrap' }}>{t('login.tagline')}</p>
          </div>

          <div style={{ background: 'white', borderRadius: 20, border: '1px solid #e5e7eb', padding: '36px 32px', boxShadow: '0 2px 16px rgba(0,0,0,0.06)' }}>
@@ -344,7 +495,7 @@ export default function LoginPage() {
              >
                {isLoading
                  ? <><div style={{ width: 15, height: 15, border: '2px solid rgba(255,255,255,0.3)', borderTopColor: 'white', borderRadius: '50%', animation: 'spin 0.7s linear infinite' }} />{mode === 'register' ? t('login.creating') : t('login.signingIn')}</>
-                  : mode === 'register' ? t('login.createAccount') : t('login.signIn')
+                  : <><Plane size={16} />{mode === 'register' ? t('login.createAccount') : t('login.signIn')}</>
                }
              </button>
            </form>
@@ -366,7 +517,7 @@ export default function LoginPage() {
            <>
              <div style={{ display: 'flex', alignItems: 'center', gap: 12, marginTop: 16 }}>
                <div style={{ flex: 1, height: 1, background: '#e5e7eb' }} />
-                <span style={{ fontSize: 12, color: '#9ca3af' }}>{language === 'de' ? 'oder' : 'or'}</span>
+                <span style={{ fontSize: 12, color: '#9ca3af' }}>{t('common.or')}</span>
                <div style={{ flex: 1, height: 1, background: '#e5e7eb' }} />
              </div>
              <a href="/api/auth/oidc/login"
@@ -383,7 +534,7 @@ export default function LoginPage() {
                onMouseLeave={e => { e.currentTarget.style.background = 'white'; e.currentTarget.style.borderColor = '#d1d5db' }}
              >
                <Shield size={16} />
-                {language === 'de' ? `Anmelden mit ${appConfig.oidc_display_name}` : `Sign in with ${appConfig.oidc_display_name}`}
+                {t('login.oidcSignIn', { name: appConfig.oidc_display_name })}
              </a>
            </>
          )}
@@ -404,7 +555,7 @@ export default function LoginPage() {
              onMouseLeave={e => { e.currentTarget.style.transform = 'translateY(0)'; e.currentTarget.style.boxShadow = '0 2px 12px rgba(245, 158, 11, 0.3)' }}
            >
              <Plane size={18} />
-              Demo ausprobieren — ohne Registrierung
+              {t('login.demoHint')}
            </button>
          )}
        </div>
@@ -5,8 +5,10 @@ import { tripsApi, daysApi, placesApi } from '../api/client'
 import Navbar from '../components/Layout/Navbar'
 import PhotoGallery from '../components/Photos/PhotoGallery'
 import { ArrowLeft } from 'lucide-react'
+import { useTranslation } from '../i18n'

 export default function PhotosPage() {
+  const { t } = useTranslation()
  const { id: tripId } = useParams()
  const navigate = useNavigate()
  const tripStore = useTripStore()
@@ -71,7 +73,7 @@ export default function PhotosPage() {
    <div className="min-h-screen bg-slate-50">
      <Navbar tripTitle={trip?.title} tripId={tripId} showBack onBack={() => navigate(`/trips/${tripId}`)} />

-      <div className="pt-14">
+      <div style={{ paddingTop: 'var(--nav-h)' }}>
        <div className="max-w-7xl mx-auto px-4 py-6">
          {/* Header */}
          <div className="flex items-center gap-3 mb-6">
@@ -80,7 +82,7 @@ export default function PhotosPage() {
              className="flex items-center gap-1 text-sm text-gray-500 hover:text-gray-700"
            >
              <ArrowLeft className="w-4 h-4" />
-              Zurück zur Planung
+              {t('common.backToPlanning')}
            </Link>
          </div>

@@ -1,9 +1,11 @@
 import React, { useState } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
 import { useAuthStore } from '../store/authStore'
+import { useTranslation } from '../i18n'
 import { Map, Eye, EyeOff, Mail, Lock, User } from 'lucide-react'

 export default function RegisterPage() {
+  const { t } = useTranslation()
  const [username, setUsername] = useState('')
  const [email, setEmail] = useState('')
  const [password, setPassword] = useState('')
@@ -20,12 +22,12 @@ export default function RegisterPage() {
    setError('')

    if (password !== confirmPassword) {
-      setError('Passwörter stimmen nicht überein')
+      setError(t('register.passwordMismatch'))
      return
    }

    if (password.length < 6) {
-      setError('Passwort muss mindestens 6 Zeichen lang sein')
+      setError(t('register.passwordTooShort'))
      return
    }

@@ -34,7 +36,7 @@ export default function RegisterPage() {
      await register(username, email, password)
      navigate('/dashboard')
    } catch (err) {
-      setError(err.message || 'Registrierung fehlgeschlagen')
+      setError(err.message || t('register.failed'))
    } finally {
      setIsLoading(false)
    }
@@ -48,19 +50,19 @@ export default function RegisterPage() {
          <div className="w-20 h-20 bg-white/10 rounded-2xl flex items-center justify-center mx-auto mb-6">
            <Map className="w-10 h-10 text-white" />
          </div>
-          <h1 className="text-4xl font-bold mb-4">Jetzt starten</h1>
+          <h1 className="text-4xl font-bold mb-4">{t('register.getStarted')}</h1>
          <p className="text-slate-300 text-lg leading-relaxed">
-            Erstellen Sie ein Konto und beginnen Sie, Ihre Traumreisen zu planen.
+            {t('register.subtitle')}
          </p>

          <div className="mt-10 space-y-3 text-left">
            {[
-              '✓ Unbegrenzte Reisepläne',
-              '✓ Interaktive Kartenansicht',
-              '✓ Orte und Kategorien verwalten',
-              '✓ Reservierungen tracken',
-              '✓ Packlisten erstellen',
-              '✓ Fotos und Dateien speichern',
+              `✓ ${t('register.feature1')}`,
+              `✓ ${t('register.feature2')}`,
+              `✓ ${t('register.feature3')}`,
+              `✓ ${t('register.feature4')}`,
+              `✓ ${t('register.feature5')}`,
+              `✓ ${t('register.feature6')}`,
            ].map(item => (
              <p key={item} className="text-slate-200 text-sm">{item}</p>
            ))}
@@ -77,8 +79,8 @@ export default function RegisterPage() {
          </div>

          <div className="bg-white rounded-2xl shadow-sm border border-slate-200 p-8">
-            <h2 className="text-2xl font-bold text-slate-900 mb-1">Konto erstellen</h2>
-            <p className="text-slate-500 mb-8">Beginnen Sie Ihre Reiseplanung</p>
+            <h2 className="text-2xl font-bold text-slate-900 mb-1">{t('register.createAccount')}</h2>
+            <p className="text-slate-500 mb-8">{t('register.startPlanning')}</p>

            <form onSubmit={handleSubmit} className="space-y-5">
              {error && (
@@ -88,7 +90,7 @@ export default function RegisterPage() {
              )}

              <div>
-                <label className="block text-sm font-medium text-slate-700 mb-1.5">Benutzername</label>
+                <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('settings.username')}</label>
                <div className="relative">
                  <User className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-slate-400" />
                  <input
@@ -96,7 +98,7 @@ export default function RegisterPage() {
                    value={username}
                    onChange={e => setUsername(e.target.value)}
                    required
-                    placeholder="maxmustermann"
+                    placeholder="johndoe"
                    minLength={3}
                    className="w-full pl-10 pr-4 py-2.5 border border-slate-300 rounded-lg text-slate-900 placeholder-slate-400 focus:ring-2 focus:ring-slate-400 focus:border-transparent transition-all"
                  />
@@ -104,7 +106,7 @@ export default function RegisterPage() {
              </div>

              <div>
-                <label className="block text-sm font-medium text-slate-700 mb-1.5">E-Mail</label>
+                <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('common.email')}</label>
                <div className="relative">
                  <Mail className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-slate-400" />
                  <input
@@ -112,14 +114,14 @@ export default function RegisterPage() {
                    value={email}
                    onChange={e => setEmail(e.target.value)}
                    required
-                    placeholder="ihre@email.de"
+                    placeholder="your@email.com"
                    className="w-full pl-10 pr-4 py-2.5 border border-slate-300 rounded-lg text-slate-900 placeholder-slate-400 focus:ring-2 focus:ring-slate-400 focus:border-transparent transition-all"
                  />
                </div>
              </div>

              <div>
-                <label className="block text-sm font-medium text-slate-700 mb-1.5">Passwort</label>
+                <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('common.password')}</label>
                <div className="relative">
                  <Lock className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-slate-400" />
                  <input
@@ -127,7 +129,7 @@ export default function RegisterPage() {
                    value={password}
                    onChange={e => setPassword(e.target.value)}
                    required
-                    placeholder="Mind. 6 Zeichen"
+                    placeholder={t('register.minChars')}
                    className="w-full pl-10 pr-12 py-2.5 border border-slate-300 rounded-lg text-slate-900 placeholder-slate-400 focus:ring-2 focus:ring-slate-400 focus:border-transparent transition-all"
                  />
                  <button
@@ -141,7 +143,7 @@ export default function RegisterPage() {
              </div>

              <div>
-                <label className="block text-sm font-medium text-slate-700 mb-1.5">Passwort bestätigen</label>
+                <label className="block text-sm font-medium text-slate-700 mb-1.5">{t('register.confirmPassword')}</label>
                <div className="relative">
                  <Lock className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-slate-400" />
                  <input
@@ -149,7 +151,7 @@ export default function RegisterPage() {
                    value={confirmPassword}
                    onChange={e => setConfirmPassword(e.target.value)}
                    required
-                    placeholder="Passwort wiederholen"
+                    placeholder={t('register.repeatPassword')}
                    className="w-full pl-10 pr-4 py-2.5 border border-slate-300 rounded-lg text-slate-900 placeholder-slate-400 focus:ring-2 focus:ring-slate-400 focus:border-transparent transition-all"
                  />
                </div>
@@ -163,17 +165,17 @@ export default function RegisterPage() {
                {isLoading ? (
                  <>
                    <div className="w-4 h-4 border-2 border-white/30 border-t-white rounded-full animate-spin"></div>
-                    Registrieren...
+                    {t('register.registering')}
                  </>
-                ) : 'Registrieren'}
+                ) : t('register.register')}
              </button>
            </form>

            <div className="mt-6 text-center">
              <p className="text-sm text-slate-500">
-                Bereits ein Konto?{' '}
+                {t('register.hasAccount')}{' '}
                <Link to="/login" className="text-slate-900 hover:text-slate-700 font-medium">
-                  Anmelden
+                  {t('register.signIn')}
                </Link>
              </p>
            </div>
@@ -6,7 +6,7 @@ import { useTranslation } from '../i18n'
 import Navbar from '../components/Layout/Navbar'
 import CustomSelect from '../components/shared/CustomSelect'
 import { useToast } from '../components/shared/Toast'
-import { Save, Map, Palette, User, Moon, Sun, Shield, Camera, Trash2, Lock } from 'lucide-react'
+import { Save, Map, Palette, User, Moon, Sun, Monitor, Shield, Camera, Trash2, Lock } from 'lucide-react'
 import { authApi, adminApi } from '../api/client'

 const MAP_PRESETS = [
@@ -136,7 +136,7 @@ export default function SettingsPage() {
    <div className="min-h-screen" style={{ background: 'var(--bg-secondary)' }}>
      <Navbar />

-      <div className="pt-14">
+      <div style={{ paddingTop: 'var(--nav-h)' }}>
        <div className="max-w-2xl mx-auto px-4 py-8 space-y-6">
          <div>
            <h1 className="text-2xl font-bold" style={{ color: 'var(--text-primary)' }}>{t('settings.title')}</h1>
@@ -208,30 +208,35 @@ export default function SettingsPage() {
              <label className="block text-sm font-medium mb-2" style={{ color: 'var(--text-secondary)' }}>{t('settings.colorMode')}</label>
              <div className="flex gap-3">
                {[
-                  { value: false, label: t('settings.light'), icon: Sun },
-                  { value: true, label: t('settings.dark'), icon: Moon },
-                ].map(opt => (
-                  <button
-                    key={String(opt.value)}
-                    onClick={async () => {
-                      try {
-                        await updateSetting('dark_mode', opt.value)
-                      } catch (e) { toast.error(e.message) }
-                    }}
-                    style={{
-                      display: 'flex', alignItems: 'center', gap: 8,
-                      padding: '10px 20px', borderRadius: 10, cursor: 'pointer',
-                      fontFamily: 'inherit', fontSize: 14, fontWeight: 500,
-                      border: settings.dark_mode === opt.value ? '2px solid var(--text-primary)' : '2px solid var(--border-primary)',
-                      background: settings.dark_mode === opt.value ? 'var(--bg-hover)' : 'var(--bg-card)',
-                      color: 'var(--text-primary)',
-                      transition: 'all 0.15s',
-                    }}
-                  >
-                    <opt.icon size={16} />
-                    {opt.label}
-                  </button>
-                ))}
+                  { value: 'light', label: t('settings.light'), icon: Sun },
+                  { value: 'dark', label: t('settings.dark'), icon: Moon },
+                  { value: 'auto', label: t('settings.auto'), icon: Monitor },
+                ].map(opt => {
+                  const current = settings.dark_mode
+                  const isActive = current === opt.value || (opt.value === 'light' && current === false) || (opt.value === 'dark' && current === true)
+                  return (
+                    <button
+                      key={opt.value}
+                      onClick={async () => {
+                        try {
+                          await updateSetting('dark_mode', opt.value)
+                        } catch (e) { toast.error(e.message) }
+                      }}
+                      style={{
+                        display: 'flex', alignItems: 'center', gap: 8,
+                        padding: '10px 20px', borderRadius: 10, cursor: 'pointer',
+                        fontFamily: 'inherit', fontSize: 14, fontWeight: 500,
+                        border: isActive ? '2px solid var(--text-primary)' : '2px solid var(--border-primary)',
+                        background: isActive ? 'var(--bg-hover)' : 'var(--bg-card)',
+                        color: 'var(--text-primary)',
+                        transition: 'all 0.15s',
+                      }}
+                    >
+                      <opt.icon size={16} />
+                      {opt.label}
+                    </button>
+                  )
+                })}
              </div>
            </div>

@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react'
+import ReactDOM from 'react-dom'
 import { useParams, useNavigate } from 'react-router-dom'
 import { useTripStore } from '../store/tripStore'
 import { useSettingsStore } from '../store/settingsStore'
@@ -6,6 +7,7 @@ import { MapView } from '../components/Map/MapView'
 import DayPlanSidebar from '../components/Planner/DayPlanSidebar'
 import PlacesSidebar from '../components/Planner/PlacesSidebar'
 import PlaceInspector from '../components/Planner/PlaceInspector'
+import DayDetailPanel from '../components/Planner/DayDetailPanel'
 import PlaceFormModal from '../components/Planner/PlaceFormModal'
 import TripFormModal from '../components/Trips/TripFormModal'
 import TripMembersModal from '../components/Trips/TripMembersModal'
@@ -19,6 +21,7 @@ import { useToast } from '../components/shared/Toast'
 import { Map, X, PanelLeftClose, PanelLeftOpen, PanelRightClose, PanelRightOpen } from 'lucide-react'
 import { useTranslation } from '../i18n'
 import { joinTrip, leaveTrip, addListener, removeListener } from '../api/websocket'
+import { addonsApi, accommodationsApi } from '../api/client'

 const MIN_SIDEBAR = 200
 const MAX_SIDEBAR = 520
@@ -32,12 +35,27 @@ export default function TripPlannerPage() {
  const tripStore = useTripStore()
  const { trip, days, places, assignments, packingItems, categories, reservations, budgetItems, files, selectedDayId, isLoading } = tripStore

+  const [enabledAddons, setEnabledAddons] = useState({ packing: true, budget: true, documents: true })
+  const [tripAccommodations, setTripAccommodations] = useState([])
+
+  const loadAccommodations = useCallback(() => {
+    if (tripId) accommodationsApi.list(tripId).then(d => setTripAccommodations(d.accommodations || [])).catch(() => {})
+  }, [tripId])
+
+  useEffect(() => {
+    addonsApi.enabled().then(data => {
+      const map = {}
+      data.addons.forEach(a => { map[a.id] = true })
+      setEnabledAddons({ packing: !!map.packing, budget: !!map.budget, documents: !!map.documents })
+    }).catch(() => {})
+  }, [])
+
  const TRIP_TABS = [
    { id: 'plan', label: t('trip.tabs.plan') },
-    { id: 'buchungen', label: t('trip.tabs.reservations') },
-    { id: 'packliste', label: t('trip.tabs.packing'), shortLabel: t('trip.tabs.packingShort') },
-    { id: 'finanzplan', label: t('trip.tabs.budget') },
-    { id: 'dateien', label: t('trip.tabs.files') },
+    { id: 'buchungen', label: t('trip.tabs.reservations'), shortLabel: t('trip.tabs.reservationsShort') },
+    ...(enabledAddons.packing ? [{ id: 'packliste', label: t('trip.tabs.packing'), shortLabel: t('trip.tabs.packingShort') }] : []),
+    ...(enabledAddons.budget ? [{ id: 'finanzplan', label: t('trip.tabs.budget') }] : []),
+    ...(enabledAddons.documents ? [{ id: 'dateien', label: t('trip.tabs.files') }] : []),
  ]

  const [activeTab, setActiveTab] = useState('plan')
@@ -51,10 +69,24 @@ export default function TripPlannerPage() {
  const [rightWidth, setRightWidth] = useState(() => parseInt(localStorage.getItem('sidebarRightWidth')) || 300)
  const [leftCollapsed, setLeftCollapsed] = useState(false)
  const [rightCollapsed, setRightCollapsed] = useState(false)
+  const [showDayDetail, setShowDayDetail] = useState(null) // day object or null
  const isResizingLeft = useRef(false)
  const isResizingRight = useRef(false)

-  const [selectedPlaceId, setSelectedPlaceId] = useState(null)
+  const [selectedPlaceId, _setSelectedPlaceId] = useState(null)
+  const [selectedAssignmentId, setSelectedAssignmentId] = useState(null)
+
+  // Set place selection - from PlacesSidebar/Map (no assignment context)
+  const setSelectedPlaceId = useCallback((placeId) => {
+    _setSelectedPlaceId(placeId)
+    setSelectedAssignmentId(null)
+  }, [])
+
+  // Set assignment selection - from DayPlanSidebar (specific assignment)
+  const selectAssignment = useCallback((assignmentId, placeId) => {
+    setSelectedAssignmentId(assignmentId)
+    _setSelectedPlaceId(placeId)
+  }, [])
  const [showPlaceForm, setShowPlaceForm] = useState(false)
  const [editingPlace, setEditingPlace] = useState(null)
  const [showTripForm, setShowTripForm] = useState(false)
@@ -71,6 +103,7 @@ export default function TripPlannerPage() {
    if (tripId) {
      tripStore.loadTrip(tripId).catch(() => { toast.error(t('trip.toast.loadError')); navigate('/dashboard') })
      tripStore.loadFiles(tripId)
+      loadAccommodations()
    }
  }, [tripId])

@@ -121,13 +154,8 @@ export default function TripPlannerPage() {
    return places.filter(p => p.lat && p.lng)
  }, [places])

-  const handleSelectDay = useCallback((dayId) => {
-    tripStore.setSelectedDay(dayId)
-    setRouteInfo(null)
-    setFitKey(k => k + 1)
-    setMobileSidebarOpen(null)
-
-    // Auto-show Luftlinien for the selected day
+  const updateRouteForDay = useCallback((dayId) => {
+    if (!dayId) { setRoute(null); setRouteInfo(null); return }
    const da = (tripStore.assignments[String(dayId)] || []).slice().sort((a, b) => a.order_index - b.order_index)
    const waypoints = da.map(a => a.place).filter(p => p?.lat && p?.lng)
    if (waypoints.length >= 2) {
@@ -135,12 +163,26 @@ export default function TripPlannerPage() {
    } else {
      setRoute(null)
    }
+    setRouteInfo(null)
  }, [tripStore])

-  const handlePlaceClick = useCallback((placeId) => {
-    setSelectedPlaceId(placeId)
-    if (placeId) { setLeftCollapsed(false); setRightCollapsed(false) }
-  }, [])
+  const handleSelectDay = useCallback((dayId, skipFit) => {
+    const changed = dayId !== selectedDayId
+    tripStore.setSelectedDay(dayId)
+    if (changed && !skipFit) setFitKey(k => k + 1)
+    setMobileSidebarOpen(null)
+    updateRouteForDay(dayId)
+  }, [tripStore, updateRouteForDay, selectedDayId])
+
+  const handlePlaceClick = useCallback((placeId, assignmentId) => {
+    if (assignmentId) {
+      selectAssignment(assignmentId, placeId)
+    } else {
+      setSelectedPlaceId(placeId)
+    }
+    if (placeId) { setShowDayDetail(null); setLeftCollapsed(false); setRightCollapsed(false) }
+    updateRouteForDay(selectedDayId)
+  }, [selectedDayId, updateRouteForDay, selectAssignment, setSelectedPlaceId])

  const handleMarkerClick = useCallback((placeId) => {
    const opening = placeId !== undefined
@@ -153,11 +195,30 @@ export default function TripPlannerPage() {
  }, [])

  const handleSavePlace = useCallback(async (data) => {
+    const pendingFiles = data._pendingFiles
+    delete data._pendingFiles
    if (editingPlace) {
      await tripStore.updatePlace(tripId, editingPlace.id, data)
+      // Upload pending files with place_id
+      if (pendingFiles?.length > 0) {
+        for (const file of pendingFiles) {
+          const fd = new FormData()
+          fd.append('file', file)
+          fd.append('place_id', editingPlace.id)
+          try { await tripStore.addFile(tripId, fd) } catch {}
+        }
+      }
      toast.success(t('trip.toast.placeUpdated'))
    } else {
-      await tripStore.addPlace(tripId, data)
+      const place = await tripStore.addPlace(tripId, data)
+      if (pendingFiles?.length > 0 && place?.id) {
+        for (const file of pendingFiles) {
+          const fd = new FormData()
+          fd.append('file', file)
+          fd.append('place_id', place.id)
+          try { await tripStore.addFile(tripId, fd) } catch {}
+        }
+      }
      toast.success(t('trip.toast.placeAdded'))
    }
  }, [editingPlace, tripId, tripStore, toast])
@@ -177,16 +238,29 @@ export default function TripPlannerPage() {
    try {
      await tripStore.assignPlaceToDay(tripId, target, placeId, position)
      toast.success(t('trip.toast.assignedToDay'))
+      updateRouteForDay(target)
    } catch (err) { toast.error(err.message) }
-  }, [selectedDayId, tripId, tripStore, toast])
+  }, [selectedDayId, tripId, tripStore, toast, updateRouteForDay])

  const handleRemoveAssignment = useCallback(async (dayId, assignmentId) => {
-    try { await tripStore.removeAssignment(tripId, dayId, assignmentId) }
+    try {
+      await tripStore.removeAssignment(tripId, dayId, assignmentId)
+      updateRouteForDay(dayId)
+    }
    catch (err) { toast.error(err.message) }
-  }, [tripId, tripStore, toast])
+  }, [tripId, tripStore, toast, updateRouteForDay])

-  const handleReorder = useCallback(async (dayId, orderedIds) => {
-    try { await tripStore.reorderAssignments(tripId, dayId, orderedIds) }
+  const handleReorder = useCallback((dayId, orderedIds) => {
+    try {
+      tripStore.reorderAssignments(tripId, dayId, orderedIds).catch(() => {})
+      // Update route immediately from orderedIds
+      const dayItems = tripStore.assignments[String(dayId)] || []
+      const ordered = orderedIds.map(id => dayItems.find(a => a.id === id)).filter(Boolean)
+      const waypoints = ordered.map(a => a.place).filter(p => p?.lat && p?.lng)
+      if (waypoints.length >= 2) setRoute(waypoints.map(p => [p.lat, p.lng]))
+      else setRoute(null)
+      setRouteInfo(null)
+    }
    catch { toast.error(t('trip.toast.reorderError')) }
  }, [tripId, tripStore, toast])

@@ -224,10 +298,21 @@ export default function TripPlannerPage() {
    const da = assignments[String(selectedDayId)] || []
    const sorted = [...da].sort((a, b) => a.order_index - b.order_index)
    const map = {}
-    sorted.forEach((a, i) => { if (a.place?.id) map[a.place.id] = i + 1 })
+    sorted.forEach((a, i) => {
+      if (!a.place?.id) return
+      if (!map[a.place.id]) map[a.place.id] = []
+      map[a.place.id].push(i + 1)
+    })
    return map
  }, [selectedDayId, assignments])

+  // Places assigned to selected day (with coords) — used for map fitting
+  const dayPlaces = useMemo(() => {
+    if (!selectedDayId) return []
+    const da = assignments[String(selectedDayId)] || []
+    return da.map(a => a.place).filter(p => p?.lat && p?.lng)
+  }, [selectedDayId, assignments])
+
  const mapTileUrl = settings.map_tile_url || 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png'
  const defaultCenter = [settings.default_lat || 48.8566, settings.default_lng || 2.3522]
  const defaultZoom = settings.default_zoom || 10
@@ -247,11 +332,11 @@ export default function TripPlannerPage() {
  if (!trip) return null

  return (
-    <div style={{ height: '100vh', display: 'flex', flexDirection: 'column', overflow: 'hidden', ...fontStyle }}>
+    <div style={{ position: 'fixed', inset: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden', ...fontStyle }}>
      <Navbar tripTitle={trip.title} tripId={tripId} showBack onBack={() => navigate('/dashboard')} onShare={() => setShowMembersModal(true)} />

      <div style={{
-        position: 'fixed', top: 56, left: 0, right: 0, zIndex: 40,
+        position: 'fixed', top: 'var(--nav-h)', left: 0, right: 0, zIndex: 40,
        display: 'flex', alignItems: 'center', justifyContent: 'center',
        padding: '0 12px',
        background: 'var(--bg-elevated)',
@@ -286,13 +371,14 @@ export default function TripPlannerPage() {
        })}
      </div>

-      {/* Offset by navbar (56px) + tab bar (44px) */}
-      <div style={{ flex: 1, overflow: 'hidden', marginTop: 100, position: 'relative' }}>
+      {/* Offset by navbar + tab bar (44px) */}
+      <div style={{ position: 'fixed', top: 'calc(var(--nav-h) + 44px)', left: 0, right: 0, bottom: 0, overflow: 'hidden', overscrollBehavior: 'contain' }}>

        {activeTab === 'plan' && (
          <div style={{ position: 'absolute', inset: 0 }}>
            <MapView
              places={mapPlaces()}
+              dayPlaces={dayPlaces}
              route={route}
              selectedPlaceId={selectedPlaceId}
              onMarkerClick={handleMarkerClick}
@@ -302,6 +388,9 @@ export default function TripPlannerPage() {
              tileUrl={mapTileUrl}
              fitKey={fitKey}
              dayOrderMap={dayOrderMap}
+              leftWidth={leftCollapsed ? 0 : leftWidth}
+              rightWidth={rightCollapsed ? 0 : rightWidth}
+              hasInspector={!!selectedPlace}
            />

            {routeInfo && (
@@ -321,7 +410,7 @@ export default function TripPlannerPage() {
            <div className="hidden md:block" style={{ position: 'absolute', left: 10, top: 10, bottom: 10, zIndex: 20 }}>
              <button onClick={() => setLeftCollapsed(c => !c)}
                style={{
-                  position: leftCollapsed ? 'fixed' : 'absolute', top: leftCollapsed ? 'calc(56px + 44px + 14px)' : 14, left: leftCollapsed ? 10 : undefined, right: leftCollapsed ? undefined : -28, zIndex: 25,
+                  position: leftCollapsed ? 'fixed' : 'absolute', top: leftCollapsed ? 'calc(var(--nav-h) + 44px + 14px)' : 14, left: leftCollapsed ? 10 : undefined, right: leftCollapsed ? undefined : -28, zIndex: -1,
                  width: 36, height: 36, borderRadius: leftCollapsed ? 10 : '0 10px 10px 0',
                  background: leftCollapsed ? '#000' : 'var(--sidebar-bg)', backdropFilter: 'blur(20px)', WebkitBackdropFilter: 'blur(20px)',
                  boxShadow: leftCollapsed ? '0 2px 12px rgba(0,0,0,0.2)' : 'none', border: 'none',
@@ -353,6 +442,7 @@ export default function TripPlannerPage() {
                  assignments={assignments}
                  selectedDayId={selectedDayId}
                  selectedPlaceId={selectedPlaceId}
+                  selectedAssignmentId={selectedAssignmentId}
                  onSelectDay={handleSelectDay}
                  onPlaceClick={handlePlaceClick}
                  onReorder={handleReorder}
@@ -361,6 +451,8 @@ export default function TripPlannerPage() {
                  onRouteCalculated={(r) => { if (r) { setRoute(r.coordinates); setRouteInfo({ distance: r.distanceText, duration: r.durationText }) } else { setRoute(null); setRouteInfo(null) } }}
                  reservations={reservations}
                  onAddReservation={(dayId) => { setEditingReservation(null); tripStore.setSelectedDay(dayId); setShowReservationModal(true) }}
+                  onDayDetail={(day) => { setShowDayDetail(day); setSelectedPlaceId(null); setSelectedAssignmentId(null) }}
+                  accommodations={tripAccommodations}
                />
                {!leftCollapsed && (
                  <div
@@ -376,7 +468,7 @@ export default function TripPlannerPage() {
            <div className="hidden md:block" style={{ position: 'absolute', right: 10, top: 10, bottom: 10, zIndex: 20 }}>
              <button onClick={() => setRightCollapsed(c => !c)}
                style={{
-                  position: rightCollapsed ? 'fixed' : 'absolute', top: rightCollapsed ? 'calc(56px + 44px + 14px)' : 14, right: rightCollapsed ? 10 : undefined, left: rightCollapsed ? undefined : -28, zIndex: 25,
+                  position: rightCollapsed ? 'fixed' : 'absolute', top: rightCollapsed ? 'calc(var(--nav-h) + 44px + 14px)' : 14, right: rightCollapsed ? 10 : undefined, left: rightCollapsed ? undefined : -28, zIndex: -1,
                  width: 36, height: 36, borderRadius: rightCollapsed ? 10 : '10px 0 0 10px',
                  background: rightCollapsed ? '#000' : 'var(--sidebar-bg)', backdropFilter: 'blur(20px)', WebkitBackdropFilter: 'blur(20px)',
                  boxShadow: rightCollapsed ? '0 2px 12px rgba(0,0,0,0.2)' : 'none', border: 'none',
@@ -422,16 +514,41 @@ export default function TripPlannerPage() {
              </div>
            </div>

-            <div className="flex md:hidden" style={{ position: 'absolute', top: 12, left: 12, right: 12, justifyContent: 'space-between', zIndex: 30 }}>
-              <button onClick={() => setMobileSidebarOpen('left')}
-                style={{ background: 'var(--bg-card)', color: 'var(--text-primary)', backdropFilter: 'blur(12px)', border: '1px solid var(--border-primary)', borderRadius: 24, padding: '11px 24px', fontSize: 15, fontWeight: 600, cursor: 'pointer', boxShadow: '0 2px 12px rgba(0,0,0,0.15)', minHeight: 44, fontFamily: 'inherit' }}>
-                {t('trip.mobilePlan')}
-              </button>
-              <button onClick={() => setMobileSidebarOpen('right')}
-                style={{ background: 'var(--bg-card)', color: 'var(--text-primary)', backdropFilter: 'blur(12px)', border: '1px solid var(--border-primary)', borderRadius: 24, padding: '11px 24px', fontSize: 15, fontWeight: 600, cursor: 'pointer', boxShadow: '0 2px 12px rgba(0,0,0,0.15)', minHeight: 44, fontFamily: 'inherit' }}>
-                {t('trip.mobilePlaces')}
-              </button>
-            </div>
+            {/* Mobile sidebar buttons — portal to body to escape Leaflet touch handling */}
+            {activeTab === 'plan' && !mobileSidebarOpen && !showPlaceForm && !showMembersModal && !showReservationModal && ReactDOM.createPortal(
+              <div className="flex md:hidden" style={{ position: 'fixed', top: 'calc(var(--nav-h) + 44px + 12px)', left: 12, right: 12, justifyContent: 'space-between', zIndex: 100, pointerEvents: 'none' }}>
+                <button onClick={() => setMobileSidebarOpen('left')}
+                  style={{ pointerEvents: 'auto', background: 'var(--bg-card)', color: 'var(--text-primary)', backdropFilter: 'blur(12px)', border: '1px solid var(--border-primary)', borderRadius: 24, padding: '11px 24px', fontSize: 15, fontWeight: 600, cursor: 'pointer', boxShadow: '0 2px 12px rgba(0,0,0,0.15)', minHeight: 44, fontFamily: 'inherit', touchAction: 'manipulation' }}>
+                  {t('trip.mobilePlan')}
+                </button>
+                <button onClick={() => setMobileSidebarOpen('right')}
+                  style={{ pointerEvents: 'auto', background: 'var(--bg-card)', color: 'var(--text-primary)', backdropFilter: 'blur(12px)', border: '1px solid var(--border-primary)', borderRadius: 24, padding: '11px 24px', fontSize: 15, fontWeight: 600, cursor: 'pointer', boxShadow: '0 2px 12px rgba(0,0,0,0.15)', minHeight: 44, fontFamily: 'inherit', touchAction: 'manipulation' }}>
+                  {t('trip.mobilePlaces')}
+                </button>
+              </div>,
+              document.body
+            )}
+
+            {showDayDetail && !selectedPlace && (() => {
+              const currentDay = days.find(d => d.id === showDayDetail.id) || showDayDetail
+              const dayAssignments = assignments[String(currentDay.id)] || []
+              const geoPlace = dayAssignments.find(a => a.place?.lat && a.place?.lng)?.place || places.find(p => p.lat && p.lng)
+              return (
+                <DayDetailPanel
+                  day={currentDay}
+                  days={days}
+                  places={places}
+                  categories={categories}
+                  tripId={tripId}
+                  assignments={assignments}
+                  reservations={reservations}
+                  lat={geoPlace?.lat}
+                  lng={geoPlace?.lng}
+                  onClose={() => setShowDayDetail(null)}
+                  onAccommodationChange={loadAccommodations}
+                />
+              )
+            })()}

            {selectedPlace && (
              <PlaceInspector
@@ -439,7 +556,9 @@ export default function TripPlannerPage() {
                categories={categories}
                days={days}
                selectedDayId={selectedDayId}
+                selectedAssignmentId={selectedAssignmentId}
                assignments={assignments}
+                reservations={reservations}
                onClose={() => setSelectedPlaceId(null)}
                onEdit={() => { setEditingPlace(selectedPlace); setShowPlaceForm(true) }}
                onDelete={() => handleDeletePlace(selectedPlace.id)}
@@ -450,9 +569,9 @@ export default function TripPlannerPage() {
              />
            )}

-            {mobileSidebarOpen && (
-              <div style={{ position: 'absolute', inset: 0, background: 'rgba(0,0,0,0.3)', zIndex: 50 }} onClick={() => setMobileSidebarOpen(null)}>
-                <div style={{ position: 'absolute', bottom: 0, left: 0, right: 0, background: 'var(--bg-card)', borderRadius: '20px 20px 0 0', maxHeight: '80vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }} onClick={e => e.stopPropagation()}>
+            {mobileSidebarOpen && ReactDOM.createPortal(
+              <div style={{ position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.3)', zIndex: 9999 }} onClick={() => setMobileSidebarOpen(null)}>
+                <div style={{ position: 'absolute', top: 'var(--nav-h)', left: 0, right: 0, bottom: 0, background: 'var(--bg-card)', display: 'flex', flexDirection: 'column', overflow: 'hidden' }} onClick={e => e.stopPropagation()}>
                  <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '14px 16px', borderBottom: '1px solid var(--border-secondary)' }}>
                    <span style={{ fontWeight: 600, fontSize: 14, color: 'var(--text-primary)' }}>{mobileSidebarOpen === 'left' ? t('trip.mobilePlan') : t('trip.mobilePlaces')}</span>
                    <button onClick={() => setMobileSidebarOpen(null)} style={{ background: 'var(--bg-tertiary)', border: 'none', borderRadius: '50%', width: 28, height: 28, cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center', color: 'var(--text-primary)' }}>
@@ -461,18 +580,19 @@ export default function TripPlannerPage() {
                  </div>
                  <div style={{ flex: 1, overflow: 'auto' }}>
                    {mobileSidebarOpen === 'left'
-                      ? <DayPlanSidebar trip={trip} days={days} places={places} categories={categories} assignments={assignments} selectedDayId={selectedDayId} selectedPlaceId={selectedPlaceId} onSelectDay={(id) => { handleSelectDay(id); setMobileSidebarOpen(null) }} onPlaceClick={handlePlaceClick} onReorder={handleReorder} onUpdateDayTitle={handleUpdateDayTitle} onAssignToDay={handleAssignToDay} onRouteCalculated={(r) => { if (r) { setRoute(r.coordinates); setRouteInfo({ distance: r.distanceText, duration: r.durationText }) } }} reservations={reservations} onAddReservation={(dayId) => { setEditingReservation(null); tripStore.setSelectedDay(dayId); setShowReservationModal(true); setMobileSidebarOpen(null) }} />
+                      ? <DayPlanSidebar tripId={tripId} trip={trip} days={days} places={places} categories={categories} assignments={assignments} selectedDayId={selectedDayId} selectedPlaceId={selectedPlaceId} onSelectDay={(id) => { handleSelectDay(id); setMobileSidebarOpen(null) }} onPlaceClick={handlePlaceClick} onReorder={handleReorder} onUpdateDayTitle={handleUpdateDayTitle} onAssignToDay={handleAssignToDay} onRouteCalculated={(r) => { if (r) { setRoute(r.coordinates); setRouteInfo({ distance: r.distanceText, duration: r.durationText }) } }} reservations={reservations} onAddReservation={(dayId) => { setEditingReservation(null); tripStore.setSelectedDay(dayId); setShowReservationModal(true); setMobileSidebarOpen(null) }} />
                      : <PlacesSidebar places={places} categories={categories} assignments={assignments} selectedDayId={selectedDayId} selectedPlaceId={selectedPlaceId} onPlaceClick={handlePlaceClick} onAddPlace={() => { setEditingPlace(null); setShowPlaceForm(true); setMobileSidebarOpen(null) }} onAssignToDay={handleAssignToDay} days={days} isMobile />
                    }
                  </div>
                </div>
-              </div>
+              </div>,
+              document.body
            )}
          </div>
        )}

        {activeTab === 'buchungen' && (
-          <div style={{ height: '100%', maxWidth: 1200, margin: '0 auto', width: '100%', display: 'flex', flexDirection: 'column' }}>
+          <div style={{ height: '100%', maxWidth: 1200, margin: '0 auto', width: '100%', display: 'flex', flexDirection: 'column', overflowY: 'auto', overscrollBehavior: 'contain' }}>
            <ReservationsPanel
              tripId={tripId}
              reservations={reservations}
@@ -488,19 +608,19 @@ export default function TripPlannerPage() {
        )}

        {activeTab === 'packliste' && (
-          <div style={{ height: '100%', overflowY: 'auto', maxWidth: 1200, margin: '0 auto', width: '100%', padding: '8px 0' }}>
+          <div style={{ height: '100%', overflowY: 'auto', overscrollBehavior: 'contain', maxWidth: 1200, margin: '0 auto', width: '100%', padding: '8px 0' }}>
            <PackingListPanel tripId={tripId} items={packingItems} />
          </div>
        )}

        {activeTab === 'finanzplan' && (
-          <div style={{ height: '100%', overflowY: 'auto', maxWidth: 1400, margin: '0 auto', width: '100%', padding: '8px 0' }}>
+          <div style={{ height: '100%', overflowY: 'auto', overscrollBehavior: 'contain', maxWidth: 1400, margin: '0 auto', width: '100%', padding: '8px 0' }}>
            <BudgetPanel tripId={tripId} />
          </div>
        )}

        {activeTab === 'dateien' && (
-          <div style={{ height: '100%', overflow: 'hidden' }}>
+          <div style={{ height: '100%', overflow: 'hidden', overscrollBehavior: 'contain' }}>
            <FileManager
              files={files || []}
              onUpload={(fd) => tripStore.addFile(tripId, fd)}
@@ -517,7 +637,7 @@ export default function TripPlannerPage() {
      <PlaceFormModal isOpen={showPlaceForm} onClose={() => { setShowPlaceForm(false); setEditingPlace(null) }} onSave={handleSavePlace} place={editingPlace} tripId={tripId} categories={categories} onCategoryCreated={cat => tripStore.addCategory?.(cat)} />
      <TripFormModal isOpen={showTripForm} onClose={() => setShowTripForm(false)} onSave={async (data) => { await tripStore.updateTrip(tripId, data); toast.success(t('trip.toast.tripUpdated')) }} trip={trip} />
      <TripMembersModal isOpen={showMembersModal} onClose={() => setShowMembersModal(false)} tripId={tripId} tripTitle={trip?.title} />
-      <ReservationModal isOpen={showReservationModal} onClose={() => { setShowReservationModal(false); setEditingReservation(null) }} onSave={handleSaveReservation} reservation={editingReservation} days={days} places={places} selectedDayId={selectedDayId} files={files} onFileUpload={(fd) => tripStore.addFile(tripId, fd)} onFileDelete={(id) => tripStore.deleteFile(tripId, id)} />
+      <ReservationModal isOpen={showReservationModal} onClose={() => { setShowReservationModal(false); setEditingReservation(null) }} onSave={handleSaveReservation} reservation={editingReservation} days={days} places={places} assignments={assignments} selectedDayId={selectedDayId} files={files} onFileUpload={(fd) => tripStore.addFile(tripId, fd)} onFileDelete={(id) => tripStore.deleteFile(tripId, id)} />
    </div>
  )
 }
@@ -0,0 +1,282 @@
+import React, { useEffect, useState, useCallback } from 'react'
+import ReactDOM from 'react-dom'
+import { useTranslation } from '../i18n'
+import { useVacayStore } from '../store/vacayStore'
+import { addListener, removeListener } from '../api/websocket'
+import Navbar from '../components/Layout/Navbar'
+import VacayCalendar from '../components/Vacay/VacayCalendar'
+import VacayPersons from '../components/Vacay/VacayPersons'
+import VacayStats from '../components/Vacay/VacayStats'
+import VacaySettings from '../components/Vacay/VacaySettings'
+import { Plus, Minus, ChevronLeft, ChevronRight, Settings, CalendarDays, AlertTriangle, Users, Eye, Pencil, Trash2, Unlink, ShieldCheck, SlidersHorizontal } from 'lucide-react'
+import Modal from '../components/shared/Modal'
+
+export default function VacayPage() {
+  const { t } = useTranslation()
+  const { years, selectedYear, setSelectedYear, addYear, removeYear, loadAll, loadPlan, loadEntries, loadStats, loadHolidays, loading, incomingInvites, acceptInvite, declineInvite, plan } = useVacayStore()
+  const [showSettings, setShowSettings] = useState(false)
+  const [deleteYear, setDeleteYear] = useState(null)
+  const [showMobileSidebar, setShowMobileSidebar] = useState(false)
+
+  useEffect(() => { loadAll() }, [])
+
+  // Live sync via WebSocket
+  const handleWsMessage = useCallback((msg) => {
+    if (msg.type === 'vacay:update' || msg.type === 'vacay:settings') {
+      loadPlan()
+      loadEntries(selectedYear)
+      loadStats(selectedYear)
+      if (msg.type === 'vacay:settings') loadAll()
+    }
+    if (msg.type === 'vacay:invite' || msg.type === 'vacay:accepted' || msg.type === 'vacay:declined' || msg.type === 'vacay:cancelled' || msg.type === 'vacay:dissolved') {
+      loadAll()
+    }
+  }, [selectedYear])
+
+  useEffect(() => {
+    addListener(handleWsMessage)
+    return () => removeListener(handleWsMessage)
+  }, [handleWsMessage])
+  useEffect(() => {
+    if (selectedYear) { loadEntries(selectedYear); loadStats(selectedYear); loadHolidays(selectedYear) }
+  }, [selectedYear])
+
+  const handleAddYear = () => {
+    const nextYear = years.length > 0 ? Math.max(...years) + 1 : new Date().getFullYear()
+    addYear(nextYear)
+  }
+
+  if (loading) {
+    return (
+      <div className="min-h-screen" style={{ background: 'var(--bg-primary)' }}>
+        <Navbar />
+        <div className="flex items-center justify-center" style={{ paddingTop: 'var(--nav-h)', minHeight: 'calc(100vh - var(--nav-h))' }}>
+          <div className="w-8 h-8 border-2 rounded-full animate-spin" style={{ borderColor: 'var(--border-primary)', borderTopColor: 'var(--text-primary)' }} />
+        </div>
+      </div>
+    )
+  }
+
+  // Sidebar content (shared between desktop sidebar and mobile drawer)
+  const sidebarContent = (
+    <>
+      {/* Year Selector */}
+      <div className="rounded-xl border p-3" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+        <div className="flex items-center justify-between mb-2">
+          <span className="text-[11px] font-medium uppercase tracking-wider" style={{ color: 'var(--text-faint)' }}>{t('vacay.year')}</span>
+          <button onClick={handleAddYear} className="p-0.5 rounded transition-colors" style={{ color: 'var(--text-faint)' }} title={t('vacay.addYear')}>
+            <Plus size={14} />
+          </button>
+        </div>
+        <div className="flex items-center justify-between mb-2">
+          <button onClick={() => { const idx = years.indexOf(selectedYear); if (idx > 0) setSelectedYear(years[idx - 1]) }} disabled={years.indexOf(selectedYear) <= 0} className="p-1 lg:p-1 p-2 rounded-lg disabled:opacity-20 transition-colors" style={{ background: 'var(--bg-secondary)' }}>
+            <ChevronLeft size={16} style={{ color: 'var(--text-muted)' }} />
+          </button>
+          <span className="text-xl font-bold tabular-nums" style={{ color: 'var(--text-primary)' }}>{selectedYear}</span>
+          <button onClick={() => { const idx = years.indexOf(selectedYear); if (idx < years.length - 1) setSelectedYear(years[idx + 1]) }} disabled={years.indexOf(selectedYear) >= years.length - 1} className="p-1 lg:p-1 p-2 rounded-lg disabled:opacity-20 transition-colors" style={{ background: 'var(--bg-secondary)' }}>
+            <ChevronRight size={16} style={{ color: 'var(--text-muted)' }} />
+          </button>
+        </div>
+        <div className="grid grid-cols-4 gap-1">
+          {years.map(y => (
+            <div key={y} onClick={() => setSelectedYear(y)}
+              className="group relative py-1.5 rounded-lg text-xs font-medium transition-all text-center cursor-pointer"
+              style={{
+                background: y === selectedYear ? 'var(--text-primary)' : 'var(--bg-secondary)',
+                color: y === selectedYear ? 'var(--bg-card)' : 'var(--text-muted)',
+              }}>
+              {y}
+              {years.length > 1 && (
+                <span onClick={e => { e.stopPropagation(); setDeleteYear(y); setShowMobileSidebar(false) }}
+                  className="absolute -top-1 -right-1 w-3.5 h-3.5 rounded-full bg-red-500 text-white text-[7px] flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity cursor-pointer">
+                  <Minus size={7} />
+                </span>
+              )}
+            </div>
+          ))}
+        </div>
+      </div>
+
+      <VacayPersons />
+
+      {/* Legend */}
+      {(plan?.holidays_enabled || plan?.company_holidays_enabled || plan?.block_weekends) && (
+        <div className="rounded-xl border p-3" style={{ background: 'var(--bg-card)', borderColor: 'var(--border-primary)' }}>
+          <span className="text-[11px] font-medium uppercase tracking-wider" style={{ color: 'var(--text-faint)' }}>{t('vacay.legend')}</span>
+          <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1.5">
+            {plan?.holidays_enabled && <LegendItem color="#fecaca" label={t('vacay.publicHoliday')} />}
+            {plan?.company_holidays_enabled && <LegendItem color="#fde68a" label={t('vacay.companyHoliday')} />}
+            {plan?.block_weekends && <LegendItem color="#e5e7eb" label={t('vacay.weekend')} />}
+          </div>
+        </div>
+      )}
+
+      <VacayStats />
+    </>
+  )
+
+  return (
+    <div className="min-h-screen" style={{ background: 'var(--bg-primary)' }}>
+      <Navbar />
+
+      <div style={{ paddingTop: 'var(--nav-h)' }}>
+        <div className="max-w-[1800px] mx-auto px-3 sm:px-4 py-4 sm:py-6">
+          {/* Header */}
+          <div className="flex items-center justify-between mb-4 sm:mb-5">
+            <div className="flex items-center gap-3">
+              <div className="w-9 h-9 rounded-xl flex items-center justify-center" style={{ background: 'var(--bg-secondary)' }}>
+                <CalendarDays size={18} style={{ color: 'var(--text-primary)' }} />
+              </div>
+              <div>
+                <h1 className="text-lg sm:text-xl font-bold" style={{ color: 'var(--text-primary)' }}>Vacay</h1>
+                <p className="text-xs hidden sm:block" style={{ color: 'var(--text-muted)' }}>{t('vacay.subtitle')}</p>
+              </div>
+            </div>
+            <div className="flex items-center gap-2">
+              {/* Mobile sidebar toggle */}
+              <button
+                onClick={() => setShowMobileSidebar(true)}
+                className="lg:hidden flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-sm transition-colors"
+                style={{ background: 'var(--bg-secondary)', color: 'var(--text-muted)' }}
+              >
+                <SlidersHorizontal size={14} />
+              </button>
+              <button
+                onClick={() => setShowSettings(true)}
+                className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-sm transition-colors"
+                style={{ background: 'var(--bg-secondary)', color: 'var(--text-muted)' }}
+              >
+                <Settings size={14} />
+                <span className="hidden sm:inline">{t('vacay.settings')}</span>
+              </button>
+            </div>
+          </div>
+
+          {/* Main layout */}
+          <div className="flex gap-4 items-start">
+            {/* Desktop Sidebar */}
+            <div className="hidden lg:flex w-[240px] shrink-0 flex-col gap-3 sticky top-[70px]">
+              {sidebarContent}
+            </div>
+
+            {/* Calendar */}
+            <div className="flex-1 min-w-0">
+              <VacayCalendar />
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Mobile Sidebar Drawer */}
+      {showMobileSidebar && ReactDOM.createPortal(
+        <div className="fixed inset-0 lg:hidden" style={{ zIndex: 99980 }}>
+          <div className="absolute inset-0" style={{ background: 'rgba(0,0,0,0.4)' }} onClick={() => setShowMobileSidebar(false)} />
+          <div className="absolute left-0 top-0 bottom-0 w-[280px] overflow-y-auto p-3 flex flex-col gap-3"
+            style={{ background: 'var(--bg-primary)', boxShadow: '4px 0 24px rgba(0,0,0,0.15)', animation: 'slideInLeft 0.2s ease-out' }}>
+            {sidebarContent}
+          </div>
+        </div>,
+        document.body
+      )}
+
+      {/* Settings Modal */}
+      <Modal isOpen={showSettings} onClose={() => setShowSettings(false)} title={t('vacay.settings')} size="md">
+        <VacaySettings onClose={() => setShowSettings(false)} />
+      </Modal>
+
+      {/* Delete Year Modal */}
+      <Modal isOpen={deleteYear !== null} onClose={() => setDeleteYear(null)} title={t('vacay.removeYear')} size="sm">
+        <div className="space-y-4">
+          <div className="flex gap-3 p-3 rounded-lg" style={{ background: 'rgba(239,68,68,0.08)', border: '1px solid rgba(239,68,68,0.15)' }}>
+            <AlertTriangle size={18} className="text-red-500 shrink-0 mt-0.5" />
+            <div>
+              <p className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>
+                {t('vacay.removeYearConfirm', { year: deleteYear })}
+              </p>
+              <p className="text-xs mt-1" style={{ color: 'var(--text-muted)' }}>
+                {t('vacay.removeYearHint')}
+              </p>
+            </div>
+          </div>
+          <div className="flex gap-3 justify-end">
+            <button onClick={() => setDeleteYear(null)} className="px-4 py-2 text-sm rounded-lg transition-colors" style={{ color: 'var(--text-muted)', border: '1px solid var(--border-primary)' }}>
+              {t('common.cancel')}
+            </button>
+            <button onClick={async () => { await removeYear(deleteYear); setDeleteYear(null) }} className="px-4 py-2 text-sm bg-red-500 hover:bg-red-600 text-white rounded-lg transition-colors">
+              {t('vacay.remove')}
+            </button>
+          </div>
+        </div>
+      </Modal>
+
+      {/* Incoming invite — forced fullscreen modal */}
+      {incomingInvites.length > 0 && ReactDOM.createPortal(
+        <div className="fixed inset-0 flex items-center justify-center px-4"
+          style={{ zIndex: 99995, backgroundColor: 'rgba(0,0,0,0.7)', backdropFilter: 'blur(8px)' }}>
+          {incomingInvites.map(inv => (
+            <div key={inv.id} className="w-full max-w-md rounded-2xl shadow-2xl overflow-hidden"
+              style={{ background: 'var(--bg-card)', animation: 'modalIn 0.25s ease-out' }}>
+              <div className="px-6 pt-6 pb-4 text-center">
+                <div className="w-14 h-14 rounded-full mx-auto mb-4 flex items-center justify-center text-lg font-bold"
+                  style={{ background: 'var(--bg-secondary)', color: 'var(--text-primary)' }}>
+                  {inv.username?.[0]?.toUpperCase()}
+                </div>
+                <h2 className="text-lg font-bold mb-1" style={{ color: 'var(--text-primary)' }}>
+                  {t('vacay.inviteTitle')}
+                </h2>
+                <p className="text-sm" style={{ color: 'var(--text-muted)' }}>
+                  <span className="font-semibold" style={{ color: 'var(--text-primary)' }}>{inv.username}</span> {t('vacay.inviteWantsToFuse')}
+                </p>
+              </div>
+              <div className="px-6 pb-4 space-y-2">
+                <InfoItem icon={Eye} text={t('vacay.fuseInfo1')} />
+                <InfoItem icon={Pencil} text={t('vacay.fuseInfo2')} />
+                <InfoItem icon={Trash2} text={t('vacay.fuseInfo3')} />
+                <InfoItem icon={ShieldCheck} text={t('vacay.fuseInfo4')} />
+                <InfoItem icon={Unlink} text={t('vacay.fuseInfo5')} />
+              </div>
+              <div className="px-6 pb-6 flex gap-3">
+                <button onClick={() => declineInvite(inv.plan_id)}
+                  className="flex-1 px-4 py-2.5 text-sm font-medium rounded-xl transition-colors"
+                  style={{ color: 'var(--text-muted)', border: '1px solid var(--border-primary)' }}>
+                  {t('vacay.decline')}
+                </button>
+                <button onClick={() => acceptInvite(inv.plan_id)}
+                  className="flex-1 px-4 py-2.5 text-sm font-medium rounded-xl transition-colors"
+                  style={{ background: 'var(--text-primary)', color: 'var(--bg-card)' }}>
+                  {t('vacay.acceptFusion')}
+                </button>
+              </div>
+            </div>
+          ))}
+        </div>,
+        document.body
+      )}
+
+      <style>{`
+        @keyframes slideInLeft {
+          from { transform: translateX(-100%); }
+          to { transform: translateX(0); }
+        }
+      `}</style>
+    </div>
+  )
+}
+
+function InfoItem({ icon: Icon, text }) {
+  return (
+    <div className="flex items-start gap-3 px-3 py-2 rounded-lg" style={{ background: 'var(--bg-secondary)' }}>
+      <Icon size={15} className="shrink-0 mt-0.5" style={{ color: 'var(--text-muted)' }} />
+      <span className="text-xs" style={{ color: 'var(--text-primary)' }}>{text}</span>
+    </div>
+  )
+}
+
+function LegendItem({ color, label }) {
+  return (
+    <div className="flex items-center gap-2">
+      <span className="w-4 h-3 rounded" style={{ background: color, border: `1px solid ${color}` }} />
+      <span className="text-[11px]" style={{ color: 'var(--text-muted)' }}>{label}</span>
+    </div>
+  )
+}
@@ -26,7 +26,7 @@ export const useAuthStore = create((set, get) => ({
      connect(data.token)
      return data
    } catch (err) {
-      const error = err.response?.data?.error || 'Anmeldung fehlgeschlagen'
+      const error = err.response?.data?.error || 'Login failed'
      set({ isLoading: false, error })
      throw new Error(error)
    }
@@ -47,7 +47,7 @@ export const useAuthStore = create((set, get) => ({
      connect(data.token)
      return data
    } catch (err) {
-      const error = err.response?.data?.error || 'Registrierung fehlgeschlagen'
+      const error = err.response?.data?.error || 'Registration failed'
      set({ isLoading: false, error })
      throw new Error(error)
    }
@@ -97,7 +97,7 @@ export const useAuthStore = create((set, get) => ({
        user: { ...state.user, maps_api_key: key || null }
      }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Speichern des API-Schlüssels')
+      throw new Error(err.response?.data?.error || 'Error saving API key')
    }
  },

@@ -106,7 +106,7 @@ export const useAuthStore = create((set, get) => ({
      const data = await authApi.updateApiKeys(keys)
      set({ user: data.user })
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Speichern der API-Schlüssel')
+      throw new Error(err.response?.data?.error || 'Error saving API keys')
    }
  },

@@ -115,7 +115,7 @@ export const useAuthStore = create((set, get) => ({
      const data = await authApi.updateSettings(profileData)
      set({ user: data.user })
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren des Profils')
+      throw new Error(err.response?.data?.error || 'Error updating profile')
    }
  },

@@ -156,7 +156,7 @@ export const useAuthStore = create((set, get) => ({
      connect(data.token)
      return data
    } catch (err) {
-      const error = err.response?.data?.error || 'Demo-Login fehlgeschlagen'
+      const error = err.response?.data?.error || 'Demo login failed'
      set({ isLoading: false, error })
      throw new Error(error)
    }
@@ -38,7 +38,7 @@ export const useSettingsStore = create((set, get) => ({
      await settingsApi.set(key, value)
    } catch (err) {
      console.error('Failed to save setting:', err)
-      throw new Error(err.response?.data?.error || 'Fehler beim Speichern der Einstellung')
+      throw new Error(err.response?.data?.error || 'Error saving setting')
    }
  },

@@ -55,7 +55,7 @@ export const useSettingsStore = create((set, get) => ({
      await settingsApi.setBulk(settingsObj)
    } catch (err) {
      console.error('Failed to save settings:', err)
-      throw new Error(err.response?.data?.error || 'Fehler beim Speichern der Einstellungen')
+      throw new Error(err.response?.data?.error || 'Error saving settings')
    }
  },
 }))
@@ -76,6 +76,17 @@ export const useTripStore = create((set, get) => ({
            }
          }
        }
+        case 'assignment:updated': {
+          const dayKey = String(payload.assignment.day_id)
+          return {
+            assignments: {
+              ...state.assignments,
+              [dayKey]: (state.assignments[dayKey] || []).map(a =>
+                a.id === payload.assignment.id ? { ...a, ...payload.assignment } : a
+              ),
+            }
+          }
+        }
        case 'assignment:deleted': {
          const dayKey = String(payload.dayId)
          return {
@@ -279,7 +290,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ places: [data.place, ...state.places] }))
      return data.place
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Hinzufügen des Ortes')
+      throw new Error(err.response?.data?.error || 'Error adding place')
    }
  },

@@ -297,7 +308,7 @@ export const useTripStore = create((set, get) => ({
      }))
      return data.place
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren des Ortes')
+      throw new Error(err.response?.data?.error || 'Error updating place')
    }
  },

@@ -314,7 +325,7 @@ export const useTripStore = create((set, get) => ({
        ),
      }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen des Ortes')
+      throw new Error(err.response?.data?.error || 'Error deleting place')
    }
  },

@@ -323,9 +334,6 @@ export const useTripStore = create((set, get) => ({
    const place = state.places.find(p => p.id === parseInt(placeId))
    if (!place) return

-    const existing = (state.assignments[String(dayId)] || []).find(a => a.place?.id === parseInt(placeId))
-    if (existing) return
-
    const tempId = Date.now() * -1
    const current = [...(state.assignments[String(dayId)] || [])]
    const insertIdx = position != null ? position : current.length
@@ -347,9 +355,11 @@ export const useTripStore = create((set, get) => ({

    try {
      const data = await assignmentsApi.create(tripId, dayId, { place_id: placeId })
-      const newAssignment = position != null
-        ? { ...data.assignment, order_index: insertIdx }
-        : data.assignment
+      const newAssignment = {
+        ...data.assignment,
+        place: data.assignment.place || place,
+        order_index: position != null ? insertIdx : data.assignment.order_index,
+      }
      set(state => ({
        assignments: {
          ...state.assignments,
@@ -390,7 +400,7 @@ export const useTripStore = create((set, get) => ({
          [String(dayId)]: state.assignments[String(dayId)].filter(a => a.id !== tempId),
        }
      }))
-      throw new Error(err.response?.data?.error || 'Fehler beim Zuweisen des Ortes')
+      throw new Error(err.response?.data?.error || 'Error assigning place')
    }
  },

@@ -408,7 +418,7 @@ export const useTripStore = create((set, get) => ({
      await assignmentsApi.delete(tripId, dayId, assignmentId)
    } catch (err) {
      set({ assignments: prevAssignments })
-      throw new Error(err.response?.data?.error || 'Fehler beim Entfernen der Zuweisung')
+      throw new Error(err.response?.data?.error || 'Error removing assignment')
    }
  },

@@ -431,7 +441,7 @@ export const useTripStore = create((set, get) => ({
      await assignmentsApi.reorder(tripId, dayId, orderedIds)
    } catch (err) {
      set({ assignments: prevAssignments })
-      throw new Error(err.response?.data?.error || 'Fehler beim Neuanordnen')
+      throw new Error(err.response?.data?.error || 'Error reordering')
    }
  },

@@ -464,7 +474,7 @@ export const useTripStore = create((set, get) => ({
      }
    } catch (err) {
      set({ assignments: prevAssignments })
-      throw new Error(err.response?.data?.error || 'Fehler beim Verschieben der Zuweisung')
+      throw new Error(err.response?.data?.error || 'Error moving assignment')
    }
  },

@@ -498,7 +508,7 @@ export const useTripStore = create((set, get) => ({
          [String(fromDayId)]: [...(s.dayNotes[String(fromDayId)] || []), note],
        }
      }))
-      throw new Error(err.response?.data?.error || 'Fehler beim Verschieben der Notiz')
+      throw new Error(err.response?.data?.error || 'Error moving note')
    }
  },

@@ -512,7 +522,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ packingItems: [...state.packingItems, result.item] }))
      return result.item
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Hinzufügen des Artikels')
+      throw new Error(err.response?.data?.error || 'Error adding item')
    }
  },

@@ -524,7 +534,7 @@ export const useTripStore = create((set, get) => ({
      }))
      return result.item
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren des Artikels')
+      throw new Error(err.response?.data?.error || 'Error updating item')
    }
  },

@@ -535,7 +545,7 @@ export const useTripStore = create((set, get) => ({
      await packingApi.delete(tripId, id)
    } catch (err) {
      set({ packingItems: prev })
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen des Artikels')
+      throw new Error(err.response?.data?.error || 'Error deleting item')
    }
  },

@@ -563,7 +573,7 @@ export const useTripStore = create((set, get) => ({
        days: state.days.map(d => d.id === parseInt(dayId) ? { ...d, notes } : d)
      }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren der Notizen')
+      throw new Error(err.response?.data?.error || 'Error updating notes')
    }
  },

@@ -574,7 +584,7 @@ export const useTripStore = create((set, get) => ({
        days: state.days.map(d => d.id === parseInt(dayId) ? { ...d, title } : d)
      }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren des Tagesnamens')
+      throw new Error(err.response?.data?.error || 'Error updating day name')
    }
  },

@@ -584,7 +594,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ tags: [...state.tags, result.tag] }))
      return result.tag
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Erstellen des Tags')
+      throw new Error(err.response?.data?.error || 'Error creating tag')
    }
  },

@@ -594,7 +604,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ categories: [...state.categories, result.category] }))
      return result.category
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Erstellen der Kategorie')
+      throw new Error(err.response?.data?.error || 'Error creating category')
    }
  },

@@ -612,7 +622,7 @@ export const useTripStore = create((set, get) => ({
      set({ days: daysData.days, assignments: assignmentsMap, dayNotes: dayNotesMap })
      return result.trip
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren der Reise')
+      throw new Error(err.response?.data?.error || 'Error updating trip')
    }
  },

@@ -631,7 +641,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ budgetItems: [...state.budgetItems, result.item] }))
      return result.item
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Hinzufügen des Budget-Eintrags')
+      throw new Error(err.response?.data?.error || 'Error adding budget item')
    }
  },

@@ -643,7 +653,7 @@ export const useTripStore = create((set, get) => ({
      }))
      return result.item
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren des Budget-Eintrags')
+      throw new Error(err.response?.data?.error || 'Error updating budget item')
    }
  },

@@ -654,7 +664,7 @@ export const useTripStore = create((set, get) => ({
      await budgetApi.delete(tripId, id)
    } catch (err) {
      set({ budgetItems: prev })
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen des Budget-Eintrags')
+      throw new Error(err.response?.data?.error || 'Error deleting budget item')
    }
  },

@@ -673,7 +683,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ files: [data.file, ...state.files] }))
      return data.file
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Hochladen der Datei')
+      throw new Error(err.response?.data?.error || 'Error uploading file')
    }
  },

@@ -682,7 +692,7 @@ export const useTripStore = create((set, get) => ({
      await filesApi.delete(tripId, id)
      set(state => ({ files: state.files.filter(f => f.id !== id) }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen der Datei')
+      throw new Error(err.response?.data?.error || 'Error deleting file')
    }
  },

@@ -701,7 +711,7 @@ export const useTripStore = create((set, get) => ({
      set(state => ({ reservations: [result.reservation, ...state.reservations] }))
      return result.reservation
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Erstellen der Reservierung')
+      throw new Error(err.response?.data?.error || 'Error creating reservation')
    }
  },

@@ -713,7 +723,7 @@ export const useTripStore = create((set, get) => ({
      }))
      return result.reservation
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren der Reservierung')
+      throw new Error(err.response?.data?.error || 'Error updating reservation')
    }
  },

@@ -737,22 +747,36 @@ export const useTripStore = create((set, get) => ({
      await reservationsApi.delete(tripId, id)
      set(state => ({ reservations: state.reservations.filter(r => r.id !== id) }))
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen der Reservierung')
+      throw new Error(err.response?.data?.error || 'Error deleting reservation')
    }
  },

  addDayNote: async (tripId, dayId, data) => {
+    const tempId = Date.now() * -1
+    const tempNote = { id: tempId, day_id: dayId, ...data, created_at: new Date().toISOString() }
+    set(state => ({
+      dayNotes: {
+        ...state.dayNotes,
+        [String(dayId)]: [...(state.dayNotes[String(dayId)] || []), tempNote],
+      }
+    }))
    try {
      const result = await dayNotesApi.create(tripId, dayId, data)
      set(state => ({
        dayNotes: {
          ...state.dayNotes,
-          [String(dayId)]: [...(state.dayNotes[String(dayId)] || []), result.note],
+          [String(dayId)]: (state.dayNotes[String(dayId)] || []).map(n => n.id === tempId ? result.note : n),
        }
      }))
      return result.note
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Hinzufügen der Notiz')
+      set(state => ({
+        dayNotes: {
+          ...state.dayNotes,
+          [String(dayId)]: (state.dayNotes[String(dayId)] || []).filter(n => n.id !== tempId),
+        }
+      }))
+      throw new Error(err.response?.data?.error || 'Error adding note')
    }
  },

@@ -767,7 +791,7 @@ export const useTripStore = create((set, get) => ({
      }))
      return result.note
    } catch (err) {
-      throw new Error(err.response?.data?.error || 'Fehler beim Aktualisieren der Notiz')
+      throw new Error(err.response?.data?.error || 'Error updating note')
    }
  },

@@ -783,7 +807,7 @@ export const useTripStore = create((set, get) => ({
      await dayNotesApi.delete(tripId, dayId, id)
    } catch (err) {
      set({ dayNotes: prev })
-      throw new Error(err.response?.data?.error || 'Fehler beim Löschen der Notiz')
+      throw new Error(err.response?.data?.error || 'Error deleting note')
    }
  },
 }))
@@ -0,0 +1,188 @@
+import { create } from 'zustand'
+import apiClient from '../api/client'
+
+const ax = apiClient
+const api = {
+  getPlan: () => ax.get('/addons/vacay/plan').then(r => r.data),
+  updatePlan: (data) => ax.put('/addons/vacay/plan', data).then(r => r.data),
+  updateColor: (color, targetUserId) => ax.put('/addons/vacay/color', { color, target_user_id: targetUserId }).then(r => r.data),
+  invite: (userId) => ax.post('/addons/vacay/invite', { user_id: userId }).then(r => r.data),
+  acceptInvite: (planId) => ax.post('/addons/vacay/invite/accept', { plan_id: planId }).then(r => r.data),
+  declineInvite: (planId) => ax.post('/addons/vacay/invite/decline', { plan_id: planId }).then(r => r.data),
+  cancelInvite: (userId) => ax.post('/addons/vacay/invite/cancel', { user_id: userId }).then(r => r.data),
+  dissolve: () => ax.post('/addons/vacay/dissolve').then(r => r.data),
+  availableUsers: () => ax.get('/addons/vacay/available-users').then(r => r.data),
+  getYears: () => ax.get('/addons/vacay/years').then(r => r.data),
+  addYear: (year) => ax.post('/addons/vacay/years', { year }).then(r => r.data),
+  removeYear: (year) => ax.delete(`/addons/vacay/years/${year}`).then(r => r.data),
+  getEntries: (year) => ax.get(`/addons/vacay/entries/${year}`).then(r => r.data),
+  toggleEntry: (date, targetUserId) => ax.post('/addons/vacay/entries/toggle', { date, target_user_id: targetUserId }).then(r => r.data),
+  toggleCompanyHoliday: (date) => ax.post('/addons/vacay/entries/company-holiday', { date }).then(r => r.data),
+  getStats: (year) => ax.get(`/addons/vacay/stats/${year}`).then(r => r.data),
+  updateStats: (year, days, targetUserId) => ax.put(`/addons/vacay/stats/${year}`, { vacation_days: days, target_user_id: targetUserId }).then(r => r.data),
+  getCountries: () => ax.get('/addons/vacay/holidays/countries').then(r => r.data),
+  getHolidays: (year, country) => ax.get(`/addons/vacay/holidays/${year}/${country}`).then(r => r.data),
+}
+
+export const useVacayStore = create((set, get) => ({
+  plan: null,
+  users: [],
+  pendingInvites: [],
+  incomingInvites: [],
+  isOwner: true,
+  isFused: false,
+  years: [],
+  entries: [],
+  companyHolidays: [],
+  stats: [],
+  selectedYear: new Date().getFullYear(),
+  selectedUserId: null,
+  holidays: {},  // date -> { name, localName }
+  loading: false,
+
+  setSelectedYear: (year) => set({ selectedYear: year }),
+  setSelectedUserId: (id) => set({ selectedUserId: id }),
+
+  loadPlan: async () => {
+    const data = await api.getPlan()
+    set({
+      plan: data.plan,
+      users: data.users,
+      pendingInvites: data.pendingInvites,
+      incomingInvites: data.incomingInvites,
+      isOwner: data.isOwner,
+      isFused: data.isFused,
+    })
+  },
+
+  updatePlan: async (updates) => {
+    const data = await api.updatePlan(updates)
+    set({ plan: data.plan })
+    await get().loadEntries()
+    await get().loadStats()
+    await get().loadHolidays()
+  },
+
+  updateColor: async (color, targetUserId) => {
+    await api.updateColor(color, targetUserId)
+    await get().loadPlan()
+    await get().loadEntries()
+  },
+
+  invite: async (userId) => {
+    await api.invite(userId)
+    await get().loadPlan()
+  },
+
+  acceptInvite: async (planId) => {
+    await api.acceptInvite(planId)
+    await get().loadAll()
+  },
+
+  declineInvite: async (planId) => {
+    await api.declineInvite(planId)
+    await get().loadPlan()
+  },
+
+  cancelInvite: async (userId) => {
+    await api.cancelInvite(userId)
+    await get().loadPlan()
+  },
+
+  dissolve: async () => {
+    await api.dissolve()
+    await get().loadAll()
+  },
+
+  loadYears: async () => {
+    const data = await api.getYears()
+    set({ years: data.years })
+    if (data.years.length > 0) {
+      set({ selectedYear: data.years[data.years.length - 1] })
+    }
+  },
+
+  addYear: async (year) => {
+    const data = await api.addYear(year)
+    set({ years: data.years })
+    await get().loadStats(year)
+  },
+
+  removeYear: async (year) => {
+    const data = await api.removeYear(year)
+    set({ years: data.years })
+  },
+
+  loadEntries: async (year) => {
+    const y = year || get().selectedYear
+    const data = await api.getEntries(y)
+    set({ entries: data.entries, companyHolidays: data.companyHolidays })
+  },
+
+  toggleEntry: async (date, targetUserId) => {
+    await api.toggleEntry(date, targetUserId)
+    await get().loadEntries()
+    await get().loadStats()
+  },
+
+  toggleCompanyHoliday: async (date) => {
+    await api.toggleCompanyHoliday(date)
+    await get().loadEntries()
+  },
+
+  loadStats: async (year) => {
+    const y = year || get().selectedYear
+    const data = await api.getStats(y)
+    set({ stats: data.stats })
+  },
+
+  updateVacationDays: async (year, days, targetUserId) => {
+    await api.updateStats(year, days, targetUserId)
+    await get().loadStats(year)
+  },
+
+  loadHolidays: async (year) => {
+    const y = year || get().selectedYear
+    const plan = get().plan
+    if (!plan?.holidays_enabled || !plan?.holidays_region) {
+      set({ holidays: {} })
+      return
+    }
+    const country = plan.holidays_region.split('-')[0]
+    const region = plan.holidays_region.includes('-') ? plan.holidays_region : null
+    try {
+      const data = await api.getHolidays(y, country)
+      // Check if this country HAS regional holidays
+      const hasRegions = data.some(h => h.counties && h.counties.length > 0)
+      // If country has regions but no region selected yet, only show global ones
+      // Actually: don't show ANY holidays until region is selected
+      if (hasRegions && !region) {
+        set({ holidays: {} })
+        return
+      }
+      const map = {}
+      data.forEach(h => {
+        if (h.global || !h.counties || (region && h.counties.includes(region))) {
+          map[h.date] = { name: h.name, localName: h.localName }
+        }
+      })
+      set({ holidays: map })
+    } catch {
+      set({ holidays: {} })
+    }
+  },
+
+  loadAll: async () => {
+    set({ loading: true })
+    try {
+      await get().loadPlan()
+      await get().loadYears()
+      const year = get().selectedYear
+      await get().loadEntries(year)
+      await get().loadStats(year)
+      await get().loadHolidays(year)
+    } finally {
+      set({ loading: false })
+    }
+  },
+}))
@@ -1,8 +1,91 @@
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'
+import { VitePWA } from 'vite-plugin-pwa'

 export default defineConfig({
-  plugins: [react()],
+  plugins: [
+    react(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      workbox: {
+        globPatterns: ['**/*.{js,css,html,svg,png,woff,woff2,ttf}'],
+        navigateFallback: 'index.html',
+        navigateFallbackDenylist: [/^\/api/, /^\/uploads/],
+        runtimeCaching: [
+          {
+            // Carto map tiles (default provider)
+            urlPattern: /^https:\/\/[a-d]\.basemaps\.cartocdn\.com\/.*/i,
+            handler: 'CacheFirst',
+            options: {
+              cacheName: 'map-tiles',
+              expiration: { maxEntries: 1000, maxAgeSeconds: 30 * 24 * 60 * 60 },
+              cacheableResponse: { statuses: [0, 200] },
+            },
+          },
+          {
+            // OpenStreetMap tiles (fallback / alternative)
+            urlPattern: /^https:\/\/[a-c]\.tile\.openstreetmap\.org\/.*/i,
+            handler: 'CacheFirst',
+            options: {
+              cacheName: 'map-tiles',
+              expiration: { maxEntries: 1000, maxAgeSeconds: 30 * 24 * 60 * 60 },
+              cacheableResponse: { statuses: [0, 200] },
+            },
+          },
+          {
+            // Leaflet CSS/JS from unpkg CDN
+            urlPattern: /^https:\/\/unpkg\.com\/.*/i,
+            handler: 'CacheFirst',
+            options: {
+              cacheName: 'cdn-libs',
+              expiration: { maxEntries: 30, maxAgeSeconds: 365 * 24 * 60 * 60 },
+              cacheableResponse: { statuses: [0, 200] },
+            },
+          },
+          {
+            // API calls — prefer network, fall back to cache
+            urlPattern: /\/api\/.*/i,
+            handler: 'NetworkFirst',
+            options: {
+              cacheName: 'api-data',
+              expiration: { maxEntries: 200, maxAgeSeconds: 24 * 60 * 60 },
+              networkTimeoutSeconds: 5,
+              cacheableResponse: { statuses: [0, 200] },
+            },
+          },
+          {
+            // Uploaded files (photos, covers, documents)
+            urlPattern: /\/uploads\/.*/i,
+            handler: 'CacheFirst',
+            options: {
+              cacheName: 'user-uploads',
+              expiration: { maxEntries: 300, maxAgeSeconds: 30 * 24 * 60 * 60 },
+              cacheableResponse: { statuses: [0, 200] },
+            },
+          },
+        ],
+      },
+      manifest: {
+        name: 'NOMAD \u2014 Travel Planner',
+        short_name: 'NOMAD',
+        description: 'Navigation Organizer for Maps, Activities & Destinations',
+        theme_color: '#111827',
+        background_color: '#0f172a',
+        display: 'standalone',
+        scope: '/',
+        start_url: '/',
+        orientation: 'any',
+        categories: ['travel', 'navigation'],
+        icons: [
+          { src: 'icons/apple-touch-icon-180x180.png', sizes: '180x180', type: 'image/png' },
+          { src: 'icons/icon-192x192.png', sizes: '192x192', type: 'image/png' },
+          { src: 'icons/icon-512x512.png', sizes: '512x512', type: 'image/png' },
+          { src: 'icons/icon-512x512.png', sizes: '512x512', type: 'image/png', purpose: 'maskable' },
+          { src: 'icons/icon.svg', sizes: 'any', type: 'image/svg+xml' },
+        ],
+      },
+    }),
+  ],
  server: {
    port: 5173,
    proxy: {
@@ -1,12 +1,12 @@
 services:
  app:
-    image: mauriceboe/nomad:latest
+    image: mauriceboe/nomad:2.5.5
    container_name: nomad
    ports:
      - "3000:3000"
    environment:
      - NODE_ENV=production
-      - JWT_SECRET=${JWT_SECRET:-change-me-to-a-long-random-string}
+      - JWT_SECRET=${JWT_SECRET:-}
      # - ALLOWED_ORIGINS=https://yourdomain.com  # Optional: restrict CORS to specific origins
      - PORT=3000
    volumes:
@@ -1,18 +1,20 @@
 {
  "name": "nomad-server",
-  "version": "2.3.4",
+  "version": "2.5.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "nomad-server",
-      "version": "2.3.4",
+      "version": "2.5.5",
      "dependencies": {
        "archiver": "^6.0.1",
        "bcryptjs": "^2.4.3",
+        "better-sqlite3": "^12.8.0",
        "cors": "^2.8.5",
        "dotenv": "^16.4.1",
        "express": "^4.18.3",
+        "helmet": "^8.1.0",
        "jsonwebtoken": "^9.0.2",
        "multer": "^1.4.5-lts.1",
        "node-cron": "^4.2.1",
@@ -216,12 +218,46 @@
        "bare-path": "^3.0.0"
      }
    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
    "node_modules/bcryptjs": {
      "version": "2.4.3",
      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
      "license": "MIT"
    },
+    "node_modules/better-sqlite3": {
+      "version": "12.8.0",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.8.0.tgz",
+      "integrity": "sha512-RxD2Vd96sQDjQr20kdP+F+dK/1OUNiVOl200vKBZY8u0vTwysfolF6Hq+3ZK2+h8My9YvZhHsF+RSGZW2VYrPQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "prebuild-install": "^7.1.1"
+      },
+      "engines": {
+        "node": "20.x || 22.x || 23.x || 24.x || 25.x"
+      }
+    },
    "node_modules/binary-extensions": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -235,6 +271,26 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
    "node_modules/bluebird": {
      "version": "3.7.2",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -291,6 +347,30 @@
        "node": ">=8"
      }
    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
    "node_modules/buffer-crc32": {
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -386,6 +466,12 @@
        "fsevents": "~2.3.2"
      }
    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "license": "ISC"
+    },
    "node_modules/compress-commons": {
      "version": "5.0.3",
      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-5.0.3.tgz",
@@ -539,6 +625,30 @@
        "ms": "2.0.0"
      }
    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
    "node_modules/depd": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -558,6 +668,15 @@
        "npm": "1.2.8000 || >= 1.4.16"
      }
    },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/dotenv": {
      "version": "16.6.1",
      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
@@ -647,6 +766,15 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
    "node_modules/es-define-property": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -701,6 +829,15 @@
        "bare-events": "^2.7.0"
      }
    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "license": "(MIT OR WTFPL)",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/express": {
      "version": "4.22.1",
      "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
@@ -753,6 +890,12 @@
      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
      "license": "MIT"
    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "license": "MIT"
+    },
    "node_modules/fill-range": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -802,6 +945,12 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "license": "MIT"
+    },
    "node_modules/fs-extra": {
      "version": "11.3.4",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
@@ -883,6 +1032,12 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "license": "MIT"
+    },
    "node_modules/glob": {
      "version": "8.1.0",
      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -995,6 +1150,15 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/helmet": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-8.1.0.tgz",
+      "integrity": "sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
    "node_modules/http-errors": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
@@ -1027,6 +1191,26 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
    "node_modules/ignore-by-default": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
@@ -1051,6 +1235,12 @@
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
      "license": "ISC"
    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "license": "ISC"
+    },
    "node_modules/ipaddr.js": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -1332,6 +1522,18 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/minimatch": {
      "version": "10.2.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
@@ -1369,6 +1571,12 @@
        "mkdirp": "bin/cmd.js"
      }
    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "license": "MIT"
+    },
    "node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1394,6 +1602,12 @@
        "node": ">= 6.0.0"
      }
    },
+    "node_modules/napi-build-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
+      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+      "license": "MIT"
+    },
    "node_modules/negotiator": {
      "version": "0.6.3",
      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -1403,6 +1617,18 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/node-abi": {
+      "version": "3.89.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz",
+      "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==",
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/node-cron": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-4.2.1.tgz",
@@ -1571,6 +1797,33 @@
        "url": "https://github.com/sponsors/jonschlinkert"
      }
    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
+      "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.",
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^2.0.0",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -1597,6 +1850,16 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/pump": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
    "node_modules/qs": {
      "version": "6.14.2",
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
@@ -1636,6 +1899,21 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
    "node_modules/readable-stream": {
      "version": "3.6.2",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -1860,6 +2138,51 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
    "node_modules/simple-update-notifier": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
@@ -1910,6 +2233,15 @@
        "safe-buffer": "~5.2.0"
      }
    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/supports-color": {
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1923,6 +2255,34 @@
        "node": ">=4"
      }
    },
+    "node_modules/tar-fs": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-fs/node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/tar-stream": {
      "version": "3.1.8",
      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
@@ -1991,6 +2351,18 @@
      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
      "license": "MIT"
    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/type-is": {
      "version": "1.6.18",
      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -1,17 +1,19 @@
 {
  "name": "nomad-server",
-  "version": "2.4.0",
+  "version": "2.5.7",
  "main": "src/index.js",
  "scripts": {
-    "start": "node --experimental-sqlite src/index.js",
+    "start": "node src/index.js",
    "dev": "nodemon src/index.js"
  },
  "dependencies": {
    "archiver": "^6.0.1",
    "bcryptjs": "^2.4.3",
+    "better-sqlite3": "^12.8.0",
    "cors": "^2.8.5",
    "dotenv": "^16.4.1",
    "express": "^4.18.3",
+    "helmet": "^8.1.0",
    "jsonwebtoken": "^9.0.2",
    "multer": "^1.4.5-lts.1",
    "node-cron": "^4.2.1",
@@ -1,9 +1,9 @@
 const path = require('path');
-const { DatabaseSync } = require('node:sqlite');
+const Database = require('better-sqlite3');
 const bcrypt = require('bcryptjs');

 const dbPath = path.join(__dirname, 'data/travel.db');
-const db = new DatabaseSync(dbPath);
+const db = new Database(dbPath);

 const hash = bcrypt.hashSync('admin123', 10);
 const existing = db.prepare('SELECT id FROM users WHERE email = ?').get('admin@admin.com');
@@ -1,4 +1,4 @@
-const { DatabaseSync } = require('node:sqlite');
+const Database = require('better-sqlite3');
 const path = require('path');
 const fs = require('fs');
 const bcrypt = require('bcryptjs');
@@ -19,7 +19,7 @@ function initDb() {
    _db = null;
  }

-  _db = new DatabaseSync(dbPath);
+  _db = new Database(dbPath);
  _db.exec('PRAGMA journal_mode = WAL');
  _db.exec('PRAGMA busy_timeout = 5000');
  _db.exec('PRAGMA foreign_keys = ON');
@@ -35,6 +35,10 @@ function initDb() {
      maps_api_key TEXT,
      unsplash_api_key TEXT,
      openweather_api_key TEXT,
+      avatar TEXT,
+      oidc_sub TEXT,
+      oidc_issuer TEXT,
+      last_login DATETIME,
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
      updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );
@@ -55,6 +59,8 @@ function initDb() {
      start_date TEXT,
      end_date TEXT,
      currency TEXT DEFAULT 'EUR',
+      cover_image TEXT,
+      is_archived INTEGER DEFAULT 0,
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
      updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );
@@ -65,6 +71,7 @@ function initDb() {
      day_number INTEGER NOT NULL,
      date TEXT,
      notes TEXT,
+      title TEXT,
      UNIQUE(trip_id, day_number)
    );

@@ -73,6 +80,7 @@ function initDb() {
      name TEXT NOT NULL,
      color TEXT DEFAULT '#6366f1',
      icon TEXT DEFAULT '📍',
+      user_id INTEGER REFERENCES users(id) ON DELETE SET NULL,
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );

@@ -99,6 +107,7 @@ function initDb() {
      reservation_notes TEXT,
      reservation_datetime TEXT,
      place_time TEXT,
+      end_time TEXT,
      duration_minutes INTEGER DEFAULT 60,
      notes TEXT,
      image_url TEXT,
@@ -122,6 +131,9 @@ function initDb() {
      place_id INTEGER NOT NULL REFERENCES places(id) ON DELETE CASCADE,
      order_index INTEGER DEFAULT 0,
      notes TEXT,
+      reservation_status TEXT DEFAULT 'none',
+      reservation_notes TEXT,
+      reservation_datetime TEXT,
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );

@@ -153,6 +165,7 @@ function initDb() {
      id INTEGER PRIMARY KEY AUTOINCREMENT,
      trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
      place_id INTEGER REFERENCES places(id) ON DELETE SET NULL,
+      reservation_id INTEGER REFERENCES reservations(id) ON DELETE SET NULL,
      filename TEXT NOT NULL,
      original_name TEXT NOT NULL,
      file_size INTEGER,
@@ -166,11 +179,14 @@ function initDb() {
      trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
      day_id INTEGER REFERENCES days(id) ON DELETE SET NULL,
      place_id INTEGER REFERENCES places(id) ON DELETE SET NULL,
+      assignment_id INTEGER REFERENCES day_assignments(id) ON DELETE SET NULL,
      title TEXT NOT NULL,
      reservation_time TEXT,
      location TEXT,
      confirmation_number TEXT,
      notes TEXT,
+      status TEXT DEFAULT 'pending',
+      type TEXT DEFAULT 'other',
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );

@@ -202,7 +218,7 @@ function initDb() {
    CREATE TABLE IF NOT EXISTS budget_items (
      id INTEGER PRIMARY KEY AUTOINCREMENT,
      trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
-      category TEXT NOT NULL DEFAULT 'Sonstiges',
+      category TEXT NOT NULL DEFAULT 'Other',
      name TEXT NOT NULL,
      total_price REAL NOT NULL DEFAULT 0,
      persons INTEGER DEFAULT NULL,
@@ -211,6 +227,95 @@ function initDb() {
      sort_order INTEGER DEFAULT 0,
      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
    );
+
+    -- Addon system
+    CREATE TABLE IF NOT EXISTS addons (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      description TEXT,
+      type TEXT NOT NULL DEFAULT 'global',
+      icon TEXT DEFAULT 'Puzzle',
+      enabled INTEGER DEFAULT 0,
+      config TEXT DEFAULT '{}',
+      sort_order INTEGER DEFAULT 0
+    );
+
+    -- Vacay addon tables
+    CREATE TABLE IF NOT EXISTS vacay_plans (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      owner_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      block_weekends INTEGER DEFAULT 1,
+      holidays_enabled INTEGER DEFAULT 0,
+      holidays_region TEXT DEFAULT '',
+      company_holidays_enabled INTEGER DEFAULT 1,
+      carry_over_enabled INTEGER DEFAULT 1,
+      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      UNIQUE(owner_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_plan_members (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      status TEXT DEFAULT 'pending',
+      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      UNIQUE(plan_id, user_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_user_colors (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      color TEXT DEFAULT '#6366f1',
+      UNIQUE(user_id, plan_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_years (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      year INTEGER NOT NULL,
+      UNIQUE(plan_id, year)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_user_years (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      year INTEGER NOT NULL,
+      vacation_days INTEGER DEFAULT 30,
+      carried_over INTEGER DEFAULT 0,
+      UNIQUE(user_id, plan_id, year)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_entries (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      date TEXT NOT NULL,
+      note TEXT DEFAULT '',
+      UNIQUE(user_id, plan_id, date)
+    );
+
+    CREATE TABLE IF NOT EXISTS vacay_company_holidays (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      plan_id INTEGER NOT NULL REFERENCES vacay_plans(id) ON DELETE CASCADE,
+      date TEXT NOT NULL,
+      note TEXT DEFAULT '',
+      UNIQUE(plan_id, date)
+    );
+
+    CREATE TABLE IF NOT EXISTS day_accommodations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
+      place_id INTEGER NOT NULL REFERENCES places(id) ON DELETE CASCADE,
+      start_day_id INTEGER NOT NULL REFERENCES days(id) ON DELETE CASCADE,
+      end_day_id INTEGER NOT NULL REFERENCES days(id) ON DELETE CASCADE,
+      check_in TEXT,
+      check_out TEXT,
+      confirmation TEXT,
+      notes TEXT,
+      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    );
  `);

  // Create indexes for performance
@@ -231,55 +336,118 @@ function initDb() {
    CREATE INDEX IF NOT EXISTS idx_day_notes_day_id ON day_notes(day_id);
    CREATE INDEX IF NOT EXISTS idx_photos_trip_id ON photos(trip_id);
    CREATE INDEX IF NOT EXISTS idx_users_email ON users(email);
+    CREATE INDEX IF NOT EXISTS idx_day_accommodations_trip_id ON day_accommodations(trip_id);
  `);

-  // Migrations
+  // Versioned migrations — each runs exactly once
+  _db.exec('CREATE TABLE IF NOT EXISTS schema_version (version INTEGER NOT NULL)');
+  const versionRow = _db.prepare('SELECT version FROM schema_version').get();
+  let currentVersion = versionRow?.version ?? 0;
+
+  // Existing or fresh DBs may already have columns the migrations add.
+  // Detect by checking for a column from migration 1 (unsplash_api_key).
+  if (currentVersion === 0) {
+    const hasUnsplash = _db.prepare(
+      "SELECT 1 FROM pragma_table_info('users') WHERE name = 'unsplash_api_key'"
+    ).get();
+    if (hasUnsplash) {
+      // All columns from CREATE TABLE already exist — skip ALTER migrations
+      currentVersion = 19;
+      _db.prepare('INSERT INTO schema_version (version) VALUES (?)').run(currentVersion);
+      console.log('[DB] Schema already up-to-date, setting version to', currentVersion);
+    } else {
+      _db.prepare('INSERT INTO schema_version (version) VALUES (?)').run(0);
+    }
+  }
+
  const migrations = [
-    `ALTER TABLE users ADD COLUMN unsplash_api_key TEXT`,
-    `ALTER TABLE users ADD COLUMN openweather_api_key TEXT`,
-    `ALTER TABLE places ADD COLUMN duration_minutes INTEGER DEFAULT 60`,
-    `ALTER TABLE places ADD COLUMN notes TEXT`,
-    `ALTER TABLE places ADD COLUMN image_url TEXT`,
-    `ALTER TABLE places ADD COLUMN transport_mode TEXT DEFAULT 'walking'`,
-    `ALTER TABLE days ADD COLUMN title TEXT`,
-    `ALTER TABLE reservations ADD COLUMN status TEXT DEFAULT 'pending'`,
-    `ALTER TABLE trip_files ADD COLUMN reservation_id INTEGER REFERENCES reservations(id) ON DELETE SET NULL`,
-    `ALTER TABLE reservations ADD COLUMN type TEXT DEFAULT 'other'`,
-    `ALTER TABLE trips ADD COLUMN cover_image TEXT`,
-    `ALTER TABLE day_notes ADD COLUMN icon TEXT DEFAULT '📝'`,
-    `ALTER TABLE trips ADD COLUMN is_archived INTEGER DEFAULT 0`,
-    `ALTER TABLE categories ADD COLUMN user_id INTEGER REFERENCES users(id) ON DELETE SET NULL`,
-    `ALTER TABLE users ADD COLUMN avatar TEXT`,
-    `ALTER TABLE users ADD COLUMN oidc_sub TEXT`,
-    `ALTER TABLE users ADD COLUMN oidc_issuer TEXT`,
-    `ALTER TABLE users ADD COLUMN last_login DATETIME`,
+    // 1–18: ALTER TABLE additions
+    () => _db.exec('ALTER TABLE users ADD COLUMN unsplash_api_key TEXT'),
+    () => _db.exec('ALTER TABLE users ADD COLUMN openweather_api_key TEXT'),
+    () => _db.exec('ALTER TABLE places ADD COLUMN duration_minutes INTEGER DEFAULT 60'),
+    () => _db.exec('ALTER TABLE places ADD COLUMN notes TEXT'),
+    () => _db.exec('ALTER TABLE places ADD COLUMN image_url TEXT'),
+    () => _db.exec("ALTER TABLE places ADD COLUMN transport_mode TEXT DEFAULT 'walking'"),
+    () => _db.exec('ALTER TABLE days ADD COLUMN title TEXT'),
+    () => _db.exec("ALTER TABLE reservations ADD COLUMN status TEXT DEFAULT 'pending'"),
+    () => _db.exec('ALTER TABLE trip_files ADD COLUMN reservation_id INTEGER REFERENCES reservations(id) ON DELETE SET NULL'),
+    () => _db.exec("ALTER TABLE reservations ADD COLUMN type TEXT DEFAULT 'other'"),
+    () => _db.exec('ALTER TABLE trips ADD COLUMN cover_image TEXT'),
+    () => _db.exec("ALTER TABLE day_notes ADD COLUMN icon TEXT DEFAULT '📝'"),
+    () => _db.exec('ALTER TABLE trips ADD COLUMN is_archived INTEGER DEFAULT 0'),
+    () => _db.exec('ALTER TABLE categories ADD COLUMN user_id INTEGER REFERENCES users(id) ON DELETE SET NULL'),
+    () => _db.exec('ALTER TABLE users ADD COLUMN avatar TEXT'),
+    () => _db.exec('ALTER TABLE users ADD COLUMN oidc_sub TEXT'),
+    () => _db.exec('ALTER TABLE users ADD COLUMN oidc_issuer TEXT'),
+    () => _db.exec('ALTER TABLE users ADD COLUMN last_login DATETIME'),
+    // 19: budget_items table rebuild (NOT NULL → nullable persons)
+    () => {
+      const schema = _db.prepare("SELECT sql FROM sqlite_master WHERE name = 'budget_items'").get();
+      if (schema?.sql?.includes('NOT NULL DEFAULT 1')) {
+        _db.exec(`
+          CREATE TABLE budget_items_new (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
+            category TEXT NOT NULL DEFAULT 'Other',
+            name TEXT NOT NULL,
+            total_price REAL NOT NULL DEFAULT 0,
+            persons INTEGER DEFAULT NULL,
+            days INTEGER DEFAULT NULL,
+            note TEXT,
+            sort_order INTEGER DEFAULT 0,
+            created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+          );
+          INSERT INTO budget_items_new SELECT * FROM budget_items;
+          DROP TABLE budget_items;
+          ALTER TABLE budget_items_new RENAME TO budget_items;
+        `);
+      }
+    },
+    // 20: accommodation check-in/check-out/confirmation fields
+    () => {
+      try { _db.exec('ALTER TABLE day_accommodations ADD COLUMN check_in TEXT'); } catch {}
+      try { _db.exec('ALTER TABLE day_accommodations ADD COLUMN check_out TEXT'); } catch {}
+      try { _db.exec('ALTER TABLE day_accommodations ADD COLUMN confirmation TEXT'); } catch {}
+    },
+    // 21: places end_time field (place_time becomes start_time conceptually, end_time is new)
+    () => {
+      try { _db.exec('ALTER TABLE places ADD COLUMN end_time TEXT'); } catch {}
+    },
+    // 22: Move reservation fields from places to day_assignments
+    () => {
+      // Add new columns to day_assignments
+      try { _db.exec('ALTER TABLE day_assignments ADD COLUMN reservation_status TEXT DEFAULT \'none\''); } catch {}
+      try { _db.exec('ALTER TABLE day_assignments ADD COLUMN reservation_notes TEXT'); } catch {}
+      try { _db.exec('ALTER TABLE day_assignments ADD COLUMN reservation_datetime TEXT'); } catch {}
+
+      // Migrate existing data: copy reservation info from places to all their assignments
+      try {
+        _db.exec(`
+          UPDATE day_assignments SET
+            reservation_status = (SELECT reservation_status FROM places WHERE places.id = day_assignments.place_id),
+            reservation_notes = (SELECT reservation_notes FROM places WHERE places.id = day_assignments.place_id),
+            reservation_datetime = (SELECT reservation_datetime FROM places WHERE places.id = day_assignments.place_id)
+          WHERE place_id IN (SELECT id FROM places WHERE reservation_status IS NOT NULL AND reservation_status != 'none')
+        `);
+        console.log('[DB] Migrated reservation data from places to day_assignments');
+      } catch (e) {
+        console.error('[DB] Migration 22 data copy error:', e.message);
+      }
+    },
+    // 23: Add assignment_id to reservations table
+    () => {
+      try { _db.exec('ALTER TABLE reservations ADD COLUMN assignment_id INTEGER REFERENCES day_assignments(id) ON DELETE SET NULL'); } catch {}
+    },
+    // Future migrations go here (append only, never reorder)
  ];

-  // Recreate budget_items to allow NULL persons (SQLite can't ALTER NOT NULL)
-  try {
-    const hasNotNull = _db.prepare("SELECT sql FROM sqlite_master WHERE name = 'budget_items'").get()
-    if (hasNotNull?.sql?.includes('NOT NULL DEFAULT 1')) {
-      _db.exec(`
-        CREATE TABLE budget_items_new (
-          id INTEGER PRIMARY KEY AUTOINCREMENT,
-          trip_id INTEGER NOT NULL REFERENCES trips(id) ON DELETE CASCADE,
-          category TEXT NOT NULL DEFAULT 'Sonstiges',
-          name TEXT NOT NULL,
-          total_price REAL NOT NULL DEFAULT 0,
-          persons INTEGER DEFAULT NULL,
-          days INTEGER DEFAULT NULL,
-          note TEXT,
-          sort_order INTEGER DEFAULT 0,
-          created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-        );
-        INSERT INTO budget_items_new SELECT * FROM budget_items;
-        DROP TABLE budget_items;
-        ALTER TABLE budget_items_new RENAME TO budget_items;
-      `)
+  if (currentVersion < migrations.length) {
+    for (let i = currentVersion; i < migrations.length; i++) {
+      console.log(`[DB] Running migration ${i + 1}/${migrations.length}`);
+      migrations[i]();
    }
-  } catch (e) { /* table doesn't exist yet or already migrated */ }
-  for (const sql of migrations) {
-    try { _db.exec(sql); } catch (e) { /* column already exists */ }
+    _db.prepare('UPDATE schema_version SET version = ?').run(migrations.length);
+    console.log(`[DB] Migrations complete — schema version ${migrations.length}`);
  }

  // First registered user becomes admin — no default admin seed needed
@@ -291,14 +459,14 @@ function initDb() {
      const defaultCategories = [
        { name: 'Hotel', color: '#3b82f6', icon: '🏨' },
        { name: 'Restaurant', color: '#ef4444', icon: '🍽️' },
-        { name: 'Sehenswürdigkeit', color: '#8b5cf6', icon: '🏛️' },
+        { name: 'Attraction', color: '#8b5cf6', icon: '🏛️' },
        { name: 'Shopping', color: '#f59e0b', icon: '🛍️' },
        { name: 'Transport', color: '#6b7280', icon: '🚌' },
-        { name: 'Aktivität', color: '#10b981', icon: '🎯' },
-        { name: 'Bar/Café', color: '#f97316', icon: '☕' },
-        { name: 'Strand', color: '#06b6d4', icon: '🏖️' },
-        { name: 'Natur', color: '#84cc16', icon: '🌿' },
-        { name: 'Sonstiges', color: '#6366f1', icon: '📍' },
+        { name: 'Activity', color: '#10b981', icon: '🎯' },
+        { name: 'Bar/Cafe', color: '#f97316', icon: '☕' },
+        { name: 'Beach', color: '#06b6d4', icon: '🏖️' },
+        { name: 'Nature', color: '#84cc16', icon: '🌿' },
+        { name: 'Other', color: '#6366f1', icon: '📍' },
      ];
      const insertCat = _db.prepare('INSERT INTO categories (name, color, icon) VALUES (?, ?, ?)');
      for (const cat of defaultCategories) insertCat.run(cat.name, cat.color, cat.icon);
@@ -307,6 +475,25 @@ function initDb() {
  } catch (err) {
    console.error('Error seeding categories:', err.message);
  }
+
+  // Seed: default addons
+  try {
+    const existingAddons = _db.prepare('SELECT COUNT(*) as count FROM addons').get();
+    if (existingAddons.count === 0) {
+      const defaultAddons = [
+        { id: 'packing', name: 'Packing List', description: 'Pack your bags with checklists per trip', type: 'trip', icon: 'ListChecks', sort_order: 0 },
+        { id: 'budget', name: 'Budget Planner', description: 'Track expenses and plan your travel budget', type: 'trip', icon: 'Wallet', sort_order: 1 },
+        { id: 'documents', name: 'Documents', description: 'Store and manage travel documents', type: 'trip', icon: 'FileText', sort_order: 2 },
+        { id: 'vacay', name: 'Vacay', description: 'Personal vacation day planner with calendar view', type: 'global', icon: 'CalendarDays', sort_order: 10 },
+        { id: 'atlas', name: 'Atlas', description: 'World map of your visited countries with travel stats', type: 'global', icon: 'Globe', sort_order: 11 },
+      ];
+      const insertAddon = _db.prepare('INSERT INTO addons (id, name, description, type, icon, enabled, sort_order) VALUES (?, ?, ?, ?, ?, 1, ?)');
+      for (const a of defaultAddons) insertAddon.run(a.id, a.name, a.description, a.type, a.icon, a.sort_order);
+      console.log('Default addons seeded');
+    }
+  } catch (err) {
+    console.error('Error seeding addons:', err.message);
+  }
 }

 // Initialize on module load
@@ -326,6 +513,7 @@ if (process.env.DEMO_MODE === 'true') {
 // without needing a server restart after reinitialize()
 const db = new Proxy({}, {
  get(_, prop) {
+    if (!_db) throw new Error('Database connection is not available (restore in progress?)');
    const val = _db[prop];
    return typeof val === 'function' ? val.bind(_db) : val;
  },
@@ -63,15 +63,18 @@ function ensureDemoMembership(db, adminId, demoId) {
 function seedExampleTrips(db, adminId, demoId) {
  const insertTrip = db.prepare('INSERT INTO trips (user_id, title, description, start_date, end_date, currency) VALUES (?, ?, ?, ?, ?, ?)');
  const insertDay = db.prepare('INSERT INTO days (trip_id, day_number, date) VALUES (?, ?, ?)');
-  const insertPlace = db.prepare('INSERT INTO places (trip_id, name, lat, lng, address, category_id, place_time, duration_minutes, notes, image_url) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
+  const insertPlace = db.prepare('INSERT INTO places (trip_id, name, lat, lng, address, category_id, place_time, duration_minutes, notes, image_url, google_place_id, website, phone) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
  const insertAssignment = db.prepare('INSERT INTO day_assignments (day_id, place_id, order_index) VALUES (?, ?, ?)');
  const insertPacking = db.prepare('INSERT INTO packing_items (trip_id, name, checked, category, sort_order) VALUES (?, ?, ?, ?, ?)');
  const insertBudget = db.prepare('INSERT INTO budget_items (trip_id, category, name, total_price, persons, note) VALUES (?, ?, ?, ?, ?, ?)');
  const insertReservation = db.prepare('INSERT INTO reservations (trip_id, day_id, title, reservation_time, confirmation_number, status, type, location) VALUES (?, ?, ?, ?, ?, ?, ?, ?)');
  const insertMember = db.prepare('INSERT OR IGNORE INTO trip_members (trip_id, user_id, invited_by) VALUES (?, ?, ?)');
+  const insertNote = db.prepare('INSERT INTO day_notes (day_id, trip_id, text, time, icon, sort_order) VALUES (?, ?, ?, ?, ?, ?)');

-  // ─── Trip 1: Tokyo & Kyoto ───
-  const trip1 = insertTrip.run(adminId, 'Tokyo & Kyoto', 'Zwei Wochen Japan — von den neonbeleuchteten Strassen Tokyos bis zu den stillen Tempeln Kyotos.', '2026-04-15', '2026-04-21', 'EUR');
+  // Category IDs: 1=Hotel, 2=Restaurant, 3=Attraction, 5=Transport, 7=Bar/Cafe, 8=Beach, 9=Nature, 6=Entertainment
+
+  // ─── Trip 1: Tokyo & Kyoto ─────────────────────────────────────────────────
+  const trip1 = insertTrip.run(adminId, 'Tokyo & Kyoto', 'Two weeks in Japan — from the neon-lit streets of Tokyo to the serene temples of Kyoto.', '2026-04-15', '2026-04-21', 'JPY');
  const t1 = Number(trip1.lastInsertRowid);

  const t1days = [];
@@ -80,38 +83,39 @@ function seedExampleTrips(db, adminId, demoId) {
    t1days.push(Number(d.lastInsertRowid));
  }

-  // Places — cat IDs: 1=Hotel, 2=Restaurant, 3=Sehenswuerdigkeit, 5=Transport, 7=Bar/Cafe, 9=Natur
  const t1places = [
-    [t1, 'Hotel Shinjuku Granbell', 35.6938, 139.7035, 'Shinjuku, Tokyo, Japan', 1, '15:00', 60, 'Check-in ab 15 Uhr. Nahe Shinjuku Station.', null],
-    [t1, 'Senso-ji Tempel', 35.7148, 139.7967, 'Asakusa, Tokyo, Japan', 3, '09:00', 90, 'Aeltester Tempel Tokyos. Morgens weniger Touristen.', null],
-    [t1, 'Shibuya Crossing', 35.6595, 139.7004, 'Shibuya, Tokyo, Japan', 3, '18:00', 45, 'Die beruehmteste Kreuzung der Welt. Abends am beeindruckendsten.', null],
-    [t1, 'Tsukiji Outer Market', 35.6654, 139.7707, 'Tsukiji, Tokyo, Japan', 2, '08:00', 120, 'Frisches Sushi zum Fruehstueck! Strassenstaende erkunden.', null],
-    [t1, 'Meiji-Schrein', 35.6764, 139.6993, 'Shibuya, Tokyo, Japan', 3, '10:00', 75, 'Ruhige Oase mitten in der Stadt. Durch den Wald zum Schrein.', null],
-    [t1, 'Akihabara', 35.7023, 139.7745, 'Akihabara, Tokyo, Japan', 3, '14:00', 180, 'Electric Town — Anime, Manga, Elektronik. Retro-Gaming Shops!', null],
-    [t1, 'Shinkansen nach Kyoto', 35.6812, 139.7671, 'Tokyo Station, Japan', 5, '08:30', 140, 'Nozomi Shinkansen, ca. 2h15. Fensterplatz fuer Fuji-Blick!', null],
-    [t1, 'Hotel Granvia Kyoto', 34.9856, 135.7580, 'Kyoto Station, Kyoto, Japan', 1, '14:00', 60, 'Direkt am Bahnhof. Perfekte Lage fuer Tagesausfluege.', null],
-    [t1, 'Fushimi Inari Taisha', 34.9671, 135.7727, 'Fushimi, Kyoto, Japan', 3, '07:00', 150, '10.000 rote Torii-Tore. Frueh morgens starten fuer leere Wege!', null],
-    [t1, 'Kinkaku-ji (Goldener Pavillon)', 35.0394, 135.7292, 'Kita, Kyoto, Japan', 3, '10:00', 60, 'Der goldene Tempel am See. Ikonisches Fotomotiv.', null],
-    [t1, 'Arashiyama Bambushain', 35.0095, 135.6673, 'Arashiyama, Kyoto, Japan', 9, '09:00', 90, 'Magischer Bambuswald. Am besten morgens vor den Massen.', null],
-    [t1, 'Nishiki Market', 35.0050, 135.7647, 'Nakagyo, Kyoto, Japan', 2, '12:00', 90, 'Kyotos Kuechengasse. Matcha-Eis und frische Mochi probieren!', null],
-    [t1, 'Gion Viertel', 35.0037, 135.7755, 'Gion, Kyoto, Japan', 3, '17:00', 120, 'Historisches Geisha-Viertel. Abends beste Chance auf Maiko-Sichtung.', null],
+    [t1, 'Hotel Shinjuku Granbell', 35.6938, 139.7035, '2-14-5 Kabukicho, Shinjuku City, Tokyo 160-0021, Japan', 1, '15:00', 60, 'Check-in from 3 PM. Steps from Shinjuku Station.', null, 'ChIJdaGEJBeMGGARYgt8sLBv6lM', 'https://www.grfranbellhotel.jp/shinjuku/', '+81 3-5155-2666'],
+    [t1, 'Senso-ji Temple', 35.7148, 139.7967, '2 Chome-3-1 Asakusa, Taito City, Tokyo 111-0032, Japan', 3, '09:00', 90, 'Oldest temple in Tokyo. Fewer tourists in the early morning.', null, 'ChIJ8T1GpMGOGGARDYGSgpoOdfg', 'https://www.senso-ji.jp/', '+81 3-3842-0181'],
+    [t1, 'Shibuya Crossing', 35.6595, 139.7004, '2 Chome-2-1 Dogenzaka, Shibuya City, Tokyo 150-0043, Japan', 3, '18:00', 45, 'World\'s busiest pedestrian crossing. Most impressive at night.', null, 'ChIJLyzOhmyLGGARMKWbl5z6wGg', null, null],
+    [t1, 'Tsukiji Outer Market', 35.6654, 139.7707, '4 Chome-16-2 Tsukiji, Chuo City, Tokyo 104-0045, Japan', 2, '08:00', 120, 'Fresh sushi for breakfast! Explore the street food stalls.', null, 'ChIJq2i1dZCLGGAR1TfoBRo25VU', 'https://www.tsukiji.or.jp/', null],
+    [t1, 'Meiji Jingu Shrine', 35.6764, 139.6993, '1-1 Yoyogikamizonocho, Shibuya City, Tokyo 151-8557, Japan', 3, '10:00', 75, 'Peaceful oasis in the middle of the city. Walk through the forest to the shrine.', null, 'ChIJ5SuJSByMGGARMg9qOlTFgkc', 'https://www.meijijingu.or.jp/', '+81 3-3379-5511'],
+    [t1, 'Akihabara Electric Town', 35.7023, 139.7745, 'Sotokanda, Chiyoda City, Tokyo, Japan', 3, '14:00', 180, 'Electric Town — anime, manga, electronics. Retro gaming shops!', null, 'ChIJGz1usEyMGGAR1mYByqOOJao', null, null],
+    [t1, 'Shinkansen to Kyoto', 35.6812, 139.7671, '1 Chome Marunouchi, Chiyoda City, Tokyo 100-0005, Japan', 5, '08:30', 140, 'Nozomi Shinkansen, approx. 2h15. Window seat for Mt. Fuji views!', null, 'ChIJC3Cf2PuLGGAROO00ukl8JwA', null, null],
+    [t1, 'Hotel Granvia Kyoto', 34.9856, 135.7580, 'Karasuma-dori Shiokoji-sagaru, Shimogyo-ku, Kyoto 600-8216, Japan', 1, '14:00', 60, 'Right at Kyoto Station. Perfect base for day trips.', null, 'ChIJUf6MDFcIAWARLihjKC9FWDY', 'https://www.granvia-kyoto.co.jp/', '+81 75-344-8888'],
+    [t1, 'Fushimi Inari Taisha', 34.9671, 135.7727, '68 Fukakusa Yabunouchicho, Fushimi Ward, Kyoto 612-0882, Japan', 3, '07:00', 150, '10,000 vermillion torii gates. Start early for empty paths!', null, 'ChIJIW0JRbMIAWARPYEzP5LVHGE', 'http://inari.jp/', '+81 75-641-7331'],
+    [t1, 'Kinkaku-ji (Golden Pavilion)', 35.0394, 135.7292, '1 Kinkakujicho, Kita Ward, Kyoto 603-8361, Japan', 3, '10:00', 60, 'The golden temple reflected in the mirror pond. Iconic photo spot.', null, 'ChIJvUbrwCCoAWAR5-uyAXPzBHg', null, '+81 75-461-0013'],
+    [t1, 'Arashiyama Bamboo Grove', 35.0095, 135.6673, 'Sagatenryuji Susukinobabacho, Ukyo Ward, Kyoto 616-8385, Japan', 9, '09:00', 90, 'Magical bamboo forest. Best visited in the morning before the crowds.', null, 'ChIJFS4EvA6pAWARQsAPVijvW7I', null, null],
+    [t1, 'Nishiki Market', 35.0050, 135.7647, 'Nishiki-koji Dori, Nakagyo Ward, Kyoto 604-8054, Japan', 2, '12:00', 90, 'Kyoto\'s kitchen street. Try the matcha ice cream and fresh mochi!', null, 'ChIJ09zzUigJAWARXzIdh1NE3hQ', 'http://www.kyoto-nishiki.or.jp/', null],
+    [t1, 'Gion District', 35.0037, 135.7755, 'Gionmachi Minamigawa, Higashiyama Ward, Kyoto 605-0074, Japan', 3, '17:00', 120, 'Historic geisha district. Best chance of spotting a maiko in the evening.', null, 'ChIJ7WWWjfYJAWARGqEHAfXIzgQ', null, null],
  ];

  const t1pIds = t1places.map(p => Number(insertPlace.run(...p).lastInsertRowid));

-  // Assign places to days
  // Day 1: Hotel Check-in, Shibuya
  insertAssignment.run(t1days[0], t1pIds[0], 0);
  insertAssignment.run(t1days[0], t1pIds[2], 1);
+  insertNote.run(t1days[0], t1, 'Pick up Pocket WiFi at airport', '13:00', 'Info', 0.5);
  // Day 2: Tsukiji, Senso-ji, Akihabara
  insertAssignment.run(t1days[1], t1pIds[3], 0);
  insertAssignment.run(t1days[1], t1pIds[1], 1);
  insertAssignment.run(t1days[1], t1pIds[5], 2);
-  // Day 3: Meiji-Schrein, free afternoon
+  // Day 3: Meiji Shrine, free afternoon
  insertAssignment.run(t1days[2], t1pIds[4], 0);
+  insertNote.run(t1days[2], t1, 'Explore Harajuku after the shrine', '12:00', 'MapPin', 1);
  // Day 4: Shinkansen to Kyoto, Hotel
  insertAssignment.run(t1days[3], t1pIds[6], 0);
  insertAssignment.run(t1days[3], t1pIds[7], 1);
+  insertNote.run(t1days[3], t1, 'Sit on right side for Mt. Fuji views!', '08:30', 'Train', 0.5);
  // Day 5: Fushimi Inari, Nishiki Market
  insertAssignment.run(t1days[4], t1pIds[8], 0);
  insertAssignment.run(t1days[4], t1pIds[11], 1);
@@ -120,34 +124,34 @@ function seedExampleTrips(db, adminId, demoId) {
  insertAssignment.run(t1days[5], t1pIds[10], 1);
  // Day 7: Gion
  insertAssignment.run(t1days[6], t1pIds[12], 0);
+  insertNote.run(t1days[6], t1, 'Last evening — farewell dinner at Pontocho Alley', '19:00', 'Star', 1);

  // Packing
  const t1packing = [
-    ['Reisepass', 1, 'Dokumente', 0], ['Japan Rail Pass', 1, 'Dokumente', 1],
-    ['Adapter Typ A/B', 0, 'Elektronik', 2], ['Kamera + Ladegeraet', 0, 'Elektronik', 3],
-    ['Bequeme Laufschuhe', 0, 'Kleidung', 4], ['Regenjacke', 0, 'Kleidung', 5],
-    ['Sonnencreme', 0, 'Hygiene', 6], ['Reiseapotheke', 0, 'Hygiene', 7],
-    ['Pocket WiFi Bestaetigung', 1, 'Elektronik', 8], ['Yen Bargeld', 0, 'Dokumente', 9],
+    ['Passport', 1, 'Documents', 0], ['Japan Rail Pass', 1, 'Documents', 1],
+    ['Power adapter Type A/B', 0, 'Electronics', 2], ['Camera + charger', 0, 'Electronics', 3],
+    ['Comfortable walking shoes', 0, 'Clothing', 4], ['Rain jacket', 0, 'Clothing', 5],
+    ['Sunscreen', 0, 'Toiletries', 6], ['Travel first aid kit', 0, 'Toiletries', 7],
+    ['Pocket WiFi confirmation', 1, 'Electronics', 8], ['Yen cash', 0, 'Documents', 9],
  ];
  t1packing.forEach(p => insertPacking.run(t1, ...p));

  // Budget
-  insertBudget.run(t1, 'Unterkunft', 'Hotel Shinjuku (3 Naechte)', 450, 2, 'Doppelzimmer');
-  insertBudget.run(t1, 'Unterkunft', 'Hotel Granvia Kyoto (4 Naechte)', 680, 2, 'Superior Room');
-  insertBudget.run(t1, 'Transport', 'Fluege FRA-NRT', 1200, 2, 'Lufthansa Direktflug');
-  insertBudget.run(t1, 'Transport', 'Japan Rail Pass (7 Tage)', 380, 2, 'Ordinaer');
-  insertBudget.run(t1, 'Essen', 'Tagesbudget Essen', 350, 2, 'Ca. 50 EUR/Tag');
-  insertBudget.run(t1, 'Aktivitaeten', 'Tempel-Eintritte & Erlebnisse', 120, 2, null);
+  insertBudget.run(t1, 'Accommodation', 'Hotel Shinjuku (3 nights)', 67500, 2, 'Double room');
+  insertBudget.run(t1, 'Accommodation', 'Hotel Granvia Kyoto (4 nights)', 102000, 2, 'Superior room');
+  insertBudget.run(t1, 'Transport', 'Flights FRA-NRT return', 180000, 2, 'Lufthansa direct');
+  insertBudget.run(t1, 'Transport', 'Japan Rail Pass (7 days)', 57000, 2, 'Ordinary');
+  insertBudget.run(t1, 'Food', 'Daily food budget', 52500, 2, 'Approx. 7,500 JPY/day');
+  insertBudget.run(t1, 'Activities', 'Temple entries & experiences', 18000, 2, null);

  // Reservations
  insertReservation.run(t1, t1days[0], 'Hotel Shinjuku Check-in', '15:00', 'SG-2026-78432', 'confirmed', 'hotel', 'Shinjuku, Tokyo');
  insertReservation.run(t1, t1days[3], 'Shinkansen Tokyo → Kyoto', '08:30', 'JR-NOZOMI-445', 'confirmed', 'transport', 'Tokyo Station');

-  // Share with demo user
  insertMember.run(t1, demoId, adminId);

-  // ─── Trip 2: Barcelona Citytrip ───
-  const trip2 = insertTrip.run(adminId, 'Barcelona Citytrip', 'Gaudi, Tapas und Meerblick — ein langes Wochenende in Kataloniens Hauptstadt.', '2026-05-21', '2026-05-24', 'EUR');
+  // ─── Trip 2: Barcelona Long Weekend ────────────────────────────────────────
+  const trip2 = insertTrip.run(adminId, 'Barcelona Long Weekend', 'Gaudi, tapas, and Mediterranean vibes — a long weekend in the Catalan capital.', '2026-05-21', '2026-05-24', 'EUR');
  const t2 = Number(trip2.lastInsertRowid);

  const t2days = [];
@@ -157,14 +161,14 @@ function seedExampleTrips(db, adminId, demoId) {
  }

  const t2places = [
-    [t2, 'Hotel W Barcelona', 41.3686, 2.1920, 'Barceloneta, Barcelona, Spain', 1, '14:00', 60, 'Direkt am Strand. Rooftop-Bar mit Panorama!', null],
-    [t2, 'Sagrada Familia', 41.4036, 2.1744, 'Eixample, Barcelona, Spain', 3, '10:00', 120, 'Gaudis Meisterwerk. Tickets unbedingt vorher online buchen!', null],
-    [t2, 'Park Gueell', 41.4145, 2.1527, 'Gracia, Barcelona, Spain', 3, '09:00', 90, 'Mosaik-Terrasse mit Stadtblick. Frueh buchen fuer Monumental Zone.', null],
-    [t2, 'La Boqueria', 41.3816, 2.1717, 'La Rambla, Barcelona, Spain', 2, '12:00', 75, 'Beruehmter Markt an der Rambla. Frischer Saft und Jamon Iberico!', null],
-    [t2, 'Barceloneta Beach', 41.3784, 2.1925, 'Barceloneta, Barcelona, Spain', 8, '16:00', 120, 'Stadtstrand zum Entspannen nach dem Sightseeing.', null],
-    [t2, 'Barri Gotic', 41.3834, 2.1762, 'Ciutat Vella, Barcelona, Spain', 3, '15:00', 90, 'Mittelalterliche Gassen. Kathedrale und Placa Reial entdecken.', null],
-    [t2, 'Casa Batllo', 41.3916, 2.1650, 'Passeig de Gracia, Barcelona, Spain', 3, '11:00', 75, 'Gaudis Drachen-Haus. Die Fassade allein ist schon ein Erlebnis.', null],
-    [t2, 'El Born & Tapas', 41.3856, 2.1825, 'El Born, Barcelona, Spain', 7, '20:00', 120, 'Trendviertel mit den besten Tapas-Bars. Cal Pep oder El Xampanyet!', null],
+    [t2, 'W Barcelona', 41.3686, 2.1920, 'Placa de la Rosa dels Vents 1, 08039 Barcelona, Spain', 1, '14:00', 60, 'Right on the beach. Rooftop bar with panoramic views!', null, 'ChIJKfj5C8yjpBIRCPC3RPI0JO4', 'https://www.marriott.com/hotels/travel/bcnwh-w-barcelona/', '+34 932 95 28 00'],
+    [t2, 'Sagrada Familia', 41.4036, 2.1744, 'C/ de Mallorca, 401, 08013 Barcelona, Spain', 3, '10:00', 120, 'Gaudi\'s masterpiece. Book tickets online in advance — sells out fast!', null, 'ChIJk_s92NyipBIRUMnDG8Kq2Js', 'https://sagradafamilia.org/', '+34 932 08 04 14'],
+    [t2, 'Park Guell', 41.4145, 2.1527, '08024 Barcelona, Spain', 3, '09:00', 90, 'Mosaic terrace with city views. Book early for the Monumental Zone.', null, 'ChIJ4eQMeOmipBIRb65JRUzGE8k', 'https://parkguell.barcelona/', '+34 934 09 18 31'],
+    [t2, 'La Boqueria Market', 41.3816, 2.1717, 'La Rambla, 91, 08001 Barcelona, Spain', 2, '12:00', 75, 'Famous market on La Rambla. Fresh juice, jamon iberico, and seafood!', null, 'ChIJB_RfKcuipBIRkPKW7MzVGKg', 'http://www.boqueria.barcelona/', '+34 933 18 25 84'],
+    [t2, 'Barceloneta Beach', 41.3784, 2.1925, 'Passeig Maritim de la Barceloneta, 08003 Barcelona, Spain', 8, '16:00', 120, 'City beach to unwind after sightseeing. Great chiringuitos nearby.', null, 'ChIJAQCl79-ipBIRUKF3myrMYkM', null, null],
+    [t2, 'Gothic Quarter', 41.3834, 2.1762, 'Barri Gotic, 08002 Barcelona, Spain', 3, '15:00', 90, 'Medieval lanes, the cathedral, and Placa Reial. Get lost in the alleys!', null, 'ChIJ4_xkvv2ipBIRrK3bdd-lHgo', null, null],
+    [t2, 'Casa Batllo', 41.3916, 2.1650, 'Passeig de Gracia, 43, 08007 Barcelona, Spain', 3, '11:00', 75, 'Gaudi\'s dragon house. The facade alone is worth the visit.', null, 'ChIJ-2VKIcaipBIRKK63H5PYjqQ', 'https://www.casabatllo.es/', '+34 932 16 03 06'],
+    [t2, 'El Born & Tapas', 41.3856, 2.1825, 'El Born, 08003 Barcelona, Spain', 7, '20:00', 120, 'Trendy neighborhood with the best tapas bars. Try Cal Pep or El Xampanyet!', null, 'ChIJNY56dxuipBIRbqjSczmLvIA', null, null],
  ];

  const t2pIds = t2places.map(p => Number(insertPlace.run(...p).lastInsertRowid));
@@ -177,68 +181,94 @@ function seedExampleTrips(db, adminId, demoId) {
  insertAssignment.run(t2days[1], t2pIds[1], 0);
  insertAssignment.run(t2days[1], t2pIds[6], 1);
  insertAssignment.run(t2days[1], t2pIds[3], 2);
-  // Day 3: Park Gueell, Barri Gotic
+  insertNote.run(t2days[1], t2, 'Tickets already booked for 10:00 AM slot', '09:30', 'Ticket', 0.5);
+  // Day 3: Park Guell, Gothic Quarter
  insertAssignment.run(t2days[2], t2pIds[2], 0);
  insertAssignment.run(t2days[2], t2pIds[5], 1);
-  // Day 4: Free morning, departure
+  // Day 4: Beach morning, departure
  insertAssignment.run(t2days[3], t2pIds[4], 0);
+  insertNote.run(t2days[3], t2, 'Flight departs at 18:30 — leave hotel by 15:00', '14:00', 'Plane', 1);

  // Packing
-  ['Reisepass', 'Sonnencreme SPF50', 'Badehose/Bikini', 'Sonnenbrille', 'Bequeme Sandalen', 'Strandtuch'].forEach((name, i) => {
-    insertPacking.run(t2, name, 0, i < 1 ? 'Dokumente' : 'Sommer', i);
+  ['Passport', 'Sunscreen SPF50', 'Swimwear', 'Sunglasses', 'Comfortable sandals', 'Beach towel'].forEach((name, i) => {
+    insertPacking.run(t2, name, 0, i < 1 ? 'Documents' : 'Summer', i);
  });

  // Budget
-  insertBudget.run(t2, 'Unterkunft', 'Hotel W Barcelona (3 Naechte)', 780, 2, 'Sea View Room');
-  insertBudget.run(t2, 'Transport', 'Fluege BER-BCN', 180, 2, 'Eurowings');
-  insertBudget.run(t2, 'Essen', 'Restaurants & Tapas', 300, 2, 'Ca. 75 EUR/Tag');
-  insertBudget.run(t2, 'Aktivitaeten', 'Sagrada Familia + Park Gueell + Casa Batllo', 95, 2, 'Online-Tickets');
+  insertBudget.run(t2, 'Accommodation', 'W Barcelona (3 nights)', 780, 2, 'Sea View Room');
+  insertBudget.run(t2, 'Transport', 'Flights BER-BCN return', 180, 2, 'Eurowings');
+  insertBudget.run(t2, 'Food', 'Restaurants & tapas', 300, 2, 'Approx. 75 EUR/day');
+  insertBudget.run(t2, 'Activities', 'Sagrada Familia + Park Guell + Casa Batllo', 95, 2, 'Online tickets');

-  insertReservation.run(t2, t2days[1], 'Sagrada Familia Eintritt', '10:00', 'SF-2026-11234', 'confirmed', 'activity', 'Eixample, Barcelona');
+  insertReservation.run(t2, t2days[1], 'Sagrada Familia Entry', '10:00', 'SF-2026-11234', 'confirmed', 'activity', 'Eixample, Barcelona');

  insertMember.run(t2, demoId, adminId);

-  // ─── Trip 3: Wochenende in Wien ───
-  const trip3 = insertTrip.run(adminId, 'Wochenende in Wien', 'Kaffeehaus-Kultur, imperiale Pracht und Sachertorte.', '2026-06-12', '2026-06-14', 'EUR');
+  // ─── Trip 3: New York City ─────────────────────────────────────────────────
+  const trip3 = insertTrip.run(adminId, 'New York City', 'The city that never sleeps — iconic landmarks, world-class food, and Broadway lights.', '2026-09-18', '2026-09-22', 'USD');
  const t3 = Number(trip3.lastInsertRowid);

  const t3days = [];
-  for (let i = 0; i < 3; i++) {
-    const d = insertDay.run(t3, i + 1, `2026-06-${12 + i}`);
+  for (let i = 0; i < 5; i++) {
+    const d = insertDay.run(t3, i + 1, `2026-09-${18 + i}`);
    t3days.push(Number(d.lastInsertRowid));
  }

  const t3places = [
-    [t3, 'Hotel Sacher Wien', 48.2038, 16.3699, 'Philharmonikerstrasse 4, Wien, Austria', 1, '15:00', 45, 'Das legendaere Hotel. Sachertorte im Cafe muss sein!', null],
-    [t3, 'Stephansdom', 48.2082, 16.3738, 'Stephansplatz, Wien, Austria', 3, '10:00', 60, 'Wahrzeichen Wiens. Turmbesteigung fuer 360-Grad-Blick.', null],
-    [t3, 'Schloss Schoenbrunn', 48.1845, 16.3122, 'Schoenbrunn, Wien, Austria', 3, '09:30', 150, 'Imperiale Pracht. Grand Tour Ticket fuer alle 40 Raeume.', null],
-    [t3, 'Naschmarkt', 48.1986, 16.3633, 'Wienzeile, Wien, Austria', 2, '12:00', 75, 'Wiens groesster Markt. Orientalische Gewuerze bis Wiener Schnitzel.', null],
-    [t3, 'Cafe Central', 48.2107, 16.3654, 'Herrengasse 14, Wien, Austria', 7, '15:00', 60, 'Wo einst Trotzki Schach spielte. Melange und Apfelstrudel!', null],
-    [t3, 'Prater & Riesenrad', 48.2166, 16.3964, 'Prater, Wien, Austria', 6, '17:00', 90, 'Riesenrad bei Sonnenuntergang. Blick ueber die ganze Stadt.', null],
+    [t3, 'The Plaza Hotel', 40.7645, -73.9744, '768 5th Ave, New York, NY 10019, USA', 1, '15:00', 60, 'Iconic luxury hotel on Central Park. The lobby alone is worth a visit.', null, 'ChIJYbISlAVYwokRn6ORbSPV0xk', 'https://www.theplazany.com/', '+1 212-759-3000'],
+    [t3, 'Statue of Liberty', 40.6892, -74.0445, 'Liberty Island, New York, NY 10004, USA', 3, '09:00', 180, 'Book crown access tickets months in advance. Ferry from Battery Park.', null, 'ChIJPTacEpBQwokRKwIlDXelxkA', 'https://www.nps.gov/stli/', '+1 212-363-3200'],
+    [t3, 'Central Park', 40.7829, -73.9654, 'Central Park, New York, NY 10024, USA', 9, '10:00', 120, 'Bethesda Fountain, Bow Bridge, and Strawberry Fields. Rent bikes!', null, 'ChIJ4zGFAZpYwokRGUGph3Mf37k', 'https://www.centralparknyc.org/', null],
+    [t3, 'Times Square', 40.7580, -73.9855, 'Manhattan, NY 10036, USA', 3, '19:00', 60, 'The crossroads of the world. Best experienced at night with all the lights.', null, 'ChIJmQJIxlVYwokRLgeuocVOGVU', 'https://www.timessquarenyc.org/', null],
+    [t3, 'Empire State Building', 40.7484, -73.9857, '350 5th Ave, New York, NY 10118, USA', 3, '11:00', 90, '86th floor observation deck. Go at sunset for the best views.', null, 'ChIJaXQRs6lZwokRY6EFpJnhNNE', 'https://www.esbnyc.com/', '+1 212-736-3100'],
+    [t3, 'Brooklyn Bridge', 40.7061, -73.9969, 'Brooklyn Bridge, New York, NY 10038, USA', 3, '16:00', 75, 'Walk from Manhattan to Brooklyn. DUMBO has great pizza and views.', null, 'ChIJK3vOQyNawokRXEYwET2GUtY', null, null],
+    [t3, 'The Metropolitan Museum of Art', 40.7794, -73.9632, '1000 5th Ave, New York, NY 10028, USA', 3, '10:00', 180, 'One of the world\'s greatest art museums. Could spend days here.', null, 'ChIJb8Jg766MwokR1YWG0nV7k-E', 'https://www.metmuseum.org/', '+1 212-535-7710'],
+    [t3, 'Joe\'s Pizza', 40.7309, -73.9969, '7 Carmine St, New York, NY 10014, USA', 2, '13:00', 30, 'New York\'s most famous pizza slice. Cash only, always a line, always worth it.', null, 'ChIJrfCL1IZZwokRwO3NKN22ZBc', 'http://www.joespizzanyc.com/', '+1 212-366-1182'],
+    [t3, 'Top of the Rock', 40.7593, -73.9794, '30 Rockefeller Plaza, New York, NY 10112, USA', 3, '17:30', 60, 'Better views than Empire State because you can SEE the Empire State.', null, 'ChIJ_y2Fb1JYwokRT_iGzhTLdBo', 'https://www.topoftherocknyc.com/', '+1 212-698-2000'],
+    [t3, 'Chelsea Market', 40.7424, -74.0061, '75 9th Ave, New York, NY 10011, USA', 2, '12:00', 90, 'Food hall in a converted factory. Lobster rolls, tacos, doughnuts, and more.', null, 'ChIJw2FNFyZZwokRcP9th_vIbkE', 'https://www.chelseamarket.com/', null],
+    [t3, 'Broadway Show', 40.7590, -73.9845, 'Broadway, Manhattan, NY 10019, USA', 6, '20:00', 150, 'Can\'t visit NYC without seeing a show. Book TKTS booth for discounts.', null, 'ChIJMYQhxFtYwokR7cJBcNqfKDY', null, null],
  ];

  const t3pIds = t3places.map(p => Number(insertPlace.run(...p).lastInsertRowid));

-  // Day 1: Arrival, Stephansdom, Cafe Central
+  // Day 1: Arrival, Times Square, Broadway
  insertAssignment.run(t3days[0], t3pIds[0], 0);
-  insertAssignment.run(t3days[0], t3pIds[1], 1);
-  insertAssignment.run(t3days[0], t3pIds[4], 2);
-  // Day 2: Schoenbrunn, Naschmarkt, Prater
-  insertAssignment.run(t3days[1], t3pIds[2], 0);
-  insertAssignment.run(t3days[1], t3pIds[3], 1);
-  insertAssignment.run(t3days[1], t3pIds[5], 2);
-  // Day 3: Free morning
-  insertAssignment.run(t3days[2], t3pIds[4], 0);
+  insertAssignment.run(t3days[0], t3pIds[3], 1);
+  insertAssignment.run(t3days[0], t3pIds[10], 2);
+  // Day 2: Statue of Liberty, Brooklyn Bridge, Joe's Pizza
+  insertAssignment.run(t3days[1], t3pIds[1], 0);
+  insertAssignment.run(t3days[1], t3pIds[5], 1);
+  insertAssignment.run(t3days[1], t3pIds[7], 2);
+  insertNote.run(t3days[1], t3, 'First ferry at 8:30 AM — arrive early at Battery Park', '08:00', 'Ship', 0.5);
+  // Day 3: Central Park, Met Museum, Top of the Rock sunset
+  insertAssignment.run(t3days[2], t3pIds[2], 0);
+  insertAssignment.run(t3days[2], t3pIds[6], 1);
+  insertAssignment.run(t3days[2], t3pIds[8], 2);
+  // Day 4: Empire State Building, Chelsea Market, shopping
+  insertAssignment.run(t3days[3], t3pIds[4], 0);
+  insertAssignment.run(t3days[3], t3pIds[9], 1);
+  insertNote.run(t3days[3], t3, 'SoHo and 5th Avenue shopping in the afternoon', '14:00', 'ShoppingBag', 1.5);
+  // Day 5: Free morning, departure
+  insertNote.run(t3days[4], t3, 'Flight departs JFK at 17:00 — last bagel at Russ & Daughters!', '10:00', 'Plane', 0);

  // Packing
-  ['Personalausweis', 'Regenschirm', 'Bequeme Schuhe', 'Kamera'].forEach((name, i) => {
-    insertPacking.run(t3, name, 0, i < 1 ? 'Dokumente' : 'Sonstiges', i);
-  });
+  const t3packing = [
+    ['Passport', 1, 'Documents', 0], ['ESTA confirmation', 1, 'Documents', 1],
+    ['Travel insurance', 0, 'Documents', 2], ['Comfortable sneakers', 0, 'Clothing', 3],
+    ['Light jacket', 0, 'Clothing', 4], ['Portable charger', 0, 'Electronics', 5],
+    ['Camera', 0, 'Electronics', 6], ['Subway card (OMNY)', 0, 'Transport', 7],
+  ];
+  t3packing.forEach(p => insertPacking.run(t3, ...p));

  // Budget
-  insertBudget.run(t3, 'Unterkunft', 'Hotel Sacher (2 Naechte)', 520, 2, 'Classic Doppelzimmer');
-  insertBudget.run(t3, 'Transport', 'Zug MUC-VIE', 60, 2, 'OeBB Sparschiene');
-  insertBudget.run(t3, 'Essen', 'Restaurants & Cafes', 200, 2, null);
+  insertBudget.run(t3, 'Accommodation', 'The Plaza Hotel (4 nights)', 2400, 2, 'Park View Room');
+  insertBudget.run(t3, 'Transport', 'Flights FRA-JFK return', 850, 2, 'United Airlines');
+  insertBudget.run(t3, 'Food', 'Daily food budget', 500, 2, 'Approx. 100 USD/day');
+  insertBudget.run(t3, 'Activities', 'Statue of Liberty + Empire State + Top of the Rock + Met', 180, 2, 'CityPASS');
+  insertBudget.run(t3, 'Entertainment', 'Broadway show tickets', 300, 2, 'Hamilton or Wicked');
+
+  insertReservation.run(t3, t3days[0], 'The Plaza Hotel Check-in', '15:00', 'PZ-2026-55891', 'confirmed', 'hotel', '768 5th Ave, New York');
+  insertReservation.run(t3, t3days[0], 'Broadway Show', '20:00', 'BW-HAM-2026-1192', 'pending', 'activity', 'Richard Rodgers Theatre');
+  insertReservation.run(t3, t3days[1], 'Statue of Liberty Ferry', '08:30', 'SOL-2026-3347', 'confirmed', 'transport', 'Battery Park');

  insertMember.run(t3, demoId, adminId);

@@ -1,6 +1,7 @@
 require('dotenv').config();
 const express = require('express');
 const cors = require('cors');
+const helmet = require('helmet');
 const path = require('path');
 const fs = require('fs');

@@ -42,16 +43,11 @@ app.use(cors({
  origin: corsOrigin,
  credentials: true
 }));
-app.use(express.json());
-
-// Security headers
-app.use((req, res, next) => {
-  res.setHeader('X-Content-Type-Options', 'nosniff');
-  res.setHeader('X-Frame-Options', 'SAMEORIGIN');
-  res.setHeader('X-XSS-Protection', '1; mode=block');
-  res.setHeader('Referrer-Policy', 'strict-origin-when-cross-origin');
-  next();
-});
+app.use(helmet({
+  contentSecurityPolicy: false,   // managed by frontend meta tag or reverse proxy
+  crossOriginEmbedderPolicy: false, // allows loading external images (maps, etc.)
+}));
+app.use(express.json({ limit: '100kb' }));
 app.use(express.urlencoded({ extended: true }));

 // Serve uploaded files
@@ -61,6 +57,7 @@ app.use('/uploads', express.static(path.join(__dirname, '../uploads')));
 const authRoutes = require('./routes/auth');
 const tripsRoutes = require('./routes/trips');
 const daysRoutes = require('./routes/days');
+const accommodationsRoutes = require('./routes/days').accommodationsRouter;
 const placesRoutes = require('./routes/places');
 const assignmentsRoutes = require('./routes/assignments');
 const packingRoutes = require('./routes/packing');
@@ -81,6 +78,7 @@ app.use('/api/auth', authRoutes);
 app.use('/api/auth/oidc', oidcRoutes);
 app.use('/api/trips', tripsRoutes);
 app.use('/api/trips/:tripId/days', daysRoutes);
+app.use('/api/trips/:tripId/accommodations', accommodationsRoutes);
 app.use('/api/trips/:tripId/places', placesRoutes);
 app.use('/api/trips/:tripId/packing', packingRoutes);
 app.use('/api/trips/:tripId/files', filesRoutes);
@@ -91,6 +89,21 @@ app.use('/api', assignmentsRoutes);
 app.use('/api/tags', tagsRoutes);
 app.use('/api/categories', categoriesRoutes);
 app.use('/api/admin', adminRoutes);
+
+// Public addons endpoint (authenticated but not admin-only)
+const { authenticate: addonAuth } = require('./middleware/auth');
+const { db: addonDb } = require('./db/database');
+app.get('/api/addons', addonAuth, (req, res) => {
+  const addons = addonDb.prepare('SELECT id, name, type, icon, enabled FROM addons WHERE enabled = 1 ORDER BY sort_order').all();
+  res.json({ addons: addons.map(a => ({ ...a, enabled: !!a.enabled })) });
+});
+
+// Addon routes
+const vacayRoutes = require('./routes/vacay');
+app.use('/api/addons/vacay', vacayRoutes);
+const atlasRoutes = require('./routes/atlas');
+app.use('/api/addons/atlas', atlasRoutes);
+
 app.use('/api/maps', mapsRoutes);
 app.use('/api/weather', weatherRoutes);
 app.use('/api/settings', settingsRoutes);
@@ -124,4 +137,25 @@ const server = app.listen(PORT, () => {
  setupWebSocket(server);
 });

+// Graceful shutdown
+function shutdown(signal) {
+  console.log(`\n${signal} received — shutting down gracefully...`);
+  scheduler.stop();
+  server.close(() => {
+    console.log('HTTP server closed');
+    const { closeDb } = require('./db/database');
+    closeDb();
+    console.log('Shutdown complete');
+    process.exit(0);
+  });
+  // Force exit after 10s if connections don't close
+  setTimeout(() => {
+    console.error('Forced shutdown after timeout');
+    process.exit(1);
+  }, 10000);
+}
+
+process.on('SIGTERM', () => shutdown('SIGTERM'));
+process.on('SIGINT', () => shutdown('SIGINT'));
+
 module.exports = app;
@@ -1,5 +1,7 @@
 const express = require('express');
 const bcrypt = require('bcryptjs');
+const { execSync } = require('child_process');
+const path = require('path');
 const { db } = require('../db/database');
 const { authenticate, adminOnly } = require('../middleware/auth');

@@ -13,7 +15,14 @@ router.get('/users', (req, res) => {
  const users = db.prepare(
    'SELECT id, username, email, role, created_at, updated_at, last_login FROM users ORDER BY created_at DESC'
  ).all();
-  res.json({ users });
+  // Add online status from WebSocket connections
+  let onlineUserIds = new Set();
+  try {
+    const { getOnlineUserIds } = require('../websocket');
+    onlineUserIds = getOnlineUserIds();
+  } catch { /* */ }
+  const usersWithStatus = users.map(u => ({ ...u, online: onlineUserIds.has(u.id) }));
+  res.json({ users: usersWithStatus });
 });

 // POST /api/admin/users
@@ -21,18 +30,18 @@ router.post('/users', (req, res) => {
  const { username, email, password, role } = req.body;

  if (!username?.trim() || !email?.trim() || !password?.trim()) {
-    return res.status(400).json({ error: 'Benutzername, E-Mail und Passwort sind erforderlich' });
+    return res.status(400).json({ error: 'Username, email and password are required' });
  }

  if (role && !['user', 'admin'].includes(role)) {
-    return res.status(400).json({ error: 'Ungültige Rolle' });
+    return res.status(400).json({ error: 'Invalid role' });
  }

  const existingUsername = db.prepare('SELECT id FROM users WHERE username = ?').get(username.trim());
-  if (existingUsername) return res.status(409).json({ error: 'Benutzername bereits vergeben' });
+  if (existingUsername) return res.status(409).json({ error: 'Username already taken' });

  const existingEmail = db.prepare('SELECT id FROM users WHERE email = ?').get(email.trim());
-  if (existingEmail) return res.status(409).json({ error: 'E-Mail bereits vergeben' });
+  if (existingEmail) return res.status(409).json({ error: 'Email already taken' });

  const passwordHash = bcrypt.hashSync(password.trim(), 10);

@@ -52,19 +61,19 @@ router.put('/users/:id', (req, res) => {
  const { username, email, role, password } = req.body;
  const user = db.prepare('SELECT * FROM users WHERE id = ?').get(req.params.id);

-  if (!user) return res.status(404).json({ error: 'Benutzer nicht gefunden' });
+  if (!user) return res.status(404).json({ error: 'User not found' });

  if (role && !['user', 'admin'].includes(role)) {
-    return res.status(400).json({ error: 'Ungültige Rolle' });
+    return res.status(400).json({ error: 'Invalid role' });
  }

  if (username && username !== user.username) {
    const conflict = db.prepare('SELECT id FROM users WHERE username = ? AND id != ?').get(username, req.params.id);
-    if (conflict) return res.status(409).json({ error: 'Benutzername bereits vergeben' });
+    if (conflict) return res.status(409).json({ error: 'Username already taken' });
  }
  if (email && email !== user.email) {
    const conflict = db.prepare('SELECT id FROM users WHERE email = ? AND id != ?').get(email, req.params.id);
-    if (conflict) return res.status(409).json({ error: 'E-Mail bereits vergeben' });
+    if (conflict) return res.status(409).json({ error: 'Email already taken' });
  }

  const passwordHash = password ? bcrypt.hashSync(password, 10) : null;
@@ -89,11 +98,11 @@ router.put('/users/:id', (req, res) => {
 // DELETE /api/admin/users/:id
 router.delete('/users/:id', (req, res) => {
  if (parseInt(req.params.id) === req.user.id) {
-    return res.status(400).json({ error: 'Eigenes Konto kann nicht gelöscht werden' });
+    return res.status(400).json({ error: 'Cannot delete own account' });
  }

  const user = db.prepare('SELECT id FROM users WHERE id = ?').get(req.params.id);
-  if (!user) return res.status(404).json({ error: 'Benutzer nicht gefunden' });
+  if (!user) return res.status(404).json({ error: 'User not found' });

  db.prepare('DELETE FROM users WHERE id = ?').run(req.params.id);
  res.json({ success: true });
@@ -145,4 +154,101 @@ router.post('/save-demo-baseline', (req, res) => {
  }
 });

+// ── Version check ──────────────────────────────────────────
+
+// Detect if running inside Docker
+const isDocker = (() => {
+  try {
+    const fs = require('fs');
+    return fs.existsSync('/.dockerenv') || (fs.existsSync('/proc/1/cgroup') && fs.readFileSync('/proc/1/cgroup', 'utf8').includes('docker'));
+  } catch { return false }
+})();
+
+router.get('/version-check', async (req, res) => {
+  const { version: currentVersion } = require('../../package.json');
+  try {
+    const resp = await fetch(
+      'https://api.github.com/repos/mauriceboe/NOMAD/releases/latest',
+      { headers: { 'Accept': 'application/vnd.github.v3+json', 'User-Agent': 'NOMAD-Server' } }
+    );
+    if (!resp.ok) return res.json({ current: currentVersion, latest: currentVersion, update_available: false });
+    const data = await resp.json();
+    const latest = (data.tag_name || '').replace(/^v/, '');
+    const update_available = latest && latest !== currentVersion && compareVersions(latest, currentVersion) > 0;
+    res.json({ current: currentVersion, latest, update_available, release_url: data.html_url || '', is_docker: isDocker });
+  } catch {
+    res.json({ current: currentVersion, latest: currentVersion, update_available: false, is_docker: isDocker });
+  }
+});
+
+function compareVersions(a, b) {
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const na = pa[i] || 0, nb = pb[i] || 0;
+    if (na > nb) return 1;
+    if (na < nb) return -1;
+  }
+  return 0;
+}
+
+// POST /api/admin/update — pull latest code, install deps, restart
+router.post('/update', async (req, res) => {
+  const rootDir = path.resolve(__dirname, '../../..');
+  const serverDir = path.resolve(__dirname, '../..');
+  const clientDir = path.join(rootDir, 'client');
+  const steps = [];
+
+  try {
+    // 1. git pull
+    const pullOutput = execSync('git pull origin main', { cwd: rootDir, timeout: 60000, encoding: 'utf8' });
+    steps.push({ step: 'git pull', success: true, output: pullOutput.trim() });
+
+    // 2. npm install server
+    execSync('npm install --production', { cwd: serverDir, timeout: 120000, encoding: 'utf8' });
+    steps.push({ step: 'npm install (server)', success: true });
+
+    // 3. npm install + build client (production only)
+    if (process.env.NODE_ENV === 'production') {
+      execSync('npm install', { cwd: clientDir, timeout: 120000, encoding: 'utf8' });
+      execSync('npm run build', { cwd: clientDir, timeout: 120000, encoding: 'utf8' });
+      steps.push({ step: 'npm install + build (client)', success: true });
+    }
+
+    // Read new version
+    delete require.cache[require.resolve('../../package.json')];
+    const { version: newVersion } = require('../../package.json');
+    steps.push({ step: 'version', version: newVersion });
+
+    // 4. Send response before restart
+    res.json({ success: true, steps, restarting: true });
+
+    // 5. Graceful restart — exit and let process manager (Docker/systemd/pm2) restart
+    setTimeout(() => {
+      console.log('[Update] Restarting after update...');
+      process.exit(0);
+    }, 1000);
+  } catch (err) {
+    steps.push({ step: 'error', success: false, output: err.message });
+    res.status(500).json({ success: false, steps });
+  }
+});
+
+// ── Addons ─────────────────────────────────────────────────
+
+router.get('/addons', (req, res) => {
+  const addons = db.prepare('SELECT * FROM addons ORDER BY sort_order, id').all();
+  res.json({ addons: addons.map(a => ({ ...a, enabled: !!a.enabled, config: JSON.parse(a.config || '{}') })) });
+});
+
+router.put('/addons/:id', (req, res) => {
+  const addon = db.prepare('SELECT * FROM addons WHERE id = ?').get(req.params.id);
+  if (!addon) return res.status(404).json({ error: 'Addon not found' });
+  const { enabled, config } = req.body;
+  if (enabled !== undefined) db.prepare('UPDATE addons SET enabled = ? WHERE id = ?').run(enabled ? 1 : 0, req.params.id);
+  if (config !== undefined) db.prepare('UPDATE addons SET config = ? WHERE id = ?').run(JSON.stringify(config), req.params.id);
+  const updated = db.prepare('SELECT * FROM addons WHERE id = ?').get(req.params.id);
+  res.json({ addon: { ...updated, enabled: !!updated.enabled, config: JSON.parse(updated.config || '{}') } });
+});
+
 module.exports = router;
@@ -13,7 +13,7 @@ function getAssignmentWithPlace(assignmentId) {
  const a = db.prepare(`
    SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
      p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
-      p.reservation_status, p.reservation_notes, p.reservation_datetime, p.place_time, p.duration_minutes, p.notes as place_notes,
+      p.place_time, p.end_time, p.duration_minutes, p.notes as place_notes,
      p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
      c.name as category_name, c.color as category_color, c.icon as category_icon
    FROM day_assignments da
@@ -46,10 +46,8 @@ function getAssignmentWithPlace(assignmentId) {
      category_id: a.category_id,
      price: a.price,
      currency: a.place_currency,
-      reservation_status: a.reservation_status,
-      reservation_notes: a.reservation_notes,
-      reservation_datetime: a.reservation_datetime,
      place_time: a.place_time,
+      end_time: a.end_time,
      duration_minutes: a.duration_minutes,
      notes: a.place_notes,
      image_url: a.image_url,
@@ -73,15 +71,15 @@ router.get('/trips/:tripId/days/:dayId/assignments', authenticate, (req, res) =>
  const { tripId, dayId } = req.params;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const day = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(dayId, tripId);
-  if (!day) return res.status(404).json({ error: 'Tag nicht gefunden' });
+  if (!day) return res.status(404).json({ error: 'Day not found' });

  const assignments = db.prepare(`
    SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
      p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
-      p.reservation_status, p.reservation_notes, p.reservation_datetime, p.place_time, p.duration_minutes, p.notes as place_notes,
+      p.place_time, p.end_time, p.duration_minutes, p.notes as place_notes,
      p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
      c.name as category_name, c.color as category_color, c.icon as category_icon
    FROM day_assignments da
@@ -124,9 +122,6 @@ router.get('/trips/:tripId/days/:dayId/assignments', authenticate, (req, res) =>
        category_id: a.category_id,
        price: a.price,
        currency: a.place_currency,
-        reservation_status: a.reservation_status,
-        reservation_notes: a.reservation_notes,
-        reservation_datetime: a.reservation_datetime,
        place_time: a.place_time,
        duration_minutes: a.duration_minutes,
        notes: a.place_notes,
@@ -155,16 +150,13 @@ router.post('/trips/:tripId/days/:dayId/assignments', authenticate, (req, res) =
  const { place_id, notes } = req.body;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const day = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(dayId, tripId);
-  if (!day) return res.status(404).json({ error: 'Tag nicht gefunden' });
+  if (!day) return res.status(404).json({ error: 'Day not found' });

  const place = db.prepare('SELECT id FROM places WHERE id = ? AND trip_id = ?').get(place_id, tripId);
-  if (!place) return res.status(404).json({ error: 'Ort nicht gefunden' });
-
-  const existing = db.prepare('SELECT id FROM day_assignments WHERE day_id = ? AND place_id = ?').get(dayId, place_id);
-  if (existing) return res.status(409).json({ error: 'Ort ist bereits diesem Tag zugewiesen' });
+  if (!place) return res.status(404).json({ error: 'Place not found' });

  const maxOrder = db.prepare('SELECT MAX(order_index) as max FROM day_assignments WHERE day_id = ?').get(dayId);
  const orderIndex = (maxOrder.max !== null ? maxOrder.max : -1) + 1;
@@ -183,13 +175,13 @@ router.delete('/trips/:tripId/days/:dayId/assignments/:id', authenticate, (req,
  const { tripId, dayId, id } = req.params;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const assignment = db.prepare(
    'SELECT da.id FROM day_assignments da JOIN days d ON da.day_id = d.id WHERE da.id = ? AND da.day_id = ? AND d.trip_id = ?'
  ).get(id, dayId, tripId);

-  if (!assignment) return res.status(404).json({ error: 'Zuweisung nicht gefunden' });
+  if (!assignment) return res.status(404).json({ error: 'Assignment not found' });

  db.prepare('DELETE FROM day_assignments WHERE id = ?').run(id);
  res.json({ success: true });
@@ -202,10 +194,10 @@ router.put('/trips/:tripId/days/:dayId/assignments/reorder', authenticate, (req,
  const { orderedIds } = req.body;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const day = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(dayId, tripId);
-  if (!day) return res.status(404).json({ error: 'Tag nicht gefunden' });
+  if (!day) return res.status(404).json({ error: 'Day not found' });

  const update = db.prepare('UPDATE day_assignments SET order_index = ? WHERE id = ? AND day_id = ?');
  db.exec('BEGIN');
@@ -228,7 +220,7 @@ router.put('/trips/:tripId/assignments/:id/move', authenticate, (req, res) => {
  const { new_day_id, order_index } = req.body;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const assignment = db.prepare(`
    SELECT da.* FROM day_assignments da
@@ -236,10 +228,10 @@ router.put('/trips/:tripId/assignments/:id/move', authenticate, (req, res) => {
    WHERE da.id = ? AND d.trip_id = ?
  `).get(id, tripId);

-  if (!assignment) return res.status(404).json({ error: 'Zuweisung nicht gefunden' });
+  if (!assignment) return res.status(404).json({ error: 'Assignment not found' });

  const newDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(new_day_id, tripId);
-  if (!newDay) return res.status(404).json({ error: 'Zieltag nicht gefunden' });
+  if (!newDay) return res.status(404).json({ error: 'Target day not found' });

  const oldDayId = assignment.day_id;
  db.prepare('UPDATE day_assignments SET day_id = ?, order_index = ? WHERE id = ?').run(new_day_id, order_index || 0, id);
@@ -0,0 +1,254 @@
+const express = require('express');
+const { db } = require('../db/database');
+const { authenticate } = require('../middleware/auth');
+
+const router = express.Router();
+router.use(authenticate);
+
+// Country code lookup from coordinates (bounding box approach)
+// Covers most countries — not pixel-perfect but good enough for visited-country tracking
+const COUNTRY_BOXES = {
+  AF:[60.5,29.4,75,38.5],AL:[19,39.6,21.1,42.7],DZ:[-8.7,19,12,37.1],AD:[1.4,42.4,1.8,42.7],AO:[11.7,-18.1,24.1,-4.4],
+  AR:[-73.6,-55.1,-53.6,-21.8],AM:[43.4,38.8,46.6,41.3],AU:[112.9,-43.6,153.6,-10.7],AT:[9.5,46.4,17.2,49],AZ:[44.8,38.4,50.4,41.9],
+  BR:[-73.9,-33.8,-34.8,5.3],BE:[2.5,49.5,6.4,51.5],BG:[22.4,41.2,28.6,44.2],CA:[-141,41.7,-52.6,83.1],CL:[-75.6,-55.9,-66.9,-17.5],
+  CN:[73.6,18.2,134.8,53.6],CO:[-79.1,-4.3,-66.9,12.5],HR:[13.5,42.4,19.5,46.6],CZ:[12.1,48.6,18.9,51.1],DK:[8,54.6,15.2,57.8],
+  EG:[24.7,22,37,31.7],EE:[21.8,57.5,28.2,59.7],FI:[20.6,59.8,31.6,70.1],FR:[-5.1,41.3,9.6,51.1],DE:[5.9,47.3,15.1,55.1],
+  GR:[19.4,34.8,29.7,41.8],HU:[16,45.7,22.9,48.6],IS:[-24.5,63.4,-13.5,66.6],IN:[68.2,6.7,97.4,35.5],ID:[95.3,-11,141,5.9],
+  IR:[44.1,25.1,63.3,39.8],IQ:[38.8,29.1,48.6,37.4],IE:[-10.5,51.4,-6,55.4],IL:[34.3,29.5,35.9,33.3],IT:[6.6,36.6,18.5,47.1],
+  JP:[129.4,31.1,145.5,45.5],KE:[33.9,-4.7,41.9,5.5],KR:[126,33.2,129.6,38.6],LV:[21,55.7,28.2,58.1],LT:[21,53.9,26.8,56.5],
+  LU:[5.7,49.4,6.5,50.2],MY:[99.6,0.9,119.3,7.4],MX:[-118.4,14.5,-86.7,32.7],MA:[-13.2,27.7,-1,35.9],NL:[3.4,50.8,7.2,53.5],
+  NZ:[166.4,-47.3,178.5,-34.4],NO:[4.6,58,31.1,71.2],PK:[60.9,23.7,77.1,37.1],PE:[-81.3,-18.4,-68.7,-0.1],PH:[117,5,126.6,18.5],
+  PL:[14.1,49,24.1,54.9],PT:[-9.5,36.8,-6.2,42.2],RO:[20.2,43.6,29.7,48.3],RU:[19.6,41.2,180,81.9],SA:[34.6,16.4,55.7,32.2],
+  RS:[18.8,42.2,23,46.2],SK:[16.8,47.7,22.6,49.6],SI:[13.4,45.4,16.6,46.9],ZA:[16.5,-34.8,32.9,-22.1],ES:[-9.4,36,-0.2,43.8],
+  SE:[11.1,55.3,24.2,69.1],CH:[6,45.8,10.5,47.8],TH:[97.3,5.6,105.6,20.5],TR:[26,36,44.8,42.1],UA:[22.1,44.4,40.2,52.4],
+  AE:[51.6,22.6,56.4,26.1],GB:[-8,49.9,2,60.9],US:[-125,24.5,-66.9,49.4],VN:[102.1,8.6,109.5,23.4],
+};
+
+function getCountryFromCoords(lat, lng) {
+  for (const [code, [minLng, minLat, maxLng, maxLat]] of Object.entries(COUNTRY_BOXES)) {
+    if (lat >= minLat && lat <= maxLat && lng >= minLng && lng <= maxLng) {
+      return code;
+    }
+  }
+  return null;
+}
+
+function getCountryFromAddress(address) {
+  if (!address) return null;
+  // Take last segment after comma, trim
+  const parts = address.split(',').map(s => s.trim()).filter(Boolean);
+  if (parts.length === 0) return null;
+  const last = parts[parts.length - 1];
+  // Try to match known country names to codes
+  const NAME_TO_CODE = {
+    'germany':'DE','deutschland':'DE','france':'FR','frankreich':'FR','spain':'ES','spanien':'ES',
+    'italy':'IT','italien':'IT','united kingdom':'GB','uk':'GB','england':'GB','united states':'US',
+    'usa':'US','netherlands':'NL','niederlande':'NL','austria':'AT','österreich':'AT','switzerland':'CH',
+    'schweiz':'CH','portugal':'PT','greece':'GR','griechenland':'GR','turkey':'TR','türkei':'TR',
+    'croatia':'HR','kroatien':'HR','czech republic':'CZ','tschechien':'CZ','czechia':'CZ',
+    'poland':'PL','polen':'PL','sweden':'SE','schweden':'SE','norway':'NO','norwegen':'NO',
+    'denmark':'DK','dänemark':'DK','finland':'FI','finnland':'FI','belgium':'BE','belgien':'BE',
+    'ireland':'IE','irland':'IE','hungary':'HU','ungarn':'HU','romania':'RO','rumänien':'RO',
+    'bulgaria':'BG','bulgarien':'BG','japan':'JP','china':'CN','australia':'AU','australien':'AU',
+    'canada':'CA','kanada':'CA','mexico':'MX','mexiko':'MX','brazil':'BR','brasilien':'BR',
+    'argentina':'AR','argentinien':'AR','thailand':'TH','indonesia':'ID','indonesien':'ID',
+    'india':'IN','indien':'IN','egypt':'EG','ägypten':'EG','morocco':'MA','marokko':'MA',
+    'south africa':'ZA','südafrika':'ZA','new zealand':'NZ','neuseeland':'NZ','iceland':'IS','island':'IS',
+    'luxembourg':'LU','luxemburg':'LU','slovenia':'SI','slowenien':'SI','slovakia':'SK','slowakei':'SK',
+    'estonia':'EE','estland':'EE','latvia':'LV','lettland':'LV','lithuania':'LT','litauen':'LT',
+    'serbia':'RS','serbien':'RS','israel':'IL','russia':'RU','russland':'RU','ukraine':'UA',
+    'vietnam':'VN','south korea':'KR','südkorea':'KR','philippines':'PH','philippinen':'PH',
+    'malaysia':'MY','colombia':'CO','kolumbien':'CO','peru':'PE','chile':'CL','iran':'IR',
+    'iraq':'IQ','irak':'IQ','pakistan':'PK','kenya':'KE','kenia':'KE','nigeria':'NG',
+    'saudi arabia':'SA','saudi-arabien':'SA','albania':'AL','albanien':'AL',
+    '日本':'JP','中国':'CN','한국':'KR','대한민국':'KR','ไทย':'TH',
+  };
+  const normalized = last.toLowerCase();
+  if (NAME_TO_CODE[normalized]) return NAME_TO_CODE[normalized];
+  // Try original case (for non-Latin scripts like 日本)
+  if (NAME_TO_CODE[last]) return NAME_TO_CODE[last];
+  // Try 2-letter code directly
+  if (last.length === 2 && last === last.toUpperCase()) return last;
+  return null;
+}
+
+// GET /api/addons/atlas/stats
+router.get('/stats', (req, res) => {
+  const userId = req.user.id;
+
+  // Get all trips (own + shared)
+  const trips = db.prepare(`
+    SELECT DISTINCT t.* FROM trips t
+    LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ?
+    WHERE t.user_id = ? OR m.user_id = ?
+    ORDER BY t.start_date DESC
+  `).all(userId, userId, userId);
+
+  // Get all places from those trips
+  const tripIds = trips.map(t => t.id);
+  if (tripIds.length === 0) {
+    return res.json({ countries: [], trips: [], stats: { totalTrips: 0, totalPlaces: 0, totalCountries: 0, totalDays: 0 } });
+  }
+
+  const placeholders = tripIds.map(() => '?').join(',');
+  const places = db.prepare(`SELECT * FROM places WHERE trip_id IN (${placeholders})`).all(...tripIds);
+
+  // Extract countries
+  const countrySet = new Map(); // code -> { code, places: [], trips: Set }
+  for (const place of places) {
+    let code = getCountryFromAddress(place.address);
+    if (!code && place.lat && place.lng) {
+      code = getCountryFromCoords(place.lat, place.lng);
+    }
+    if (code) {
+      if (!countrySet.has(code)) {
+        countrySet.set(code, { code, places: [], tripIds: new Set() });
+      }
+      countrySet.get(code).places.push({ id: place.id, name: place.name, lat: place.lat, lng: place.lng });
+      countrySet.get(code).tripIds.add(place.trip_id);
+    }
+  }
+
+  // Calculate total days across all trips
+  let totalDays = 0;
+  for (const trip of trips) {
+    if (trip.start_date && trip.end_date) {
+      const start = new Date(trip.start_date);
+      const end = new Date(trip.end_date);
+      const diff = Math.ceil((end - start) / (1000 * 60 * 60 * 24)) + 1;
+      if (diff > 0) totalDays += diff;
+    }
+  }
+
+  const countries = [...countrySet.values()].map(c => {
+    const countryTrips = trips.filter(t => c.tripIds.has(t.id));
+    const dates = countryTrips.map(t => t.start_date).filter(Boolean).sort();
+    return {
+      code: c.code,
+      placeCount: c.places.length,
+      tripCount: c.tripIds.size,
+      firstVisit: dates[0] || null,
+      lastVisit: dates[dates.length - 1] || null,
+    };
+  });
+
+  // Unique cities (extract city from address — second to last comma segment)
+  // Strip postal codes and normalize to avoid duplicates like "Tokyo" vs "Tokyo 131-0045"
+  const citySet = new Set();
+  for (const place of places) {
+    if (place.address) {
+      const parts = place.address.split(',').map(s => s.trim()).filter(Boolean);
+      let raw = parts.length >= 2 ? parts[parts.length - 2] : parts[0];
+      if (raw) {
+        const city = raw.replace(/[\d\-−〒]+/g, '').trim().toLowerCase();
+        if (city) citySet.add(city);
+      }
+    }
+  }
+  const totalCities = citySet.size;
+
+  // Most visited country
+  const mostVisited = countries.length > 0 ? countries.reduce((a, b) => a.placeCount > b.placeCount ? a : b) : null;
+
+  // Continent breakdown
+  const CONTINENT_MAP = {
+    AF:'Africa',AL:'Europe',DZ:'Africa',AD:'Europe',AO:'Africa',AR:'South America',AM:'Asia',AU:'Oceania',AT:'Europe',AZ:'Asia',
+    BR:'South America',BE:'Europe',BG:'Europe',CA:'North America',CL:'South America',CN:'Asia',CO:'South America',HR:'Europe',CZ:'Europe',DK:'Europe',
+    EG:'Africa',EE:'Europe',FI:'Europe',FR:'Europe',DE:'Europe',GR:'Europe',HU:'Europe',IS:'Europe',IN:'Asia',ID:'Asia',
+    IR:'Asia',IQ:'Asia',IE:'Europe',IL:'Asia',IT:'Europe',JP:'Asia',KE:'Africa',KR:'Asia',LV:'Europe',LT:'Europe',
+    LU:'Europe',MY:'Asia',MX:'North America',MA:'Africa',NL:'Europe',NZ:'Oceania',NO:'Europe',PK:'Asia',PE:'South America',PH:'Asia',
+    PL:'Europe',PT:'Europe',RO:'Europe',RU:'Europe',SA:'Asia',RS:'Europe',SK:'Europe',SI:'Europe',ZA:'Africa',ES:'Europe',
+    SE:'Europe',CH:'Europe',TH:'Asia',TR:'Europe',UA:'Europe',AE:'Asia',GB:'Europe',US:'North America',VN:'Asia',NG:'Africa',
+  };
+  const continents = {};
+  countries.forEach(c => {
+    const cont = CONTINENT_MAP[c.code] || 'Other';
+    continents[cont] = (continents[cont] || 0) + 1;
+  });
+
+  // Last trip (most recent past trip)
+  const now = new Date().toISOString().split('T')[0];
+  const pastTrips = trips.filter(t => t.end_date && t.end_date <= now).sort((a, b) => b.end_date.localeCompare(a.end_date));
+  const lastTrip = pastTrips[0] ? { id: pastTrips[0].id, title: pastTrips[0].title, start_date: pastTrips[0].start_date, end_date: pastTrips[0].end_date } : null;
+  // Find country for last trip
+  if (lastTrip) {
+    const lastTripPlaces = places.filter(p => p.trip_id === lastTrip.id);
+    for (const p of lastTripPlaces) {
+      let code = getCountryFromAddress(p.address);
+      if (!code && p.lat && p.lng) code = getCountryFromCoords(p.lat, p.lng);
+      if (code) { lastTrip.countryCode = code; break; }
+    }
+  }
+
+  // Next trip (earliest future trip)
+  const futureTrips = trips.filter(t => t.start_date && t.start_date > now).sort((a, b) => a.start_date.localeCompare(b.start_date));
+  const nextTrip = futureTrips[0] ? { id: futureTrips[0].id, title: futureTrips[0].title, start_date: futureTrips[0].start_date } : null;
+  if (nextTrip) {
+    const diff = Math.ceil((new Date(nextTrip.start_date) - new Date()) / (1000 * 60 * 60 * 24));
+    nextTrip.daysUntil = Math.max(0, diff);
+  }
+
+  // Travel streak (consecutive years with at least one trip)
+  const tripYears = new Set(trips.filter(t => t.start_date).map(t => parseInt(t.start_date.split('-')[0])));
+  let streak = 0;
+  const currentYear = new Date().getFullYear();
+  for (let y = currentYear; y >= 2000; y--) {
+    if (tripYears.has(y)) streak++;
+    else break;
+  }
+  const firstYear = tripYears.size > 0 ? Math.min(...tripYears) : null;
+
+  res.json({
+    countries,
+    stats: {
+      totalTrips: trips.length,
+      totalPlaces: places.length,
+      totalCountries: countries.length,
+      totalDays,
+      totalCities,
+    },
+    mostVisited,
+    continents,
+    lastTrip,
+    nextTrip,
+    streak,
+    firstYear,
+    tripsThisYear: trips.filter(t => t.start_date && t.start_date.startsWith(String(currentYear))).length,
+  });
+});
+
+// GET /api/addons/atlas/country/:code — details for a country
+router.get('/country/:code', (req, res) => {
+  const userId = req.user.id;
+  const code = req.params.code.toUpperCase();
+
+  const trips = db.prepare(`
+    SELECT DISTINCT t.* FROM trips t
+    LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ?
+    WHERE t.user_id = ? OR m.user_id = ?
+  `).all(userId, userId, userId);
+
+  const tripIds = trips.map(t => t.id);
+  if (tripIds.length === 0) return res.json({ places: [], trips: [] });
+
+  const placeholders = tripIds.map(() => '?').join(',');
+  const places = db.prepare(`SELECT * FROM places WHERE trip_id IN (${placeholders})`).all(...tripIds);
+
+  const matchingPlaces = [];
+  const matchingTripIds = new Set();
+
+  for (const place of places) {
+    let pCode = getCountryFromAddress(place.address);
+    if (!pCode && place.lat && place.lng) pCode = getCountryFromCoords(place.lat, place.lng);
+    if (pCode === code) {
+      matchingPlaces.push({ id: place.id, name: place.name, address: place.address, lat: place.lat, lng: place.lng, trip_id: place.trip_id });
+      matchingTripIds.add(place.trip_id);
+    }
+  }
+
+  const matchingTrips = trips.filter(t => matchingTripIds.has(t.id)).map(t => ({ id: t.id, title: t.title, start_date: t.start_date, end_date: t.end_date }));
+
+  res.json({ places: matchingPlaces, trips: matchingTrips });
+});
+
+module.exports = router;
@@ -145,7 +145,7 @@ router.post('/register', authLimiter, (req, res) => {

    res.status(201).json({ token, user: { ...user, avatar_url: null } });
  } catch (err) {
-    res.status(500).json({ error: 'Fehler beim Erstellen des Benutzers' });
+    res.status(500).json({ error: 'Error creating user' });
  }
 });

@@ -154,17 +154,17 @@ router.post('/login', authLimiter, (req, res) => {
  const { email, password } = req.body;

  if (!email || !password) {
-    return res.status(400).json({ error: 'E-Mail und Passwort sind erforderlich' });
+    return res.status(400).json({ error: 'Email and password are required' });
  }

  const user = db.prepare('SELECT * FROM users WHERE LOWER(email) = LOWER(?)').get(email);
  if (!user) {
-    return res.status(401).json({ error: 'Ungültige E-Mail oder Passwort' });
+    return res.status(401).json({ error: 'Invalid email or password' });
  }

  const validPassword = bcrypt.compareSync(password, user.password_hash);
  if (!validPassword) {
-    return res.status(401).json({ error: 'Ungültige E-Mail oder Passwort' });
+    return res.status(401).json({ error: 'Invalid email or password' });
  }

  db.prepare('UPDATE users SET last_login = CURRENT_TIMESTAMP WHERE id = ?').run(user.id);
@@ -181,7 +181,7 @@ router.get('/me', authenticate, (req, res) => {
  ).get(req.user.id);

  if (!user) {
-    return res.status(404).json({ error: 'Benutzer nicht gefunden' });
+    return res.status(404).json({ error: 'User not found' });
  }

  res.json({ user: { ...user, avatar_url: avatarUrl(user) } });
@@ -189,6 +189,9 @@ router.get('/me', authenticate, (req, res) => {

 // PUT /api/auth/me/password
 router.put('/me/password', authenticate, (req, res) => {
+  if (process.env.DEMO_MODE === 'true' && req.user.email === 'demo@nomad.app') {
+    return res.status(403).json({ error: 'Password change is disabled in demo mode.' });
+  }
  const { new_password } = req.body;
  if (!new_password) return res.status(400).json({ error: 'New password is required' });
  if (new_password.length < 8) return res.status(400).json({ error: 'Password must be at least 8 characters' });
@@ -200,6 +203,10 @@ router.put('/me/password', authenticate, (req, res) => {

 // DELETE /api/auth/me — delete own account
 router.delete('/me', authenticate, (req, res) => {
+  // Block demo user
+  if (process.env.DEMO_MODE === 'true' && req.user.email === 'demo@nomad.app') {
+    return res.status(403).json({ error: 'Account deletion is disabled in demo mode.' });
+  }
  // Prevent deleting last admin
  if (req.user.role === 'admin') {
    const adminCount = db.prepare("SELECT COUNT(*) as count FROM users WHERE role = 'admin'").get().count;
@@ -48,7 +48,7 @@ router.get('/list', (req, res) => {

    res.json({ backups: files });
  } catch (err) {
-    res.status(500).json({ error: 'Fehler beim Laden der Backups' });
+    res.status(500).json({ error: 'Error loading backups' });
  }
 });

@@ -100,7 +100,7 @@ router.post('/create', async (req, res) => {
  } catch (err) {
    console.error('Backup error:', err);
    if (fs.existsSync(outputPath)) fs.unlinkSync(outputPath);
-    res.status(500).json({ error: 'Fehler beim Erstellen des Backups' });
+    res.status(500).json({ error: 'Error creating backup' });
  }
 });

@@ -115,7 +115,7 @@ router.get('/download/:filename', (req, res) => {

  const filePath = path.join(backupsDir, filename);
  if (!fs.existsSync(filePath)) {
-    return res.status(404).json({ error: 'Backup nicht gefunden' });
+    return res.status(404).json({ error: 'Backup not found' });
  }

  res.download(filePath, filename);
@@ -132,36 +132,48 @@ async function restoreFromZip(zipPath, res) {
    const extractedDb = path.join(extractDir, 'travel.db');
    if (!fs.existsSync(extractedDb)) {
      fs.rmSync(extractDir, { recursive: true, force: true });
-      return res.status(400).json({ error: 'Ungültiges Backup: travel.db nicht gefunden' });
+      return res.status(400).json({ error: 'Invalid backup: travel.db not found' });
    }

    // Step 1: close DB connection BEFORE touching the file (required on Windows)
    closeDb();

-    // Step 2: remove WAL/SHM and overwrite DB file
-    const dbDest = path.join(dataDir, 'travel.db');
-    for (const ext of ['', '-wal', '-shm']) {
-      try { fs.unlinkSync(dbDest + ext); } catch (e) {}
-    }
-    fs.copyFileSync(extractedDb, dbDest);
+    try {
+      // Step 2: remove WAL/SHM and overwrite DB file
+      const dbDest = path.join(dataDir, 'travel.db');
+      for (const ext of ['', '-wal', '-shm']) {
+        try { fs.unlinkSync(dbDest + ext); } catch (e) {}
+      }
+      fs.copyFileSync(extractedDb, dbDest);

-    // Step 3: restore uploads
-    const extractedUploads = path.join(extractDir, 'uploads');
-    if (fs.existsSync(extractedUploads)) {
-      if (fs.existsSync(uploadsDir)) fs.rmSync(uploadsDir, { recursive: true, force: true });
-      fs.cpSync(extractedUploads, uploadsDir, { recursive: true });
+      // Step 3: restore uploads — overwrite in-place instead of rmSync
+      // (rmSync fails with EBUSY because express.static holds the directory)
+      const extractedUploads = path.join(extractDir, 'uploads');
+      if (fs.existsSync(extractedUploads)) {
+        // Clear contents of each subdirectory without removing the root uploads dir
+        for (const sub of fs.readdirSync(uploadsDir)) {
+          const subPath = path.join(uploadsDir, sub);
+          if (fs.statSync(subPath).isDirectory()) {
+            for (const file of fs.readdirSync(subPath)) {
+              try { fs.unlinkSync(path.join(subPath, file)); } catch (e) {}
+            }
+          }
+        }
+        // Copy restored files over
+        fs.cpSync(extractedUploads, uploadsDir, { recursive: true, force: true });
+      }
+    } finally {
+      // Step 4: ALWAYS reopen DB — even if file copy failed, so the server stays functional
+      reinitialize();
    }

    fs.rmSync(extractDir, { recursive: true, force: true });

-    // Step 4: reopen DB with restored data
-    reinitialize();
-
    res.json({ success: true });
  } catch (err) {
    console.error('Restore error:', err);
    if (fs.existsSync(extractDir)) fs.rmSync(extractDir, { recursive: true, force: true });
-    if (!res.headersSent) res.status(500).json({ error: err.message || 'Fehler beim Wiederherstellen' });
+    if (!res.headersSent) res.status(500).json({ error: err.message || 'Error restoring backup' });
  }
 }

@@ -173,7 +185,7 @@ router.post('/restore/:filename', async (req, res) => {
  }
  const zipPath = path.join(backupsDir, filename);
  if (!fs.existsSync(zipPath)) {
-    return res.status(404).json({ error: 'Backup nicht gefunden' });
+    return res.status(404).json({ error: 'Backup not found' });
  }
  await restoreFromZip(zipPath, res);
 });
@@ -183,13 +195,13 @@ const uploadTmp = multer({
  dest: path.join(dataDir, 'tmp/'),
  fileFilter: (req, file, cb) => {
    if (file.originalname.endsWith('.zip')) cb(null, true);
-    else cb(new Error('Nur ZIP-Dateien erlaubt'));
+    else cb(new Error('Only ZIP files allowed'));
  },
  limits: { fileSize: 500 * 1024 * 1024 },
 });

 router.post('/upload-restore', uploadTmp.single('backup'), async (req, res) => {
-  if (!req.file) return res.status(400).json({ error: 'Keine Datei hochgeladen' });
+  if (!req.file) return res.status(400).json({ error: 'No file uploaded' });
  const zipPath = req.file.path;
  await restoreFromZip(zipPath, res);
  if (fs.existsSync(zipPath)) fs.unlinkSync(zipPath);
@@ -223,7 +235,7 @@ router.delete('/:filename', (req, res) => {

  const filePath = path.join(backupsDir, filename);
  if (!fs.existsSync(filePath)) {
-    return res.status(404).json({ error: 'Backup nicht gefunden' });
+    return res.status(404).json({ error: 'Backup not found' });
  }

  fs.unlinkSync(filePath);
@@ -14,7 +14,7 @@ router.get('/', authenticate, (req, res) => {
  const { tripId } = req.params;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const items = db.prepare(
    'SELECT * FROM budget_items WHERE trip_id = ? ORDER BY category ASC, created_at ASC'
@@ -29,9 +29,9 @@ router.post('/', authenticate, (req, res) => {
  const { category, name, total_price, persons, days, note } = req.body;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

-  if (!name) return res.status(400).json({ error: 'Name ist erforderlich' });
+  if (!name) return res.status(400).json({ error: 'Name is required' });

  const maxOrder = db.prepare('SELECT MAX(sort_order) as max FROM budget_items WHERE trip_id = ?').get(tripId);
  const sortOrder = (maxOrder.max !== null ? maxOrder.max : -1) + 1;
@@ -40,7 +40,7 @@ router.post('/', authenticate, (req, res) => {
    'INSERT INTO budget_items (trip_id, category, name, total_price, persons, days, note, sort_order) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'
  ).run(
    tripId,
-    category || 'Sonstiges',
+    category || 'Other',
    name,
    total_price || 0,
    persons != null ? persons : null,
@@ -60,10 +60,10 @@ router.put('/:id', authenticate, (req, res) => {
  const { category, name, total_price, persons, days, note, sort_order } = req.body;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const item = db.prepare('SELECT * FROM budget_items WHERE id = ? AND trip_id = ?').get(id, tripId);
-  if (!item) return res.status(404).json({ error: 'Budget-Eintrag nicht gefunden' });
+  if (!item) return res.status(404).json({ error: 'Budget item not found' });

  db.prepare(`
    UPDATE budget_items SET
@@ -96,10 +96,10 @@ router.delete('/:id', authenticate, (req, res) => {
  const { tripId, id } = req.params;

  const trip = verifyTripOwnership(tripId, req.user.id);
-  if (!trip) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!trip) return res.status(404).json({ error: 'Trip not found' });

  const item = db.prepare('SELECT id FROM budget_items WHERE id = ? AND trip_id = ?').get(id, tripId);
-  if (!item) return res.status(404).json({ error: 'Budget-Eintrag nicht gefunden' });
+  if (!item) return res.status(404).json({ error: 'Budget item not found' });

  db.prepare('DELETE FROM budget_items WHERE id = ?').run(id);
  res.json({ success: true });
@@ -16,7 +16,7 @@ router.get('/', authenticate, (req, res) => {
 router.post('/', authenticate, adminOnly, (req, res) => {
  const { name, color, icon } = req.body;

-  if (!name) return res.status(400).json({ error: 'Kategoriename ist erforderlich' });
+  if (!name) return res.status(400).json({ error: 'Category name is required' });

  const result = db.prepare(
    'INSERT INTO categories (name, color, icon, user_id) VALUES (?, ?, ?, ?)'
@@ -31,7 +31,7 @@ router.put('/:id', authenticate, adminOnly, (req, res) => {
  const { name, color, icon } = req.body;
  const category = db.prepare('SELECT * FROM categories WHERE id = ?').get(req.params.id);

-  if (!category) return res.status(404).json({ error: 'Kategorie nicht gefunden' });
+  if (!category) return res.status(404).json({ error: 'Category not found' });

  db.prepare(`
    UPDATE categories SET
@@ -49,7 +49,7 @@ router.put('/:id', authenticate, adminOnly, (req, res) => {
 router.delete('/:id', authenticate, adminOnly, (req, res) => {
  const category = db.prepare('SELECT * FROM categories WHERE id = ?').get(req.params.id);

-  if (!category) return res.status(404).json({ error: 'Kategorie nicht gefunden' });
+  if (!category) return res.status(404).json({ error: 'Category not found' });

  db.prepare('DELETE FROM categories WHERE id = ?').run(req.params.id);
  res.json({ success: true });
@@ -12,7 +12,7 @@ function verifyAccess(tripId, userId) {
 // GET /api/trips/:tripId/days/:dayId/notes
 router.get('/', authenticate, (req, res) => {
  const { tripId, dayId } = req.params;
-  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Trip not found' });

  const notes = db.prepare(
    'SELECT * FROM day_notes WHERE day_id = ? AND trip_id = ? ORDER BY sort_order ASC, created_at ASC'
@@ -24,13 +24,13 @@ router.get('/', authenticate, (req, res) => {
 // POST /api/trips/:tripId/days/:dayId/notes
 router.post('/', authenticate, (req, res) => {
  const { tripId, dayId } = req.params;
-  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Trip not found' });

  const day = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(dayId, tripId);
-  if (!day) return res.status(404).json({ error: 'Tag nicht gefunden' });
+  if (!day) return res.status(404).json({ error: 'Day not found' });

  const { text, time, icon, sort_order } = req.body;
-  if (!text?.trim()) return res.status(400).json({ error: 'Text erforderlich' });
+  if (!text?.trim()) return res.status(400).json({ error: 'Text required' });

  const result = db.prepare(
    'INSERT INTO day_notes (day_id, trip_id, text, time, icon, sort_order) VALUES (?, ?, ?, ?, ?, ?)'
@@ -44,10 +44,10 @@ router.post('/', authenticate, (req, res) => {
 // PUT /api/trips/:tripId/days/:dayId/notes/:id
 router.put('/:id', authenticate, (req, res) => {
  const { tripId, dayId, id } = req.params;
-  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Trip not found' });

  const note = db.prepare('SELECT * FROM day_notes WHERE id = ? AND day_id = ? AND trip_id = ?').get(id, dayId, tripId);
-  if (!note) return res.status(404).json({ error: 'Notiz nicht gefunden' });
+  if (!note) return res.status(404).json({ error: 'Note not found' });

  const { text, time, icon, sort_order } = req.body;
  db.prepare(
@@ -68,10 +68,10 @@ router.put('/:id', authenticate, (req, res) => {
 // DELETE /api/trips/:tripId/days/:dayId/notes/:id
 router.delete('/:id', authenticate, (req, res) => {
  const { tripId, dayId, id } = req.params;
-  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Reise nicht gefunden' });
+  if (!verifyAccess(tripId, req.user.id)) return res.status(404).json({ error: 'Trip not found' });

  const note = db.prepare('SELECT id FROM day_notes WHERE id = ? AND day_id = ? AND trip_id = ?').get(id, dayId, tripId);
-  if (!note) return res.status(404).json({ error: 'Notiz nicht gefunden' });
+  if (!note) return res.status(404).json({ error: 'Note not found' });

  db.prepare('DELETE FROM day_notes WHERE id = ?').run(id);
  res.json({ success: true });
@@ -13,7 +13,7 @@ function getAssignmentsForDay(dayId) {
  const assignments = db.prepare(`
    SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
      p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
-      p.reservation_status, p.reservation_notes, p.reservation_datetime, p.place_time, p.duration_minutes, p.notes as place_notes,
+      p.place_time, p.end_time, p.duration_minutes, p.notes as place_notes,
      p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
      c.name as category_name, c.color as category_color, c.icon as category_icon
    FROM day_assignments da
@@ -46,10 +46,8 @@ function getAssignmentsForDay(dayId) {
        category_id: a.category_id,
        price: a.price,
        currency: a.place_currency,
-        reservation_status: a.reservation_status,
-        reservation_notes: a.reservation_notes,
-        reservation_datetime: a.reservation_datetime,
        place_time: a.place_time,
+        end_time: a.end_time,
        duration_minutes: a.duration_minutes,
        notes: a.place_notes,
        image_url: a.image_url,
@@ -75,7 +73,7 @@ router.get('/', authenticate, (req, res) => {

  const trip = verifyTripOwnership(tripId, req.user.id);
  if (!trip) {
-    return res.status(404).json({ error: 'Reise nicht gefunden' });
+    return res.status(404).json({ error: 'Trip not found' });
  }

  const days = db.prepare('SELECT * FROM days WHERE trip_id = ? ORDER BY day_number ASC').all(tripId);
@@ -91,7 +89,7 @@ router.get('/', authenticate, (req, res) => {
  const allAssignments = db.prepare(`
    SELECT da.*, p.id as place_id, p.name as place_name, p.description as place_description,
      p.lat, p.lng, p.address, p.category_id, p.price, p.currency as place_currency,
-      p.reservation_status, p.reservation_notes, p.reservation_datetime, p.place_time, p.duration_minutes, p.notes as place_notes,
+      p.place_time, p.end_time, p.duration_minutes, p.notes as place_notes,
      p.image_url, p.transport_mode, p.google_place_id, p.website, p.phone,
      c.name as category_name, c.color as category_color, c.icon as category_icon
    FROM day_assignments da
@@ -137,10 +135,8 @@ router.get('/', authenticate, (req, res) => {
        category_id: a.category_id,
        price: a.price,
        currency: a.place_currency,
-        reservation_status: a.reservation_status,
-        reservation_notes: a.reservation_notes,
-        reservation_datetime: a.reservation_datetime,
        place_time: a.place_time,
+        end_time: a.end_time,
        duration_minutes: a.duration_minutes,
        notes: a.place_notes,
        image_url: a.image_url,
@@ -184,7 +180,7 @@ router.post('/', authenticate, (req, res) => {

  const trip = verifyTripOwnership(tripId, req.user.id);
  if (!trip) {
-    return res.status(404).json({ error: 'Reise nicht gefunden' });
+    return res.status(404).json({ error: 'Trip not found' });
  }

  const { date, notes } = req.body;
@@ -209,12 +205,12 @@ router.put('/:id', authenticate, (req, res) => {

  const trip = verifyTripOwnership(tripId, req.user.id);
  if (!trip) {
-    return res.status(404).json({ error: 'Reise nicht gefunden' });
+    return res.status(404).json({ error: 'Trip not found' });
  }

  const day = db.prepare('SELECT * FROM days WHERE id = ? AND trip_id = ?').get(id, tripId);
  if (!day) {
-    return res.status(404).json({ error: 'Tag nicht gefunden' });
+    return res.status(404).json({ error: 'Day not found' });
  }

  const { notes, title } = req.body;
@@ -232,12 +228,12 @@ router.delete('/:id', authenticate, (req, res) => {

  const trip = verifyTripOwnership(tripId, req.user.id);
  if (!trip) {
-    return res.status(404).json({ error: 'Reise nicht gefunden' });
+    return res.status(404).json({ error: 'Trip not found' });
  }

  const day = db.prepare('SELECT * FROM days WHERE id = ? AND trip_id = ?').get(id, tripId);
  if (!day) {
-    return res.status(404).json({ error: 'Tag nicht gefunden' });
+    return res.status(404).json({ error: 'Day not found' });
  }

  db.prepare('DELETE FROM days WHERE id = ?').run(id);
@@ -245,4 +241,149 @@ router.delete('/:id', authenticate, (req, res) => {
  broadcast(tripId, 'day:deleted', { dayId: Number(id) }, req.headers['x-socket-id']);
 });

+// === Accommodation routes ===
+const accommodationsRouter = express.Router({ mergeParams: true });
+
+function getAccommodationWithPlace(id) {
+  return db.prepare(`
+    SELECT a.*, p.name as place_name, p.address as place_address, p.image_url as place_image, p.lat as place_lat, p.lng as place_lng
+    FROM day_accommodations a
+    JOIN places p ON a.place_id = p.id
+    WHERE a.id = ?
+  `).get(id);
+}
+
+// GET /api/trips/:tripId/accommodations
+accommodationsRouter.get('/', authenticate, (req, res) => {
+  const { tripId } = req.params;
+
+  const trip = verifyTripOwnership(tripId, req.user.id);
+  if (!trip) {
+    return res.status(404).json({ error: 'Trip not found' });
+  }
+
+  const accommodations = db.prepare(`
+    SELECT a.*, p.name as place_name, p.address as place_address, p.image_url as place_image, p.lat as place_lat, p.lng as place_lng
+    FROM day_accommodations a
+    JOIN places p ON a.place_id = p.id
+    WHERE a.trip_id = ?
+    ORDER BY a.created_at ASC
+  `).all(tripId);
+
+  res.json({ accommodations });
+});
+
+// POST /api/trips/:tripId/accommodations
+accommodationsRouter.post('/', authenticate, (req, res) => {
+  const { tripId } = req.params;
+
+  const trip = verifyTripOwnership(tripId, req.user.id);
+  if (!trip) {
+    return res.status(404).json({ error: 'Trip not found' });
+  }
+
+  const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
+
+  if (!place_id || !start_day_id || !end_day_id) {
+    return res.status(400).json({ error: 'place_id, start_day_id, and end_day_id are required' });
+  }
+
+  const place = db.prepare('SELECT id FROM places WHERE id = ? AND trip_id = ?').get(place_id, tripId);
+  if (!place) {
+    return res.status(404).json({ error: 'Place not found' });
+  }
+
+  const startDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(start_day_id, tripId);
+  if (!startDay) {
+    return res.status(404).json({ error: 'Start day not found' });
+  }
+
+  const endDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(end_day_id, tripId);
+  if (!endDay) {
+    return res.status(404).json({ error: 'End day not found' });
+  }
+
+  const result = db.prepare(
+    'INSERT INTO day_accommodations (trip_id, place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'
+  ).run(tripId, place_id, start_day_id, end_day_id, check_in || null, check_out || null, confirmation || null, notes || null);
+
+  const accommodation = getAccommodationWithPlace(result.lastInsertRowid);
+  res.status(201).json({ accommodation });
+  broadcast(tripId, 'accommodation:created', { accommodation }, req.headers['x-socket-id']);
+});
+
+// PUT /api/trips/:tripId/accommodations/:id
+accommodationsRouter.put('/:id', authenticate, (req, res) => {
+  const { tripId, id } = req.params;
+
+  const trip = verifyTripOwnership(tripId, req.user.id);
+  if (!trip) {
+    return res.status(404).json({ error: 'Trip not found' });
+  }
+
+  const existing = db.prepare('SELECT * FROM day_accommodations WHERE id = ? AND trip_id = ?').get(id, tripId);
+  if (!existing) {
+    return res.status(404).json({ error: 'Accommodation not found' });
+  }
+
+  const { place_id, start_day_id, end_day_id, check_in, check_out, confirmation, notes } = req.body;
+
+  const newPlaceId = place_id !== undefined ? place_id : existing.place_id;
+  const newStartDayId = start_day_id !== undefined ? start_day_id : existing.start_day_id;
+  const newEndDayId = end_day_id !== undefined ? end_day_id : existing.end_day_id;
+  const newCheckIn = check_in !== undefined ? check_in : existing.check_in;
+  const newCheckOut = check_out !== undefined ? check_out : existing.check_out;
+  const newConfirmation = confirmation !== undefined ? confirmation : existing.confirmation;
+  const newNotes = notes !== undefined ? notes : existing.notes;
+
+  if (place_id !== undefined) {
+    const place = db.prepare('SELECT id FROM places WHERE id = ? AND trip_id = ?').get(place_id, tripId);
+    if (!place) {
+      return res.status(404).json({ error: 'Place not found' });
+    }
+  }
+
+  if (start_day_id !== undefined) {
+    const startDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(start_day_id, tripId);
+    if (!startDay) {
+      return res.status(404).json({ error: 'Start day not found' });
+    }
+  }
+
+  if (end_day_id !== undefined) {
+    const endDay = db.prepare('SELECT id FROM days WHERE id = ? AND trip_id = ?').get(end_day_id, tripId);
+    if (!endDay) {
+      return res.status(404).json({ error: 'End day not found' });
+    }
+  }
+
+  db.prepare(
+    'UPDATE day_accommodations SET place_id = ?, start_day_id = ?, end_day_id = ?, check_in = ?, check_out = ?, confirmation = ?, notes = ? WHERE id = ?'
+  ).run(newPlaceId, newStartDayId, newEndDayId, newCheckIn, newCheckOut, newConfirmation, newNotes, id);
+
+  const accommodation = getAccommodationWithPlace(id);
+  res.json({ accommodation });
+  broadcast(tripId, 'accommodation:updated', { accommodation }, req.headers['x-socket-id']);
+});
+
+// DELETE /api/trips/:tripId/accommodations/:id
+accommodationsRouter.delete('/:id', authenticate, (req, res) => {
+  const { tripId, id } = req.params;
+
+  const trip = verifyTripOwnership(tripId, req.user.id);
+  if (!trip) {
+    return res.status(404).json({ error: 'Trip not found' });
+  }
+
+  const existing = db.prepare('SELECT * FROM day_accommodations WHERE id = ? AND trip_id = ?').get(id, tripId);
+  if (!existing) {
+    return res.status(404).json({ error: 'Accommodation not found' });
+  }
+
+  db.prepare('DELETE FROM day_accommodations WHERE id = ?').run(id);
+  res.json({ success: true });
+  broadcast(tripId, 'accommodation:deleted', { accommodationId: Number(id) }, req.headers['x-socket-id']);
+});
+
 module.exports = router;
+module.exports.accommodationsRouter = accommodationsRouter;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Maurice	0497032ed7	v2.5.7: Reservation overhaul, Day Detail Panel, i18n, paste support, auto dark mode BREAKING: Reservations have been completely rebuilt. Existing place-level reservations are no longer used. All reservations must be re-created via the Bookings tab. Your trips, places, and other data are unaffected. Reservation System (rebuilt from scratch): - Reservations now link to specific day assignments instead of places - Same place on different days can have independent reservations - New assignment picker in booking modal (grouped by day, searchable) - Removed day/place dropdowns from booking form - Reservation badges in day plan sidebar with type-specific icons - Reservation details in place inspector (only for selected assignment) - Reservation summary in day detail panel Day Detail Panel (new): - Opens on day click in the sidebar - Detailed weather: hourly forecast, precipitation, wind, sunrise/sunset - Historical climate averages for dates beyond 16 days - Accommodation management with check-in/check-out, confirmation number - Hotel assignment across multiple days with day range picker - Reservation overview for the day Places: - Places can now be assigned to the same day multiple times - Start time + end time fields (replaces single time field) - Map badges show multiple position numbers (e.g. "1 · 4") - Route optimization fixed for duplicate places - File attachments during place editing (not just creation) - Cover image upload during trip creation (not just editing) - Paste support (Ctrl+V) for images in trip, place, and file forms Internationalization: - 200+ hardcoded German strings translated to i18n (EN + DE) - Server error messages in English - Category seeds in English for new installations - All planner, register, photo, packing components translated UI/UX: - Auto dark mode (follows system preference, configurable in settings) - Navbar toggle switches light/dark (overrides auto) - Sidebar minimize buttons z-index fixed - Transport mode selector removed from day plan - CustomSelect supports grouped headers (isHeader option) - Optimistic updates for day notes (instant feedback) - Booking cards redesigned with type-colored headers and structured details Weather: - Wind speed in mph when using Fahrenheit setting - Weather description language matches app language Admin: - Weather info panel replaces OpenWeatherMap key input - "Recommended" badge styling updated	2026-03-24 20:10:45 +01:00
Maurice	e4607e426c	v2.5.6: Open-Meteo weather, WebSocket fixes, admin improvements - Replace OpenWeatherMap with Open-Meteo (no API key needed) - 16-day forecast (up from 5 days) - Historical climate averages as fallback beyond 16 days - Auto-upgrade from climate to real forecast when available - Fix Vacay WebSocket sync across devices (socket-ID exclusion instead of user-ID) - Add GitHub release history tab in admin panel - Show cluster count "1" for single map markers when zoomed out - Add weather info panel in admin settings (replaces OpenWeatherMap key input) - Update i18n translations (DE + EN)	2026-03-24 10:02:03 +01:00
Maurice	faa8c84655	Vacay drag-to-paint, "Everyone" button, live exchange rates - Vacay: click-and-drag to paint/erase vacation days across calendar - Vacay: "Everyone" button sets days for all persons (2+ only) - Budget: live currency conversion via frankfurter.app (cached 1h) - Budget: conversion widget in total card with selectable target currency - Day planner: remove transport mode buttons from day view	2026-03-23 21:11:20 +01:00
Maurice	88dca41ef7	Standardize all Docker paths to /opt/nomad in README All examples (Quick Start, Docker Compose, Update) now use absolute /opt/nomad/data and /opt/nomad/uploads paths consistently.	2026-03-23 20:47:39 +01:00
Maurice	33162123af	Fix README update command: use real paths instead of placeholders Placeholder paths (/your/data) caused data loss when copied literally. Now uses /opt/nomad/data with a warning about correct paths.	2026-03-23 20:46:20 +01:00
Maurice	10662e0b63	v2.5.5 — Fix PDF preview overlay, mobile login tagline - PDF file preview now renders via portal above navbar - Fix mobile login tagline text wrapping	2026-03-23 20:09:29 +01:00
Maurice	8286fa8591	Fix mobile login tagline wrapping to single line	2026-03-23 20:03:34 +01:00
Maurice	5f2bd51824	Fix update for Docker: show commands instead of one-click install - Detect Docker environment (/.dockerenv) on server - Version check returns is_docker flag - Docker: show terminal commands for docker pull/restart - Git installs: keep one-click update button - Data safety hint shown in both modes	2026-03-23 19:17:59 +01:00
Maurice	4d3ee08481	v2.5.4 — Smart map zoom & place files in reservations - Map auto-fits to day places when selecting a day or place - Dynamic padding accounts for sidebars and place inspector overlay - Place-based reservations now show linked files in the bookings tab - Increased max zoom to 16 for closer detail on nearby places	2026-03-23 19:14:14 +01:00
Maurice	aeb530515e	v2.5.3 — Admin update checker & one-click self-update - Add version check against GitHub releases in admin dashboard - Show amber banner when a newer version is available - One-click update: git pull + npm install + auto-restart - Confirmation dialog with backup recommendation and data safety info - Dark mode support for update banner - Fix fresh DB migration: initial schema now includes all columns - i18n: English + German translations for all update UI	2026-03-23 19:02:08 +01:00
Maurice	f4d3542d99	Update README: node:sqlite → better-sqlite3	2026-03-22 17:58:41 +01:00
Maurice	d604ad1c5b	Stabilize core: better-sqlite3, versioned migrations, graceful shutdown - Replace experimental node:sqlite with better-sqlite3 (stable API) - Replace try/catch migration pattern with schema_version tracking - Add SIGTERM/SIGINT handler for clean shutdown (DB flush, scheduler stop) - Fix BudgetPanel crash: remove undefined setShowAddCategory call - Update Dockerfile: remove --experimental-sqlite, add native build tools	2026-03-22 17:52:24 +01:00
Maurice	3919c61eb6	Fix demo seed: add trip_id to day_notes insert	2026-03-22 03:22:13 +01:00
Maurice	98556c9aaf	Add takeoff animation to demo login	2026-03-22 03:17:36 +01:00
Maurice	7e4ec82d3e	Overhaul demo content: English, 3 trips with Google Place IDs, notes, budgets	2026-03-22 03:16:56 +01:00
Maurice	5f891c83e8	Update screenshots with new branding	2026-03-22 03:09:33 +01:00
Maurice	3d6ae6811c	README: use light logo as default, auto-switch for dark/light GitHub theme	2026-03-22 02:51:32 +01:00
Maurice	dd3d4263a7	v2.5.2 — PWA, new branding, bug fixes Progressive Web App: - Service worker with Workbox caching (map tiles, API, uploads, CDN) - Web app manifest with standalone display mode - Custom app icon with PNG generation from SVG - Apple meta tags, dynamic theme-color for dark/light mode - iOS safe area handling New Branding: - Custom NOMAD logo (icon + text variants for light/dark mode) - Logo used in navbar, login page, demo banner, admin, PDF export - MuseoModerno font for login tagline - Plane takeoff animation on login - Liquid glass hover effect on dashboard spotlight & widgets - Brand images protected from save/copy/drag - "made with NOMAD" footer on PDF exports Bug Fixes: - Fix mobile note reorder (missing tripId prop) - Fix Atlas city counting (strip postal codes, normalize case) - Fix Atlas country detection (add Japanese/Korean/Thai names) - Fix PDF note positioning (use order_index instead of sort_order) - Fix PDF note icons (render actual icon instead of hardcoded notepad) - Fix file source badge overflow on mobile (text truncation) - Fix navbar dropdown z-index overlap with mobile plan/places buttons - Fix dashboard trip card hover contrast in dark mode - Fix day header hover color matching place background in dark mode - Shorten settings button labels on mobile UI Improvements: - Mobile navbar shows icon only, desktop shows full logo - NOMAD version badge in profile dropdown - Top padding before first item in day planner - Improved drag & drop stability (larger drop zones, less flickering)	2026-03-22 02:50:13 +01:00
Maurice	5f4e7f9487	Fix mobile note reorder, shorten settings buttons, fix Atlas city/country counting	2026-03-21 23:27:04 +01:00
Maurice	e652efee8a	Switch to default status bar style — iOS handles safe areas cleanly	2026-03-21 23:10:23 +01:00
Maurice	47028798b1	Fix bottom bar: use transform trick to paint safe area	2026-03-21 23:07:10 +01:00
Maurice	6076a482b8	Fix bottom safe area: use fixed body to cover full screen	2026-03-21 23:01:45 +01:00
Maurice	a590db8e10	Truncate long place names in file source badges on mobile	2026-03-21 22:56:09 +01:00
Maurice	502c334cbf	Fix bottom safe area: html background + fixed inset for map page	2026-03-21 22:54:20 +01:00
Maurice	031cc3587b	Fix hardcoded pixel offsets in TripPlannerPage for safe area	2026-03-21 22:47:48 +01:00
Maurice	f55f5ea449	Fix PWA safe area: navbar extends behind status bar, remove bottom black bar	2026-03-21 22:42:21 +01:00
Maurice	557de4cd5a	Add PWA support for iOS home screen install - Web app manifest (standalone display, NOMAD branding, icons) - Service worker with Workbox caching (map tiles, API, uploads, CDN) - SVG app icon + PNG generation script via sharp - Apple meta tags (web-app-capable, black-translucent status bar) - Dynamic theme-color for dark/light mode - Safe area insets for notch devices	2026-03-21 22:21:23 +01:00
Maurice	544ac796d5	Auto-route on reorder/assign/remove, lock places for optimization, fix zoom - Route line auto-updates on day select, reorder, assign, remove (no manual button) - Remove manual route calculation button (keep optimize + Google Maps) - Lock places at their position during route optimization (click avatar to toggle) - Locked places shown with red background, border and lock overlay - Custom tooltip for lock feature (DE/EN, dark mode) - Fix map zoom: panTo instead of setView keeps current zoom level - Fix fitBounds only on actual day change, not on place click - Missing translations: needTwoPlaces, routeOptimized, noGeoPlaces	2026-03-21 16:12:13 +01:00
Maurice	5b6e3d6c1a	Fix drag/drop to bottom of day, add restore warning modal, add missing translations	2026-03-21 15:35:05 +01:00
Maurice	df695ee8d8	v2.5.1 — Security hardening, backup restore fix & restore warning modal	2026-03-21 15:13:10 +01:00
Maurice	d845057f84	Security hardening, backup restore fix & restore warning modal - Fix backup restore: try/finally ensures DB always reopens after closeDb - Fix EBUSY on uploads during restore (in-place overwrite instead of rmSync) - Add DB proxy null guard for clearer errors during restore window - Add red warning modal before backup restore (DE/EN, dark mode support) - JWT secret: empty docker-compose default so auto-generation kicks in - OIDC: pass token via URL fragment instead of query param (no server logs) - Block SVG uploads on photos, files and covers (stored XSS prevention) - Add helmet for security headers (HSTS, X-Frame, nosniff, etc.) - Explicit express.json body size limit (100kb) - Fix XSS in Leaflet map markers (escape image_url in HTML) - Remove verbose WebSocket debug logging from client	2026-03-21 15:09:41 +01:00
Maurice	e70fe50ae3	Fix demo banner: i18n for demo button, icon alignment, add addon mgmt & OIDC to full version features	2026-03-21 11:14:53 +01:00
mauriceboe	2000371844	Update README.md	2026-03-20 23:42:49 +01:00
Maurice	d45d9c2cfa	Fix Atlas labels, update Demo Banner with addons & NOMAD intro (v2.5.0) - Remove Next Trip from Atlas bottom panel - Fix label wrapping with whitespace-nowrap on streak/year labels - Redesign Demo Banner: add addon showcase (Vacay, Atlas, Packing, Budget, Documents, Widgets), "What is NOMAD?" section, 2-column grid layout, compact design	2026-03-20 23:39:12 +01:00
Maurice	d24f0b3ccd	Fix Atlas: remove Next Trip, fix label wrapping (v2.5.0)	2026-03-20 23:39:12 +01:00
mauriceboe	c1fb745627	Update README.md	2026-03-20 23:20:34 +01:00
Maurice	384d583628	v2.5.0 — Addon System, Vacay, Atlas, Dashboard Widgets & Mobile Overhaul The biggest NOMAD update yet. Introduces a modular addon architecture and three major new features. Addon System: - Admin panel addon management with enable/disable toggles - Trip addons (Packing List, Budget, Documents) dynamically show/hide in trip tabs - Global addons appear in the main navigation for all users Vacay — Vacation Day Planner (Global Addon): - Monthly calendar view with international public holidays (100+ countries via Nager.Date API) - Company holidays with auto-cleanup of conflicting entries - User-based system: each NOMAD user is a person in the calendar - Fusion system: invite other users to share a combined calendar with real-time WebSocket sync - Vacation entitlement tracking with automatic carry-over to next year - Full settings: block weekends, public holidays, company holidays, carry-over toggle - Invite/accept/decline flow with forced confirmation modal - Color management per user with collision detection on fusion - Dissolve fusion with preserved entries Atlas — Travel World Map (Global Addon): - Fullscreen Leaflet world map with colored country polygons (GeoJSON) - Glass-effect bottom panel with stats, continent breakdown, streak tracking - Country tooltips with trip count, places visited, first/last visit dates - Liquid glass hover effect on the stats panel - Canvas renderer with tile preloading for maximum performance - Responsive: mobile stats bars, no zoom controls on touch Dashboard Widgets: - Currency converter with 50 currencies, CustomSelect dropdowns, localStorage persistence - Timezone widget with customizable city list, live updating clock - Per-user toggle via settings button, bottom sheet on mobile Admin Panel: - Consistent dark mode across all tabs (CSS variable overrides) - Online/offline status badges on user list via WebSocket - Unified heading sizes and subtitles across all sections - Responsive tab grid on mobile Mobile Improvements: - Vacay: slide-in sidebar drawer, floating toolbar, responsive calendar grid - Atlas: top/bottom glass stat bars, no popups - Trip Planner: fixed position content container prevents overscroll, portal-based sidebar buttons - Dashboard: fixed viewport container, mobile widget bottom sheet - Admin: responsive tab grid, compact buttons - Global: overscroll-behavior fixes, modal scroll containment Other: - Trip tab labels: Planung→Karte, Packliste→Liste, Buchungen→Buchung (DE mobile) - Reservation form responsive layout - Backup panel responsive buttons	2026-03-20 23:14:06 +01:00
Maurice	3edf65957b	Block demo user from deleting account and changing password (v2.4.1)	2026-03-20 00:02:53 +01:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="2000" zoomAndPan="magnify" viewBox="0 0 1500 1499.999933" height="2000" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="a5b4275efd"><path d="M 45 5.265625 L 1455 5.265625 L 1455 1494.765625 L 45 1494.765625 Z M 45 5.265625 " clip-rule="nonzero"/></clipPath><clipPath id="61932b752f"><path d="M 855.636719 699.203125 L 222.246094 699.203125 C 197.679688 699.203125 179.90625 675.753906 186.539062 652.101562 L 360.429688 32.390625 C 364.921875 16.386719 379.511719 5.328125 396.132812 5.328125 L 1029.527344 5.328125 C 1054.089844 5.328125 1071.867188 28.777344 1065.230469 52.429688 L 891.339844 672.136719 C 886.851562 688.140625 872.257812 699.203125 855.636719 699.203125 Z M 444.238281 1166.980469 L 533.773438 847.898438 C 540.410156 824.246094 522.632812 800.796875 498.070312 800.796875 L 172.472656 800.796875 C 155.851562 800.796875 141.261719 811.855469 136.769531 827.859375 L 47.234375 1146.941406 C 40.597656 1170.59375 58.375 1194.042969 82.9375 1194.042969 L 408.535156 1194.042969 C 425.15625 1194.042969 439.75 1182.984375 444.238281 1166.980469 Z M 609.003906 827.859375 L 435.113281 1447.570312 C 428.476562 1471.21875 446.253906 1494.671875 470.816406 1494.671875 L 1104.210938 1494.671875 C 1120.832031 1494.671875 1135.421875 1483.609375 1139.914062 1467.605469 L 1313.804688 847.898438 C 1320.441406 824.246094 1302.664062 800.796875 1278.101562 800.796875 L 644.707031 800.796875 C 628.085938 800.796875 613.492188 811.855469 609.003906 827.859375 Z M 1056.105469 333.019531 L 966.570312 652.101562 C 959.933594 675.753906 977.710938 699.203125 1002.273438 699.203125 L 1327.871094 699.203125 C 1344.492188 699.203125 1359.085938 688.140625 1363.574219 672.136719 L 1453.109375 353.054688 C 1459.746094 329.40625 1441.96875 305.953125 1417.40625 305.953125 L 1091.808594 305.953125 C 1075.1875 305.953125 1060.597656 317.015625 1056.105469 333.019531 Z M 1056.105469 333.019531 " clip-rule="nonzero"/></clipPath></defs><g clip-path="url(#a5b4275efd)"><g clip-path="url(#61932b752f)"><path fill="#000000" d="M 40.597656 5.328125 L 40.597656 1494.671875 L 1459.472656 1494.671875 L 1459.472656 5.328125 Z M 40.597656 5.328125 " fill-opacity="1" fill-rule="nonzero"/></g></g></svg>