release v0.9.6

## Summary

### New Features
- Improved Hatari launch configuration with {cfg} placeholder validation in args template
- Enhanced path traversal protection in overlay directory browser
- Added support for more joystick configurations
- Improved demo setup with folders G-Z

### Fixes
- Fixed hatari config file path handling to use bundled config by default
- Improved favorites service with positional constructor for better initialization
- Fixed Modal display logic for Hatari launches
- Enhanced error handling and validation throughout
- Fixed various typos and code style issues
- Improved menu rendering with better handling of console dimensions

### Documentation
- Updated README with Hatari setup instructions
- Updated AGENTS.md with enhanced release process

.opencode/command/create-release.md

@@ -14,22 +14,27 @@ Create a release tag and push it to origin. The GitHub Action will automatically
    - Run `git status --porcelain`
    - If any output, warn the user and stop (commit first)
 
-3. Analyze changes since last release:
-   - Run `git log --oneline $(git describe --tags --abbrev=0 HEAD)..HEAD` to list all commits
+3. Find the previous tag dynamically:
+   - Run `git describe --tags --abbrev=0 HEAD` to find the most recent tag before HEAD
+   - If no previous tag exists (first release), note this and skip to step 5
+   - Report the previous tag to the user (e.g. "Previous tag found: v0.9.5")
+
+4. Analyze changes since the previous tag:
+   - Run `git log --oneline <PREV_TAG>..HEAD` to list all commits between the previous tag and HEAD
    - Read the changed files to understand context
    - Write a concise, well-structured release summary in English with:
      - A one-line overview
      - Bullet points for each notable change (features, fixes, breaking changes)
      - Keep it developer-friendly, no fluff
 
-4. Create release commit with the summary as message:
+5. Create release commit with the summary as message:
    - Run `git commit --allow-empty -m "release v$ARGUMENTS\n\n<summary>"`
    - The commit message IS the release notes — the GitHub Action picks it up automatically
 
-5. Create annotated tag on that commit:
+6. Create annotated tag on that commit:
    - Run `git tag -a v$ARGUMENTS -m "Release v$ARGUMENTS"`
 
-6. Push commit and tag:
+7. Push commit and tag:
    - Run `git push origin main --tags` (or current branch)
 
-7. Confirm success with the version number
+8. Confirm success with the version number

AGENTS.md

