diff --git a/.env b/.env
deleted file mode 100644
index e8985d5..0000000
--- a/.env
+++ /dev/null
@@ -1,34 +0,0 @@
-# Flask-Configuration - Key are generated through setup.sh
-SECRET_KEY=""
-REDEEM_SECRET=""
-WTF_CSRF_SECRET_KEY=""
-
-# locales
-BABEL_DEFAULT_LOCALE="en"
-BABEL_SUPPORTED_LOCALES="de,en"
-BABEL_TRANSLATION_DIRECTORIES="translations"
-
-# Timezone
-TZ=Europe/Berlin
-
-# Security
-SESSION_COOKIE_SECURE="False"
-CSRF_ENABLED="True"
-# Account registration
-REGISTRATION_ENABLED="True"
-
-# checking interval if keys have to be redeemed before a specific date
-CHECK_EXPIRING_KEYS_INTERVAL_HOURS=6
-
-# Pushover
-PUSHOVER_APP_TOKEN=""
-PUSHOVER_USER_KEY=""
-
-# Gotify
-GOTIFY_URL=""
-GOTIFY_TOKEN=""
-
-# Matrix
-MATRIX_HOMESERVER=""
-MATRIX_ACCESS_TOKEN=""
-MATRIX_ROOM_ID=""
diff --git a/README.md b/README.md
index b25f09c..4eef38a 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,7 @@
 This project helps you keep track of your collected game keys.  
 No more confusion about whether a key is redeemed, gifted, or still unused – now you have everything in one place, with search, status, and even automatic Steam cover images!
 
-It's even possible to gift your keys via a unique website. Just edit the game to "Gifted" and you'll get a option to copy the on your overview page. (maybe HTTPS only)
-
-(the link will also remain in the edit area)
+You can even gift your keys via a unique 24-hour website link – just mark a game as "Gifted" and copy the link from your overview. (HTTPS recommended)
 
 ![Screenshot](GameManager.png)
 
@@ -16,70 +14,72 @@ It's even possible to gift your keys via a unique website. Just edit the game to
 ## ✨ Features ✨
 
 - **Key Management:**  
-  Enter your game keys, the corresponding game, platform, and maybe where you got the key.
+  Enter your game keys, platform, source, and more.
 - **Status Tracking:**  