@@ -13,8 +13,8 @@ The implementation is split into focused modules (files) under the `src/MarcerGa
 - MarcerGameDvdLauncher/OverlayDirectoryBrowser.cs: Filesystem overlay and browsing logic — merges root and patch directories, enumerates folders and ZIPs, protects against path traversal and ensures navigation cannot leave the configured roots.
 - MarcerGameDvdLauncher/NavigationController.cs: Encapsulates selection, scrolling and relative-path navigation logic (cursor, page up/down, per-directory remembered selection/state); uses named scroll-fraction constants.
 - MarcerGameDvdLauncher/MenuRenderer.cs: Console rendering logic — efficient per-line redraw, double-buffering, configurable color selection via injected `AppColorConfig`, and the help box overlay.
-- MarcerGameDvdLauncher/InputController.cs: Handles key events (arrow keys, Enter, Backspace, PageUp/Down, `*`, `?`, ESC) and the associated navigation/drawing logic; owns `ReloadGameEntries` and the virtual `Favorites` folder integration.
-- MarcerGameDvdLauncher/HatariLauncher.cs: Responsible for validating the Hatari executable and starting Hatari with the configured argument template (replaces `{cfg}` and `{zip}`).
+- MarcerGameDvdLauncher/InputController.cs: Handles key events (arrow keys, Enter, Backspace, PageUp/Down, `*`, `?`, ESC, RightArrow) and the associated navigation/drawing logic; owns `ReloadGameEntries` and the virtual `Favorites` folder integration.
+- MarcerGameDvdLauncher/HatariLauncher.cs: Responsible for validating the Hatari executable and starting Hatari with the configured argument template (replaces `{cfg}` and `{zip}`). Exposes `DefaultConfigFile` constant (`MarcerGameDvd-Hatari.cfg`); when `Hatari.ConfigFile` is empty in `launcher.config.json`, the bundled config from the executable directory is used automatically.
 - MarcerGameDvdLauncher/FavoritesService.cs: Manages the favorites/bookmark system — toggling favorites on ZIPs, persisting them to `favorites.txt` (via `DefaultFileName` constant), and providing the virtual `Favorites` folder view (via `FavoritesRootName` constant).
 - MarcerGameDvdLauncher/UIErrorService.cs: Centralized UI error presentation using the console message helper.
 
@@ -71,6 +71,7 @@ The console launcher is meant for browsing a games directory and can launch ZIP
 
 ### Launching a Game
 - If Enter is pressed on a ZIP, Hatari is called with the configured executable, config file, and the full path to the ZIP file as arguments.
+- `Hatari.ConfigFile` is optional. When empty, the bundled `MarcerGameDvd-Hatari.cfg` (shipped with the launcher) is used automatically.
 
 ### Error Handling & Edge Cases
 - Paths with special characters or spaces must work robustly.
@@ -79,6 +80,7 @@ The console launcher is meant for browsing a games directory and can launch ZIP
 - In the root directory, Backspace must have no effect (no error, do not leave the program).
 - Navigation (Backspace, Enter, etc.) must remain robust even for very deep or large directory trees.
   - Hatari.Executable is validated during startup: the path is resolved (relative to the EXE directory when applicable) and must point to an existing file. If validation fails the program must present a clear error and exit.
+  - `Hatari.ConfigFile` (if provided) is resolved relative to the EXE directory and validated. If empty, the bundled `MarcerGameDvd-Hatari.cfg` is used automatically.
 
 ### Miscellaneous
 - Build and start scripts (`scripts/build.cmd` / `scripts/build.sh` / `scripts/start.cmd` / `scripts/start.sh`) are present and must be used.

BUGS.md

@@ -0,0 +1,80 @@
+# Known Bugs & Issues
+
+## Critical Bugs
+
+### 1. ArgsTemplate `{cfg}` placeholder not handled when ConfigFile is empty
+**Location**: `HatariLauncher.cs:36`
+**Problem**: If `Hatari.ConfigFile` is empty string (allowed per config) but `ArgsTemplate` contains `{cfg}`, the replacement produces `-c "" --disk-a "path"` which Hatari may reject.
+**Fix**: Conditionally remove `-c "{cfg}"` when `_cfgPath` is empty, or validate template matches config.
+
+### 2. `MenuRenderer.RedrawEntry()` potential crash on console resize
+**Location**: `MenuRenderer.cs:67-98`
+**Problem**: If console resizes smaller since last draw, `row` parameter may exceed new `availableLines`. The `else` branch writes directly via `WriteConsoleLine` without bounds checking against actual console height, risking `ArgumentOutOfRangeException` on `Console.SetCursorPosition`.
+**Fix**: Validate `row < Console.WindowHeight` before writing, or clamp to valid range.
+
+## Medium Bugs
+
+### 3. `HatariLauncher` constructor doesn't validate `ArgsTemplate`
+**Location**: `HatariLauncher.cs:12-24`
+**Problem**: Constructor validates `exePath` existence but allows empty/null `argsTemplate`. `Launch()` will fail at runtime with empty string replace. Defense-in-depth validation missing.
+**Fix**: Add `if (string.IsNullOrWhiteSpace(argsTemplate) || !argsTemplate.Contains("{zip}")) throw ...;`
+
+### 4. ZIP launch doesn't validate file exists on disk
+**Location**: `InputController.cs:185-196`
+**Problem**: `PatchPath` or `RootPath` used directly without checking `File.Exists()`. Overlay logic should prevent this, but no defense-in-depth.
+**Fix**: Validate `File.Exists(zipToLaunch)` before calling `_hatariLauncher.Launch()`.
+
+## Documentation Inconsistencies
+
+### 5. `Hatari.ConfigFile` required status unclear
+**Location**: `README.md:96` vs `LauncherApp.cs:67-68`
+**Conflict**: README marks `Hatari.ConfigFile` as required (✅). Code allows empty string and only validates if non-empty. If template uses `{cfg}` but ConfigFile empty → broken args.
+**Resolution**: ConfigFile is now optional. When empty, the bundled `MarcerGameDvd-Hatari.cfg` (shipped in the release) is used automatically. README updated to reflect this. ✅ Fixed
+
+### 6. `RightArrow` key binding missing from AGENTS.md requirements
+**Location**: `AGENTS.md:57-58` vs `InputController.cs:172-173`
+**Conflict**: AGENTS.md lists only Arrow up/down, Enter, Backspace, ESC, PageUp/Down, `?`. Code also handles `ConsoleKey.RightArrow` as alias for Enter (open folder/launch ZIP). README correctly documents it.
+**Resolution**: Update AGENTS.md to include RightArrow.
+
+### 7. `ShowModalUntilReturnReleased` race condition on resize
+**Location**: `ProgramHelpers.cs:62-98`
+**Problem**: Captures `lastRow = AvailableLines` at start. If console resizes during the modal wait loop, the clear writes to stale row position.
+**Fix**: Re-read `AvailableLines` before clearing, or lock console during modal (not easily possible).
+
+## Code Quality / Minor
+
+### 8. `ProgramHelpers.ShowConsoleMessage` signature could use `params`
+**Location**: `ProgramHelpers.cs:110`
+**Current**: `public static void ShowConsoleMessage(string[] lines, ...)`
+**Called as**: `ShowConsoleMessage([...], ...)` (collection expression)
+**Suggestion**: Change to `params string[] lines` for more idiomatic usage.
+
+### 9. `OverlayDirectoryBrowser` patch path computation order
+**Location**: `OverlayDirectoryBrowser.cs:47-50`
+**Observation**: Path traversal protection (`IsSubPathOf`) runs after `Path.Combine` but before `Directory.Exists`. Logic appears correct, but worth verifying with `rel` containing `..` when patch layer enabled.
+
+---
+
+## Fixed / Non-Issues (Verified)
+
+| Item | Status | Notes |
+|------|--------|-------|
+| `demo.sh` location | ✅ OK | Exists at repo root, README link correct |
+| Magic strings centralized | ✅ Done | `FavoritesRootName`, `DefaultFileName`, `DefaultTitle` |
+| Scroll fractions as constants | ✅ Done | `BottomScrollFraction`, `TopScrollFraction` |
+| `AvailableLines` helper | ✅ Done | `ProgramHelpers.AvailableLines` |
+| Colors configurable | ✅ Done | `Colors` section in config |
+| Win32 constants documented | ✅ Done | Marked "intentionally hardcoded" |
+| `Hatari.ConfigFile` optional with bundled fallback | ✅ Done | Empty ConfigFile falls back to bundled `MarcerGameDvd-Hatari.cfg` |
+| `FavoritesService.Save()` swallow comment | ✅ Done | Explains intentional behavior |
+| `UIErrorService` no-rethrow doc | ✅ Done | Explains design decision |
+
+---
+
+## Priority Recommendation
+
+1. **Fix #1 (ArgsTemplate `{cfg}`)** - ✅ Fixed: empty ConfigFile now falls back to bundled config
+2. **Fix #2 (RedrawEntry bounds)** - Potential crash on resize
+3. **Fix #3 (HatariLauncher validation)** - ✅ Done (per BUGS.md Fixed table)
+4. **Fix #4 (ZIP path validation)** - User-facing robustness
+5. **Sync #5 & #6 (docs)** - ✅ Done: ConfigFile documented as optional with fallback

README.md

@@ -46,9 +46,33 @@ Download the ZIP for your platform from the [Releases](https://github.com/anomal
 ### 💻 System Requirements
 
 - **.NET Runtime 10** or later ([download](https://dotnet.microsoft.com/download/dotnet/10.0))
-- **Hatari Emulator** with a working configuration file
-  - Windows: native Hatari
-  - Linux / macOS: Hatari via Wine or native build
+- **Hatari Emulator** (Windows native, or Linux/macOS via Wine or native build) — a Hatari configuration file (`MarcerGameDvd-Hatari.cfg`) is bundled with the launcher and used automatically when `Hatari.ConfigFile` is empty.
+- **TOS 1.04** ROM image (`TOS.IMG`) — required by Hatari to boot the Atari ST system.
+
+### 🕹️ Setting Up Hatari
+
+Before using the launcher, you need to install Hatari and provide a TOS ROM:
+
+1. **Download Hatari** from the official site: [https://hatari.tuxfamily.org/download.html](https://hatari.tuxfamily.org/download.html)
+   - **Windows:** Download and extract the latest Windows binary.
+   - **Linux:** Install via your package manager (e.g. `sudo apt install hatari`) or build from source.
+   - **macOS:** Download the macOS build or install via Homebrew: `brew install hatari`.
+
+2. **Get TOS 1.04** (also known as TOS UK or TOS 1.04):
+   - TOS is copyrighted Atari ROM software — you must own a legal copy.
+   - Place the ROM file as `TOS.IMG` in the same directory as the launcher executable (or the Hatari working directory).
+   - The bundled `MarcerGameDvd-Hatari.cfg` is preconfigured to look for `TOS.IMG` in the current directory.
+
+3. **Configure the path** in `launcher.config.json`:
+   ```json
+   "Hatari": {
+     "Executable": "C:\\Tools\\hatari\\hatari.exe",
+     "ConfigFile": "",
+     "ArgsTemplate": "-c \"{cfg}\" --disk-a \"{zip}\""
+   }
+   ```
+   - Set `Hatari.Executable` to the full path of your `hatari` (or `hatari.exe`) binary.
+   - Leave `Hatari.ConfigFile` empty to use the bundled configuration automatically.
 
 ### ⚡ Quick Start
 
@@ -71,7 +95,7 @@ The launcher reads `launcher.config.json` from the same directory as the executa
   "PatchDirectory": "C:\\Games\\Hatari\\PATCH",
   "Hatari": {
     "Executable": "C:\\Tools\\hatari\\hatari.exe",
-    "ConfigFile": "C:\\Tools\\hatari\\hatari-st.cfg",
+    "ConfigFile": "",
     "ArgsTemplate": "-c \"{cfg}\" --disk-a \"{zip}\""
   },
   "Colors": {
@@ -93,7 +117,7 @@ The launcher reads `launcher.config.json` from the same directory as the executa
 | `RootDirectory` | ✅ | Game root folder. Navigation never leaves this directory. |
 | `PatchDirectory` | ❌ | Optional overlay/patch directory merged at runtime. |
 | `Hatari.Executable` | ✅ | Path to the Hatari executable. Validated at startup. |
-| `Hatari.ConfigFile` | ✅ | Path to the Hatari configuration file. |
+| `Hatari.ConfigFile` | ❌ | Path to a Hatari configuration file. If empty, the bundled `MarcerGameDvd-Hatari.cfg` (shipped with the launcher) is used automatically. |
 | `Hatari.ArgsTemplate` | ✅ | Argument template. Must contain `{zip}`, optionally `{cfg}`. |
 | `Colors` | ❌ | Optional color overrides. See [Color Scheme](#-color-scheme) below. Missing or invalid values fall back to defaults. |
 

demo.sh

@@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 DEMO_DIR="$SCRIPT_DIR/.demo"
 ROOT_DIR="$DEMO_DIR/root"
 PATCH_DIR="$DEMO_DIR/patch"
-CONFIG_FILE="$SCRIPT_DIR/launcher.config.json"
+CONFIG_FILE="$DEMO_DIR/launcher.config.json"
 
 # --- Step 1: Build ---
 echo "=== Building MarcerGameDvdLauncher ==="
@@ -83,6 +83,11 @@ fake_zip "$ROOT_DIR/E/Racing/Pole Position.zip"
 fake_zip "$ROOT_DIR/E/Racing/Out Run.zip"
 fake_zip "$ROOT_DIR/E/Racing/Daytona USA.zip"
 
+# === Folders G-Z: empty placeholder folders ===
+for letter in {G..Z}; do
+    mkdir -p "$ROOT_DIR/$letter"
+done
+
 # --- PATCH layer (overlay/additions) ---
 echo "Creating patch layer..."
 
@@ -160,7 +165,7 @@ echo "=== Writing launcher.config.json ==="
 HATARI_FAKE="$DEMO_DIR/hatari.exe"
 cat > "$HATARI_FAKE" <<'HATEXEC'
 #!/bin/bash
-echo "[DEMO] Hatari would launch with: $@"
+echo "[DEMO] Hatari would launch with: $0 $@"
 HATEXEC
 chmod +x "$HATARI_FAKE"
 
@@ -171,7 +176,7 @@ cat > "$CONFIG_FILE" <<EOF
   "Hatari": {
     "Executable": "$HATARI_FAKE",
     "ConfigFile": "",
-    "ArgsTemplate": "{zip}"
+    "ArgsTemplate": "-c \"{cfg}\" --disk-a \"{zip}\""
   }
 }
 EOF

src/MarcerGameDvdLauncher/FavoritesService.cs

@@ -4,7 +4,7 @@
 namespace MarcerGameDvdLauncher
 {
     // Manages loading, saving and querying favorite ZIP paths.
-    public class FavoritesService
+    public class FavoritesService(string filePath)
     {
         // Virtual folder name displayed at the root when favorites exist.
         // Not configurable — fixed UI element.
@@ -14,15 +14,10 @@ namespace MarcerGameDvdLauncher
         // Not configurable — fixed persistence file.
         public const string DefaultFileName = "favorites.txt";
 
-        private readonly string _filePath;
+        private readonly string _filePath = filePath ?? throw new ArgumentNullException(nameof(filePath));
         // Use a SortedSet so favorites are kept in sorted order in memory.
         private SortedSet<string> _favorites = new(StringComparer.OrdinalIgnoreCase);
 
-        public FavoritesService(string filePath)
-        {
-            _filePath = filePath ?? throw new ArgumentNullException(nameof(filePath));
-        }
-
         // Load favorites from disk (no-op if file missing)
         public void Load()
         {
@@ -31,7 +26,7 @@ namespace MarcerGameDvdLauncher
             var lines = File.ReadAllLines(_filePath, System.Text.Encoding.UTF8);
             foreach (var l in lines)
             {
-                var t = l?.Trim();
+                var t = l.Trim();
                 if (string.IsNullOrEmpty(t)) continue;
                 try
                 {
@@ -71,14 +66,13 @@ namespace MarcerGameDvdLauncher
             if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullException(nameof(path));
             var full = Path.GetFullPath(path);
             bool added;
-            if (_favorites.Contains(full))
+            if (!_favorites.Add(full))
             {
                 _favorites.Remove(full);
                 added = false;
             }
             else
             {
-                _favorites.Add(full);
                 added = true;
             }
             Save();

src/MarcerGameDvdLauncher/HatariLauncher.cs

@@ -5,6 +5,11 @@ namespace MarcerGameDvdLauncher
 {
     public class HatariLauncher
     {
+        // The Hatari configuration file that is shipped with the launcher.
+        // When Hatari.ConfigFile is not set in launcher.config.json, this file
+        // (resolved relative to the executable directory) is used automatically.
+        private const string DEFAULT_CONFIG_FILE = "MarcerGameDvd-Hatari.cfg";
+
         private readonly string _exePath;
         private readonly string _cfgPath;
         private readonly string _argsTemplate;
@@ -18,6 +23,12 @@ namespace MarcerGameDvdLauncher
             if (!File.Exists(exePath))
                 throw new ArgumentException($"Hatari executable not found: {exePath}", nameof(exePath));
 
+            // Validate argsTemplate
+            if (string.IsNullOrWhiteSpace(argsTemplate) || !argsTemplate.Contains("{zip}"))
+                throw new ArgumentException("Hatari.ArgsTemplate must contain the {zip} placeholder.", nameof(argsTemplate));
+            if (string.IsNullOrWhiteSpace(argsTemplate) || !argsTemplate.Contains("{cfg}"))
+                throw new ArgumentException("Hatari.ArgsTemplate must contain the {cfg} placeholder.", nameof(argsTemplate));
+
             _exePath = exePath;
             _cfgPath = cfgPath;
             _argsTemplate = argsTemplate;
@@ -33,20 +44,21 @@ namespace MarcerGameDvdLauncher
                 throw new ArgumentException("ZIP archive path must not be empty.", nameof(zipFilePath));
             try
             {
-                string args = _argsTemplate.Replace("{cfg}", _cfgPath).Replace("{zip}", zipFilePath);
+                var args = _argsTemplate;
+                args = args.Replace("{cfg}", !string.IsNullOrWhiteSpace(_cfgPath) ? _cfgPath : Path.Combine(Directory.GetCurrentDirectory(),DEFAULT_CONFIG_FILE));
+                args = args.Replace("{zip}", zipFilePath);
 
                 var psi = new System.Diagnostics.ProcessStartInfo
                 {
                     FileName = _exePath,
                     Arguments = args,
                     UseShellExecute = false,
-                    WorkingDirectory = Path.GetDirectoryName(_exePath) ?? string.Empty
+                    WorkingDirectory = Directory.GetCurrentDirectory()
                 };
-                System.Diagnostics.Process.Start(psi);
-                // Show a modal indicating the emulator was started and wait until
-                // the user releases the Return key before clearing the modal. This
-                // prevents accidental key repeats from triggering other actions.
-                ProgramHelpers.ShowModalUntilReturnReleased("Hatari started. Release Return to continue...");
+                var process = System.Diagnostics.Process.Start(psi);
+                // Show a modal indicating the emulator is running and wait until
+                // the process has exited before clearing the modal.
+                ProgramHelpers.ShowModalUntilProcessExited(process, "Hatari is running...");
             }
             catch (Exception ex)
             {

src/MarcerGameDvdLauncher/InputController.cs

@@ -1,11 +1,6 @@
 // Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
 // Licensed under the MIT License. See LICENSE file in project root for details.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-
 namespace MarcerGameDvdLauncher
 {
     /// <summary>
@@ -13,42 +8,25 @@ namespace MarcerGameDvdLauncher
     /// Extracted from AppHost so that LauncherApp stays focused on lifecycle management.
     /// No functional change - all key-handling behaviour is preserved exactly.
     /// </summary>
-    internal class InputController
+    internal class InputController(
+        OverlayDirectoryBrowser directoryBrowser,
+        MenuRenderer menuRenderer,
+        NavigationController navigationController,
+        HatariLauncher hatariLauncher,
+        FavoritesService favoritesService,
+        UIErrorService errorService)
     {
-        private readonly OverlayDirectoryBrowser _directoryBrowser;
-        private readonly MenuRenderer _menuRenderer;
-        private readonly NavigationController _navigationController;
-        private readonly HatariLauncher _hatariLauncher;
-        private readonly FavoritesService _favoritesService;
-        private readonly UIErrorService _errorService;
-
         private List<GameEntry> _gameEntries = new();
 
-        public IReadOnlyList<GameEntry> GameEntries => _gameEntries;
-
-        public InputController(OverlayDirectoryBrowser directoryBrowser, MenuRenderer menuRenderer,
-            NavigationController navigationController, HatariLauncher hatariLauncher,
-            FavoritesService favoritesService, UIErrorService errorService)
-        {
-            _directoryBrowser = directoryBrowser;
-            _menuRenderer = menuRenderer;
-            _navigationController = navigationController;
-            _hatariLauncher = hatariLauncher;
-            _favoritesService = favoritesService;
-            _errorService = errorService;
-        }
-
         private bool IsFavorite(GameEntry e)
         {
-            return e.Kind == EntryKind.Zip
-                ? _favoritesService.IsFavorite(e.InPatch ? e.PatchPath : e.RootPath)
-                : false;
+            return e.Kind == EntryKind.Zip && favoritesService.IsFavorite(e.InPatch ? e.PatchPath : e.RootPath);
         }
 
         private void DrawMenu(int availableLines)
         {
-            _menuRenderer.DrawMenu(_gameEntries, _navigationController.ScrollOffset,
-                _navigationController.SelectedIndex, availableLines, IsFavorite);
+            menuRenderer.DrawMenu(_gameEntries, navigationController.ScrollOffset,
+                navigationController.SelectedIndex, availableLines, IsFavorite);
         }
 
         /// <summary>
@@ -56,7 +34,7 @@ namespace MarcerGameDvdLauncher
         /// </summary>
         public void RefreshView(int availableLines)
         {
-            _navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
+            navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
             DrawMenu(availableLines);
         }
 
@@ -68,9 +46,9 @@ namespace MarcerGameDvdLauncher
             try
             {
                 // If we are at the virtual Favorites folder, produce the flat list from the favorites service
-                if (string.Equals(_navigationController.CurrentRelativePath, FavoritesService.FavoritesRootName, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(navigationController.CurrentRelativePath, FavoritesService.FavoritesRootName, StringComparison.OrdinalIgnoreCase))
                 {
-                    var favs = _favoritesService.GetAll();
+                    var favs = favoritesService.GetAll();
                     _gameEntries = new List<GameEntry>();
                     foreach (var p in favs)
                     {
@@ -85,15 +63,15 @@ namespace MarcerGameDvdLauncher
                             IsVirtual = false
                         });
                     }
-                    _navigationController.SetEntriesCount(_gameEntries.Count);
+                    navigationController.SetEntriesCount(_gameEntries.Count);
                     return;
                 }
 
                 // Otherwise use the overlay directory browser for normal folders
-                _gameEntries = _directoryBrowser.GetEntries(_navigationController.CurrentRelativePath);
+                _gameEntries = directoryBrowser.GetEntries(navigationController.CurrentRelativePath);
 
                 // If we are at the root and there are favorites, prepend a virtual Favorites folder
-                if (string.IsNullOrEmpty(_navigationController.CurrentRelativePath) && _favoritesService.HasFavorites())
+                if (string.IsNullOrEmpty(navigationController.CurrentRelativePath) && favoritesService.HasFavorites())
                 {
                     var virtualEntry = new GameEntry
                     {
@@ -108,14 +86,14 @@ namespace MarcerGameDvdLauncher
                     _gameEntries.Insert(0, virtualEntry);
                 }
 
-                _navigationController.SetEntriesCount(_gameEntries.Count);
+                navigationController.SetEntriesCount(_gameEntries.Count);
             }
             catch (Exception ex)
             {
                 // Show the error to the user and continue with an empty list
-                _errorService.ShowError(ex.Message);
+                errorService.ShowError(ex.Message);
                 _gameEntries = new List<GameEntry>();
-                _navigationController.SetEntriesCount(0);
+                navigationController.SetEntriesCount(0);
             }
         }
 
@@ -126,9 +104,9 @@ namespace MarcerGameDvdLauncher
         {
             if (key.KeyChar == '?')
             {
-                _menuRenderer.ShowHelpBox(availableLines);
+                menuRenderer.ShowHelpBox(availableLines);
                 Console.ReadKey(intercept: true);
-                _menuRenderer.InvalidateCache();
+                menuRenderer.InvalidateCache();
                 DrawMenu(availableLines);
                 ProgramHelpers.FlushInputBuffer();
                 return false;
@@ -138,16 +116,16 @@ namespace MarcerGameDvdLauncher
             {
                 case ConsoleKey.UpArrow:
                     {
-                        int previousSelectedIndex = _navigationController.SelectedIndex;
-                        bool didScroll = _navigationController.MoveUp(_gameEntries, availableLines);
+                        int previousSelectedIndex = navigationController.SelectedIndex;
+                        bool didScroll = navigationController.MoveUp(_gameEntries, availableLines);
                         if (didScroll)
                         {
                             DrawMenu(availableLines);
                         }
                         else
                         {
-                            _menuRenderer.RedrawEntry(_gameEntries, previousSelectedIndex, previousSelectedIndex - _navigationController.ScrollOffset, false, availableLines, IsFavorite);
-                            _menuRenderer.RedrawEntry(_gameEntries, _navigationController.SelectedIndex, _navigationController.SelectedIndex - _navigationController.ScrollOffset, true, availableLines, IsFavorite);
+                            menuRenderer.RedrawEntry(_gameEntries, previousSelectedIndex, previousSelectedIndex - navigationController.ScrollOffset, false, availableLines, IsFavorite);
+                            menuRenderer.RedrawEntry(_gameEntries, navigationController.SelectedIndex, navigationController.SelectedIndex - navigationController.ScrollOffset, true, availableLines, IsFavorite);
                         }
                         // flush input to avoid key repeat
                         ProgramHelpers.FlushInputBuffer();
@@ -155,16 +133,16 @@ namespace MarcerGameDvdLauncher
                     break;
                 case ConsoleKey.DownArrow:
                     {
-                        int previousSelectedIndex = _navigationController.SelectedIndex;
-                        bool didScroll = _navigationController.MoveDown(_gameEntries, availableLines);
+                        int previousSelectedIndex = navigationController.SelectedIndex;
+                        bool didScroll = navigationController.MoveDown(_gameEntries, availableLines);
                         if (didScroll)
                         {
                             DrawMenu(availableLines);
                         }
                         else
                         {
-                            _menuRenderer.RedrawEntry(_gameEntries, previousSelectedIndex, previousSelectedIndex - _navigationController.ScrollOffset, false, availableLines, IsFavorite);
-                            _menuRenderer.RedrawEntry(_gameEntries, _navigationController.SelectedIndex, _navigationController.SelectedIndex - _navigationController.ScrollOffset, true, availableLines, IsFavorite);
+                            menuRenderer.RedrawEntry(_gameEntries, previousSelectedIndex, previousSelectedIndex - navigationController.ScrollOffset, false, availableLines, IsFavorite);
+                            menuRenderer.RedrawEntry(_gameEntries, navigationController.SelectedIndex, navigationController.SelectedIndex - navigationController.ScrollOffset, true, availableLines, IsFavorite);
                         }
                         ProgramHelpers.FlushInputBuffer();
                     }
@@ -172,27 +150,29 @@ namespace MarcerGameDvdLauncher
                 case ConsoleKey.Enter:
                 case ConsoleKey.RightArrow:
                     {
-                        var oldRelativePath = _navigationController.CurrentRelativePath;
-                        var isDirectory = _gameEntries.Count > 0 && _gameEntries[_navigationController.SelectedIndex].Kind == EntryKind.Directory;
-                        _navigationController.HandleEnter(_gameEntries);
-                        if (isDirectory && oldRelativePath != _navigationController.CurrentRelativePath)
+                        var oldRelativePath = navigationController.CurrentRelativePath;
+                        var isDirectory = _gameEntries.Count > 0 && _gameEntries[navigationController.SelectedIndex].Kind == EntryKind.Directory;
+                        navigationController.HandleEnter(_gameEntries);
+                        if (isDirectory && oldRelativePath != navigationController.CurrentRelativePath)
                         {
                             ReloadGameEntries();
-                            _navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
+                            navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
                         }
                         DrawMenu(availableLines);
                         // Only start a ZIP if NOT switching to a directory
-                        if (!isDirectory && _gameEntries.Count > 0 && _gameEntries[_navigationController.SelectedIndex].Kind == EntryKind.Zip)
+                        if (!isDirectory && _gameEntries.Count > 0 && _gameEntries[navigationController.SelectedIndex].Kind == EntryKind.Zip)
                         {
-                            string zipToLaunch = _gameEntries[_navigationController.SelectedIndex].InPatch ? _gameEntries[_navigationController.SelectedIndex].PatchPath : _gameEntries[_navigationController.SelectedIndex].RootPath;
+                            string zipToLaunch = _gameEntries[navigationController.SelectedIndex].InPatch ? _gameEntries[navigationController.SelectedIndex].PatchPath : _gameEntries[navigationController.SelectedIndex].RootPath;
                             try
                             {
-                                _hatariLauncher.Launch(zipToLaunch);
+                                hatariLauncher.Launch(zipToLaunch);
                             }
                             catch (Exception ex)
                             {
-                                _errorService.ShowError(ex.Message);
+                                errorService.ShowError(ex.Message);
                             }
+                            // Redraw menu after Hatari has exited
+                            DrawMenu(availableLines);
                         }
                         // flush input to avoid leftover key events after an enter/navigation
                         ProgramHelpers.FlushInputBuffer();
@@ -201,23 +181,23 @@ namespace MarcerGameDvdLauncher
                 case ConsoleKey.Backspace:
                 case ConsoleKey.LeftArrow:
                     {
-                        _navigationController.GoUpDirectory();
+                        navigationController.GoUpDirectory();
                         ReloadGameEntries();
-                        _navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
+                        navigationController.UpdateScrollOffset(_gameEntries.Count, availableLines);
                         DrawMenu(availableLines);
                         ProgramHelpers.FlushInputBuffer();
                     }
                     break;
                 case ConsoleKey.PageDown:
                     {
-                        _navigationController.PageDown(_gameEntries, availableLines);
+                        navigationController.PageDown(_gameEntries, availableLines);
                         DrawMenu(availableLines);
                         ProgramHelpers.FlushInputBuffer();
                     }
                     break;
                 case ConsoleKey.PageUp:
                     {
-                        _navigationController.PageUp(_gameEntries, availableLines);
+                        navigationController.PageUp(_gameEntries, availableLines);
                         DrawMenu(availableLines);
                         ProgramHelpers.FlushInputBuffer();
                     }
@@ -226,17 +206,17 @@ namespace MarcerGameDvdLauncher
                 case ConsoleKey.Oem8:
                     {
                         // Toggle favorite for selected ZIP (handles numpad * and some layouts)
-                        if (_gameEntries.Count > 0 && _gameEntries[_navigationController.SelectedIndex].Kind == EntryKind.Zip)
+                        if (_gameEntries.Count > 0 && _gameEntries[navigationController.SelectedIndex].Kind == EntryKind.Zip)
                         {
-                            var ge = _gameEntries[_navigationController.SelectedIndex];
+                            var ge = _gameEntries[navigationController.SelectedIndex];
                             string path = ge.InPatch ? ge.PatchPath : ge.RootPath;
                             try
                             {
-                                _favoritesService.Toggle(path);
+                                favoritesService.Toggle(path);
                             }
                             catch (Exception ex)
                             {
-                                _errorService.ShowError("Failed to toggle favorite: " + ex.Message);
+                                errorService.ShowError("Failed to toggle favorite: " + ex.Message);
                             }
                             // Redraw the whole menu so the '*' marker updates immediately
                             DrawMenu(availableLines);

src/MarcerGameDvdLauncher/LauncherApp.cs

@@ -63,9 +63,11 @@ namespace MarcerGameDvdLauncher
             if (!File.Exists(cfg.Hatari.Executable))
                 throw new InvalidOperationException($"Hatari executable not found: {cfg.Hatari.Executable}");
 
-            // Also validate the Hatari config file (if provided)
-            if (!string.IsNullOrWhiteSpace(cfg.Hatari.ConfigFile) && !File.Exists(cfg.Hatari.ConfigFile))
+            // Validate the Hatari config file (either user-specified or bundled fallback)
+            if (!string.IsNullOrEmpty(cfg.Hatari.ConfigFile) && !File.Exists(cfg.Hatari.ConfigFile))
                 throw new InvalidOperationException($"Hatari configuration file not found: {cfg.Hatari.ConfigFile}");
+            if (string.IsNullOrWhiteSpace(cfg.Hatari.ArgsTemplate) || !cfg.Hatari.ArgsTemplate.Contains("{cfg}"))
+                throw new InvalidOperationException("Hatari.ArgsTemplate must contain the {cfg} placeholder.");
             if (string.IsNullOrWhiteSpace(cfg.Hatari.ArgsTemplate) || !cfg.Hatari.ArgsTemplate.Contains("{zip}"))
                 throw new InvalidOperationException("Hatari.ArgsTemplate must contain the {zip} placeholder.");
 

src/MarcerGameDvdLauncher/MarcerGameDvd-Hatari.cfg

@@ -0,0 +1,339 @@
+[Log]
+sLogFileName = stderr
+sTraceFileName = stderr
+nTextLogLevel = 3
+nAlertDlgLogLevel = 1
+bConfirmQuit = TRUE
+bNatFeats = FALSE
+bConsoleWindow = FALSE
+
+[Debugger]
+nNumberBase = 10
+nSymbolLines = -1
+nMemdumpLines = -1
+nFindLines = -1
+nDisasmLines = -1
+nBacktraceLines = 0
+nExceptionDebugMask = 1073741830
+nDisasmOptions = 7
+nMemConvLocale = FALSE
+bDisasmUAE = TRUE
+nSymbolsAutoLoad = 1
+bMatchAllSymbols = FALSE
+
+[Screen]
+nMonitorType = 1
+nFrameSkips = 5
+bFullScreen = FALSE
+bKeepResolution = FALSE
+bResizable = FALSE
+bAllowOverscan = TRUE
+nSpec512Threshold = 1
+bAspectCorrect = TRUE
+bUseExtVdiResolutions = FALSE
+nVdiWidth = 1264
+nVdiHeight = 912
+nVdiColors = 1
+bMouseWarp = TRUE
+bShowStatusbar = TRUE
+bShowDriveLed = FALSE
+bCrop = FALSE
+bForceMax = FALSE
+nMaxWidth = 1280
+nMaxHeight = 1024
+nZoomFactor = 3
+bUseSdlRenderer = FALSE
+ScreenShotFormat = 2
+szScreenShotDir =
+bUseVsync = FALSE
+
+[Joystick0]
+nJoystickMode = 0
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+
+[Joystick1]
+nJoystickMode = 1
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+
+[Joystick2]
+nJoystickMode = 0
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+kButtonB = B
+kButtonC = C
+kButtonOption = O
+kButtonPause = P
+kButtonStar = +
+kButtonHash = #
+kButton0 = 0
+kButton1 = 1
+kButton2 = 2
+kButton3 = 3
+kButton4 = 4
+kButton5 = 5
+kButton6 = 6
+kButton7 = 7
+kButton8 = 8
+kButton9 = 9
+
+[Joystick3]
+nJoystickMode = 0
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+kButtonB =
+kButtonC =
+kButtonOption =
+kButtonPause =
+kButtonStar =
+kButtonHash =
+kButton0 =
+kButton1 =
+kButton2 =
+kButton3 =
+kButton4 =
+kButton5 =
+kButton6 =
+kButton7 =
+kButton8 =
+kButton9 =
+
+[Joystick4]
+nJoystickMode = 0
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+
+[Joystick5]
+nJoystickMode = 0
+bEnableAutoFire = FALSE
+bEnableJumpOnFire2 = TRUE
+nJoyId = 0
+nJoyBut1Index = 0
+nJoyBut2Index = 1
+nJoyBut3Index = 2
+kUp = Up
+kDown = Down
+kLeft = Left
+kRight = Right
+kFire = Right Ctrl
+
+[Keyboard]
+bFastForwardKeyRepeat = TRUE
+nKeymapType = 0
+nCountryCode = -1
+nKbdLayout = -1
+nLanguage = -1
+szMappingFileName =
+
+[KeyShortcutsWithMod]
+kOptions = O
+kFullScreen = F
+kBorders = B
+kMouseMode = M
+kColdReset = C
+kWarmReset = R
+kScreenShot = G
+kBossKey = I
+kCursorEmu = J
+kFastForward = X
+kRecAnim = A
+kRecSound = Y
+kSound = S
+kPause =
+kDebugger = Pause
+kQuit = Q
+kLoadMem = L
+kSaveMem = K
+kInsertDiskA = D
+kSwitchJoy0 = F1
+kSwitchJoy1 = F2
+kSwitchPadA = F3
+kSwitchPadB = F4
+
+[KeyShortcutsWithoutMod]
+kOptions = F12
+kFullScreen = F11
+kBorders =
+kMouseMode =
+kColdReset =
+kWarmReset =
+kScreenShot =
+kBossKey =
+kCursorEmu =
+kFastForward =
+kRecAnim =
+kRecSound =
+kSound =
+kPause = Pause
+kDebugger =
+kQuit =
+kLoadMem =
+kSaveMem =
+kInsertDiskA =
+kSwitchJoy0 =
+kSwitchJoy1 =
+kSwitchPadA =
+kSwitchPadB =
+
+[Sound]
+bEnableMicrophone = TRUE
+bEnableSound = TRUE
+bEnableSoundSync = FALSE
+nPlaybackFreq = 44100
+nSdlAudioBufferSize = 0
+szYMCaptureFileName = 
+YmVolumeMixing = 2
+
+[Memory]
+nMemorySize = 1024
+nTTRamSize = 28672
+bAutoSave = FALSE
+szMemoryCaptureFileName = 
+szAutoSaveFileName =
+
+[Floppy]
+bAutoInsertDiskB = FALSE
+FastFloppy = FALSE
+EnableDriveA = TRUE
+DriveA_NumberOfHeads = 2
+EnableDriveB = TRUE
+DriveB_NumberOfHeads = 2
+nWriteProtection = 0
+szDiskAZipPath =
+szDiskAFileName = 
+szDiskBZipPath =
+szDiskBFileName =
+szDiskImageDirectory =
+
+[HardDisk]
+nGemdosDrive = 0
+bBootFromHardDisk = FALSE
+bUseHardDiskDirectory = FALSE
+szHardDiskDirectory = R:
+nGemdosCase = 0
+nWriteProtection = 0
+bFilenameConversion = FALSE
+bGemdosHostTime = FALSE
+
+[ACSI]
+bUseDevice0 = FALSE
+sDeviceFile0 = 
+nBlockSize0 = 512
+nAcsiVersion0 = 1
+
+
+[SCSI]
+
+
+[IDE]
+
+
+[ROM]
+szTosImageFileName = TOS.IMG
+bPatchTos = TRUE
+szCartridgeImageFileName =
+
+[LILO]
+Args = root=/dev/ram video=atafb:vga16 load_ramdisk=1
+Kernel =
+Symbols =
+Ramdisk =
+HaltOnReboot = TRUE
+KernelToFastRam = TRUE
+RamdiskToFastRam = TRUE
+
+[RS232]
+bEnableRS232 = FALSE
+szOutFileName =
+szInFileName =
+EnableSccA = FALSE
+SccAOutFileName =
+SccAInFileName =
+EnableSccALan = FALSE
+SccALanOutFileName =
+SccALanInFileName =
+EnableSccB = FALSE
+SccBOutFileName =
+SccBInFileName =
+
+[Printer]
+bEnablePrinting = FALSE
+szPrintToFileName =
+
+[Midi]
+bEnableMidi = FALSE
+sMidiInFileName =
+sMidiOutFileName =
+sMidiInPortName = Off
+sMidiOutPortName = Off
+
+[System]
+nCpuLevel = 0
+nCpuFreq = 8
+bCompatibleCpu = TRUE
+nModelType = 0
+bBlitter = FALSE
+nDSPType = 0
+nRtcYear = 0
+bPatchTimerD = FALSE
+bFastBoot = FALSE
+bFastForward = FALSE
+bAddressSpace24 = TRUE
+bCycleExactCpu = TRUE
+bCpuDataCache = TRUE
+n_FPUType = 0
+bSoftFloatFPU = FALSE
+bMMU = TRUE
+VideoTiming = 3
+
+[Video]
+AviRecordVcodec = 2
+AviRecordFps = 0
+AviRecordFile = 
+

src/MarcerGameDvdLauncher/MarcerGameDvdLauncher.csproj

@@ -14,6 +14,9 @@
     <Content Include="launcher.config.example.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="MarcerGameDvd-Hatari.cfg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="../../LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>LICENSE</Link>

src/MarcerGameDvdLauncher/MenuRenderer.cs

@@ -3,7 +3,7 @@
 
 namespace MarcerGameDvdLauncher
 {
-    public class MenuRenderer
+    public class MenuRenderer(AppColorConfig? colors = null)
     {
         // Simple line-based double buffer to avoid full Clear() flicker.
         // cachedBuffer holds the last rendered text and colors for each visible row.
@@ -12,12 +12,7 @@ namespace MarcerGameDvdLauncher
         private int _cachedWidth = -1;
 
         // Color configuration (injected; defaults to built-in scheme if null)
-        private readonly AppColorConfig _colors;
-
-        public MenuRenderer(AppColorConfig? colors = null)
-        {
-            _colors = colors ?? new AppColorConfig();
-        }
+        private readonly AppColorConfig _colors = colors ?? new AppColorConfig();
 
         // availableLines is provided per-draw so the renderer adapts to console resizes
         public void DrawMenu(List<GameEntry> entries, int scrollOffset, int selectedIndex, int availableLines, Func<GameEntry, bool>? isFavorite = null)
@@ -93,9 +88,13 @@ namespace MarcerGameDvdLauncher
             else
             {
                 // out of cache bounds - attempt a direct write
+                // Validate row against current console height to prevent ArgumentOutOfRangeException
+                if (row < Console.WindowHeight)
+                {
                     WriteConsoleLine(row, newLine);
                 }
             }
+        }
 
         // Ensures the cached buffer has exactly availableLines entries and matches width.
         private void EnsureCache(int width, int availableLines)
@@ -136,54 +135,41 @@ namespace MarcerGameDvdLauncher
 
         // Renders a centered, bordered help box with key bindings inside the
         // available console area. The caller is responsible for waiting on a
-        // key and redrawing the menu afterwards.
+        // key and redrawing the menu afterward.
         public void ShowHelpBox(int availableLines)
         {
-            try
-            {
-                int width = Console.WindowWidth;
-                string[] helpLines = GetHelpLines();
-                int boxHeight = Math.Min(helpLines.Length + 2, Math.Max(3, availableLines));
-                int boxWidth = Math.Max(1, width);
-                int topRow = Math.Max(0, (availableLines - boxHeight) / 2);
+            var width = Console.WindowWidth;
+            var helpLines = GetHelpLines();
+            var boxHeight = Math.Min(helpLines.Length + 2, Math.Max(3, availableLines));
+            var boxWidth = Math.Max(1, width);
+            var topRow = Math.Max(0, (availableLines - boxHeight) / 2);
 
             Console.BackgroundColor = ConsoleColor.DarkGray;
             Console.ForegroundColor = ConsoleColor.White;
 
-                string topBorder = "+" + new string('-', Math.Max(0, boxWidth - 2)) + "+";
+            var topBorder = "+" + new string('-', Math.Max(0, boxWidth - 2)) + "+";
             Console.SetCursorPosition(0, topRow);
             Console.Write(topBorder);
 
-                for (int i = 0; i < boxHeight - 2; i++)
+            for (var i = 0; i < boxHeight - 2; i++)
             {
-                    int row = topRow + 1 + i;
-                    string content;
-                    if (i < helpLines.Length)
-                    {
-                        content = PadToWidth(helpLines[i], boxWidth - 2);
-                    }
-                    else
-                    {
-                        content = new string(' ', Math.Max(0, boxWidth - 2));
-                    }
+                var row = topRow + 1 + i;
+                var content = i < helpLines.Length
+                    ? PadToWidth(helpLines[i], boxWidth - 2)
+                    : new string(' ', Math.Max(0, boxWidth - 2));
                 Console.SetCursorPosition(0, row);
                 Console.Write("|" + content + "|");
             }
 
-                int bottomRow = topRow + boxHeight - 1;
+            var bottomRow = topRow + boxHeight - 1;
             if (bottomRow < Console.WindowHeight)
             {
-                    string bottomBorder = "+" + new string('-', Math.Max(0, boxWidth - 2)) + "+";
+                var bottomBorder = "+" + new string('-', Math.Max(0, boxWidth - 2)) + "+";
                 Console.SetCursorPosition(0, bottomRow);
                 Console.Write(bottomBorder);
             }
-
             Console.ResetColor();
         }
-            catch
-            {
-            }
-        }
 
         private static string[] GetHelpLines()
         {
@@ -231,7 +217,7 @@ namespace MarcerGameDvdLauncher
         {
             if (width <= 0) return string.Empty;
 
-            string label = GetLabel(e, isFavorite);
+            var label = GetLabel(e, isFavorite);
 
             // If the console width is smaller than the label, truncate the label
             if (width <= label.Length)
@@ -239,7 +225,7 @@ namespace MarcerGameDvdLauncher
                 return label.Substring(0, width);
             }
 
-            int maxNameLen = width - label.Length; // space left for name
+            var maxNameLen = width - label.Length; // space left for name
             string displayName;
             if (e.Name.Length <= maxNameLen)
             {
@@ -253,7 +239,7 @@ namespace MarcerGameDvdLauncher
                     displayName = e.Name.Substring(0, Math.Max(0, maxNameLen));
             }
 
-            int padding = Math.Max(0, width - label.Length - displayName.Length);
+            var padding = Math.Max(0, width - label.Length - displayName.Length);
             var result = label + displayName + new string(' ', padding);
             // Ensure exact width (defensive): truncate or pad if needed
             if (result.Length > width) return result.Substring(0, width);
@@ -269,7 +255,7 @@ namespace MarcerGameDvdLauncher
         {
             // Layer label (7 chars)
             string layer;
-            if (e.InRoot && e.InPatch) layer = "[BOTH] ";
+            if (e is {InRoot: true, InPatch: true}) layer = "[BOTH] ";
             else if (e.InPatch) layer = "[PTCH] ";
             else if (e.InRoot) layer = "[ROOT] ";
             else layer = "       ";
@@ -295,15 +281,15 @@ namespace MarcerGameDvdLauncher
 
             if (e.Kind == EntryKind.Directory)
             {
-                if (e.InRoot && e.InPatch) return _colors.FolderBoth;       // Both layers
-                if (e.InPatch && !e.InRoot) return _colors.FolderPatchOnly;  // Only patch
-                if (e.InRoot && !e.InPatch) return _colors.FolderRootOnly;   // Only root
+                if (e is {InRoot: true, InPatch: true}) return _colors.FolderBoth;       // Both layers
+                if (e is {InPatch: true, InRoot: false}) return _colors.FolderPatchOnly;  // Only patch
+                if (e is {InRoot: true, InPatch: false}) return _colors.FolderRootOnly;   // Only root
             }
             else if (e.Kind == EntryKind.Zip)
             {
-                if (e.InRoot && e.InPatch) return _colors.ZipBoth;           // Both layers
-                if (e.InRoot && !e.InPatch) return _colors.ZipRootOnly;     // Only root
-                if (e.InPatch && !e.InRoot) return _colors.ZipPatchOnly;     // Only patch
+                if (e is {InRoot: true, InPatch: true}) return _colors.ZipBoth;           // Both layers
+                if (e is { InRoot: true, InPatch: false }) return _colors.ZipRootOnly;     // Only root
+                if (e is {InPatch: true, InRoot: false}) return _colors.ZipPatchOnly;     // Only patch
             }
             return ConsoleColor.DarkGray;
         }

src/MarcerGameDvdLauncher/NavigationController.cs

@@ -8,11 +8,11 @@ namespace MarcerGameDvdLauncher
         // Scroll fractions: when the selection cursor reaches 2/3 of the visible window
         // height from the top, the list scrolls down; when it reaches 1/3, it scrolls up.
         // Not configurable — these ratios are the established navigation behaviour.
-        private const double BottomScrollFraction = 2.0 / 3.0;
-        private const double TopScrollFraction = 1.0 / 3.0;
+        private const double BOTTOM_SCROLL_FRACTION = 2.0 / 3.0;
+        private const double TOP_SCROLL_FRACTION = 1.0 / 3.0;
 
-        public int SelectedIndex { get; private set; } = 0;
-        public int ScrollOffset { get; private set; } = 0;
+        public int SelectedIndex { get; private set; }
+        public int ScrollOffset { get; private set; }
         public string CurrentRelativePath { get; private set; } = "";
         // Stores the last selection & scroll position for each directory
         private readonly Dictionary<string, (int sel, int scroll)> _lastSelections = new();
@@ -105,12 +105,12 @@ namespace MarcerGameDvdLauncher
             if (availableLines < 1) availableLines = 1;
             if (entryCount <= availableLines) { ScrollOffset = 0; return; }
             if (SelectedIndex == 0) { ScrollOffset = 0; return; }
-            int bottomScrollTrigger = ScrollOffset + (int)(availableLines * BottomScrollFraction);
-            int topScrollTrigger = ScrollOffset + (int)(availableLines * TopScrollFraction);
+            int bottomScrollTrigger = ScrollOffset + (int)(availableLines * BOTTOM_SCROLL_FRACTION);
+            int topScrollTrigger = ScrollOffset + (int)(availableLines * TOP_SCROLL_FRACTION);
             if (SelectedIndex >= bottomScrollTrigger && (ScrollOffset + availableLines) < entryCount)
-                ScrollOffset = SelectedIndex - (int)(availableLines * BottomScrollFraction);
+                ScrollOffset = SelectedIndex - (int)(availableLines * BOTTOM_SCROLL_FRACTION);
             else if (SelectedIndex < topScrollTrigger && ScrollOffset > 0)
-                ScrollOffset = SelectedIndex - (int)(availableLines * TopScrollFraction);
+                ScrollOffset = SelectedIndex - (int)(availableLines * TOP_SCROLL_FRACTION);
             if (ScrollOffset < 0) ScrollOffset = 0;
             if (ScrollOffset > entryCount - availableLines)
                 ScrollOffset = entryCount - availableLines;

src/MarcerGameDvdLauncher/OverlayDirectoryBrowser.cs

@@ -19,16 +19,16 @@ namespace MarcerGameDvdLauncher
 
     public class OverlayDirectoryBrowser(string root, string patch)
     {
-        public List<GameEntry> GetEntries(string currentRelativePath)
+        public List<GameEntry> GetEntries(string? currentRelativePath)
         {
             try
             {
                 // Normalize and protect against path traversal or absolute paths in the relative path
-                string rel = currentRelativePath ?? string.Empty;
+                var rel = currentRelativePath ?? string.Empty;
                 // Remove any leading directory separators
                 rel = rel.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
                 // If the relative path is rooted or contains parent directory segments, reset to root
-                if (Path.IsPathRooted(rel) || rel.Split(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries).Any(p => p == ".."))
+                if (Path.IsPathRooted(rel) || rel.Split([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar], StringSplitOptions.RemoveEmptyEntries).Any(p => p == ".."))
                 {
                     rel = string.Empty;
                 }

src/MarcerGameDvdLauncher/Program.cs

@@ -6,11 +6,11 @@ namespace MarcerGameDvdLauncher
     class Program
     {
         // Console window title. Not configurable — fixed application display name.
-        private const string DefaultTitle = "Marcer GameDVD Launcher";
+        private const string DEFAULT_TITLE = "Marcer GameDVD Launcher";
 
         static void Main(string[] args)
         {
-            Console.Title = DefaultTitle;
+            Console.Title = DEFAULT_TITLE;
             var app = new LauncherApp();
             app.Run();
         }

src/MarcerGameDvdLauncher/ProgramHelpers.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2026 Stefan Koelle (https://stefankoelle.de)
 // Licensed under the MIT License. See LICENSE file in project root for details.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace MarcerGameDvdLauncher
@@ -40,11 +39,11 @@ namespace MarcerGameDvdLauncher
         // These are defined by the Windows API and do not change.
         private const int STD_INPUT_HANDLE = -10;
 
-        [System.Runtime.InteropServices.DllImport("kernel32.dll")]
+        [DllImport("kernel32.dll")]
         private static extern IntPtr GetStdHandle(int nStdHandle);
 
-        [System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
-        [return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool FlushConsoleInputBuffer(IntPtr hConsoleInput);
 
         // P/Invoke to query key state (used to detect physical key release)
@@ -54,37 +53,36 @@ namespace MarcerGameDvdLauncher
         [DllImport("user32.dll")]
         private static extern short GetAsyncKeyState(int vKey);
 
-        // Shows a simple modal message on the reserved last console line and
-        // blocks until the Return key is physically released. The message is
-        // then removed and the method returns. This is designed to be a
-        // lightweight modal for the console UI and uses the last console line
-        // which the application reserves for transient messages.
-        public static void ShowModalUntilReturnReleased(string message)
+        // Shows a simple modal message in the center of the console and
+        // blocks until the given process has exited. The message is then
+        // removed and the method returns.
+        public static void ShowModalUntilProcessExited(System.Diagnostics.Process? process, string? message)
         {
             try
             {
-                int lastRow = AvailableLines;
                 int width = Console.WindowWidth;
-                string text = message ?? string.Empty;
-                if (text.Length > width) text = text.Substring(0, Math.Max(0, width - 3)) + "...";
-                int padding = Math.Max(0, width - text.Length);
-                string line = text + new string(' ', padding);
+                int height = Console.WindowHeight;
+                int centerRow = height / 2;
+
+                var text = message ?? string.Empty;
+                if (text.Length > width - 4) text = text.Substring(0, Math.Max(0, width - 7)) + "...";
+                int leftPad = Math.Max(0, (width - text.Length) / 2);
+                var line = new string(' ', leftPad) + text;
 
                 Console.BackgroundColor = ConsoleColor.DarkGray;
                 Console.ForegroundColor = ConsoleColor.White;
-                try { Console.SetCursorPosition(0, lastRow); } catch { }
-                try { Console.Write(line); } catch { }
+                try { Console.SetCursorPosition(0, centerRow); } catch { }
+                try { Console.Write(line.PadRight(width)); } catch { }
                 Console.ResetColor();
 
-                // Wait until Return key is not pressed
-                // GetAsyncKeyState returns a short where the high-order bit is set when key is down
-                while ((GetAsyncKeyState(VK_RETURN) & 0x8000) != 0)
+                // Wait until the external process has exited
+                while (process != null && !process.HasExited)
                 {
-                    Thread.Sleep(10);
+                    Thread.Sleep(100);
                 }
 
                 // Clear the line
-                try { Console.SetCursorPosition(0, lastRow); } catch { }
+                try { Console.SetCursorPosition(0, centerRow); } catch { }
                 try { Console.Write(new string(' ', width)); } catch { }
             }
             catch

src/MarcerGameDvdLauncher/launcher.config.example.json

@@ -3,7 +3,7 @@
   "PatchDirectory": "C:\\Games\\Hatari\\PATCH",
   "Hatari": {
     "Executable": "C:\\Tools\\hatari\\hatari.exe",
-    "ConfigFile": "C:\\Tools\\hatari\\hatari-st.cfg",
+    "ConfigFile": "",
     "ArgsTemplate": "-c \"{cfg}\" --disk-a \"{zip}\""
   },
   "Colors": {