-  Mark keys as "Redeemed", "Gifted" or "Available" – always know your status.
-- **Shop URL & Steam Cover:**  
-  Save the shop URL and (optionally) the Steam AppID. The app will automatically show the official Steam cover image if available.
-- **Gift your Games:**
-  You can create a unique redeem/gift website, which will expire after 24h.
-- **Multi-user:**  
+  Mark keys as "Redeemed", "Gifted", or "Available".
+- **Steam Cover & Shop Info:**  
+  Provide the Steam AppID and get the official game cover. Add shop URLs too.
+- **Game Descriptions & Prices:**  
+  Automatically fetch game descriptions, current best prices, and historical lows from [IsThereAnyDeal](https://isthereanydeal.com/) (API key required).
+- **Gifting:**  
+  Create a one-time gift link for each game that expires after 24 hours.
+- **Search Functionality:**  
+  Quickly find games with an integrated search bar.
+- **Multi-user Support:**  
   Each user manages their own keys.
-- **Enable/Disable Registrations:**
-  Perfect if you want to run the Server just on your own (via .env file)
-- **Search:**  
-  Find games quickly with the search function.
+- **User Roles:**  
+  The first registered user becomes an admin automatically.
+- **Admin Area:**  
+  Admins can reset passwords, delete users, and view audit logs.
+- **Audit Logs:**  
+  Track user logins, password resets, and deleted accounts.
+- **Registration Toggle:**  
+  Enable or disable user registration via the `.env` file.
 - **Responsive UI:**  
-  Works on desktop and mobile, with Dark Mode toggle.
+  Fully functional on desktop and mobile with Dark Mode support.
 - **Multi-language:**  
-  Switch between English and German instantly*.
-- **Import/Export (CSV / PDF -only export-):**
-  Easy export and import of your keys. (e.g. in case you have to start over)
-- **Change Password:**
-  Change your Password on the fly.
-- **Website Security:**
-  You can turn on/off CSRF and Secure Cookie via .env file.
-- **Notifications:**
-  If you have key that have to be redeemed before a specific date. You can set up sending messages via, Pushover, Matrix and Gotify
-- **No key data leaves your server!**
-- **(Planned):**
-  - ~~Import/Export (CSV)~~
-  - ~~Redeem site with unique sharing link~~
+  Switch between English and German on the fly.
+- **Import/Export (CSV, PDF export):**  
+  Import/export your game keys easily.
+- **Password Management:**  
+  Users can change their passwords directly.
+- **Notifications:**  
+  Get alerts for expiring keys via Gotify, Matrix, or Pushover.
+- **Security Settings:**  
+  Toggle CSRF protection and secure cookies in `.env`.
+- **Self-hosted:**  
+  No data leaves your server.
 
 ---
 
-## 🚀 Get Started! 🚀
+## 🚀 Get Started
 
-## 1. **Clone the Repository (Option 1 or  Option 2)**
-
-### Option 1: Clone the main repository
+### 1. Clone the Repository
 
 ```bash
 git clone https://codeberg.org/nocci/GameKeyManager
 cd steam-gift-manager
 ```
 
-### Option 2: Clone from alternative repository (if option 1 fails)
+Alternative:
 
 ```bash
 git clone https://git.nocci.it/nocci/GameKeyManager
 ```
 
-### 2. **Setup Docker**
+### 2. Setup Docker
 
-Make sure you have [Docker](https://www.docker.com/) and [docker-compose](https://docs.docker.com/compose/) installed.
-If not, the script will ask you what to do and can install Docker and docker-compose for you. (maybe not if you are running Arch)
+Make sure Docker and docker-compose are installed.  
+If not, the setup script can guide you (Arch-based distros may vary).
 
-### 3. **Initial Setup**
+### 3. Initial Setup
 
 ```bash
 chmod +x setup.sh
 ./setup.sh
 ```
 
-This script prepares all directories, configuration, and translation files.
-
-### 4. **Build and Start the App**
+### 4. Build and Start the App
 
 ```bash
 cd steam-gift-manager/
@@ -87,102 +87,81 @@ docker-compose build --no-cache
 docker-compose up -d
 ```
 
-### 5. **Edit your .env file to your liking**
+### 5. Configure `.env` File
 
-It's in your root folder of the installation!
+Adjust your settings:
 
-```xml
-# Security
-SESSION_COOKIE_SECURE="True" (only works if you run this app via HTTPS)
+```env
+SESSION_COOKIE_SECURE="True"   # Only works with HTTPS
 CSRF_ENABLED="True"
+ITAD_API_KEY="your_api_key"    # Optional, for price data
 ```
 
-**Important after any(!) change of the .env file!**
+Apply changes after editing:
 
 ```bash
-cd steam-gift-manager/
 docker-compose down && docker-compose up -d --build
 ```
 
-### 6. **Initialize and Edit Translations (Optional)**
+### 6. Translate (optional)
 
 ```bash
 ./translate.sh
 ```
 
-Edit the .po files in translations/de_DE/LC_MESSAGES/messages.po and en_US/LC_MESSAGES/messages.po
+Edit the `.json` files in `translations/`, then restart:
 
 ```bash
-./translate.sh
-cd steam-gift-manager/
 docker-compose down && docker-compose up -d --build
 ```
 
-### 7. **Open the App**
+### 7. Access the App
 
-Go to [http://localhost:5000](http://localhost:5000) in your browser.
-
-- Register your first user.
-- Add your keys, shop URLs etc.
-- Enjoy search, status, and automatic Steam cover images!
+Visit [http://localhost:5000](http://localhost:5000)  
+Register the first user – this account becomes the admin!
 
 ---
 
-## 🛠️ Technology Stack 🛠️
+## 🔔 Notifications (optinal)
 
-- **Frontend:** Bootstrap 5, Jinja2 Templates ...
-- **Backend:** Python 3, Flask, Flask-Babel, Flask-Login, Flask-SQLAlchemy, Apprise ...
-- **Database:** SQLite (persisted in `data/`)
-- **Containerization:** Docker, docker-compose
-- **Translations:** Flask-Babel, editable `.po` files in `translations/`
-
-## 🌍 Multi-language
-
-- Switch between English and German using the dropdown in the navigation bar.
-- All game and menu texts can be translated or individualized.
-
-## 🔔 Notifications
-
-- Send notifications if a game has to be redeemed by a specific date
-- Switched from generic notifications to [Apprise](https://github.com/caronc/apprise) - have a look into the .env file
-- 48 hours before you are running out of time the app will send you a notice to your services
+- Reminders for expiring keys (48h notice)
+- Pushover, Matrix, Gotify and more are supported through AppRise
+- Configurable via `.env`
 
 ---
 
-## 🪙 Do you this project? 🪙
+## 🛠️ Tech Stack
 
-If you’d like to support itme, you can make a donation here:
+- **Frontend:** Bootstrap 5, Jinja2, ... 
+- **Backend:** Python 3, Flask,  Flask-SQLAlchemy, ... 
+- **Database:** SQLite
+- **Container:** Docker, docker-compose
 
-[![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/nocci)
+---
 
+## 💬 Contribute
+
+Contributions are welcome:
+
+- Report bugs
+- Suggest features
+- Submit Pull Requests
+
+---
+
+## 🪙 Support
+
+Like the project? You can support me:
+
+[![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/nocci)  
 [![Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/nocci/donate)
 
-Thank you!
+---
+
+## 📜 License
+
+Licensed under [Apache License 2.0](LICENSE).
 
 ---
 
-## 🙌 Contribute! 🙌
-
-This project is open source!
-
-- **Bug Reports:** Please report bugs as Issues.
-- **Feature Requests:** Suggest new features!
-- **Pull Requests:** Submit your code changes!
-
-// **only possible after Forgejo opens for federation** \\\
-
----
-
-## 📜 License 📜
-
-This project is licensed under the [Apache License 2.0](LICENSE).
-
----
-
-## 💖 Acknowledgements 💖
-
-A big thank you to everyone who supports and contributes to this project!
-
----
-
-**Enjoy your organized Game key collection!** 🚀
+**Enjoy managing your game collection!**
\ No newline at end of file
diff --git a/app.py b/app.py
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.sh b/setup.sh
index be7212f..a44b53d 100644
--- a/setup.sh
+++ b/setup.sh
@@ -79,13 +79,28 @@ PROJECT_DIR="steam-gift-manager"
 TRANSLATIONS_DIR="$PWD/$PROJECT_DIR/translations"
 DATA_DIR="$PWD/data"
 
-# 1. Create folders
+# Create folders
 mkdir -p "$PROJECT_DIR"
 mkdir -p "$PROJECT_DIR"/{templates,static,translations}
 mkdir -p "$DATA_DIR"
 
 chmod -R a+rwX "$TRANSLATIONS_DIR" "$DATA_DIR"
 
+echo -e "\n\033[1;32m✅ Downloading assets - Please wait!\033[0m"
+
+# Download Pictures from my server
+cd "$PROJECT_DIR/static"
+wget -O logo.webp "https://drop.nocadmin.net/logo.webp" > /dev/null 2>&1
+wget -O logo_small.webp "https://drop.nocadmin.net/logo_small.webp" > /dev/null 2>&1
+wget -O forgejo.webp "https://drop.nocadmin.net/forgejo.webp" > /dev/null 2>&1
+wget -O gog_logo.webp "https://drop.nocadmin.net/gog_logo.webp" > /dev/null 2>&1
+wget -O logo_small_maskable.webp "https://drop.nocadmin.net/logo_small_maskable.webp" > /dev/null 2>&1
+wget -O favicon.ico "https://drop.nocadmin.net/favicon.ico" > /dev/null 2>&1
+wget -O apple-touch-icon.png "https://drop.nocadmin.net/apple-touch-icon.png" > /dev/null 2>&1
+wget -O web-app-manifest-192x192.png "https://drop.nocadmin.net/web-app-manifest-192x192.png" > /dev/null 2>&1
+wget -O web-app-manifest-512x512.png "https://drop.nocadmin.net/web-app-manifest-512x512.png" > /dev/null 2>&1
+cd ../..
+
 cd $PROJECT_DIR
 
 # requirements.txt
@@ -135,6 +150,7 @@ TZ=Europe/Berlin
 FORCE_HTTPS=False
 SESSION_COOKIE_SECURE=auto
 CSRF_ENABLED="True"
+
 # Account registration
 REGISTRATION_ENABLED="True"
 
@@ -158,7 +174,7 @@ REDIS_URL=redis://redis:6379/0
 
 # Enable Debug (e.g. for VS Code)
 FLASK_DEBUG=1
-DEBUGPY=1
+DEBUGPY=0
 EOL
 
 # app.py (the main app)
@@ -167,19 +183,19 @@ cat <<'PYTHON_END' > app.py
 import atexit
 import csv
 import io
-import locale # Note: locale was in your imports but not standard for typical web apps unless specific use.
+import locale
 import logging
 import os
 import random
 import re
 import secrets
-import sqlite3 # Note: direct sqlite3 import is unusual if you're using SQLAlchemy for all DB ops.
+import sqlite3
 import time
 import traceback
 from datetime import datetime, timedelta
 from functools import wraps
-from io import BytesIO # Note: io.BytesIO is good, no need for direct BytesIO import if io is already imported.
-from time import sleep # Note: time.sleep is fine, no need for direct 'sleep' import if 'time' is imported.
+from io import BytesIO
+from time import sleep
 from urllib.parse import urlparse
 from zoneinfo import ZoneInfo
 import warnings 
@@ -261,6 +277,11 @@ os.environ['TZ'] = TZ
 app = Flask(__name__)
 app.jinja_env.globals['getattr'] = getattr
 
+@app.errorhandler(404)
+def not_found_error(error):
+    return render_template('404.html'), 404
+
+
 # UNIX-Systems (Linux, Docker)
 try:
     time.tzset()
@@ -878,12 +899,12 @@ def edit_game(game_id):
 
     if request.method == 'POST':
         try:
-            # Validierung
+            # Validation
             if not request.form.get('name') or not request.form.get('steam_key'):
                 flash(translate('Name and Steam Key are required'), 'error')
                 return redirect(url_for('edit_game', game_id=game_id))
 
-            # Dublettenprüfung
+            # Duplicate check
             existing = Game.query.filter(
                 Game.steam_key == request.form['steam_key'],
                 Game.id != game.id,
@@ -893,7 +914,7 @@ def edit_game(game_id):
                 flash(translate('Steam Key already exists'), 'error')
                 return redirect(url_for('edit_game', game_id=game_id))
 
-            # Felder aktualisieren
+            # Update fields
             game.name = request.form['name']
             game.steam_key = request.form['steam_key']
             game.status = request.form['status']
@@ -904,12 +925,12 @@ def edit_game(game_id):
             game.steam_appid = request.form.get('steam_appid', '')
             game.redeem_date = safe_parse_date(request.form.get('redeem_date', ''))
             
-            # Token-Logik
+            # Token-Logic
             if game.status == 'geschenkt':
                 # Vorhandene Tokens löschen
                 RedeemToken.query.filter_by(game_id=game.id).delete()
                 
-                # Neuen Token generieren
+                # Generate new Token
                 token = secrets.token_urlsafe(12)[:17]
                 expires = datetime.now(local_tz) + timedelta(hours=24)
                 new_token = RedeemToken(
@@ -927,11 +948,11 @@ def edit_game(game_id):
         except IntegrityError as e:
             db.session.rollback()
             app.logger.error(f"IntegrityError: {traceback.format_exc()}")
-            flash(translate('Database error: {error}', error=str(e.orig)), 'error')  # Platzhalter korrigiert
+            flash(translate('Database error: {error}', error=str(e.orig)), 'error')
         except Exception as e:
             db.session.rollback()
             app.logger.error(f"Unexpected error: {traceback.format_exc()}")
-            flash(translate('Unexpected error: {error}', error=str(e)), 'error')  # Platzhalter korrigiert
+            flash(translate('Unexpected error: {error}', error=str(e)), 'error')
 
     return render_template(
         'edit_game.html',
@@ -1006,14 +1027,14 @@ def export_pdf():
     elements = []
     img_height = 2*cm
 
-    # Titel
+    # Title
     elements.append(Paragraph(
         translate("Game List (without Keys)", lang=session.get('lang', 'en')), 
         styles['Title']
     ))
     elements.append(Spacer(1, 12))
 
-    # Tabellenkopf
+    # Table header
     col_widths = [
         5*cm, 10*cm, 6*cm, 3*cm
     ]
@@ -1047,7 +1068,7 @@ def export_pdf():
             game.redeem_date.strftime('%d.%m.%y') if game.redeem_date else ''
         ])
 
-    # Table format (korrekte Einrückung)
+    # Table format
     table = Table(data, colWidths=col_widths, repeatRows=1)
     table.setStyle(TableStyle([
         ('FONTNAME', (0,0), (-1,0), 'Helvetica-Bold'),
@@ -1287,7 +1308,7 @@ def update_game_data(game_id):
         flash(translate('Steam-AppID missing, no Steam Data transferred'), 'warning')
 
 
-    # ITAD-Slug donings and such
+    # ITAD-Slug doings and such
     itad_slug = fetch_itad_slug(steam_appid)
     if itad_slug:
         game.itad_slug = itad_slug
@@ -1422,7 +1443,7 @@ def cleanup_expired_tokens_job():
     with app.app_context():
         cleanup_expired_tokens()
 
-# Jobs hinzufügen
+# Add Jobs
 scheduler.add_job(
     check_expiring_keys_job,
     'interval',
@@ -1440,7 +1461,7 @@ def update_prices_job():
     with app.app_context():
         games = Game.query.filter(Game.steam_appid.isnot(None)).all()
         for game in games:
-            # Nur Preise aktualisieren
+            # just update prices
             itad_data = fetch_itad_data(f"app/{game.steam_appid}")
             if itad_data:
                 game.current_price = itad_data.get('price_new')
@@ -1488,7 +1509,7 @@ if __name__ == '__main__':
 PYTHON_END
 
 
-# 9. Templates
+# Templates - this was the "fun" part
 mkdir -p templates static
 
 # Base Template
@@ -2037,16 +2058,16 @@ cat <<HTML_END > templates/edit_game.html
         <textarea id="game_notes" name="notes" class="form-control" rows="3">{{ game.notes }}</textarea>
       </div>
 
-      <!-- Externe Daten Anzeige -->
+      <!-- Show External Data -->
       <div class="col-12">
         <div class="card mb-4">
           <div class="card-header">
-            <span>🔄 {{ _('Externe Daten') }}</span>
+            <span>🔄 {{ _('External Data') }}</span>
           </div>
           <div class="card-body">
             {% if game.release_date %}
               <div class="mb-2">
-                <strong>{{ _('Veröffentlichung:') }}</strong>
+                <strong>{{ _('Release Date:') }}</strong>
                 {{ game.release_date|strftime('%d.%m.%Y') }}
               </div>
             {% endif %}
@@ -2079,7 +2100,7 @@ cat <<HTML_END > templates/edit_game.html
       {% if game.status == 'geschenkt' %}
         <div class="col-12">
           <div class="card mb-3">
-            <div class="card-header">{{ _('Einlöse-Links') }}</div>
+            <div class="card-header">{{ _('Redeem-Link') }}</div>
             <div class="card-body">
               {% for token in game.redeem_tokens if not token.is_expired() %}
                 <div class="input-group mb-3">
@@ -2532,7 +2553,7 @@ cat <<HTML_END > templates/admin_audit_logs.html
 
 HTML_END
 
-# Error Site
+# Error Sites
 cat <<HTML_END > templates/403.html
 {% extends "base.html" %}
 {% block content %}
@@ -2561,6 +2582,34 @@ cat <<HTML_END > templates/403.html
 {% endblock %}
 HTML_END
 
+cat <<HTML_END > templates/404.html
+{% extends "base.html" %}
+{% block content %}
+<div class="d-flex flex-column align-items-center justify-content-center" style="min-height:60vh;">
+  <div class="text-center">
+    <img src="{{ url_for('static', filename='logo.webp') }}"
+         alt="Forbidden"
+         class="img-fluid rounded shadow mb-4"
+         style="max-width: 160px;">
+    <h1 class="display-3 fw-bold text-danger mb-3">404</h1>
+    <h2 class="mb-4">{{ _('Access Forbidden') }}</h2>
+    <p class="lead mb-4">
+      <span class="d-block mb-2">{{ _('Sorry, you are not allowed to access this page.') }}</span>
+      <span class="text-muted">({{ _('Registration is currently disabled.') }})</span>
+    </p>
+    <a href="{{ url_for('index') }}" class="btn btn-lg btn-primary shadow">
+      🏠 {{ _('Back to Home') }}
+    </a>
+    <div class="mt-4 text-muted">
+      <small>
+        <span>Sorry, you haven't unlocked this area yet. Grind some more XP or check your DLC entitlements.<br>Maybe try again after the next patch?</span>
+      </small>
+    </div>
+  </div>
+</div>
+{% endblock %}
+HTML_END
+
 # CSS
 cat <<CSS_END > static/style.css
 :root {
@@ -2774,7 +2823,7 @@ APP_DIR="steam-gift-manager"
 TRANSLATION_DIR="$APP_DIR/translations"
 LANGS=("de" "en")
 
-# Prüfe jq
+# check jq
 if ! command -v jq &>/dev/null; then
   echo "❌ jq is required. Install with: sudo apt-get install jq"
   exit 1
@@ -2810,12 +2859,12 @@ SCRIPT_END
 chmod +x ../translate.sh
 
 
-# SOFORT AUSFÜHREN, um Basis-JSONs zu erstellen
+# EXECUTE IMMEDIATELY to create basic JSONs
 cd ..
 ./translate.sh
 cd $PROJECT_DIR
 
-# 5. Dockerfile
+# Dockerfile
 cat <<'DOCKER_END' > Dockerfile
 FROM python:3.10-slim
 
@@ -2824,12 +2873,6 @@ SHELL ["/bin/bash", "-c"]
 RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     wget \
-    && mkdir -p /app/static \
-    && wget -O /app/static/logo.webp "https://drop.nocadmin.net/logo.webp" \
-    && wget -O /app/static/logo_small.webp "https://drop.nocadmin.net/logo_small.webp" \
-    && wget -O /app/static/forgejo.webp "https://drop.nocadmin.net/forgejo.webp" \
-    && wget -O /app/static/gog_logo.webp "https://drop.nocadmin.net/gog_logo.webp" \
-    && wget -O /app/static/logo_small_maskable.webp  "https://drop.nocadmin.net/logo_small_maskable.webp" \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update && apt-get install -y locales && \
@@ -2896,6 +2939,7 @@ services:
     volumes:
       - ../data:/app/data 
       - ./translations:/app/translations:rw
+      - ./static:/app/static:rw
     user: "${UID:-1000}:${GID:-1000}"
     restart: unless-stopped
     command: ["/app/entrypoint.sh"]
@@ -2924,7 +2968,7 @@ set -e
 # Set the working directory to the project directory
 cd "$(dirname "$0")/steam-gift-manager"
 
-# Setze FLASK_APP, falls nötig
+# set FLASK_APP, if needed
 export FLASK_APP=app.py
 
 # Initialize migrations, if not yet available
@@ -2960,28 +3004,30 @@ cat <<MANIFEST_END > static/manifest.json
   },
   "icons": [
     {
-      "src": "/static/logo_small.webp",
+      "src": "/static/web-app-manifest-192x192.png",
       "sizes": "192x192",
       "type": "image/webp",
       "purpose": "any"
     },
     {
-      "src": "/static/logo_small_maskable.webp",
+      "src": "/static/web-app-manifest-192x192.png",
       "sizes": "192x192",
-      "type": "image/webp",
+      "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/static/logo.webp",
+      "src": "/static/web-app-manifest-512x512.png",
       "sizes": "512x512",
-      "type": "image/webp",
-      "purpose": "any maskable"
+      "type": "image/png",
+      "purpose": "maskable"
     }
-  ]
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#3f3a3a",
+  "display": "standalone"
 }
 MANIFEST_END
 
-
 # Service Worker
 cat <<SW_END > static/serviceworker.js
 const CACHE_NAME = 'game-key-manager-v2';
@@ -2989,6 +3035,8 @@ const ASSETS = [
   '/',
   '/static/style.css',
   '/static/logo.webp',
+  '/static/web-app-manifest-512x512.png',
+  '/static/web-app-manifest-192x192.png',
   '/static/logo_small.webp',
   '/static/gog_logo.webp',
   '/static/forgejo.webp'
@@ -3018,6 +3066,22 @@ self.addEventListener('activate', (event) => {
 });
 SW_END
 
+# Download German Translation from my server
+cd "$TRANSLATIONS_DIR"
+
+read -p "Do you want to download German translations from the dev-server (could cause trouble, but normally it is safe)? [y/N]: " download_de
+if [[ "$download_de" =~ ^[YyJj]$ ]]; then
+  wget -O de.json "https://drop.nocadmin.net/de.json" > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    echo "✅ German translations downloaded successfully."
+  else
+    echo "❌ Download failed. Keeping existing de.json."
+  fi
+else
+  echo "⏩ Skipped downloading German translations."
+fi
+
+
 echo -e "\n\033[1;32m✅ Setup done! Seems to be okay!\033[0m"
 echo -e "Have a look in your .env"
 echo -e "nano .env"
diff --git a/steam-gift-manager/.env b/steam-gift-manager/.env
new file mode 100644
index 0000000..70fc37e
--- /dev/null
+++ b/steam-gift-manager/.env
@@ -0,0 +1,41 @@
+# Flask-Configuration
+SECRET_KEY="ef16ed848264df8391a7f9769f0ac13d5d4c1a711793bb6b"
+REDEEM_SECRET="02c6a04e663604a837141d79e75b0a93"
+WTF_CSRF_SECRET_KEY="5c6c0f730c337afb804ba21c6e1b3f93"
+
+# Language Settings
+DEFAULT_LANGUAGE="en"
+SUPPORTED_LANGUAGES="de,en"
+
+# Timezone
+TZ=Europe/Berlin
+
+# Security
+FORCE_HTTPS=False
+SESSION_COOKIE_SECURE=auto
+CSRF_ENABLED="True"
+
+# Account registration
+REGISTRATION_ENABLED="True"
+
+# checking interval if keys have to be redeemed before a specific date
+CHECK_EXPIRING_KEYS_INTERVAL_HOURS=6
+
+# Want to check prices? Here you are!
+ITAD_API_KEY="your-secret-key-here"
+ITAD_COUNTRY="DE"
+
+# Apprise URLs (separate several with a comma or space)
+APPRISE_URLS=""
+
+### example for multiple notifications
+#APPRISE_URLS="pover://USER_KEY@APP_TOKEN
+#gotify://gotify.example.com/TOKEN
+#matrixs://TOKEN@matrix.org/!ROOM_ID"
+
+# Redis URL
+REDIS_URL=redis://redis:6379/0
+
+# Enable Debug (e.g. for VS Code)
+FLASK_DEBUG=1
+DEBUGPY=0
diff --git a/steam-gift-manager/Dockerfile b/steam-gift-manager/Dockerfile
index ee654d4..496be18 100644
--- a/steam-gift-manager/Dockerfile
+++ b/steam-gift-manager/Dockerfile
@@ -2,13 +2,25 @@ FROM python:3.10-slim
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get update && apt-get install -y --no-install-recommends wget     && mkdir -p /app/static     && wget -O /app/static/logo.webp "https://drop.nocadmin.net/logo.webp"     && wget -O /app/static/logo_small.webp "https://drop.nocadmin.net/logo_small.webp"     && wget -O /app/static/forgejo.webp "https://drop.nocadmin.net/forgejo.webp"     && wget -O /app/static/gog_logo.webp "https://drop.nocadmin.net/gog_logo.webp"     && wget -O /app/static/logo_small_maskable.webp  "https://drop.nocadmin.net/logo_small_maskable.webp"     && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /app/data &&     chown -R 1000:1000 /app/data 
+RUN apt-get update && apt-get install -y locales && \
+    sed -i '/de_DE.UTF-8/s/^# //' /etc/locale.gen && \
+    locale-gen
+ENV LC_ALL=de_DE.UTF-8 LANG=de_DE.UTF-8
 
-ENV TZ=
-RUN ln -snf /usr/share/zoneinfo/ /etc/localtime && echo  > /etc/timezone
 
+RUN mkdir -p /app/data && \
+    chown -R 1000:1000 /app/data 
+
+ENV TZ=${TZ}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+COPY entrypoint.sh /app/entrypoint.sh
+RUN chmod +x /app/entrypoint.sh
 
 WORKDIR /app
 COPY requirements.txt .
@@ -18,10 +30,14 @@ COPY . .
 
 ARG UID=1000
 ARG GID=1000
-RUN groupadd -g $GID appuser &&     useradd -u $UID -g $GID -m appuser &&     chown -R appuser:appuser /app
+
+RUN groupadd -g ${GID} appuser && \
+    useradd -l -o -u ${UID} -g appuser -m appuser && \
+    mkdir -p /app && \
+    chown -R appuser:appuser /app
 
 USER appuser
 
-EXPOSE 5000
+EXPOSE 5000 5678
+ENTRYPOINT ["/app/entrypoint.sh"]
 
-CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:app"]
diff --git a/steam-gift-manager/app.py b/steam-gift-manager/app.py
index 64cf1a7..3dbe756 100644
--- a/steam-gift-manager/app.py
+++ b/steam-gift-manager/app.py
@@ -1,54 +1,119 @@
-import os
-import warnings
-from sqlalchemy.exc import LegacyAPIWarning
-warnings.simplefilter("ignore", category=LegacyAPIWarning)
-from flask import Flask, render_template, request, redirect, url_for, flash, make_response, session, abort, send_file, jsonify
-from flask_sqlalchemy import SQLAlchemy
-from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
-from werkzeug.security import generate_password_hash, check_password_hash
-from datetime import datetime, timedelta
-from flask_wtf import CSRFProtect
-from flask import abort
-from flask import request, redirect
-import io
-import warnings
-import re
-import io
-import csv
-import secrets
-import requests
-from dotenv import load_dotenv
-load_dotenv(override=True)
-from sqlalchemy.exc import IntegrityError
-from apscheduler.schedulers.background import BackgroundScheduler
+# Standard library imports
 import atexit
-from flask_migrate import Migrate
-from sqlalchemy import MetaData
-from reportlab.pdfgen import canvas
-from reportlab.lib.pagesizes import A4, landscape, letter
-from reportlab.platypus import (
-    SimpleDocTemplate, 
-    Table, 
-    TableStyle, 
-    Paragraph, 
-    Image, 
-    Spacer
-)
-from reportlab.lib import colors
-from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
-from reportlab.lib.utils import ImageReader
-from reportlab.lib.units import cm, inch, mm
-from io import BytesIO
-import reportlab.lib
+import csv
+import io
+import locale
 import logging
-logging.basicConfig()
+import os
+import random
+import re
+import secrets
+import sqlite3
+import time
+import traceback
+from datetime import datetime, timedelta
+from functools import wraps
+from io import BytesIO
+from time import sleep
+from urllib.parse import urlparse
+from zoneinfo import ZoneInfo
+import warnings 
+
+# 3rd-Provider-Modules
+import pytz
+import requests
+from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
+from apscheduler.schedulers.background import BackgroundScheduler
+from dotenv import load_dotenv
+from flask import (
+    Flask,
+    Markup,
+    abort,
+    flash,
+    g,
+    jsonify,
+    make_response,
+    redirect,
+    render_template,
+    request,
+    send_file,
+    session,
+    url_for
+)
+from flask_login import (
+    LoginManager,
+    UserMixin,
+    current_user,
+    login_required,
+    login_user,
+    logout_user
+)
+from flask_migrate import Migrate
+from flask_session import Session
+from flask_sqlalchemy import SQLAlchemy
+from flask_wtf import CSRFProtect, FlaskForm
+from redis import Redis
+from reportlab.lib import colors
+from reportlab.lib.pagesizes import A4, landscape, letter
+from reportlab.lib.styles import ParagraphStyle, getSampleStyleSheet
+from reportlab.lib.units import cm, inch, mm
+from reportlab.lib.utils import ImageReader
+from reportlab.pdfgen import canvas
+from reportlab.platypus import (
+    Image,
+    Paragraph,
+    SimpleDocTemplate,
+    Spacer,
+    Table,
+    TableStyle
+)
+from sqlalchemy import MetaData, UniqueConstraint, event
+from sqlalchemy.engine import Engine
+from sqlalchemy.exc import IntegrityError, LegacyAPIWarning
+from sqlalchemy.orm import joinedload
+from werkzeug.security import check_password_hash, generate_password_hash
+from wtforms import SelectField, StringField, TextAreaField, validators
+
+# Config
+load_dotenv(override=True)
+warnings.simplefilter("ignore", category=LegacyAPIWarning)
+
+# Logging-Config
+logging.basicConfig(level=logging.INFO)
+logging.getLogger('apscheduler').setLevel(logging.WARNING)
+
+
+@event.listens_for(Engine, "connect")
+def enable_foreign_keys(dbapi_connection, connection_record):
+    if isinstance(dbapi_connection, sqlite3.Connection):
+        cursor = dbapi_connection.cursor()
+        cursor.execute("PRAGMA foreign_keys=ON;")
+        cursor.close()
+
+ITAD_API_KEY_PLACEHOLDER = "your_api_key_here"
+TZ = os.getenv('TZ', 'UTC')
+os.environ['TZ'] = TZ
 app = Flask(__name__)
+app.jinja_env.globals['getattr'] = getattr
+
+@app.errorhandler(404)
+def not_found_error(error):
+    return render_template('404.html'), 404
+
+
+# UNIX-Systems (Linux, Docker)
+try:
+    time.tzset()
+except AttributeError:
+    pass  # tzset not availabe on Windows
+local_tz = pytz.timezone(TZ)
 
 # Load Languages
 import os
 import json
 
-TRANSLATION_DIR = os.path.join(os.path.dirname(__file__), 'translations')
+
+TRANSLATION_DIR = os.path.join(os.getcwd(), 'translations')
 SUPPORTED_LANGUAGES = ['de', 'en']
 TRANSLATIONS = {}
 
@@ -56,23 +121,37 @@ for lang in SUPPORTED_LANGUAGES:
     try:
         with open(os.path.join(TRANSLATION_DIR, f'{lang}.json'), encoding='utf-8') as f:
             TRANSLATIONS[lang] = json.load(f)
+        print(f"✅ Loaded {lang} translations")
     except Exception:
+        print(f"❌ Failed loading {lang}.json: {str(e)}")
         TRANSLATIONS[lang] = {}
 
 def translate(key, lang=None, **kwargs):
-    if not lang:
-        lang = session.get('lang', 'en')
-    value = TRANSLATIONS.get(lang, {}).get(key)
-    if value is None and lang != 'en':
-        value = TRANSLATIONS.get('en', {}).get(key, key)
-    else:
-        value = value or key
-    return value.format(**kwargs) if kwargs and isinstance(value, str) else value
+    lang = lang or session.get('lang', 'en')
+    fallback_lang = app.config.get('DEFAULT_LANGUAGE', 'en')
+    
+    translations = TRANSLATIONS.get(lang, {})
+    fallback_translations = TRANSLATIONS.get(fallback_lang, {})
+    
+    value = translations.get(key) or fallback_translations.get(key) or key
+    return value.format(**kwargs) if isinstance(value, str) else value
 
 ## DEBUG Translations
 if app.debug:
     print(f"Loaded translations for 'de': {TRANSLATIONS.get('de', {})}")
 
+### Admin decorator
+def admin_required(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        if not current_user.is_authenticated:
+            abort(403)
+        if not current_user.is_admin:
+            abort(403)
+        return f(*args, **kwargs)
+    return decorated_function
+
+
 csrf = CSRFProtect(app)
 
 convention = {
@@ -86,27 +165,55 @@ convention = {
 metadata = MetaData(naming_convention=convention)
 load_dotenv(override=True)
 
-# Lade Umgebungsvariablen aus .env mit override
+# load variables from .env with override
 load_dotenv(override=True)
 
 # App-Configuration
 app.config.update(
+    # Most Important
     SECRET_KEY=os.getenv('SECRET_KEY'),
-    SQLALCHEMY_DATABASE_URI='sqlite:////app/data/games.db',
-    SQLALCHEMY_TRACK_MODIFICATIONS=False,
-    SESSION_COOKIE_SECURE=os.getenv('SESSION_COOKIE_SECURE', 'False') == 'True',
-    SESSION_COOKIE_SAMESITE='Lax',
-    PERMANENT_SESSION_LIFETIME=timedelta(days=30),
-    SESSION_REFRESH_EACH_REQUEST=False,
-    WTF_CSRF_ENABLED=os.getenv('CSRF_ENABLED', 'True') == 'True',
-    REGISTRATION_ENABLED=os.getenv('REGISTRATION_ENABLED', 'True').lower() == 'true',
-    SEND_FILE_MAX_AGE_DEFAULT=int(os.getenv('SEND_FILE_MAX_AGE_DEFAULT', 0)),
-    TEMPLATES_AUTO_RELOAD=os.getenv('TEMPLATES_AUTO_RELOAD', 'True') == 'True'
+    SQLALCHEMY_DATABASE_URI = 'sqlite:////app/data/games.db',
+    SQLALCHEMY_TRACK_MODIFICATIONS = False,
+    DEFAULT_LANGUAGE='en',
+    ITAD_COUNTRY = os.getenv("ITAD_COUNTRY", "DE"),
+
+    # SESSION-HANDLING (In Production: Use Redis!)
+    SESSION_TYPE='redis',
+    SESSION_PERMANENT = False,
+    SESSION_USE_SIGNER = True,
+    SESSION_REDIS=Redis.from_url(os.getenv("REDIS_URL", "redis://redis:6379/0")),
+    SESSION_FILE_DIR = '/app/data/flask-sessions',
+    SESSION_COOKIE_NAME = 'gamekeys_session',
+    SESSION_COOKIE_SECURE = os.getenv('SESSION_COOKIE_SECURE', 'False').lower() == 'true',
+    SESSION_COOKIE_HTTPONLY = True,
+    SESSION_COOKIE_SAMESITE = 'Lax',
+    PERMANENT_SESSION_LIFETIME = timedelta(days=30),
+
+
+    # LOGIN COOKIE STUFF
+    REMEMBER_COOKIE_DURATION=timedelta(days=30),
+    REMEMBER_COOKIE_HTTPONLY=True,
+    REMEMBER_COOKIE_SECURE=True if os.getenv('FORCE_HTTPS', 'False').lower() == 'true' else False,
+    REMEMBER_COOKIE_SAMESITE='Lax',
+
+    # CSRF-PROTECTION
+    WTF_CSRF_ENABLED = True,
+    WTF_CSRF_SECRET_KEY = os.getenv('CSRF_SECRET_KEY', os.urandom(32).hex()),
+    WTF_CSRF_TIME_LIMIT = 3600,
+
+    # SECURITYsa & PERFORMANCE
+    REGISTRATION_ENABLED = os.getenv('REGISTRATION_ENABLED', 'True').lower() == 'true',
+    SEND_FILE_MAX_AGE_DEFAULT = int(os.getenv('SEND_FILE_MAX_AGE_DEFAULT', 0)),
+    TEMPLATES_AUTO_RELOAD = os.getenv('TEMPLATES_AUTO_RELOAD', 'True').lower() == 'true',
+    PREFERRED_URL_SCHEME = 'https' if os.getenv('FORCE_HTTPS') else 'http'
 )
 
+
+Session(app)
+
 interval_hours = int(os.getenv('CHECK_EXPIRING_KEYS_INTERVAL_HOURS', 12))
 
-# Initialisation
+# Init
 db = SQLAlchemy(app, metadata=metadata)
 migrate = Migrate(app, db)
 login_manager = LoginManager(app)
@@ -114,55 +221,175 @@ login_manager.login_view = 'login'
 
 # Logging
 app.logger.addHandler(logging.StreamHandler())
-app.logger.setLevel(logging.INFO)
+app.logger.setLevel(logging.DEBUG)
+
+@app.errorhandler(403)
+def forbidden_error(error):
+    return render_template('403.html'), 403
 
 
 @app.before_request
+def set_language():
+    if 'lang' not in session or not session['lang']:
+        session['lang'] = app.config.get('DEFAULT_LANGUAGE', 'en')
+    g.lang = session['lang']
+
 def enforce_https():
-    if os.getenv('FORCE_HTTPS', 'False').lower() == 'true':
-        if request.headers.get('X-Forwarded-Proto', 'http') != 'https' and not request.is_secure:
+    if os.getenv('FORCE_HTTPS', 'False').lower() == 'true' and not app.debug:
+        proto = request.headers.get('X-Forwarded-Proto', 'http')
+        if proto != 'https' and not request.is_secure:
             url = request.url.replace('http://', 'https://', 1)
-            app.logger.info(f"Redirecting to HTTPS: {url}")
             return redirect(url, code=301)
 
+def debug_translations():
+    if app.debug:
+        app.logger.debug(f"Lang: {session.get('lang')}")
+
+app.before_request(enforce_https)
+
+
 
 @app.context_processor
-def inject_template_vars():
-    def _(key, **kwargs):
-        lang = session.get('lang', 'en')
-        return translate(key, lang, **kwargs)
-    theme = request.cookies.get('theme', 'light')
-    return dict(_=_, theme=theme)
+def inject_template_globals():
+    return {
+        '_': lambda key, **kwargs: translate(key, lang=session.get('lang', 'en'), **kwargs),
+        'now': datetime.now(local_tz),
+        'app_version': os.getenv('APP_VERSION', '1.0.0'),
+        'local_tz': local_tz
+    }
+
+@app.template_filter('strftime')
+def _jinja2_filter_datetime(date, fmt='%d.%m.%Y'):
+    if date is None:
+        return ''
+    return date.strftime(fmt)
+
+@app.errorhandler(403)
+def forbidden(e):
+    return render_template('403.html'), 403
+
 
 # DB Models
-class User(db.Model, UserMixin):
+class ActivityLog(db.Model):
+    __tablename__ = 'activity_logs'
+    
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
+    action = db.Column(db.String(100), nullable=False)
+    details = db.Column(db.Text)
+    timestamp = db.Column(db.DateTime, default=lambda: datetime.now(local_tz))
+    
+    user = db.relationship('User', backref='activities')
+
+
+class User(UserMixin, db.Model):
     __tablename__ = 'users'
+    
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(80), unique=True, nullable=False)
     password = db.Column(db.String(256), nullable=False)
-    games = db.relationship('Game', back_populates='owner', lazy=True)
+    is_admin = db.Column(db.Boolean, default=False)
+    games = db.relationship(
+        'Game', 
+        back_populates='owner', 
+        cascade='all, delete-orphan',
+        passive_deletes=True
+    )
+
 
 class Game(db.Model):
+    __tablename__ = 'games'
+    __table_args__ = (
+        UniqueConstraint('steam_key', 'user_id', name='uq_steam_key_user'),
+    )
+    
     id = db.Column(db.Integer, primary_key=True)
-    owner = db.relationship('User', back_populates='games')
     name = db.Column(db.String(100), nullable=False)
     steam_key = db.Column(db.String(100), nullable=False, unique=True)
     status = db.Column(db.String(50), nullable=False)
     recipient = db.Column(db.String(100))
     notes = db.Column(db.Text)
     url = db.Column(db.String(200))
-    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    created_at = db.Column(db.DateTime, default=lambda: datetime.now(local_tz))
     redeem_date = db.Column(db.DateTime)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
     steam_appid = db.Column(db.String(20))
+    platform = db.Column(db.String(50), default='pc')
+    current_price = db.Column(db.Float)
+    current_price_shop = db.Column(db.String(100))
+    historical_low = db.Column(db.Float)
+    release_date = db.Column(db.DateTime)
+    release_date = db.Column(db.DateTime)
+    itad_slug = db.Column(db.String(200))
+    steam_description_en = db.Column(db.Text)
+    steam_description_de = db.Column(db.Text)
+
+    # with users.id
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), nullable=False)
+    
+    owner = db.relationship(
+        'User', 
+        back_populates='games'
+    )
+    
+    redeem_tokens = db.relationship(
+        'RedeemToken',
+        back_populates='game',
+        cascade='all, delete-orphan',
+        passive_deletes=True
+    )
 
 class RedeemToken(db.Model):
+    __tablename__ = 'redeem_tokens'
+    
     id = db.Column(db.Integer, primary_key=True)
     token = db.Column(db.String(17), unique=True, nullable=False)
-    game_id = db.Column(db.Integer, db.ForeignKey('game.id'), nullable=False)
-    expires = db.Column(db.DateTime, nullable=False)
-    used = db.Column(db.Boolean, default=False)
+    expires = db.Column(db.DateTime(timezone=True), nullable=False)
     total_hours = db.Column(db.Integer, nullable=False)
+    
+    # ForeignKey with CASCADE
+    game_id = db.Column(
+        db.Integer, 
+        db.ForeignKey('games.id', ondelete='CASCADE'),
+        nullable=False
+    )
+    
+    game = db.relationship('Game', back_populates='redeem_tokens')
+
+    def is_expired(self):
+        # use timeszone (from .env)
+        local_tz = pytz.timezone(os.getenv('TZ', 'UTC'))
+        now = datetime.now(local_tz)
+        return now > self.expires.astimezone(local_tz)
+
+class GameForm(FlaskForm):
+    name = StringField('Name', [validators.DataRequired()])
+    steam_key = StringField('Steam Key')
+    status = SelectField('Status', choices=[
+        ('nicht eingelöst', 'Nicht eingelöst'),
+        ('eingelöst', 'Eingelöst'),
+        ('geschenkt', 'Geschenkt')
+    ])
+    recipient = StringField('Empfänger')
+    notes = TextAreaField('Notizen')
+    url = StringField('Store URL')
+    redeem_date = StringField('Einlösedatum')
+    steam_appid = StringField('Steam App ID')
+    
+PLATFORM_CHOICES = [
+    ('steam', 'Steam'),
+    ('gog', 'GOG'),
+    ('xbox', 'XBox'),
+    ('playstation', 'PlayStation'),
+    ('switch', 'Nintendo Switch'),
+    ('other', 'Other'),
+    ('pc', 'PC')
+]
+
+STATUS_CHOICES = [
+    ('nicht eingelöst', 'Nicht eingelöst'),
+    ('eingelöst', 'Eingelöst'),
+    ('geschenkt', 'Geschenkt')
+]
 
 with app.app_context():
     db.create_all()
@@ -182,6 +409,131 @@ def get_or_404(model, id):
         abort(404)
     return instance
 
+# Admin Audit Helper
+def log_activity(user_id, action, details=None):
+    """
+    Store an activity log entry for auditing purposes.
+    """
+    log = ActivityLog(
+        user_id=user_id,
+        action=action,
+        details=details
+    )
+    db.session.add(log)
+    db.session.commit()
+
+# Game Infos Helper
+def fetch_steam_data(appid, lang='en'):
+    lang_map = {
+        'en': 'english',
+        'de': 'german'
+    }
+    steam_lang = lang_map.get(lang, 'english')
+    try:
+        response = requests.get(
+            "https://store.steampowered.com/api/appdetails",
+            params={"appids": appid, "l": steam_lang},
+            timeout=15
+        )
+        data = response.json().get(str(appid), {})
+        if data.get("success"):
+            return {
+                "name": data["data"].get("name"),
+                "detailed_description": data["data"].get("detailed_description"),
+                "release_date": data["data"].get("release_date", {}).get("date"),
+            }
+    except Exception as e:
+        app.logger.error(f"Steam API error: {str(e)}")
+    return None
+
+def parse_steam_release_date(date_str):
+    """Parsing Steam-Release-Date (the german us thingy, you know)"""
+    import locale
+    from datetime import datetime
+
+    # try german format
+    try:
+        locale.setlocale(locale.LC_TIME, "de_DE.UTF-8")
+        return datetime.strptime(date_str, "%d. %b. %Y")
+    except Exception:
+        pass
+    # Fallback: okay lets try the english one
+    try:
+        locale.setlocale(locale.LC_TIME, "en_US.UTF-8")
+        return datetime.strptime(date_str, "%d %b, %Y")
+    except Exception:
+        pass
+    return None
+
+def fetch_itad_slug(steam_appid: int) -> str | None:
+    api_key = os.getenv("ITAD_API_KEY")
+    if not api_key or api_key.strip() == "your-secret-key-here":
+        app.logger.warning("ITAD-API-Key ist nicht gesetzt oder ist ein Platzhalter.")
+        return None
+    try:
+        response = requests.get(
+            "https://api.isthereanydeal.com/games/lookup/v1",
+            params={"key": api_key, "appid": steam_appid, "platform": "steam"},
+            timeout=10
+        )
+        data = response.json()
+        return data.get("game", {}).get("slug")
+    except Exception as e:
+        app.logger.error(f"ITAD Error: {str(e)}")
+        return None
+
+
+def fetch_itad_game_id(steam_appid: int) -> str | None:
+    api_key = os.getenv("ITAD_API_KEY")
+    if not api_key or api_key.strip() == "your-secret-key-here":
+        app.logger.warning("ITAD-API-Key ist nicht gesetzt oder ist ein Platzhalter.")
+        return None
+
+    try:
+        response = requests.get(
+            "https://api.isthereanydeal.com/games/lookup/v1",
+            params={"key": api_key, "appid": steam_appid, "platform": "steam"},
+            timeout=10
+        )
+        response.raise_for_status()
+        data = response.json()
+        if data.get("found") and data.get("game") and data["game"].get("id"):
+            return data["game"]["id"]
+        app.logger.error(f"ITAD Response Error: {data}")
+        return None
+    except Exception as e:
+        app.logger.error(f"ITAD Error: {str(e)}")
+        return None
+
+def fetch_itad_prices(game_id: str) -> dict | None:
+    api_key = os.getenv("ITAD_API_KEY")
+    country = os.getenv("ITAD_COUNTRY", "DE")
+
+    if not api_key or api_key.strip() == "your-secret-key-here":
+        app.logger.warning("ITAD-API-Key ist nicht gesetzt oder ist ein Platzhalter.")
+        return None
+
+    try:
+        response = requests.post(
+            "https://api.isthereanydeal.com/games/prices/v3",
+            params={
+                "key": api_key,
+                "country": country,
+                "shops": "steam",
+                "vouchers": "false"
+            },
+            json=[game_id],
+            headers={"Content-Type": "application/json"},
+            timeout=15
+        )
+        response.raise_for_status()
+        return response.json()[0]
+
+    except Exception as e:
+        app.logger.error(f"ITAD-Preisabfrage fehlgeschlagen: {str(e)}")
+        return None
+
+
 @app.route('/')
 @login_required
 def index():
@@ -201,49 +553,74 @@ def index():
 def set_lang(lang):
     if lang in SUPPORTED_LANGUAGES:
         session['lang'] = lang
+        session.permanent = True
     return redirect(request.referrer or url_for('index'))
     
 @app.route('/set-theme/<theme>')
 def set_theme(theme):
     resp = make_response('', 204)
-    # Von 'dark_mode' zu 'theme' ändern
     resp.set_cookie('theme', theme, max_age=60*60*24*365)
     return resp
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
+    if current_user.is_authenticated: # Prevent already logged-in users from accessing login page
+        return redirect(url_for('index'))
+
     if request.method == 'POST':
-        username = request.form['username']
-        password = request.form['password']
+        username = request.form.get('username')
+        password = request.form.get('password')
+        remember = request.form.get('remember_me') == 'true' 
+
         user = User.query.filter_by(username=username).first()
-        
+
         if user and check_password_hash(user.password, password):
-            login_user(user)
-            return redirect(url_for('index'))
-        
-        flash(_('Invalid credentials'), 'danger')
+            # Pass remember=True to login_user and set duration
+            # The duration will be taken from app.config['REMEMBER_COOKIE_DURATION']
+            login_user(user, remember=remember)
+            
+            # Log activity
+            log_activity(user.id, 'user_login', f"User '{user.username}' logged in.")
+
+            next_page = request.args.get('next')
+            # Add security check for next_page to prevent open redirect
+            if not next_page or urlparse(next_page).netloc != '':
+                next_page = url_for('index')
+            flash(translate('Logged in successfully.'), 'success')
+            return redirect(next_page)
+        else:
+            flash(translate('Invalid username or password.'), 'danger')
     return render_template('login.html')
 
 @app.route('/register', methods=['GET', 'POST'])
 def register():
     if not app.config['REGISTRATION_ENABLED']:
-        flash(_('No new registrations. They are deactivated!'), 'danger')
-        return redirect(url_for('login'))
-        
+        abort(403)
+
     if request.method == 'POST':
         username = request.form['username']
-        password = generate_password_hash(request.form['password'])
-        
-        if User.query.filter_by(username=username).first():
-            flash(_('Username already exists'), 'danger')
+        password = request.form['password']
+
+        existing_user = User.query.filter_by(username=username).first()
+        if existing_user:
+            flash(translate('Username already exists'), 'error')
             return redirect(url_for('register'))
-        
-        new_user = User(username=username, password=password)
+
+        # make the first user admin
+        is_admin = User.query.count() == 0
+
+        new_user = User(
+            username=username,
+            password=generate_password_hash(password),
+            is_admin=is_admin
+        )
+
         db.session.add(new_user)
         db.session.commit()
         login_user(new_user)
+        flash(translate('Registration successful'), 'success')
         return redirect(url_for('index'))
-    
+
     return render_template('register.html')
 
 @app.route('/logout')
@@ -261,16 +638,16 @@ def change_password():
         confirm_password = request.form['confirm_password']
 
         if not check_password_hash(current_user.password, current_password):
-            flash(_('Current passwort is wrong'), 'danger')
+            flash(translate('Current passwort is wrong'), 'danger')
             return redirect(url_for('change_password'))
 
         if new_password != confirm_password:
-            flash(_('New Passwords are not matching'), 'danger')
+            flash(translate('New Passwords are not matching'), 'danger')
             return redirect(url_for('change_password'))
 
         current_user.password = generate_password_hash(new_password)
         db.session.commit()
-        flash(_('Password changed successfully'), 'success')
+        flash(translate('Password changed successfully', session.get('lang', 'en')), 'success')
         return redirect(url_for('index'))
 
     return render_template('change_password.html')
@@ -285,10 +662,15 @@ def add_game():
             
             if not steam_appid:
                 steam_appid = extract_steam_appid(url)
-            
+
+            steam_key = request.form['steam_key']
+            if Game.query.filter_by(steam_key=steam_key).first():
+                flash(translate('Steam Key already exists!'), 'error')
+                return redirect(url_for('add_game'))
+
             new_game = Game(
                 name=request.form['name'],
-                steam_key=request.form['steam_key'],
+                steam_key=steam_key,
                 status=request.form['status'],
                 recipient=request.form.get('recipient', ''),
                 notes=request.form.get('notes', ''),
@@ -300,83 +682,113 @@ def add_game():
             
             db.session.add(new_game)
             db.session.commit()
-            flash(_('Game added successfully!'), 'success')
+            flash(translate('Game added successfully!'), 'success')
             return redirect(url_for('index'))
         
-        except IntegrityError:
+        except IntegrityError as e:
             db.session.rollback()
-            flash(_('Steam Key already exists!'), 'danger')
+            if "UNIQUE constraint failed: game.steam_key" in str(e):
+                flash(translate('Steam Key already exists!'), 'error')
+            else:
+                flash(translate('Database error: %(error)s', error=str(e)), 'error')
+        
         except Exception as e:
             db.session.rollback()
-            flash(_('Error: ') + str(e), 'danger')
+            flash(translate('Error: %(error)s', error=str(e)), 'error')
     
-    return render_template('add_game.html')
+    return render_template(
+        'add_game.html',
+        platforms=PLATFORM_CHOICES,
+        statuses=STATUS_CHOICES
+    )
+
 
 @app.route('/edit/<int:game_id>', methods=['GET', 'POST'])
 @login_required
 def edit_game(game_id):
-    game = db.session.get(Game, game_id)
-    if not game or game.owner != current_user:
-        abort(404)
-    
-    if not game or game.owner != current_user:
-        abort(403)
-    
-    active_redeem = RedeemToken.query.filter(
-        RedeemToken.game_id == game_id,
-        RedeemToken.expires > datetime.utcnow()
-    ).first()
-    
-    redeem_url = url_for('redeem_page', token=active_redeem.token, _external=True) if active_redeem else None
+    # Eager Loading für Tokens
+    game = Game.query.options(joinedload(Game.redeem_tokens)).get_or_404(game_id)
+
+    def safe_parse_date(date_str):
+        try:
+            naive = datetime.strptime(date_str, '%Y-%m-%d') if date_str else None
+            return local_tz.localize(naive) if naive else None
+        except ValueError:
+            return None
 
     if request.method == 'POST':
         try:
-            url = request.form.get('url', '')
-            steam_appid = request.form.get('steam_appid', '').strip()
-            
-            if not steam_appid:
-                steam_appid = extract_steam_appid(url)
-            
+            # Validation
+            if not request.form.get('name') or not request.form.get('steam_key'):
+                flash(translate('Name and Steam Key are required'), 'error')
+                return redirect(url_for('edit_game', game_id=game_id))
+
+            # Duplicate check
+            existing = Game.query.filter(
+                Game.steam_key == request.form['steam_key'],
+                Game.id != game.id,
+                Game.user_id == current_user.id 
+            ).first()
+            if existing:
+                flash(translate('Steam Key already exists'), 'error')
+                return redirect(url_for('edit_game', game_id=game_id))
+
+            # Update fields
             game.name = request.form['name']
             game.steam_key = request.form['steam_key']
             game.status = request.form['status']
+            game.platform = request.form.get('platform', 'pc')
             game.recipient = request.form.get('recipient', '')
             game.notes = request.form.get('notes', '')
-            game.url = url
-            game.steam_appid = steam_appid
-            game.redeem_date = datetime.strptime(request.form['redeem_date'], '%Y-%m-%d') if request.form['redeem_date'] else None
+            game.url = request.form.get('url', '')
+            game.steam_appid = request.form.get('steam_appid', '')
+            game.redeem_date = safe_parse_date(request.form.get('redeem_date', ''))
             
+            # Token-Logic
+            if game.status == 'geschenkt':
+                # Vorhandene Tokens löschen
+                RedeemToken.query.filter_by(game_id=game.id).delete()
+                
+                # Generate new Token
+                token = secrets.token_urlsafe(12)[:17]
+                expires = datetime.now(local_tz) + timedelta(hours=24)
+                new_token = RedeemToken(
+                    token=token,
+                    game_id=game.id,
+                    expires=expires,
+                    total_hours=24
+                )
+                db.session.add(new_token)
+
             db.session.commit()
-            flash(_('Changes saved!'), 'success')
+            flash(translate('Changes saved successfully'), 'success')
             return redirect(url_for('index'))
-        
+
+        except IntegrityError as e:
+            db.session.rollback()
+            app.logger.error(f"IntegrityError: {traceback.format_exc()}")
+            flash(translate('Database error: {error}', error=str(e.orig)), 'error')
         except Exception as e:
             db.session.rollback()
-            flash(_('Error: ') + str(e), 'danger')
-    
-    return render_template('edit_game.html',
-                         game=game,
-                         redeem_url=redeem_url,
-                         active_redeem=active_redeem,
-                         redeem_date=game.redeem_date.strftime('%Y-%m-%d') if game.redeem_date else '')
+            app.logger.error(f"Unexpected error: {traceback.format_exc()}")
+            flash(translate('Unexpected error: {error}', error=str(e)), 'error')
+
+    return render_template(
+        'edit_game.html',
+        game=game,
+        platforms=PLATFORM_CHOICES,
+        statuses=STATUS_CHOICES,
+        redeem_date=game.redeem_date.strftime('%Y-%m-%d') if game.redeem_date else ''
+    )
 
 
 @app.route('/delete/<int:game_id>', methods=['POST'])
 @login_required
 def delete_game(game_id):
-    game = db.session.get(Game, game_id)
-    if not game or game.owner != current_user:
-        abort(404)
-    
-    if game.owner != current_user:
-        abort(403)
-    
-    try:
-        db.session.delete(game)
-        db.session.commit()
-    except Exception as e:
-        db.session.rollback()
-    
+    game = Game.query.get_or_404(game_id)
+    db.session.delete(game)
+    db.session.commit()
+    flash(translate('Game deleted successfully'), 'success')
     return redirect(url_for('index'))
 
 
@@ -434,11 +846,14 @@ def export_pdf():
     elements = []
     img_height = 2*cm
 
-    # Titel
-    elements.append(Paragraph(_("Game List (without Keys)"), styles['Title']))
+    # Title
+    elements.append(Paragraph(
+        translate("Game List (without Keys)", lang=session.get('lang', 'en')), 
+        styles['Title']
+    ))
     elements.append(Spacer(1, 12))
 
-    # Tabellenkopf
+    # Table header
     col_widths = [
         5*cm, 10*cm, 6*cm, 3*cm
     ]
@@ -472,7 +887,7 @@ def export_pdf():
             game.redeem_date.strftime('%d.%m.%y') if game.redeem_date else ''
         ])
 
-    # Table format (korrekte Einrückung)
+    # Table format
     table = Table(data, colWidths=col_widths, repeatRows=1)
     table.setStyle(TableStyle([
         ('FONTNAME', (0,0), (-1,0), 'Helvetica-Bold'),
@@ -535,71 +950,249 @@ def import_games():
                     
                     db.session.commit()
                 
-                flash(_('%(new)d new games imported, %(dup)d skipped duplicates', new=new_games, dup=duplicates), 'success')
+                flash(translate("new_games_imported", new=new_games, dup=duplicates), 'success')
             
             except Exception as e:
                 db.session.rollback()
-                flash(_('Import error: %(error)s', error=str(e)), 'danger')
+                flash(translate('Import error: {error}', error=str(e)), 'danger')
             
             return redirect(url_for('index'))
         
-        flash(_('Please upload a valid CSV file.'), 'danger')
+        flash(translate('Please upload a valid CSV file.'), 'danger')
     
     return render_template('import.html')
 
 @app.route('/generate_redeem/<int:game_id>', methods=['POST'])
 @login_required
 def generate_redeem(game_id):
-    game = db.session.get(Game, game_id)
-    if not game or game.owner != current_user:
-        abort(403)
-    
-    if game.owner != current_user or game.status != 'verschenkt':
-        abort(403)
-    
+    game = Game.query.get_or_404(game_id)
+    if game.user_id != current_user.id or game.status != 'geschenkt':
+        return jsonify({'error': translate('Forbidden')}), 403
+
     try:
-        token = secrets.token_urlsafe(12)[:17]
-        expires = datetime.utcnow() + timedelta(hours=24)
-        total_hours = 24
-        
         RedeemToken.query.filter_by(game_id=game_id).delete()
-        
+        token = secrets.token_urlsafe(12)[:17]
+        expires = datetime.now(local_tz) + timedelta(hours=24)
         new_token = RedeemToken(
             token=token,
             game_id=game_id,
             expires=expires,
             total_hours=24
         )
-        
         db.session.add(new_token)
         db.session.commit()
-        
-        redeem_url = url_for('redeem_page', token=token, _external=True)
-        return jsonify({'url': redeem_url})
-    
+        redeem_url = url_for('redeem', token=token, _external=True)
+        message = translate(
+            'Redeem link generated: <a href="{url}" target="_blank">{url}</a>',
+            url=redeem_url
+        )
+        return jsonify({'url': redeem_url, 'message': message})
     except Exception as e:
-        app.logger.error(f"Redeem error: {str(e)}")
+        db.session.rollback()
         return jsonify({'error': str(e)}), 500
 
-@app.route('/redeem/<token>')
+@app.route('/redeem/<token>', endpoint='redeem')
 def redeem_page(token):
     redeem_token = RedeemToken.query.filter_by(token=token).first()
-    
     if not redeem_token:
         abort(404)
-    if redeem_token.expires < datetime.utcnow():
+    expires_utc = redeem_token.expires.astimezone(pytz.UTC)
+    if datetime.now(pytz.UTC) > expires_utc:
         db.session.delete(redeem_token)
         db.session.commit()
         abort(404)
-    
     game = Game.query.get(redeem_token.game_id)
     redeem_token.used = True
     db.session.commit()
 
-    return render_template('redeem.html',
-                         game=game,
-                         redeem_token=redeem_token,
-                         platform_link='https://store.steampowered.com/account/registerkey?key=' if game.steam_appid else 'https://www.gog.com/redeem')
+    # which Plattform
+    if game.platform == "steam" or game.steam_appid:
+        platform_link = 'https://store.steampowered.com/account/registerkey?key='
+        platform_label = "Steam"
+    elif game.platform == "gog":
+        platform_link = 'https://www.gog.com/redeem/'
+        platform_label = "GOG"
+    elif game.platform == "xbox":
+        platform_link = 'https://redeem.microsoft.com/'
+        platform_label = "XBOX"
+    elif game.platform == "playstation":
+        platform_link = 'https://store.playstation.com/redeem'
+        platform_label = "PlayStation"
+    else:
+        platform_link = '#'
+        platform_label = game.platform.capitalize() if game.platform else "Unknown"
+
+    return render_template(
+        'redeem.html',
+        game=game,
+        redeem_token=redeem_token,
+        expires_timestamp=int(expires_utc.timestamp() * 1000),
+        platform_link=platform_link,
+        platform_label=platform_label
+    )
+
+@app.route('/admin/users')
+@login_required
+@admin_required
+def admin_users():
+    users = User.query.all()
+    return render_template('admin_users.html', users=users)
+
+@app.route('/admin/users/delete/<int:user_id>', methods=['POST'])
+@login_required
+@admin_required
+def admin_delete_user(user_id):
+    if current_user.id == user_id:
+        flash(translate('You cannot delete yourself'), 'error')
+        return redirect(url_for('admin_users'))
+    
+    user = User.query.get_or_404(user_id)
+    db.session.delete(user)
+    db.session.commit()
+    
+    log_activity(
+        current_user.id,
+        'user_deleted',
+        f"Deleted user: {user.username} (ID: {user.id})"
+    )
+    
+    flash(translate('User deleted successfully'), 'success')
+    return redirect(url_for('admin_users'))
+
+@app.route('/admin/users/reset_password/<int:user_id>', methods=['POST'])
+@login_required
+@admin_required
+def admin_reset_password(user_id):
+    user = User.query.get_or_404(user_id)
+    new_password = secrets.token_urlsafe(8)
+    user.password = generate_password_hash(new_password)
+    db.session.commit()
+    
+    log_activity(
+        current_user.id,
+        'user_newpassword',
+        f"New password for user: {user.username} (ID: {user.id})"
+    )
+    
+
+    flash(
+        translate('New password for {username}: {password}', 
+                  username=user.username, 
+                  password=new_password),
+        'info'
+    )
+    return redirect(url_for('admin_users'))
+
+@app.route('/admin/audit-logs')
+@login_required
+@admin_required
+def admin_audit_logs():
+    page = request.args.get('page', 1, type=int)
+    logs = ActivityLog.query.order_by(ActivityLog.timestamp.desc()).paginate(page=page, per_page=20)
+    return render_template('admin_audit_logs.html', logs=logs)
+
+@app.route('/game/<int:game_id>/update', methods=['POST'])
+@login_required
+def update_game_data(game_id):
+    game = Game.query.get_or_404(game_id)
+    
+    # 1. Getting Steam AppID
+    steam_appid = request.form.get('steam_appid', '').strip()
+    app.logger.info(f"🚀 Update gestartet für Game {game_id} mit AppID: {steam_appid}")
+
+    # 2. Steam-Data (Multilingual)
+    if steam_appid:
+        try:
+            app.logger.debug(f"🔍 Fetching Steam data for AppID: {steam_appid}")
+            for lang in ['en', 'de']:
+                steam_data = fetch_steam_data(steam_appid, lang=lang)
+                if steam_data:
+                    if lang == 'en' and steam_data.get("name"):
+                        game.name = steam_data.get("name", game.name)
+                    setattr(game, f'steam_description_{lang}', steam_data.get("detailed_description") or "No Infos available")
+                    if lang == 'en':
+                        date_str = steam_data.get("release_date", {})
+                        if date_str:
+                            parsed_date = parse_steam_release_date(date_str)
+                            if parsed_date:
+                                game.release_date = local_tz.localize(parsed_date)
+                            else:
+                                app.logger.warning(f"Could not parse Steam release date: {date_str}")
+            app.logger.info("✅ Steam data successfully updated")
+        except Exception as e:
+            app.logger.error(f"💥 Kritischer Steam-Fehler: {str(e)}", exc_info=True)
+            flash(translate('Error during Steam query'), 'danger')
+    else:
+        app.logger.warning("⚠️ Keine Steam-AppID vorhanden, Steam-Daten werden nicht aktualisiert")
+        flash(translate('Steam-AppID missing, no Steam Data transferred'), 'warning')
+
+
+    # ITAD-Slug doings and such
+    itad_slug = fetch_itad_slug(steam_appid)
+    if itad_slug:
+        game.itad_slug = itad_slug
+
+    # 4. ITAD-Prices
+    price_data = None
+    if steam_appid:
+        try:
+            app.logger.debug("🔄 Starte ITAD-Abfrage...")
+            game.itad_game_id = fetch_itad_game_id(steam_appid)
+            
+            if game.itad_game_id:
+                app.logger.info(f"🔑 ITAD Game ID: {game.itad_game_id}")
+                price_data = fetch_itad_prices(game.itad_game_id)
+                
+                if price_data:
+                    # Best price right now
+                    all_deals = price_data.get("deals", [])
+                    if all_deals:
+                        best_deal = min(
+                            all_deals,
+                            key=lambda deal: deal.get("price", {}).get("amount", float('inf'))
+                        )
+                        game.current_price = best_deal.get("price", {}).get("amount")
+                        game.current_price_shop = best_deal.get("shop", {}).get("name")
+                        app.logger.info(f"💶 Current Best: {game.current_price}€ at {game.current_price_shop}")
+                    else:
+                        game.current_price = None
+                        game.current_price_shop = None
+
+                        app.logger.info(f"💶 Current Best: {game.current_price}€")
+                    
+                    game.historical_low = price_data.get("historyLow", {}).get("all", {}).get("amount")
+                    app.logger.info(f"📉 Historical Low: {game.historical_low}€")
+                else:
+                    app.logger.warning("⚠️ Keine ITAD-Preisdaten erhalten")
+            else:
+                app.logger.warning("⚠️ Keine ITAD Game ID erhalten")
+                
+        except Exception as e:
+            app.logger.error(f"💥 ITAD-API-Fehler: {str(e)}", exc_info=True)
+            flash(translate('Fehler bei Preisabfrage'), 'danger')
+
+    try:
+        db.session.commit()
+        flash(translate('Externe Daten erfolgreich aktualisiert!'), 'success')
+        app.logger.info("💾 Datenbank-Update erfolgreich")
+    except Exception as e:
+        db.session.rollback()
+        app.logger.error(f"💥 Datenbank-Fehler: {str(e)}", exc_info=True)
+        flash(translate('Fehler beim Speichern der Daten'), 'danger')
+
+    return redirect(url_for('edit_game', game_id=game_id))
+
+
+@app.route('/game/<int:game_id>')
+@login_required
+def game_details(game_id):
+    game = Game.query.get_or_404(game_id)
+    return render_template('game_details.html', game=game)
+
+
+@app.route('/debug-session')
+def debug_session():
+    return jsonify(dict(session))
 
 # Apprise Notifications
 import apprise
@@ -626,45 +1219,109 @@ def send_notification(user, game):
     return send_apprise_notification(user, game)
 
 def check_expiring_keys():
-    with app.app_context():
-        now = datetime.utcnow()
-        expiry_threshold = now + timedelta(hours=48)
-        
-        # Moderner Select-Aufruf
-        stmt = select(Game).where(
-            Game.status != 'eingelöst',
-            Game.redeem_date <= expiry_threshold,
-            Game.redeem_date > now
-        )
-        
-        expiring_games = db.session.execute(stmt).scalars().all()
-        
-        for game in expiring_games:
-            user = User.query.get(game.user_id)
-            if user.notification_service and user.notification_service != 'none':
-                send_notification(user, game)
+    now = datetime.now(local_tz)
+    expiry_threshold = now + timedelta(hours=48)
+
+    stmt = select(Game).where(
+        Game.status != 'eingelöst',
+        Game.redeem_date <= expiry_threshold,
+        Game.redeem_date > now
+    )
+    
+    expiring_games = db.session.execute(stmt).scalars().all()
+    
+    for game in expiring_games:
+        user = User.query.get(game.user_id)
+        if user.notification_service and user.notification_service != 'none':
+            send_notification(user, game)
 
 
 # Optional: cleaning up old tokens
 def cleanup_expired_tokens():
-    now = datetime.utcnow()
-    expired = RedeemToken.query.filter(RedeemToken.expires < now).all()
-    for token in expired:
-        db.session.delete(token)
-    db.session.commit()
+    with app.app_context():
+        try:
+            now = datetime.now(local_tz)
+            expired = RedeemToken.query.filter(RedeemToken.expires < now).all()
+            for token in expired:
+                db.session.delete(token)
+            db.session.commit()
+            app.logger.info(f"Cleaned up {len(expired)} expired tokens.")
+        except Exception as e:
+            app.logger.error(f"Error during cleanup_expired_tokens: {e}")
+            db.session.rollback()
 
 
 # Scheduler start
-scheduler = BackgroundScheduler()
-scheduler.add_job(func=check_expiring_keys, trigger="interval", hours=interval_hours)
-scheduler.add_job(func=cleanup_expired_tokens, trigger="interval", hours=1)
-scheduler.start()
+scheduler = BackgroundScheduler(timezone=str(local_tz))
 
-# Shutdown of the Schedulers when stopping the app
-atexit.register(lambda: scheduler.shutdown())
+def check_expiring_keys_job():
+    with app.app_context():
+        check_expiring_keys()
+
+def cleanup_expired_tokens_job():
+    with app.app_context():
+        cleanup_expired_tokens()
+
+# Add Jobs
+scheduler.add_job(
+    check_expiring_keys_job,
+    'interval',
+    hours=int(os.getenv('CHECK_EXPIRING_KEYS_INTERVAL_HOURS', 12)),
+    id='check_expiring_keys'
+)
+scheduler.add_job(
+    cleanup_expired_tokens_job,
+    'interval',
+    hours=1,
+    id='cleanup_expired_tokens'
+)
+# price updates
+def update_prices_job():
+    with app.app_context():
+        games = Game.query.filter(Game.steam_appid.isnot(None)).all()
+        for game in games:
+            # just update prices
+            itad_data = fetch_itad_data(f"app/{game.steam_appid}")
+            if itad_data:
+                game.current_price = itad_data.get('price_new')
+                game.historical_low = itad_data.get('price_low', {}).get('amount')
+        db.session.commit()
+
+scheduler.add_job(
+    update_prices_job,
+    'interval',
+    hours=12,
+    id='update_prices'
+)
+
+
+def update_missing_steam_descriptions_job():
+    with app.app_context():
+        games = Game.query.filter(
+            (Game.steam_description_en == None) | (Game.steam_description_en == '') |
+            (Game.steam_description_de == None) | (Game.steam_description_de == '')
+        ).all()
+        for game in games:
+            for lang in ['en', 'de']:
+                if not getattr(game, f'steam_description_{lang}', None):
+                    steam_data = fetch_steam_data(game.steam_appid, lang=lang)
+                    if steam_data:
+                        setattr(game, f'steam_description_{lang}', steam_data.get('detailed_description'))
+        db.session.commit()
+
+scheduler.add_job(
+    update_missing_steam_descriptions_job,
+    'interval',
+    hours=24,
+    id='update_missing_steam_descriptions'
+)
+
+# start Scheduler 
+scheduler.start()
+atexit.register(lambda: scheduler.shutdown(wait=False))
 
 if __name__ == '__main__':
     with app.app_context():
         db.create_all()
-    app.run(host='0.0.0.0', port=5000)
+    app.run(debug=True, host='0.0.0.0', port=5000)
 
diff --git a/steam-gift-manager/docker-compose.yml b/steam-gift-manager/docker-compose.yml
index 0840c1d..a9886bd 100644
--- a/steam-gift-manager/docker-compose.yml
+++ b/steam-gift-manager/docker-compose.yml
@@ -1,15 +1,44 @@
 services:
+  redis:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis_data:/data
+    networks:
+      - app-network
+
   steam-manager:
-    build: .
+    build:
+      context: .
+      args:
+        - UID=0
+        - GID=1000
     ports:
       - "5000:5000"
+      - "5678:5678"
+    env_file:
+      - .env
     environment:
-      - REGISTRATION_ENABLED=True
-      - TZ=
+      - REDIS_URL=redis://redis:6379/0
     volumes:
-      - ../data:/app/data
+      - ../data:/app/data 
       - ./translations:/app/translations:rw
-      - ../.env:/app/.env
-    user: "0:"
+      - ./static:/app/static:rw
+    user: "0:1000"
     restart: unless-stopped
+    command: ["/app/entrypoint.sh"]
+    networks:
+      - app-network
+    depends_on:
+      - redis
+
+volumes:
+  redis_data:
+
+networks:
+  app-network:
+    driver: bridge
+
+
 
diff --git a/steam-gift-manager/entrypoint.sh b/steam-gift-manager/entrypoint.sh
new file mode 100644
index 0000000..877de46
--- /dev/null
+++ b/steam-gift-manager/entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Debug-Output
+echo "🔄 DEBUGPY-Value: ''"
+echo "🔄 FLASK_DEBUG-Value: ''"
+
+# Debug-Modus activate if .env told you so
+if [[ "" == "1" || "" == "1" ]]; then
+  echo "🔄 Starting in DEBUG mode (Port 5678)..."
+  exec python -m debugpy --listen 0.0.0.0:5678 -m flask run --host=0.0.0.0 --port=5000
+else
+  echo "🚀 Starting in PRODUCTION mode..."
+  exec gunicorn -b 0.0.0.0:5000 app:app
+fi
+
+
diff --git a/steam-gift-manager/requirements.txt b/steam-gift-manager/requirements.txt
index 01baa3b..2a2c066 100644
--- a/steam-gift-manager/requirements.txt
+++ b/steam-gift-manager/requirements.txt
@@ -14,3 +14,7 @@ requests
 pillow
 gunicorn
 apprise
+debugpy
+pytz
+Flask-Session
+redis
diff --git a/steam-gift-manager/static/apple-touch-icon.png b/steam-gift-manager/static/apple-touch-icon.png
new file mode 100644
index 0000000..14e6c59
Binary files /dev/null and b/steam-gift-manager/static/apple-touch-icon.png differ
diff --git a/steam-gift-manager/static/favicon.ico b/steam-gift-manager/static/favicon.ico
new file mode 100644
index 0000000..b3433b0
Binary files /dev/null and b/steam-gift-manager/static/favicon.ico differ
diff --git a/steam-gift-manager/static/forgejo.webp b/steam-gift-manager/static/forgejo.webp
new file mode 100644
index 0000000..34d45aa
Binary files /dev/null and b/steam-gift-manager/static/forgejo.webp differ
diff --git a/steam-gift-manager/static/gog_logo.webp b/steam-gift-manager/static/gog_logo.webp
new file mode 100644
index 0000000..ce9a8a9
Binary files /dev/null and b/steam-gift-manager/static/gog_logo.webp differ
diff --git a/steam-gift-manager/static/logo.webp b/steam-gift-manager/static/logo.webp
new file mode 100644
index 0000000..7196e01
Binary files /dev/null and b/steam-gift-manager/static/logo.webp differ
diff --git a/steam-gift-manager/static/logo_small.webp b/steam-gift-manager/static/logo_small.webp
new file mode 100644
index 0000000..424e4bb
Binary files /dev/null and b/steam-gift-manager/static/logo_small.webp differ
diff --git a/steam-gift-manager/static/logo_small_maskable.webp b/steam-gift-manager/static/logo_small_maskable.webp
new file mode 100644
index 0000000..8ac87ad
Binary files /dev/null and b/steam-gift-manager/static/logo_small_maskable.webp differ
diff --git a/steam-gift-manager/static/manifest.json b/steam-gift-manager/static/manifest.json
index 56e7189..05ba690 100644
--- a/steam-gift-manager/static/manifest.json
+++ b/steam-gift-manager/static/manifest.json
@@ -13,22 +13,25 @@
   },
   "icons": [
     {
-      "src": "/static/logo_small.webp",
+      "src": "/static/web-app-manifest-192x192.png",
       "sizes": "192x192",
       "type": "image/webp",
       "purpose": "any"
     },
     {
-      "src": "/static/logo_small_maskable.webp",
+      "src": "/static/web-app-manifest-192x192.png",
       "sizes": "192x192",
-      "type": "image/webp",
+      "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/static/logo.webp",
+      "src": "/static/web-app-manifest-512x512.png",
       "sizes": "512x512",
-      "type": "image/webp",
-      "purpose": "any maskable"
+      "type": "image/png",
+      "purpose": "maskable"
     }
-  ]
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#3f3a3a",
+  "display": "standalone"
 }
diff --git a/steam-gift-manager/static/serviceworker.js b/steam-gift-manager/static/serviceworker.js
index 4fc266b..db9ab63 100644
--- a/steam-gift-manager/static/serviceworker.js
+++ b/steam-gift-manager/static/serviceworker.js
@@ -3,6 +3,8 @@ const ASSETS = [
   '/',
   '/static/style.css',
   '/static/logo.webp',
+  '/static/web-app-manifest-512x512.png',
+  '/static/web-app-manifest-192x192.png',
   '/static/logo_small.webp',
   '/static/gog_logo.webp',
   '/static/forgejo.webp'
diff --git a/steam-gift-manager/static/style.css b/steam-gift-manager/static/style.css
index c056d1d..f5088d8 100644
--- a/steam-gift-manager/static/style.css
+++ b/steam-gift-manager/static/style.css
@@ -133,3 +133,38 @@ body {
     border: 0;
 }
 
+.price-value {
+  font-size: 1.2em;
+  font-weight: 400;
+  margin-top: 2px;
+}
+
+.navbar-nav .nav-link {
+  white-space: nowrap;
+}
+
+@media (max-width: 991.98px) {
+  .navbar-nav {
+    flex-direction: column !important;
+    align-items: flex-start !important;
+  }
+}
+
+.card-body img,
+.steam-description img {
+    max-width: 100%;
+    height: auto;
+    display: block;
+    margin: 8px auto;
+}
+
+td.font-monospace {
+    word-break: break-all;
+    /* or */
+    overflow-wrap: break-word;
+}
+
+.alert-error { background-color: #f8d7da; border-color: #f5c6cb; color: #721c24; }
+.alert-success { background-color: #d4edda; border-color: #c3e6cb; color: #155724; }
+.alert-info { background: #d9edf7; color: #31708f; }
+
diff --git a/steam-gift-manager/static/web-app-manifest-192x192.png b/steam-gift-manager/static/web-app-manifest-192x192.png
new file mode 100644
index 0000000..92a5881
Binary files /dev/null and b/steam-gift-manager/static/web-app-manifest-192x192.png differ
diff --git a/steam-gift-manager/static/web-app-manifest-512x512.png b/steam-gift-manager/static/web-app-manifest-512x512.png
new file mode 100644
index 0000000..a55a741
Binary files /dev/null and b/steam-gift-manager/static/web-app-manifest-512x512.png differ
diff --git a/steam-gift-manager/templates/403.html b/steam-gift-manager/templates/403.html
new file mode 100644
index 0000000..2aa4783
--- /dev/null
+++ b/steam-gift-manager/templates/403.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="d-flex flex-column align-items-center justify-content-center" style="min-height:60vh;">
+  <div class="text-center">
+    <img src="{{ url_for('static', filename='logo.webp') }}"
+         alt="Forbidden"
+         class="img-fluid rounded shadow mb-4"
+         style="max-width: 160px;">
+    <h1 class="display-3 fw-bold text-danger mb-3">403</h1>
+    <h2 class="mb-4">{{ _('Access Forbidden') }}</h2>
+    <p class="lead mb-4">
+      <span class="d-block mb-2">{{ _('Sorry, you are not allowed to access this page.') }}</span>
+      <span class="text-muted">({{ _('Registration is currently disabled.') }})</span>
+    </p>
+    <a href="{{ url_for('index') }}" class="btn btn-lg btn-primary shadow">
+      🏠 {{ _('Back to Home') }}
+    </a>
+    <div class="mt-4 text-muted">
+      <small>
+        <span>Sorry, you haven't unlocked this area yet. Grind some more XP or check your DLC entitlements.<br>Maybe try again after the next patch?</span>
+      </small>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/steam-gift-manager/templates/404.html b/steam-gift-manager/templates/404.html
new file mode 100644
index 0000000..e7145be
--- /dev/null
+++ b/steam-gift-manager/templates/404.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="d-flex flex-column align-items-center justify-content-center" style="min-height:60vh;">
+  <div class="text-center">
+    <img src="{{ url_for('static', filename='logo.webp') }}"
+         alt="Forbidden"
+         class="img-fluid rounded shadow mb-4"
+         style="max-width: 160px;">
+    <h1 class="display-3 fw-bold text-danger mb-3">404</h1>
+    <h2 class="mb-4">{{ _('Access Forbidden') }}</h2>
+    <p class="lead mb-4">
+      <span class="d-block mb-2">{{ _('Sorry, you are not allowed to access this page.') }}</span>
+      <span class="text-muted">({{ _('Registration is currently disabled.') }})</span>
+    </p>
+    <a href="{{ url_for('index') }}" class="btn btn-lg btn-primary shadow">
+      🏠 {{ _('Back to Home') }}
+    </a>
+    <div class="mt-4 text-muted">
+      <small>
+        <span>Sorry, you haven't unlocked this area yet. Grind some more XP or check your DLC entitlements.<br>Maybe try again after the next patch?</span>
+      </small>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/steam-gift-manager/templates/add_game.html b/steam-gift-manager/templates/add_game.html
index 65ad86c..88f6d24 100644
--- a/steam-gift-manager/templates/add_game.html
+++ b/steam-gift-manager/templates/add_game.html
@@ -1,51 +1,94 @@
 {% extends "base.html" %}
 {% block content %}
 <div class="card p-4 shadow-sm">
-    <h2 class="mb-4">{{ _('Add New Game') }}</h2>
-    <form method="POST" aria-label="{{ _('Add New Game') }}">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <div class="row g-3">
-            <div class="col-md-6">
-                <label for="game_name" class="form-label">{{ _('Name') }} <span aria-hidden="true" class="text-danger">*</span></label>
-                <input type="text" id="game_name" name="name" class="form-control" required aria-required="true">
-            </div>
-            <div class="col-md-6">
-                <label for="game_key" class="form-label">{{ _('Game Key') }} <span aria-hidden="true" class="text-danger">*</span></label>
-                <input type="text" id="game_key" name="steam_key" class="form-control" required aria-required="true">
-            </div>
-            <div class="col-md-4">
-                <label for="game_status" class="form-label">{{ _('Status') }} <span aria-hidden="true" class="text-danger">*</span></label>
-                <select id="game_status" name="status" class="form-select" required aria-required="true">
-                    <option value="nicht eingelöst">{{ _('Not redeemed') }}</option>
-                    <option value="verschenkt">{{ _('Gifted') }}</option>
-                    <option value="eingelöst">{{ _('Redeemed') }}</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="game_redeem_date" class="form-label">{{ _('Redeem by') }}</label>
-                <input type="date" id="game_redeem_date" name="redeem_date" class="form-control">
-            </div>
-            <div class="col-md-4">
-                <label for="game_recipient" class="form-label">{{ _('Recipient') }}</label>
-                <input type="text" id="game_recipient" name="recipient" class="form-control">
-            </div>
-            <div class="col-md-6">
-                <label for="game_appid" class="form-label">{{ _('Steam AppID (optional)') }}</label>
-                <input type="text" id="game_appid" name="steam_appid" class="form-control">
-            </div>
-            <div class="col-md-6">
-                <label for="game_url" class="form-label">{{ _('Shop URL') }}</label>
-                <input type="url" id="game_url" name="url" class="form-control">
-            </div>
-            <div class="col-12">
-                <label for="game_notes" class="form-label">{{ _('Notes') }}</label>
-                <textarea id="game_notes" name="notes" class="form-control" rows="3"></textarea>
-            </div>
-            <div class="col-12">
-                <button type="submit" class="btn btn-success">{{ _('Save') }}</button>
-                <a href="{{ url_for('index') }}" class="btn btn-outline-secondary">{{ _('Cancel') }}</a>
-            </div>
-        </div>
-    </form>
+  <h2 class="mb-4">{{ _('Add Game') }}</h2>
+  {% with messages = get_flashed_messages(with_categories=true) %}
+    {% if messages %}
+      <div class="mb-3">
+        {% for category, message in messages %}
+          <div class="alert alert-{{ 'danger' if category == 'error' else category }}">
+            {{ message|safe }}
+          </div>
+        {% endfor %}
+      </div>
+    {% endif %}
+  {% endwith %}
+  <form method="POST" aria-label="{{ _('Add Game') }}">
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+    <div class="row g-3">
+      <!-- Name -->
+      <div class="col-md-6">
+        <label for="game_name" class="form-label">{{ _('Name') }} <span class="text-danger">*</span></label>
+        <input type="text" id="game_name" name="name" class="form-control" value="{{ request.form.name or '' }}" required>
+      </div>
+
+      <!-- Steam Key -->
+      <div class="col-md-6">
+        <label for="game_key" class="form-label">{{ _('Game Key') }} <span class="text-danger">*</span></label>
+        <input type="text" id="game_key" name="steam_key" class="form-control" value="{{ request.form.steam_key or '' }}" required>
+      </div>
+
+      <!-- Platform Dropdown -->
+      <div class="col-md-6">
+        <label for="game_platform" class="form-label">{{ _('Platform') }} <span class="text-danger">*</span></label>
+        <select id="game_platform" name="platform" class="form-select" required>
+          {% for value, label in platforms %}
+            <option value="{{ value }}" {% if request.form.platform == value %}selected{% endif %}>
+              {{ _(label) }}
+            </option>
+          {% endfor %}
+        </select>
+      </div>
+
+      <!-- Status Dropdown -->
+      <div class="col-md-6">
+        <label for="game_status" class="form-label">{{ _('Status') }} <span class="text-danger">*</span></label>
+        <select id="game_status" name="status" class="form-select" required>
+          {% for value, label in statuses %}
+            <option value="{{ value }}" {% if request.form.status == value %}selected{% endif %}>
+              {{ _(label) }}
+            </option>
+          {% endfor %}
+        </select>
+      </div>
+
+      <!-- Steam AppID -->
+      <div class="col-md-6">
+        <label for="game_appid" class="form-label">{{ _('Steam AppID (optional)') }}</label>
+        <input type="text" id="game_appid" name="steam_appid" class="form-control" value="{{ request.form.steam_appid or '' }}">
+      </div>
+
+      <!-- Redeem Date -->
+      <div class="col-md-6">
+        <label for="game_redeem_date" class="form-label">{{ _('Redeem by') }}</label>
+        <input type="date" id="game_redeem_date" name="redeem_date" class="form-control" value="{{ request.form.redeem_date or '' }}">
+      </div>
+
+      <!-- Recipient -->
+      <div class="col-12">
+        <label for="game_recipient" class="form-label">{{ _('Recipient') }}</label>
+        <input type="text" id="game_recipient" name="recipient" class="form-control" value="{{ request.form.recipient or '' }}">
+      </div>
+
+      <!-- Shop URL -->
+      <div class="col-12">
+        <label for="game_url" class="form-label">{{ _('Shop URL') }}</label>
+        <input type="url" id="game_url" name="url" class="form-control" value="{{ request.form.url or '' }}">
+      </div>
+
+      <!-- Notes -->
+      <div class="col-12">
+        <label for="game_notes" class="form-label">{{ _('Notes') }}</label>
+        <textarea id="game_notes" name="notes" class="form-control" rows="3">{{ request.form.notes or '' }}</textarea>
+      </div>
+
+      <!-- Buttons -->
+      <div class="col-12">
+        <button type="submit" class="btn btn-primary">{{ _('Save') }}</button>
+        <a href="{{ url_for('index') }}" class="btn btn-outline-secondary ms-2">{{ _('Cancel') }}</a>
+      </div>
+    </div>
+  </form>
 </div>
 {% endblock %}
+
diff --git a/steam-gift-manager/templates/admin_audit_logs.html b/steam-gift-manager/templates/admin_audit_logs.html
new file mode 100644
index 0000000..5c8b935
--- /dev/null
+++ b/steam-gift-manager/templates/admin_audit_logs.html
@@ -0,0 +1,55 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container mt-4">
+    <h2>{{ _('Audit Logs') }}</h2>
+    
+    <div class="table-responsive">
+        <table class="table table-hover">
+            <thead>
+                <tr>
+                    <th>{{ _('Timestamp') }}</th>
+                    <th>{{ _('User') }}</th>
+                    <th>{{ _('Action') }}</th>
+                    <th>{{ _('Details') }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for log in logs.items %}
+                <tr>
+                    <td>{{ log.timestamp|strftime('%d.%m.%Y %H:%M') }}</td>
+                    <td>{{ log.user.username if log.user else 'System' }}</td>
+                    <td>{{ log.action }}</td>
+                    <td>{{ log.details|default('', true) }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    
+    {% if logs.pages > 1 %}
+    <nav aria-label="Page navigation">
+        <ul class="pagination">
+            {% if logs.has_prev %}
+            <li class="page-item">
+                <a class="page-link" href="{{ url_for('admin_audit_logs', page=logs.prev_num) }}">{{ _('Previous') }}</a>
+            </li>
+            {% endif %}
+            
+            {% for page_num in logs.iter_pages() %}
+            <li class="page-item {% if page_num == logs.page %}active{% endif %}">
+                <a class="page-link" href="{{ url_for('admin_audit_logs', page=page_num) }}">{{ page_num }}</a>
+            </li>
+            {% endfor %}
+            
+            {% if logs.has_next %}
+            <li class="page-item">
+                <a class="page-link" href="{{ url_for('admin_audit_logs', page=logs.next_num) }}">{{ _('Next') }}</a>
+            </li>
+            {% endif %}
+        </ul>
+    </nav>
+    {% endif %}
+</div>
+{% endblock %}
+
diff --git a/steam-gift-manager/templates/admin_users.html b/steam-gift-manager/templates/admin_users.html
new file mode 100644
index 0000000..e2f1398
--- /dev/null
+++ b/steam-gift-manager/templates/admin_users.html
@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container mt-4">
+    <h2>{{ _('User Management') }}</h2>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>{{ _('Username') }}</th>
+                <th>{{ _('Actions') }}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for user in users %}
+            <tr>
+                <td>
+                    {{ user.username }}
+                    {% if user.is_admin %}<span class="badge bg-primary">Admin</span>{% endif %}
+                </td>
+                <td>
+                    {% if user.id != current_user.id %}
+                    <form method="POST" action="{{ url_for('admin_delete_user', user_id=user.id) }}" class="d-inline">
+                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+                        <button type="submit" class="btn btn-danger btn-sm">{{ _('Delete') }}</button>
+                    </form>
+                    
+                    <form method="POST" action="{{ url_for('admin_reset_password', user_id=user.id) }}">
+                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+                        <button type="submit" class="btn btn-warning">{{ _('Reset Password') }}</button>
+                    </form>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}
+
diff --git a/steam-gift-manager/templates/base.html b/steam-gift-manager/templates/base.html
index 1f112fa..9781a06 100644
--- a/steam-gift-manager/templates/base.html
+++ b/steam-gift-manager/templates/base.html
@@ -11,9 +11,8 @@
     <!-- Preload Bootstrap CSS for better LCP -->
     <link rel="preload" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <noscript><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"></noscript>
-    <!-- Eigene Styles -->
+    <!-- My Styles -->
     <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
-    {# LCP-Optimierung: Preload für das erste Cover-Bild, falls vorhanden #}
     {% if games and games[0].steam_appid %}
     <link rel="preload"
           as="image"
@@ -36,59 +35,53 @@
 })();
 </script>
 <body>
-    <nav class="navbar navbar-expand-lg bg-body-tertiary">
-        <div class="container">
-            <a class="navbar-brand d-flex align-items-center gap-2" href="/">
-                <img src="{{ url_for('static', filename='logo_small.webp') }}" alt="Logo" width="150" height="116" style="object-fit:contain; border-radius:8px;">
-                <span>Game Key Manager</span>
-            </a>
-            <div class="d-flex align-items-center gap-3">
-                <form class="d-flex" action="{{ url_for('index') }}" method="GET" role="search" aria-label="{{ _('Search games') }}">
-                    <label for="searchInput" class="visually-hidden">{{ _('Search') }}</label>
-                    <input class="form-control me-2" 
-                           type="search" 
-                           name="q"
-                           id="searchInput"
-                           placeholder="{{ _('Search') }}"
-                           value="{{ search_query }}">
-                    <button class="btn btn-outline-success" type="submit" aria-label="{{ _('Search') }}">🔍</button>
-                </form>
-                <div class="form-check form-switch">
-                    <input class="form-check-input"
-                           type="checkbox"
-                           id="darkModeSwitch" {% if theme == 'dark' %}checked{% endif %}>
-                    <label class="form-check-label" for="darkModeSwitch">{{ _('Dark Mode') }}</label>
-                </div>
-                <div class="dropdown ms-3">
-                    <div hidden id="locale-debug" data-locale="{{ session.get('lang', 'en') }}"></div>
-                    <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                        {% if session.get('lang', 'en') == 'de' %} Deutsch {% elif session.get('lang', 'en') == 'en' %} English {% else %} Sprache {% endif %}
-                    </button>
-                    <ul class="dropdown-menu">
-                        <li><a class="dropdown-item {% if session.get('lang', 'en') == 'de' %}active{% endif %}" href="{{ url_for('set_lang', lang='de') }}">Deutsch</a></li>
-                        <li><a class="dropdown-item {% if session.get('lang', 'en') == 'en' %}active{% endif %}" href="{{ url_for('set_lang', lang='en') }}">English</a></li>
-                    </ul>
-                </div>
-                {% if current_user.is_authenticated %}
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('change_password') }}">🔒 {{ _('Password') }}</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('logout') }}">🚪 {{ _('Logout') }}</a>
-                    </li>
-                {% endif %}
-            </div>
-        </div>
-    </nav>
+<nav class="navbar navbar-expand-lg bg-body-tertiary">
+  <div class="container">
+    <a class="navbar-brand d-flex align-items-center gap-2" href="/">
+      <img src="{{ url_for('static', filename='logo_small.webp') }}" alt="Logo" width="36" height="28" style="object-fit:contain; border-radius:8px;">
+      <span>Game Key Manager</span>
+    </a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse flex-grow-1" id="mainNavbar">
+      <form class="d-flex ms-auto my-2 my-lg-0" action="{{ url_for('index') }}" method="GET" role="search" aria-label="{{ _('Search games') }}">
+        <input class="form-control me-2" type="search" name="q" id="searchInput" placeholder="{{ _('Search') }}" value="{{ search_query }}">
+        <button class="btn btn-outline-success" type="submit" aria-label="{{ _('Search') }}">🔍</button>
+      </form>
+      <ul class="navbar-nav ms-lg-3 mb-2 mb-lg-0">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="langDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            {% if session.get('lang', 'en') == 'de' %} Deutsch {% elif session.get('lang', 'en') == 'en' %} English {% else %} Sprache {% endif %}
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="langDropdown">
+            <li><a class="dropdown-item {% if session.get('lang', 'en') == 'de' %}active{% endif %}" href="{{ url_for('set_lang', lang='de') }}">Deutsch</a></li>
+            <li><a class="dropdown-item {% if session.get('lang', 'en') == 'en' %}active{% endif %}" href="{{ url_for('set_lang', lang='en') }}">English</a></li>
+          </ul>
+        </li>
+        {% if current_user.is_authenticated %}
+          {% if current_user.is_admin %}
+          <li class="nav-item"><a class="nav-link" href="{{ url_for('admin_users') }}">⚙️ {{ _('Admin') }}</a></li>
+          <li class="nav-item"><a class="nav-link" href="{{ url_for('admin_audit_logs') }}">📜 {{ _('Audit Logs') }}</a></li>
+          {% endif %}
+          <li class="nav-item"><a class="nav-link" href="{{ url_for('change_password') }}">🔒 {{ _('Password') }}</a></li>
+          <li class="nav-item"><a class="nav-link" href="{{ url_for('logout') }}">🚪 {{ _('Logout') }}</a></li>
+        {% endif %}
+      </ul>
+    </div>
+  </div>
+</nav>
     <div class="container mt-4">
         {% with messages = get_flashed_messages(with_categories=true) %}
             {% if messages %}
-                {% for category, message in messages %}
-                <div class="alert alert-{{ category }} alert-dismissible fade show">
-                    {{ message }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+                <div class="flash-container">
+                  {% for category, message in messages %}
+                    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
+                      {{ message|safe }}
+                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                    </div>
+                  {% endfor %}
                 </div>
-                {% endfor %}
             {% endif %}
         {% endwith %}
         {% block content %}{% endblock %}
diff --git a/steam-gift-manager/templates/edit_game.html b/steam-gift-manager/templates/edit_game.html
index 81db0bd..e33e108 100644
--- a/steam-gift-manager/templates/edit_game.html
+++ b/steam-gift-manager/templates/edit_game.html
@@ -1,35 +1,85 @@
 {% extends "base.html" %}
 {% block content %}
 <div class="card p-4 shadow-sm">
-  <h2 class="mb-4">{{ _('Edit Game') }}</h2>
-  <form method="POST" aria-label="{{ _('Edit Game') }}">
+  <h2 class="mb-4">{{ _('Spiel bearbeiten') }}</h2>
+
+  <!-- Flash-Nachrichten -->
+  {% with messages = get_flashed_messages(with_categories=true) %}
+    {% if messages %}
+      <div class="flash-messages mb-4">
+        {% for category, message in messages %}
+          <div class="alert alert-{{ 'danger' if category == 'error' else category }} alert-dismissible fade show">
+            {{ message|safe }}
+            <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+          </div>
+        {% endfor %}
+      </div>
+    {% endif %}
+  {% endwith %}
+
+  <!-- Update Data Form (separate, outside main form, uses POST) -->
+  <div class="mb-3 text-end">
+  <form method="POST" action="{{ url_for('update_game_data', game_id=game.id) }}" id="updateDataForm">
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+    <!-- Ändere die ID für Eindeutigkeit -->
+    <input type="hidden" name="steam_appid" id="itad_steam_appid" value="{{ game.steam_appid }}">
+    <button type="submit" class="btn btn-secondary">
+      🔄 {{ _('Update Data') }}
+    </button>
+  </form>
+  <script>
+  document.getElementById('updateDataForm').addEventListener('submit', function(e) {
+    e.preventDefault();
+    
+    const currentAppId = document.getElementById('game_appid').value;
+    
+    document.getElementById('itad_steam_appid').value = currentAppId;
+    
+    this.submit();
+  });
+  </script>
+  </div>
+
+  <form method="POST" aria-label="{{ _('Spiel bearbeiten') }}">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="row g-3">
+      <!-- Formularfelder -->
       <div class="col-md-6">
-        <label for="game_name" class="form-label">{{ _('Name') }} <span aria-hidden="true" class="text-danger">*</span></label>
-        <input type="text" id="game_name" name="name" class="form-control" value="{{ game.name }}" required aria-required="true">
+        <label class="form-label">{{ _('Name') }} <span class="text-danger">*</span></label>
+        <input type="text" name="name" class="form-control" value="{{ game.name }}" required>
       </div>
       <div class="col-md-6">
-        <label for="game_key" class="form-label">{{ _('Game Key') }} <span aria-hidden="true" class="text-danger">*</span></label>
-        <input type="text" id="game_key" name="steam_key" class="form-control" value="{{ game.steam_key }}" required aria-required="true">
-      </div>
-      <div class="col-md-6">
-        <label for="game_appid" class="form-label">{{ _('Steam AppID (optional)') }}</label>
-        <input type="text" id="game_appid" name="steam_appid" class="form-control" value="{{ game.steam_appid or '' }}">
-      </div>
-      <div class="col-md-4">
-        <label for="game_status" class="form-label">{{ _('Status') }} <span aria-hidden="true" class="text-danger">*</span></label>
-        <select id="game_status" name="status" class="form-select" required aria-required="true">
-          <option value="nicht eingelöst" {% if game.status == 'nicht eingelöst' %}selected{% endif %}>{{ _('Not redeemed') }}</option>
-          <option value="verschenkt" {% if game.status == 'verschenkt' %}selected{% endif %}>{{ _('Gifted') }}</option>
-          <option value="eingelöst" {% if game.status == 'eingelöst' %}selected{% endif %}>{{ _('Redeemed') }}</option>
+        <label for="game_platform" class="form-label">{{ _('Platform') }} <span class="text-danger">*</span></label>
+        <select id="game_platform" name="platform" class="form-select" required>
+          {% for value, label in platforms %}
+            <option value="{{ value }}" {% if game.platform == value %}selected{% endif %}>{{ _(label) }}</option>
+          {% endfor %}
         </select>
       </div>
-      <div class="col-md-4">
-        <label for="game_redeem_date" class="form-label">{{ _('Redeem by') }}</label>
-        <input type="date" id="game_redeem_date" name="redeem_date" class="form-control" value="{{ redeem_date }}">
+      <div class="col-md-6">
+        <label for="game_status" class="form-label">{{ _('Status') }} <span class="text-danger">*</span></label>
+        <select id="game_status" name="status" class="form-select" required>
+          {% for value, label in statuses %}
+            <option value="{{ value }}" {% if game.status == value %}selected{% endif %}>{{ _(label) }}</option>
+          {% endfor %}
+        </select>
       </div>
-      <div class="col-md-4">
+      <div class="col-md-6">
+        <label class="form-label">{{ _('Steam Key') }} <span class="text-danger">*</span></label>
+        <input type="text" name="steam_key" class="form-control" value="{{ game.steam_key }}" required>
+      </div>
+      <div class="col-md-6">
+        <label for="game_appid" class="form-label">{{ _('Steam AppID') }}</label>
+        <input type="text" id="game_appid" name="steam_appid" class="form-control" value="{{ game.steam_appid or '' }}">
+        <small class="text-muted">
+          {{ _('For GOG games: Enter the Steam AppID here to enable price tracking.') }}
+        </small>
+      </div>
+      <div class="col-md-6">
+        <label for="game_redeem_date" class="form-label">{{ _('Redeem by') }}</label>
+        <input type="date" id="game_redeem_date" name="redeem_date" class="form-control" value="{{ game.redeem_date.strftime('%Y-%m-%d') if game.redeem_date else '' }}">
+      </div>
+      <div class="col-12">
         <label for="game_recipient" class="form-label">{{ _('Recipient') }}</label>
         <input type="text" id="game_recipient" name="recipient" class="form-control" value="{{ game.recipient }}">
       </div>
@@ -41,27 +91,95 @@
         <label for="game_notes" class="form-label">{{ _('Notes') }}</label>
         <textarea id="game_notes" name="notes" class="form-control" rows="3">{{ game.notes }}</textarea>
       </div>
+
+      <!-- Show External Data -->
       <div class="col-12">
-        {% if redeem_url and active_redeem %}
-        <div class="mb-3">
-          <label for="active_redeem_link" class="form-label">{{ _('Active Redeem Link') }}</label>
-          <input type="text"
-                 id="active_redeem_link"
-                 class="form-control"
-                 value="{{ redeem_url }}"
-                 readonly
-                 onclick="this.select()">
-          <small class="text-muted">
-            {{ _('Expires at') }}: {{ active_redeem.expires.strftime('%d.%m.%Y %H:%M') }}
-          </small>
+        <div class="card mb-4">
+          <div class="card-header">
+            <span>🔄 {{ _('External Data') }}</span>
+          </div>
+          <div class="card-body">
+            {% if game.release_date %}
+              <div class="mb-2">
+                <strong>{{ _('Release Date:') }}</strong>
+                {{ game.release_date|strftime('%d.%m.%Y') }}
+              </div>
+            {% endif %}
+            {% if game.current_price %}
+              <div class="text-center mb-2">
+                <span class="badge bg-primary d-block">{{ _('Now') }}</span>
+                <div class="fw-bold" style="font-size:1.1em;">
+                  {{ "%.2f"|format(game.current_price) }} €
+                </div>
+              </div>
+            {% endif %}
+            {% if game.historical_low %}
+              <div class="text-center">
+                <span class="badge bg-secondary d-block">{{ _('Hist. Low') }}</span>
+                <div class="fw-bold" style="font-size:1.1em;">
+                  {{ "%.2f"|format(game.historical_low) }} €
+                </div>
+              </div>
+            {% endif %}
+            {% if game.itad_slug %}
+              <a href="https://isthereanydeal.com/game/{{ game.itad_slug }}/info/" target="_blank" rel="noopener" class="btn btn-outline-info mt-2">
+                🔗 {{ _('View on IsThereAnyDeal') }}
+              </a>
+            {% endif %}
+          </div>
         </div>
-        {% endif %}
       </div>
+
+      <!-- Einlöse-Links -->
+      {% if game.status == 'geschenkt' %}
+        <div class="col-12">
+          <div class="card mb-3">
+            <div class="card-header">{{ _('Redeem-Link') }}</div>
+            <div class="card-body">
+              {% for token in game.redeem_tokens if not token.is_expired() %}
+                <div class="input-group mb-3">
+                  <input type="text" class="form-control" value="{{ url_for('redeem', token=token.token, _external=True) }}" readonly id="redeem-link-{{ loop.index }}">
+                  <button type="button" class="btn btn-outline-secondary copy-btn" data-clipboard-target="#redeem-link-{{ loop.index }}">
+                    {{ _('Copy') }}
+                  </button>
+                </div>
+                <small class="text-muted">
+                  {{ _('Expires at') }}: {{ token.expires.astimezone(local_tz).strftime('%d.%m.%Y %H:%M') }}
+                </small>
+              {% else %}
+                <p class="text-muted mb-0">{{ _('No active redeem links') }}</p>
+              {% endfor %}
+            </div>
+          </div>
+        </div>
+      {% endif %}
+
+      <!-- Buttons -->
       <div class="col-12">
         <button type="submit" class="btn btn-primary">{{ _('Save') }}</button>
         <a href="{{ url_for('index') }}" class="btn btn-outline-secondary ms-2">{{ _('Cancel') }}</a>
+        <a href="{{ url_for('game_details', game_id=game.id) }}" class="btn btn-info ms-2">🔍 {{ _('View Details') }}</a>
       </div>
     </div>
   </form>
 </div>
+
+<!-- Copy-JavaScript -->
+<script>
+  document.querySelectorAll('.copy-btn').forEach(btn => {
+    btn.addEventListener('click', async function() {
+      const input = document.querySelector(this.dataset.clipboardTarget);
+      try {
+        await navigator.clipboard.writeText(input.value);
+        this.innerHTML = '✅ {{ _("Copied!") }}';
+        setTimeout(() => this.innerHTML = '{{ _("Copy") }}', 2000);
+      } catch (err) {
+        this.innerHTML = '❌ {{ _("Error") }}';
+        setTimeout(() => this.innerHTML = '{{ _("Copy") }}', 2000);
+      }
+    });
+  });
+</script>
 {% endblock %}
+
+
diff --git a/steam-gift-manager/templates/game_details.html b/steam-gift-manager/templates/game_details.html
new file mode 100644
index 0000000..b4ed10e
--- /dev/null
+++ b/steam-gift-manager/templates/game_details.html
@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="card shadow-sm">
+    <div class="card-body">
+        <h1>{{ game.name }}</h1>
+        
+        <div class="row">
+            <!-- Bild und Basis-Infos -->
+            <div class="col-md-4">
+                {% if game.steam_appid %}
+                <img src="https://cdn.cloudflare.steamstatic.com/steam/apps/{{ game.steam_appid }}/header.jpg" 
+                     class="img-fluid rounded mb-3" 
+                     alt="{{ game.name }} Cover"
+                     loading="lazy">
+                {% endif %}
+            </div>
+
+            <!-- Details -->
+            <div class="col-md-8">
+                <dl class="row">
+                    <dt class="col-sm-3">{{ _('Status') }}</dt>
+                    <dd class="col-sm-9">
+                        {% if game.status == 'nicht eingelöst' %}
+                            <span class="badge bg-warning text-dark">{{ _('Not redeemed') }}</span>
+                        {% elif game.status == 'geschenkt' %}
+                            <span class="badge bg-success">{{ _('Gifted') }}</span>
+                        {% elif game.status == 'eingelöst' %}
+                            <span class="badge bg-secondary">{{ _('Redeemed') }}</span>
+                        {% endif %}
+                    </dd>
+                    
+                    <dt class="col-sm-3">{{ _('Release Date') }}</dt>
+                    <dd class="col-sm-9">{{ game.release_date|strftime('%d.%m.%Y') if game.release_date else 'N/A' }}</dd>
+                    
+                    <dt class="col-sm-3">{{ _('Current Price') }}</dt>
+                    <dd class="col-sm-9">{{ "%.2f €"|format(game.current_price) if game.current_price else 'N/A' }}</dd>
+                    
+                </dl>
+                
+                <a href="{{ url_for('edit_game', game_id=game.id) }}" class="btn btn-primary">
+                    {{ _('Edit') }}
+                </a>
+            </div>
+        </div>
+        {% set lang = session.get('lang', 'en') %}
+        {% set desc = getattr(game, 'steam_description_' + lang) %}
+        {% if desc %}
+        <div class="row mt-4">
+            <div class="col-12">
+                <div class="card">
+                    <div class="card-header">{{ _('Game Description') }}</div>
+                    <div class="card-body">
+                        {{ desc|safe }}
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% endif %}
+    </div>
+</div>
+{% endblock %}
+
diff --git a/steam-gift-manager/templates/index.html b/steam-gift-manager/templates/index.html
index f9398a1..ea383e8 100644
--- a/steam-gift-manager/templates/index.html
+++ b/steam-gift-manager/templates/index.html
@@ -22,6 +22,7 @@
                 <th>{{ _('Created') }}</th>
                 <th>{{ _('Redeem by') }}</th>
                 <th>{{ _('Shop') }}</th>
+                <th>{{ _('Price') }}</th>
                 <th>{{ _('Actions') }}</th>
             </tr>
         </thead>
@@ -29,38 +30,40 @@
             {% for game in games %}
             <tr>
                 <td>
-                {% if game.steam_appid %}
-                <img src="https://cdn.cloudflare.steamstatic.com/steam/apps/{{ game.steam_appid }}/header.jpg"
-                     alt="Steam Header" 
-                     class="game-cover"
-                     {% if loop.first %}fetchpriority="high"{% endif %}
-                     width="368" 
-                     height="172"
-                     loading="lazy">
-                {% elif game.url and 'gog.com' in game.url %}
-                <img src="{{ url_for('static', filename='gog_logo.webp') }}"
-                     alt="GOG Logo" 
-                     class="game-cover"
-                     width="368"
-                     height="172"
-                     loading="lazy">
-                {% endif %}
+                  <a href="{{ url_for('game_details', game_id=game.id) }}" title="{{ _('Details') }}">
+                    {% if game.steam_appid %}
+                      <img src="https://cdn.cloudflare.steamstatic.com/steam/apps/{{ game.steam_appid }}/header.jpg"
+                          alt="Steam Header" 
+                          class="game-cover"
+                          {% if loop.first %}fetchpriority="high"{% endif %}
+                          width="368" 
+                          height="172"
+                          loading="lazy">
+                    {% elif game.url and 'gog.com' in game.url %}
+                      <img src="{{ url_for('static', filename='gog_logo.webp') }}"
+                          alt="GOG Logo" 
+                          class="game-cover"
+                          width="368"
+                          height="172"
+                          loading="lazy">
+                    {% endif %}
+                  </a>
                 </td>
                 <td>{{ game.name }}</td>
                 <td class="font-monospace">{{ game.steam_key }}</td>
                 <td>
                     {% if game.status == 'nicht eingelöst' %}
                         <span class="badge bg-warning text-dark">{{ _('Not redeemed') }}</span>
-                    {% elif game.status == 'verschenkt' %}
+                    {% elif game.status == 'geschenkt' %}
                         <span class="badge bg-success">{{ _('Gifted') }}</span>
                     {% elif game.status == 'eingelöst' %}
                         <span class="badge bg-secondary">{{ _('Redeemed') }}</span>
                     {% endif %}
                 </td>
-                <td>{{ format_date(game.created_at) }}</td>
+                <td>{{ game.created_at|strftime('%d.%m.%Y') }}</td>
                 <td>
                     {% if game.redeem_date %}
-                        <span class="badge bg-danger">{{ format_date(game.redeem_date) }}</span>
+                        <span class="badge bg-danger">{{ game.redeem_date|strftime('%d.%m.%Y') }}</span>
                     {% endif %}
                 </td>
                 <td>
@@ -68,9 +71,37 @@
                         <a href="{{ game.url }}" target="_blank" class="btn btn-sm btn-outline-info">🔗 {{ _('Shop') }}</a>
                     {% endif %}
                 </td>
+                <td>
+                  {% if game.current_price is not none %}
+                  <div {% if game.historical_low is not none %}class="mb-2"{% endif %}>
+                      <div class="text-body-secondary" style="font-size: 0.85em; line-height: 1.2;">
+                          {{ _('Current Deal') }}
+                      </div>
+                      <div style="font-size: 1.05em; line-height: 1.2;">
+                          {{ "%.2f"|format(game.current_price) }} €
+                          {% if game.current_price_shop %}
+                          <span class="d-block text-body-secondary" style="font-size: 0.75em; line-height: 1.1;">({{ game.current_price_shop }})</span>
+                          {% endif %}
+                      </div>
+                  </div>
+                  {% endif %}
+
+                  {# Historical Low #}
+                  {% if game.historical_low is not none %}
+                  <div>
+                      <div class="text-body-secondary" style="font-size: 0.85em; line-height: 1.2;">
+                          {{ _('Hist. Low') }}
+                      </div>
+                      <div style="font-size: 1.05em; line-height: 1.2;">
+                          {{ "%.2f"|format(game.historical_low) }} €
+                      </div>
+                  </div>
+                  {% endif %}
+                </td>
                 <td class="text-nowrap">
-                    {% if game.status == 'verschenkt' %}
-                    <button class="btn btn-sm btn-success generate-redeem" 
+                    {% if game.status == 'geschenkt' %}
+                    <button type="button" 
+                            class="btn btn-sm btn-success generate-redeem" 
                             data-game-id="{{ game.id }}"
                             title="{{ _('Generate redeem link') }}">
                         🔗
@@ -87,29 +118,46 @@
         </tbody>
     </table>
 </div>
-
 <script>
-const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
-
 document.querySelectorAll('.generate-redeem').forEach(btn => {
     btn.addEventListener('click', async function() {
         const gameId = this.dataset.gameId;
+        const flashContainer = document.querySelector('.flash-container');
+        
         try {
-            const response = await fetch('/generate_redeem/' + gameId, {
+            const response = await fetch(`/generate_redeem/${gameId}`, {
                 method: 'POST',
                 headers: {
-                    'X-CSRFToken': csrfToken
+                    'X-CSRFToken': document.querySelector('meta[name="csrf-token"]').content,
+                    'Accept': 'application/json'
                 }
             });
-            if (!response.ok) throw new Error('Network error');
+
             const data = await response.json();
-            if(data.url) {
+            
+            if (!response.ok) {
+                throw new Error(data.error || '{{ _("Unknown error") }}');
+            }
+
+            if (data.url) {
                 await navigator.clipboard.writeText(data.url);
-                alert('{{ _("Redeem link copied to clipboard!") }}');
+                
+                // Erfolgsmeldung mit übersetztem Text
+                flashContainer.innerHTML = `
+                    <div class="alert alert-success alert-dismissible fade show" role="alert">
+                        {{ _("Link copied") }}: <a href="${data.url}" target="_blank">${data.url}</a>
+                        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+                    </div>
+                `;
             }
         } catch (error) {
-            console.error('Error:', error);
-            alert('{{ _("Error generating link") }}');
+            // Fehlermeldung mit übersetztem Text
+            flashContainer.innerHTML = `
+                <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                    {{ _("Error") }}: ${error.message}
+                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+                </div>
+            `;
         }
     });
 });
diff --git a/steam-gift-manager/templates/login.html b/steam-gift-manager/templates/login.html
index 0c0ccb7..98e1882 100644
--- a/steam-gift-manager/templates/login.html
+++ b/steam-gift-manager/templates/login.html
@@ -2,7 +2,7 @@
 {% block content %}
 <div class="row justify-content-center">
   <div class="col-md-6 col-lg-4">
-    <h1 class="mb-4">{{ _('Login') }}</h1>
+    <h1 class="mb-4 text-center">{{ _('Login') }}</h1>
     <form method="POST" aria-label="{{ _('Login form') }}" autocomplete="on">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
       <div class="mb-3">
@@ -26,18 +26,26 @@
                autocomplete="current-password"
                aria-required="true">
       </div>
-      {% if error %}
+      <div class="mb-3 form-check">
+        <input type="checkbox" class="form-check-input" id="remember_me" name="remember_me" value="true">
+        <label class="form-check-label" for="remember_me">{{ _('Remember me') }}</label>
+      </div>
+      {# Flash messages are handled in base.html, so the specific error block here can be removed #}
+      {# {% if error %}
       <div class="alert alert-danger" role="alert">
         {{ error }}
       </div>
-      {% endif %}
-      <button type="submit" class="btn btn-primary w-100">{{ _('Login') }}</button>
+      {% endif %} #}
+
+      <button type="submit" class="btn btn-primary w-100 mb-3">{{ _('Login') }}</button>
     </form>
+
+    {% if config.REGISTRATION_ENABLED %}
     <div class="mt-3 text-center">
       <a href="{{ url_for('register') }}">{{ _('No account? Register here!') }}</a>
     </div>
+    {% endif %}
   </div>
 </div>
 {% endblock %}
 
-
diff --git a/steam-gift-manager/templates/redeem.html b/steam-gift-manager/templates/redeem.html
index 7a0e49c..2892a4c 100644
--- a/steam-gift-manager/templates/redeem.html
+++ b/steam-gift-manager/templates/redeem.html
@@ -17,9 +17,9 @@
                         <code class="fs-3">{{ game.steam_key }}</code>
                     </div>
                     <a href="{{ platform_link }}{{ game.steam_key }}" 
-                       class="btn btn-primary btn-lg mb-3"
-                       target="_blank">
-                        {{ _('Redeem now on') }} {% if game.steam_appid %}Steam{% else %}GOG{% endif %}
+                      class="btn btn-primary btn-lg mb-3"
+                      target="_blank">
+                        {{ _('Redeem now on') }} {{ platform_label }}
                     </a>
                     <div class="mt-4 text-muted">
                         <small>
@@ -41,9 +41,10 @@
 </div>
 <script>
 const totalDuration = {{ redeem_token.total_hours * 3600 * 1000 }};  // Gesamtdauer in Millisekunden
-const expires = {{ (redeem_token.expires.timestamp() * 1000) | int }};
+const expires = {{ expires_timestamp }};
 const countdownEl = document.getElementById('expiry-countdown');
 const progressBar = document.getElementById('expiry-bar');
+const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
 
 function formatTime(unit) {
     return unit < 10 ? `0${unit}` : unit;
diff --git a/steam-gift-manager/translations/de.json b/steam-gift-manager/translations/de.json
index 0f3b89d..171d981 100644
--- a/steam-gift-manager/translations/de.json
+++ b/steam-gift-manager/translations/de.json
@@ -1,71 +1,94 @@
 {
-  "": "",
+  "Access Forbidden": "Zugriff verweigert",
+  "Action": "Aktion",
   "Actions": "Aktionen",
-  "Active Redeem Link": "Aktiver Einlöse-Link",
+  "Add Game": "Spiel hinzufügen",
   "Add New Game": "Neues Spiel hinzufügen",
-  "Already have an account? Login!": "",
+  "Admin": "Admin",
+  "Already have an account? Login!": "Du hast schon ein Konto? Jetzt anmelden!",
+  "Audit Logs": "Prüfprotokolle",
+  "Back to Home": "Zurück zur Startseite",
   "Cancel": "Abbrechen",
   "Change Password": "Passwort ändern",
-  "Change password form": "",
-  "Changes saved!": "Änderungen gespeichert!",
+  "Change password form": "Passwort ändern Formular",
   "Confirm New Password": "Neues Passwort bestätigen",
-  "Confirm Password": "",
+  "Confirm Password": "Passwort bestätigen",
+  "Copied!": "Kopiert!",
+  "Copy": "Kopieren",
   "Cover": "Cover",
   "Created": "Erstellt",
+  "Current Deal": "Aktuelles Angebot",
   "Current Password": "Aktuelles Passwort",
-  "Current passwort is wrong": "Aktuelles Passwort ist falsch",
-  "Dark Mode": "Dunkler Modus",
-  "Edit Game": "Spiel bearbeiten",
-  "Error generating link": "Fehler beim Generieren des Links",
-  "Error: ": "Fehler: ",
-  "Expires at": "Ablaufdatum",
+  "Current Price": "Aktueller Preis",
+  "Delete": "Löschen",
+  "Details": "Details",
+  "Edit": "Bearbeiten",
+  "Redeem-Link": "Einlöse-Link",
+  "Error": "Fehler",
+  "Expires at": "Läuft ab am",
   "Export CSV": "CSV exportieren",
-  "Game Key": "Spiele-Key",
-  "Game Key Manager": "Game-Key-Verwaltung",
-  "Game List (without Keys)": "Spieleliste (ohne Keys)",
-  "Game added successfully!": "Spiel erfolgreich hinzugefügt!",
+  "Externe Daten": "Externe Daten",
+  "For GOG games: Enter the Steam AppID here to enable price tracking.": "Für GOG-Spiele: Gib hier die Steam AppID ein, um die Preisüberwachung zu aktivieren.",
+  "Game Description": "Spielbeschreibung",
+  "Game Key": "Spielschlüssel",
+  "Game Key Manager": "Game Key Manager",
   "Generate redeem link": "Einlöse-Link generieren",
   "Gifted": "Verschenkt",
+  "Hist. Low": "Historischer Tiefstpreis",
   "Import": "Importieren",
   "Import CSV": "CSV importieren",
   "Import Games": "Spiele importieren",
-  "Import error: %(error)s', error=str(e)), 'danger": "",
-  "Invalid credentials": "Ungültige Anmeldedaten",
-  "Key": "Key",
+  "Key": "Schlüssel",
+  "Link copied": "Link kopiert",
   "Login": "Anmelden",
-  "Login form": "",
+  "Login form": "Anmeldeformular",
   "Logout": "Abmelden",
   "My Games": "Meine Spiele",
   "Name": "Name",
   "New Password": "Neues Passwort",
-  "New Passwords are not matching": "Neue Passwörter stimmen nicht überein",
-  "No account? Register here!": "",
+  "Next": "Weiter",
+  "No account? Register here!": "Noch kein Konto? Hier registrieren!",
+  "No active redeem links": "Keine aktiven Einlöse-Links",
   "No games yet": "Der Kornspeicher ist leer, Sire!",
-  "No new registrations. They are deactivated!": "Keine neuen Registrierungen. Sie sind deaktiviert!",
-  "Not redeemed": "Nicht eingelöst",
   "Notes": "Notizen",
+  "Not redeemed": "Nicht eingelöst",
+  "Now": "Jetzt",
   "Password": "Passwort",
-  "Password changed successfully": "Passwort erfolgreich geändert",
-  "Please upload a valid CSV file.": "Bitte eine gültige CSV-Datei hochladen.",
+  "Platform": "Plattform",
+  "Previous": "Zurück",
+  "Price": "Preis",
   "Really delete?": "Wirklich löschen?",
   "Recipient": "Empfänger",
-  "Redeem by": "Einzulösen vor",
-  "Redeem link copied to clipboard!": "Einlöse-Link in die Zwischenablage kopiert!",
-  "Redeem now on": "Jetzt einlösen bei",
+  "Redeem by": "Einlösen bis",
   "Redeemed": "Eingelöst",
+  "Redeem now on": "Jetzt einlösen bei",
   "Register": "Registrieren",
-  "Registration form": "",
+  "Registration form": "Registrierungsformular",
+  "Registration is currently disabled.": "Registrierung ist derzeit deaktiviert.",
+  "Release Date": "Veröffentlichungsdatum",
+  "Remember me": "Angemeldet bleiben",
+  "Reset Password": "Passwort zurücksetzen",
   "Save": "Speichern",
-  "Search": "Suche",
-  "Search games": "",
+  "Search": "Suchen",
+  "Search games": "Spiele suchen",
   "Select CSV file": "CSV-Datei auswählen",
   "Shop": "Shop",
   "Shop URL": "Shop-URL",
+  "Sorry, you are not allowed to access this page.": "Du bist nicht berechtigt, diese Seite zu betreten.",
+  "Spiel bearbeiten": "Spiel bearbeiten",
   "Status": "Status",
-  "Steam AppID (optional)": "Steam-AppID (optional)",
-  "Steam Key already exists!": "Steam-Key existiert bereits!",
+  "Steam AppID": "Steam AppID",
+  "Steam AppID (optional)": "Steam AppID (optional)",
+  "Steam Key": "Steam-Schlüssel",
   "This page will expire in": "Diese Seite läuft ab in",
+  "Timestamp": "Zeitstempel",
+  "Unknown error": "Unbekannter Fehler",
+  "Update Data": "Daten aktualisieren",
+  "User": "Benutzer",
+  "User Management": "Benutzerverwaltung",
   "Username": "Benutzername",
-  "Username already exists": "Benutzername existiert bereits",
-  "Your Key:": "Dein Key:"
+  "Release Date:": "Veröffentlichung:",
+  "View Details": "Details anzeigen",
+  "View on IsThereAnyDeal": "Auf IsThereAnyDeal ansehen",
+  "Your Key:": "Dein Schlüssel:"
 }
diff --git a/steam-gift-manager/translations/en.json b/steam-gift-manager/translations/en.json
index 243f316..a0ae9a5 100644
--- a/steam-gift-manager/translations/en.json
+++ b/steam-gift-manager/translations/en.json
@@ -1,72 +1,94 @@
 {
-  "": "",
+  "Access Forbidden": "",
+  "Action": "",
   "Actions": "",
-  "Active Redeem Link": "",
+  "Add Game": "",
   "Add New Game": "",
+  "Admin": "",
   "Already have an account? Login!": "",
+  "Audit Logs": "",
+  "Back to Home": "",
   "Cancel": "",
   "Change Password": "",
   "Change password form": "",
-  "Changes saved!": "",
   "Confirm New Password": "",
   "Confirm Password": "",
+  "Copied!": "",
+  "Copy": "",
   "Cover": "",
   "Created": "",
+  "Current Deal": "",
   "Current Password": "",
-  "Current passwort is wrong": "",
-  "Dark Mode": "",
-  "Edit Game": "",
-  "Error: ": "",
-  "Error generating link": "",
+  "Current Price": "",
+  "Delete": "",
+  "Details": "",
+  "Edit": "",
+  "Error": "",
   "Expires at": "",
   "Export CSV": "",
-  "Game added successfully!": "",
+  "External Data": "",
+  "For GOG games: Enter the Steam AppID here to enable price tracking.": "",
+  "Game Description": "",
   "Game Key": "",
   "Game Key Manager": "",
-  "Game List (without Keys)": "",
   "Generate redeem link": "",
   "Gifted": "",
+  "Hist. Low": "",
   "Import": "",
   "Import CSV": "",
-  "Import error: %(error)s', error=str(e)), 'danger": "",
   "Import Games": "",
-  "Invalid credentials": "",
   "Key": "",
+  "Link copied": "",
   "Login": "",
   "Login form": "",
   "Logout": "",
   "My Games": "",
   "Name": "",
-  "%(new)d new games imported, %(dup)d skipped duplicates', new=new_games, dup=duplicates), 'success": "",
   "New Password": "",
-  "New Passwords are not matching": "",
+  "Next": "",
   "No account? Register here!": "",
+  "No active redeem links": "",
   "No games yet": "",
-  "No new registrations. They are deactivated!": "",
   "Notes": "",
   "Not redeemed": "",
+  "Now": "",
   "Password": "",
-  "Password changed successfully": "",
-  "Please upload a valid CSV file.": "",
+  "Platform": "",
+  "Previous": "",
+  "Price": "",
   "Really delete?": "",
   "Recipient": "",
   "Redeem by": "",
   "Redeemed": "",
-  "Redeem link copied to clipboard!": "",
+  "Redeem-Link": "",
   "Redeem now on": "",
   "Register": "",
   "Registration form": "",
+  "Registration is currently disabled.": "",
+  "Release Date": "",
+  "Release Date:": "",
+  "Remember me": "",
+  "Reset Password": "",
   "Save": "",
   "Search": "",
   "Search games": "",
   "Select CSV file": "",
   "Shop": "",
   "Shop URL": "",
+  "Sorry, you are not allowed to access this page.": "",
+  "Spiel bearbeiten": "",
   "Status": "",
+  "Steam AppID": "",
   "Steam AppID (optional)": "",
-  "Steam Key already exists!": "",
+  "Steam Key": "",
   "This page will expire in": "",
+  "Timestamp": "",
+  "Unknown error": "",
+  "Update Data": "",
+  "User": "",
+  "User Management": "",
   "Username": "",
-  "Username already exists": "",
+  "View Details": "",
+  "View on IsThereAnyDeal": "",
   "Your Key:": ""
 }
diff --git a/translate.sh b/translate.sh
index 65b52bb..16c782e 100755
--- a/translate.sh
+++ b/translate.sh
@@ -5,37 +5,34 @@ APP_DIR="steam-gift-manager"
 TRANSLATION_DIR="$APP_DIR/translations"
 LANGS=("de" "en")
 
-# Prüfe jq
+# check jq
 if ! command -v jq &>/dev/null; then
   echo "❌ jq is required. Install with: sudo apt-get install jq"
   exit 1
 fi
 
-# 1. Lege JSON-Dateien an, falls sie fehlen
+echo -e "\n\033[1;32m✅ Extracting translations...\033[0m"
+
+# 1. create json files
+mkdir -p "$TRANSLATION_DIR"
 for lang in "${LANGS[@]}"; do
   file="$TRANSLATION_DIR/$lang.json"
-  if [ ! -f "$file" ]; then
-    echo "{}" > "$file"
-    echo "Created $file"
-  fi
+  [ -f "$file" ] || echo "{}" > "$file"
 done
 
-# 2. Extrahiere alle zu übersetzenden Strings
-STRINGS=$(grep -rhoP "_\(\s*['\"](.+?)['\"]\s*\)" \
+# 2. extract all strings
+STRINGS=$(grep -rhoP "_\(\s*['\"]((?:[^']|'[^'])*?)['\"]\s*[,)]" \
   "$APP_DIR/templates" "$APP_DIR/app.py" | \
-  sed -E "s/_\(\s*['\"](.+?)['\"]\s*\)/\1/" | sort | uniq)
+  sed -E "s/_\(\s*['\"](.+?)['\"]\s*[,)]/\1/" | sort | uniq)
 
-# 3. Ergänze neue Keys in die JSON-Dateien
+# 3. put da keys in da json
 for lang in "${LANGS[@]}"; do
   file="$TRANSLATION_DIR/$lang.json"
   tmp="$file.tmp"
-  cp "$file" "$tmp"
-  while IFS= read -r key; do
-    if ! jq -e --arg k "$key" 'has($k)' "$tmp" >/dev/null; then
-      jq --arg k "$key" '. + {($k): ""}' "$tmp" > "$tmp.new" && mv "$tmp.new" "$tmp"
-    fi
-  done <<< "$STRINGS"
+  jq --argjson keys "$(echo "$STRINGS" | jq -R . | jq -s .)" \
+    'reduce $keys[] as $k (.; .[$k] = (.[$k] // ""))' "$file" > "$tmp"
   mv "$tmp" "$file"
-  echo "Updated $file"
 done
-echo "✅ JSON translation files updated. Please enter your translations!"
+
+echo -e "\n\033[1;32m✅ Done! Translation keys added.\033[0m"
+
diff --git a/upgrade.sh b/upgrade.sh
index 54b874f..3e5ccb9 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -4,7 +4,7 @@ set -e
 # Set the working directory to the project directory
 cd "$(dirname "$0")/steam-gift-manager"
 
-# Setze FLASK_APP, falls nötig
+# set FLASK_APP, if needed
 export FLASK_APP=app.py
 
 # Initialize migrations, if not yet available