diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..7400b0b65
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+template/collage/**/*.json
diff --git a/api/admin.php b/api/admin.php
index 0a6875fc4..c9c68ccea 100644
--- a/api/admin.php
+++ b/api/admin.php
@@ -30,7 +30,7 @@
 $defaultConfig = $configurationService->getDefaultConfiguration();
 
 $data = ArrayUtility::replaceBooleanValues($_POST);
-$action = isset($data['type']) ? $data['type'] : null;
+$action = $data['type'] ?? null;
 
 // Reset
 if ($action === 'reset') {
@@ -257,59 +257,11 @@
     // Collage json config
     $newConfig['collage']['limit'] = $newConfig['collage']['limit'] ?? $defaultConfig['collage']['limit'];
     if ($newConfig['collage']['enabled']) {
-        $collageConfigFilePath = Collage::getCollageConfigPath($newConfig['collage']['layout'], $newConfig['collage']['orientation']);
-
-        if ($collageConfigFilePath !== null) {
-            $collageJson = json_decode((string)file_get_contents($collageConfigFilePath), true);
-
-            if (is_array($collageJson)) {
-                if (isset($collageJson['layout']) && !empty($collageJson['layout'])) {
-                    $layoutConfigArray = $collageJson['layout'];
-
-                    if (array_key_exists('placeholder', $collageJson)) {
-                        $newConfig['collage']['placeholder'] = $collageJson['placeholder'];
-                    }
-                    if (array_key_exists('placeholderposition', $collageJson)) {
-                        $newConfig['collage']['placeholderposition'] = $collageJson['placeholderposition'];
-                    }
-                    if (array_key_exists('placeholderpath', $collageJson)) {
-                        $newConfig['collage']['placeholderpath'] = $collageJson['placeholderpath'];
-                    }
-                } else {
-                    $layoutConfigArray = $collageJson;
-                }
-
-                // Calculate collage limit
-                if (str_starts_with($newConfig['collage']['layout'], '2x')) {
-                    $newConfig['collage']['limit'] = (int) ceil(count($layoutConfigArray) / 2);
-                } else {
-                    $newConfig['collage']['limit'] = count($layoutConfigArray);
-                }
-
-                // If there is a collage placeholder whithin the correct range (0 < placeholderposition <= collage limit), we need to decrease the collage limit by 1
-                if ($newConfig['collage']['placeholder']) {
-                    $collagePlaceholderPosition = (int) $newConfig['collage']['placeholderposition'];
-                    if ($collagePlaceholderPosition > 0 && $collagePlaceholderPosition <= $newConfig['collage']['limit']) {
-                        $newConfig['collage']['limit'] = $newConfig['collage']['limit'] - 1;
-                    } else {
-                        $newConfig['collage']['placeholder'] = false;
-                        $logger->debug('Placeholder position not in range. Placeholder disabled.');
-                    }
-
-                    if ($newConfig['collage']['placeholderpath'] === '') {
-                        $newConfig['collage']['placeholder'] = false;
-                        $logger->debug('Collage Placeholder is empty. Collage Placeholder disabled.');
-                    }
-                }
-            } else {
-                $newConfig['collage']['enabled'] = false;
-                $logger->debug('No valid collage json found. Collage disabled.');
-            }
-        }
+        $limitData = Collage::calculateLimit($newConfig['collage'], $logger);
+        $newConfig['collage']['limit'] = $limitData['limit'];
+        $newConfig['collage']['placeholder'] = $limitData['placeholderEnabled'];
         if ($newConfig['collage']['limit'] < 1) {
             $newConfig['collage']['enabled'] = false;
-            $newConfig['collage']['limit'] = $defaultConfig['collage']['limit'];
-            $logger->debug('Invalid collage limit, must be 1 or greater. Collage disabled.');
         }
     }
 
diff --git a/api/applyEffects.php b/api/applyEffects.php
index b8913225e..4108998b9 100644
--- a/api/applyEffects.php
+++ b/api/applyEffects.php
@@ -37,6 +37,15 @@
         throw new \Exception('Invalid or missing style parameter');
     }
 
+    if (isset($_POST['collageLayout'])) {
+        $config['collage']['layout'] = $_POST['collageLayout'];
+
+    }
+
+    $limitData = Collage::calculateLimit($config['collage'], $logger);
+    $config['collage']['limit'] = $limitData['limit'];
+    $config['collage']['placeholder'] = $limitData['placeholderEnabled'];
+
     $vars['style'] = $_POST['style'];
 
     $vars['imageFilter'] = null;
diff --git a/api/capture.php b/api/capture.php
index 07d30962d..3f0ed8c65 100644
--- a/api/capture.php
+++ b/api/capture.php
@@ -19,6 +19,10 @@
         throw new \Exception('No style provided');
     }
 
+    if (isset($_POST['collageLimit'])) {
+        $config['collage']['limit'] = $_POST['collageLimit'];
+    }
+
     if (!empty($_POST['file']) && (preg_match('/^[a-z0-9_]+\.jpg$/', $_POST['file']) || preg_match('/^[a-z0-9_]+\.(mp4)$/', $_POST['file']))) {
         $file = $_POST['file'];
     } else {
diff --git a/assets/js/core.js b/assets/js/core.js
index 5e3196023..8c5ee43f1 100644
--- a/assets/js/core.js
+++ b/assets/js/core.js
@@ -78,6 +78,8 @@ const photoBooth = (function () {
     api.chromaimage = '';
     api.filename = '';
     api.photoStyle = '';
+    api.collageLayout = config.collage.layout;
+    api.collageLimit = config.collage.limit;
 
     api.isTimeOutPending = function () {
         return typeof timeOut !== 'undefined';
@@ -122,7 +124,6 @@ const photoBooth = (function () {
 
     api.init = function () {
         api.reset();
-
         startPage.addClass('stage--active');
         if (usesBackgroundPreview) {
             photoboothPreview.startVideo(CameraDisplayMode.BACKGROUND);
@@ -284,7 +285,7 @@ const photoBooth = (function () {
                         '<br>' +
                         (api.nextCollageNumber + 1) +
                         ' / ' +
-                        config.collage.limit;
+                        api.collageLimit;
                     labelElement.style.textAlign = 'center';
                     element.appendChild(labelElement);
                 } else {
@@ -561,6 +562,7 @@ const photoBooth = (function () {
         if (api.photoStyle === PhotoStyle.COLLAGE) {
             data.file = currentCollageFile;
             data.collageNumber = api.nextCollageNumber;
+            data.collageLimit = api.collageLimit;
         }
 
         if (api.photoStyle === PhotoStyle.CHROMA) {
@@ -636,10 +638,10 @@ const photoBooth = (function () {
                     loaderImage.show();
 
                     photoboothTools.console.logDev(
-                        'Taken collage photo number: ' + (result.current + 1) + ' / ' + result.limit
+                        'Taken collage photo number: ' + (result.current + 1) + ' / ' + api.collageLimit
                     );
 
-                    if (result.current + 1 < result.limit) {
+                    if (result.current + 1 < api.collageLimit) {
                         photoboothTools.console.logDev('core: initialize Media.');
                         photoboothPreview.initializeMedia();
                         api.takingPic = false;
@@ -650,7 +652,7 @@ const photoBooth = (function () {
                         setTimeout(() => {
                             api.clearLoaderImage();
                             imageUrl = '';
-                            if (result.current + 1 < result.limit) {
+                            if (result.current + 1 < api.collageLimit) {
                                 api.thrill(PhotoStyle.COLLAGE);
                             } else {
                                 currentCollageFile = '';
@@ -660,7 +662,7 @@ const photoBooth = (function () {
                         }, continuousCollageTime);
                     } else {
                         // collage with interruption
-                        if (result.current + 1 < result.limit) {
+                        if (result.current + 1 < api.collageLimit) {
                             const takePictureButton = $(
                                 '<button type="button" class="button collageNext rotaryfocus" id="btnCollageNext">'
                             );
@@ -890,7 +892,9 @@ const photoBooth = (function () {
             data: {
                 file: result.file,
                 filter: imgFilter,
-                style: api.photoStyle
+                style: api.photoStyle,
+                collageLayout: api.collageLayout,
+                collageLimit: api.collageLimit
             },
             success: (data) => {
                 setFiltersEnabled(true);
@@ -1401,6 +1405,12 @@ const photoBooth = (function () {
 
     $('.takeCollage, .newcollage').on('click', function (e) {
         e.preventDefault();
+        if (config.collage.enabled && config.collage.allow_selection && $('#collageSelectorModal').length) {
+            $('#collageSelectorModal').data('pending-start', true);
+            $('#collageSelectorModal').removeClass('hidden').attr('aria-hidden', 'false');
+            $(this).trigger('blur');
+            return;
+        }
         api.thrill(PhotoStyle.COLLAGE);
         $(this).trigger('blur');
     });
@@ -1601,6 +1611,41 @@ const photoBooth = (function () {
         });
     }
 
+    if (
+        typeof onStandaloneGalleryView === 'undefined' &&
+        typeof onCaptureChromaView === 'undefined' &&
+        config.collage.enabled &&
+        config.collage.allow_selection
+    ) {
+        const collageModal = $('#collageSelectorModal');
+        const closeBtn = $('#collageSelectorClose');
+        const optionButtons = $('.collageSelector__option');
+
+        // Move modal to body so it isn't hidden by stage visibility
+        if (collageModal.length) {
+            $('body').append(collageModal.detach());
+        }
+
+        const setSelection = (layout, limit) => {
+            api.collageLayout = layout;
+            api.collageLimit = parseInt(limit, 10);
+        };
+
+        const closeModal = () => {
+            collageModal.addClass('hidden');
+            collageModal.attr('aria-hidden', 'true');
+        };
+
+        closeBtn.on('click', closeModal);
+
+        optionButtons.on('click', function () {
+            const button = $(this);
+            setSelection(button.data('layout'), button.data('limit'));
+            closeModal();
+            api.thrill(PhotoStyle.COLLAGE);
+        });
+    }
+
     previewVideo.on('loadedmetadata', function (ev) {
         const videoEl = ev.target;
         let newWidth = videoEl.offsetWidth;
diff --git a/assets/sass/components/_button.scss b/assets/sass/components/_button.scss
index 48af19c91..c22736896 100644
--- a/assets/sass/components/_button.scss
+++ b/assets/sass/components/_button.scss
@@ -117,6 +117,67 @@
   }
 }
 
+/**
+ * Select menu
+ */
+#collageSelector {
+  width: 100%;
+  margin-top: 0.75rem;
+}
+
+.collageSelector__trigger {
+  justify-content: flex-start;
+  gap: 0.5rem;
+  width: 100%;
+}
+
+.collageSelector__current {
+  display: block;
+  font-size: 0.9rem;
+  opacity: 0.85;
+  margin-top: 0.25rem;
+}
+
+.collageSelector__options {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+  gap: 0.75rem;
+  width: 100%;
+}
+
+.collageSelector__option {
+  width: 100%;
+  border: 1px solid var(--border-color);
+  border-radius: 0.5rem;
+  padding: 1rem;
+  font-size: 1.05rem;
+  text-align: left;
+  background: #fff;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.08);
+}
+
+.collageSelector__option:focus,
+.collageSelector__option:hover,
+.collageSelector__option.is-selected {
+  border-color: var(--primary-color);
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--primary-color), #fff 70%);
+}
+
+.collageSelector__limit {
+  display: block;
+  font-size: 0.85rem;
+  opacity: 0.8;
+  margin-top: 0.35rem;
+}
+
+[data-ui-button='classic_rounded'],
+[data-ui-button='modern'],
+[data-ui-button='modern_squared'] {
+  .collageSelector__option {
+    border-radius: 0.75rem;
+  }
+}
+
 /**
  * Buttonbar
  */
@@ -173,3 +234,27 @@
   gap: 0.5rem;
   padding: 0.5rem 1rem;
 }
+
+.collageSelector__preview-container {
+  margin-bottom: 0.75rem;
+  border-radius: 0.25rem;
+  overflow: hidden;
+  background: #f5f5f5;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0.5rem;
+}
+
+.collageSelector__preview {
+  width: 100%;
+  max-width: 120px;
+  height: auto;
+  display: block;
+}
+
+.collageSelector__label {
+  font-weight: 600;
+  margin-bottom: 0.25rem;
+  color: var(--text-color);
+}
diff --git a/assets/sass/components/_modal.scss b/assets/sass/components/_modal.scss
index 20dc32961..44f3746ec 100644
--- a/assets/sass/components/_modal.scss
+++ b/assets/sass/components/_modal.scss
@@ -8,7 +8,8 @@
   --modal-font-size: 1rem;
   --modal-line-height: 1.2;
   --modal-padding: 2rem;
-  --modal-spacing: 2rem;
+  --modal-spacing: 1.5rem;
+  --modal-max-width: 960px;
 
   --modal-button-color: var(--button-font-color);
   --modal-button-background: var(--primary-color);
@@ -45,11 +46,14 @@
     position: relative;
     color: var(--modal-color);
     background: var(--modal-background);
-    max-width: calc(100dvw - var(--modal-spacing) * 2);
+    width: min(var(--modal-max-width), calc(100dvw - var(--modal-spacing) * 2));
+    max-width: min(var(--modal-max-width), calc(100dvw - var(--modal-spacing) * 2));
+    min-width: min(640px, calc(100dvw - var(--modal-spacing) * 2));
     max-height: calc(100dvh - var(--modal-spacing) * 2);
   }
 
   &-body {
+    width: 100%;
     text-align: center;
     overflow-y: scroll;
     font-size: var(--modal-font-size);
diff --git a/assets/sass/components/_stage.scss b/assets/sass/components/_stage.scss
index 992da181d..90768cebf 100644
--- a/assets/sass/components/_stage.scss
+++ b/assets/sass/components/_stage.scss
@@ -37,6 +37,14 @@
   &--start {
     --stage-color: var(--stage-start-color);
     --stage-background: var(--stage-start-background);
+    #collageDiv {
+      font-size: var(--button-font-size);
+      font-weight: bold;
+      color: var(--button-color);
+      padding-left: 2rem;
+      padding-right: 2rem;
+      padding-bottom: 1rem;
+    }
   }
 
   &--chroma {
diff --git a/assets/sass/themes/_classic.scss b/assets/sass/themes/_classic.scss
index 0774f5d73..9aac278ee 100644
--- a/assets/sass/themes/_classic.scss
+++ b/assets/sass/themes/_classic.scss
@@ -80,5 +80,8 @@
     .stage-inner:before {
       border-radius: 1rem;
     }
+    #collageDiv {
+      border-radius: 1rem;
+    }
   }
 }
diff --git a/assets/sass/themes/_modern.scss b/assets/sass/themes/_modern.scss
index f02dfebd0..c301d3c29 100644
--- a/assets/sass/themes/_modern.scss
+++ b/assets/sass/themes/_modern.scss
@@ -6,6 +6,11 @@
   .stage--start {
     .stage-inner {
       justify-content: flex-end;
+      #collageDiv {
+        background: color-mix(in srgb, var(--primary-color), transparent 75%);
+        backdrop-filter: blur(10px);
+        border-radius: 1rem;
+      }
     }
 
     button[data-command='cups-button'] {
diff --git a/docs/faq/custom-collage.md b/docs/faq/custom-collage.md
index 09138de17..0743fdf6a 100644
--- a/docs/faq/custom-collage.md
+++ b/docs/faq/custom-collage.md
@@ -129,3 +129,72 @@ Notes:
 - `placeholder` uses `placeholderpath` at `placeholderposition`.
 
 Single framed images only work when `apply_frame` is `always`.
+
+---
+
+## Collage Frames and Backgrounds: Name Changes
+
+This guide explains how layout-specific frames and backgrounds are applied automatically if they exist. The system supports **default templates** with specific layout prefixes.
+
+### How Name Changes Work
+
+When you select a collage layout, the system looks for **layout-specific files**:
+
+- **Frames:** `<layout>_<frame_filename>`
+- **Backgrounds:** `<layout>_<background_filename>`
+
+If the layout-specific file exists, it replaces the default. If it does **not exist**, the system uses the default file.
+
+**Example:**
+
+- Default frame: `basic.png`
+- Layout: `1+2-1`
+- System checks for: `1+2-1_basic.png`
+    - If exists → used automatically
+    - If not → falls back to `basic.png`
+
+---
+
+### Supported Layout Prefixes / Default Templates
+
+The following prefixes can be used when naming layout-specific frame or background files (based on default available templates):
+
+- `1+2-1`
+- `1+3-1`
+- `1+3-2`
+- `2+1-1`
+- `2+2-1`
+- `2+2-2`
+- `2x3-1`
+- `2x3-2`
+- `2x4-1`
+- `2x4-2`
+- `2x4-3`
+- `2x4-4`
+- `3+1-1`
+- `collage.json`
+
+---
+
+### User Guidelines
+
+- **Upload layout-specific files** using the pattern: `<layout>_<filename>`
+    - Example: `2+2-1_frame.png` or `2+4-2_background.jpg` or `collage.json_background.jpg`
+- **Keep default files** in place for fallback.
+    - Example: `frame.png`, `background.jpg`
+- **Automatic selection:**
+    - When a layout is selected, the system checks if a layout-specific file exists.
+        - If it exists, it replaces the default automatically.
+        - If not, the default is used.
+
+---
+
+#### Example Workflow
+
+| Selected Layout | Default Frame | Layout-Specific Frame Used |
+|-----------------|---------------|---------------------------|
+| `2+2-1`         | `basic.png`   | `2+2-1_basic.png`         |
+| `2x4-2`         | `basic.png`   | `2x4-2_basic.png`         |
+
+- Backgrounds follow the **same naming convention**.
+    - Example: `2x3-1_white.png` replaces `white.png` if it exists.
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index a468f03f1..4b5ecd595 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -857,7 +857,7 @@
             'unit' => 'seconds',
         ],
         'collage_layout' => [
-            'view' => 'advanced',
+            'view' => 'basic',
             'type' => 'select',
             'name' => 'collage[layout]',
             'data-theme-field' => 'true',
@@ -865,6 +865,20 @@
             'options' => CollageLayoutEnum::cases(),
             'value' => $config['collage']['layout'],
         ],
+        'collage_allow_selection' => [
+            'view' => 'advanced',
+            'type' => 'checkbox',
+            'name' => 'collage[allow_selection]',
+            'value' => $config['collage']['allow_selection'],
+        ],
+        'collage_layouts_enabled' => [
+            'view' => 'advanced',
+            'type' => 'multi-select',
+            'name' => 'collage[layouts_enabled]',
+            'placeholder' => $defaultConfig['collage']['layouts_enabled'],
+            'options' => CollageLayoutEnum::cases(),
+            'value' => $config['collage']['layouts_enabled'],
+        ],
         'collage_orientation' => [
             'view' => 'basic',
             'type' => 'select',
diff --git a/resources/lang/en.json b/resources/lang/en.json
index a722d3863..030a727f1 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -48,6 +48,7 @@
   "click_element": "Click",
   "close": "Close",
   "collage": "Collage",
+  "collage:collage_allow_selection": "Allow layout selection",
   "collage:collage_background": "Background",
   "collage:collage_background_color": "Collage background color",
   "collage:collage_cntdwn_time": "Collage-countdown timer:",
@@ -62,6 +63,7 @@
   "collage:collage_keep_single_images": "Add single images from collage to gallery",
   "collage:collage_key": "Key code which triggers a collage",
   "collage:collage_layout": "Choose collage layout:",
+  "collage:collage_layouts_enabled": "available layouts for selection",
   "collage:collage_placeholder": "Use custom placeholder",
   "collage:collage_placeholderpath": "Placeholder image path",
   "collage:collage_placeholderposition": "Collage image number to replace",
@@ -335,6 +337,7 @@
   "manual:authentication:protect_localhost_index": "If disabled, start screen can be accessed without username and password from localhost.",
   "manual:authentication:protect_localhost_manual": "If disabled, manual and FAQ can be accessed without username and password from localhost.",
   "manual:authentication:protect_manual": "If enabled, manual and FAQ can only be accessed if a username and password is entered.",
+  "manual:collage:collage_allow_selection": "If enabled, a button is visible on the start page to choose an collage layout.",
   "manual:collage:collage_background": "Enter the path of the background which is applied to your collage after taking it.",
   "manual:collage:collage_cntdwn_time": "Set your countdown time between pictures while taking a collage.",
   "manual:collage:collage_continuous": "Take collage without interrupption.",
@@ -347,6 +350,7 @@
   "manual:collage:collage_keep_single_images": "If enabled, single images from collage will be added to the gallery. Please note that single images are not visible if you access the gallery at the result screen!",
   "manual:collage:collage_key": "Specify the key id to use that key to take a collage (e.g. 13 is the enter key). For example use <a href=\"https://keycode.info\"  target=\"_blank\">https://keycode.info</a> to find out the key id.",
   "manual:collage:collage_layout": "Choose between different collage layouts.",
+  "manual:collage:collage_layouts_enabled": "Selected layouts will be available for the layout selection visible on the start screen.",
   "manual:collage:collage_placeholder": "If enabled, the image of the collage at the specified position will be replaced by a custom image from the placeholder path",
   "manual:collage:collage_placeholderpath": "Specify the path to the placeholder image. The image should be a .jpg.",
   "manual:collage:collage_placeholderposition": "Define the collage position which should be replaced by a custom image. Please specify a value between 1 and the maximum collage image number depending on the layout.",
@@ -889,6 +893,7 @@
   "saveerror": "Error!",
   "saving": "Saving ...",
   "seconds": "second(s)",
+  "selectCollageLayout": "Select collage layout:",
   "selectFilter": "Image filter",
   "send": "Send",
   "serverprocesses": "Processes",
@@ -925,6 +930,7 @@
   "takeVideo": "Video",
   "telegram": "Community @ Telegram",
   "testMenu": "Available tests",
+  "testTextPositions": "Preview collage layouts with text zones",
   "test_connection": "Test Connection",
   "test_update_available": "There is a test update available.",
   "theme_title": "Themes",
diff --git a/src/Collage.php b/src/Collage.php
index 3cba844cd..b4a7979a7 100644
--- a/src/Collage.php
+++ b/src/Collage.php
@@ -5,8 +5,10 @@
 use Photobooth\Dto\CollageConfig;
 use Photobooth\Enum\ImageFilterEnum;
 use Photobooth\Factory\CollageConfigFactory;
+use Photobooth\Service\LoggerService;
 use Photobooth\Utility\ImageUtility;
 use Photobooth\Utility\PathUtility;
+use Psr\Log\LoggerInterface;
 
 class Collage
 {
@@ -27,6 +29,73 @@ public static function reset(): void
         self::$layoutPath = '';
     }
 
+    /**
+     * Calculate collage limit based on layout definition and placeholder settings.
+     *
+     * @return array{limit:int, placeholderEnabled:bool}
+     */
+    public static function calculateLimit(
+        array $collageConfig,
+        ?LoggerInterface $logger = null
+    ): array {
+        $layout = (string) ($collageConfig['layout'] ?? '');
+        $orientation = (string) ($collageConfig['orientation'] ?? 'landscape');
+        $placeholderEnabled = (bool) ($collageConfig['placeholder'] ?? false);
+        $placeholderPosition = (int) ($collageConfig['placeholderposition'] ?? 0);
+        $placeholderPath = $collageConfig['placeholderpath'] ?? null;
+
+        $fallbackLimit = (int) ($collageConfig['limit'] ?? 1);
+        if ($fallbackLimit < 1) {
+            $fallbackLimit = 1;
+        }
+        $limit = $fallbackLimit;
+        $logger = $logger ?? LoggerService::getInstance()->getLogger('main');
+
+        $collageConfigFilePath = self::getCollageConfigPath($layout, $orientation);
+
+        if ($collageConfigFilePath !== null) {
+            $collageJson = json_decode((string) file_get_contents($collageConfigFilePath), true);
+            if (is_array($collageJson)) {
+                $layoutConfigArray = !empty($collageJson['layout'])
+                    ? $collageJson['layout']
+                    : $collageJson;
+
+                if (str_starts_with($layout, '2x')) {
+                    $limit = (int) ceil(count($layoutConfigArray) / 2);
+                } else {
+                    $limit = count($layoutConfigArray);
+                }
+
+                if ($placeholderEnabled) {
+                    if ($placeholderPosition > 0 && $placeholderPosition <= $limit) {
+                        $limit--;
+                    } else {
+                        $placeholderEnabled = false;
+                        $logger->debug('Placeholder position not in range. Placeholder disabled.');
+                    }
+
+                    if ($placeholderPath === null || $placeholderPath === '') {
+                        $placeholderEnabled = false;
+                        $logger->debug('Collage Placeholder is empty. Collage Placeholder disabled.');
+                    }
+                }
+            } else {
+                $logger->debug('No valid collage json found. Collage disabled.');
+            }
+        }
+
+        if ($limit < 1) {
+            $limit = $fallbackLimit;
+            $placeholderEnabled = false;
+            $logger->debug('Invalid collage limit, must be 1 or greater. Collage disabled.');
+        }
+
+        return [
+            'limit' => $limit,
+            'placeholderEnabled' => $placeholderEnabled,
+        ];
+    }
+
     public static function getCollageConfigPath(string $collageLayout, string $pictureOrientation): ?string
     {
         self::$drawDashedLine =
@@ -120,6 +189,100 @@ public static function createCollage(array $config, array $srcImagePaths, string
                         $c->textOnCollageLine3 = array_key_exists('text_line3', $collageJson) ? $collageJson['text_line3'] : $c->textOnCollageLine3;
                         $c->textOnCollageLinespace = isset($collageJson['text_linespace']) ? $collageJson['text_linespace'] : $c->textOnCollageLinespace;
                     }
+
+                    if ($c->collageAllowSelection) {
+                        if (isset($collageJson['text_disabled']) && $collageJson['text_disabled'] === true) {
+                            $c->textOnCollageEnabled = 'disabled';
+                        } elseif (isset($collageJson['text_alignment']) && is_array($collageJson['text_alignment'])) {
+                            $ta = $collageJson['text_alignment'];
+                            $c->textOnCollageEnabled = 'enabled';
+
+                            $replace = ['x' => self::$collageWidth, 'y' => self::$collageHeight];
+
+                            // Check if zone mode
+                            if (isset($ta['mode']) && $ta['mode'] === 'zone') {
+                                // Zone mode: store zone parameters for Image::applyTextInZone()
+                                $c->textZoneMode = true;
+                                $c->textZoneX = (float) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['x'] ?? '0'));
+                                $c->textZoneY = (float) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['y'] ?? '0'));
+                                $c->textZoneW = isset($ta['w']) ? (float) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['w'])) : 0;
+                                $c->textZoneH = isset($ta['h']) ? (float) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['h'])) : 0;
+                                $c->textZonePadding = isset($ta['padding']) ? (float) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['padding'])) : 0;
+                                $c->textZoneAlign = $ta['align'] ?? 'center';
+                                $c->textZoneValign = $ta['valign'] ?? 'middle';
+                                $c->textZoneRotation = isset($ta['rotation']) ? (int) $ta['rotation'] : 0;
+
+                                // In zone mode: ignore admin X/Y/Rotation values
+                                // Keep admin font, color, text lines, fontSize (as start), lineHeight (as factor)
+                            } else {
+                                // Legacy mode: calculate X/Y position based on alignment
+                                $zoneX = Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['x'] ?? '0'));
+                                $zoneY = Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['y'] ?? '0'));
+                                $zoneW = isset($ta['w']) ? Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['w'])) : 0;
+                                $zoneH = isset($ta['h']) ? Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['h'])) : 0;
+
+                                if (isset($ta['fontSize'])) {
+                                    $c->textOnCollageFontSize = (int) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['fontSize']));
+                                }
+
+                                if (isset($ta['rotation'])) {
+                                    $c->textOnCollageRotation = (int) $ta['rotation'];
+                                }
+
+                                if (isset($ta['lineHeight'])) {
+                                    $c->textOnCollageLinespace = (int) Helper::doMath(str_replace(array_keys($replace), array_values($replace), $ta['lineHeight']));
+                                }
+
+                                $align = $ta['align'] ?? 'start';
+                                $valign = $ta['valign'] ?? 'top';
+
+                                if ($align === 'center' || $valign === 'middle') {
+                                    $textLines = [];
+                                    if (!empty($c->textOnCollageLine1)) {
+                                        $textLines[] = $c->textOnCollageLine1;
+                                    }
+                                    if (!empty($c->textOnCollageLine2)) {
+                                        $textLines[] = $c->textOnCollageLine2;
+                                    }
+                                    if (!empty($c->textOnCollageLine3)) {
+                                        $textLines[] = $c->textOnCollageLine3;
+                                    }
+
+                                    if (count($textLines) > 0 && file_exists($c->textOnCollageFont)) {
+                                        $maxWidth = 0;
+                                        foreach ($textLines as $line) {
+                                            $bbox = imagettfbbox($c->textOnCollageFontSize, $c->textOnCollageRotation, $c->textOnCollageFont, $line);
+                                            if ($bbox) {
+                                                $width = abs($bbox[2] - $bbox[0]);
+                                                if ($width > $maxWidth) {
+                                                    $maxWidth = $width;
+                                                }
+                                            }
+                                        }
+                                        $totalHeight = $c->textOnCollageFontSize + (count($textLines) - 1) * $c->textOnCollageLinespace;
+
+                                        if ($align === 'center') {
+                                            $c->textOnCollageLocationX = (int) ($zoneX + ($zoneW - $maxWidth) / 2);
+                                        } else {
+                                            $c->textOnCollageLocationX = (int) $zoneX;
+                                        }
+
+                                        if ($valign === 'middle') {
+                                            $c->textOnCollageLocationY = (int) ($zoneY + ($zoneH - $totalHeight) / 2 + $c->textOnCollageFontSize);
+                                        } else {
+                                            $c->textOnCollageLocationY = (int) ($zoneY + $c->textOnCollageFontSize);
+                                        }
+                                    } else {
+                                        $c->textOnCollageLocationX = (int) $zoneX;
+                                        $c->textOnCollageLocationY = (int) $zoneY;
+                                    }
+                                } else {
+                                    $c->textOnCollageLocationX = (int) $zoneX;
+                                    $c->textOnCollageLocationY = (int) $zoneY;
+                                }
+                            }
+                        }
+                    }
                 } else {
                     $layoutConfigArray = $collageJson;
                 }
@@ -178,7 +341,7 @@ public static function createCollage(array $config, array $srcImagePaths, string
             }
         }
 
-        $imageHandler->framePath = $c->collageFrame;
+        $imageHandler->framePath = Helper::getPrefixedFile($c->collageFrame, $c->collageLayout);
         $imageHandler->frameExtend = false;
 
         for ($i = 0; $i < $c->collageLimit; $i++) {
@@ -253,6 +416,7 @@ public static function createCollage(array $config, array $srcImagePaths, string
             throw new \Exception('Failed to create collage resource.');
         }
 
+        $c->collageBackground = Helper::getPrefixedFile($c->collageBackground, $c->collageLayout);
         if (!empty($c->collageBackground)) {
             $backgroundImage = $imageHandler->createFromImage($c->collageBackground);
             if (!$backgroundImage instanceof \GdImage) {
@@ -348,10 +512,70 @@ public static function createCollage(array $config, array $srcImagePaths, string
             $imageHandler->textLine2 = $c->textOnCollageLine2;
             $imageHandler->textLine3 = $c->textOnCollageLine3;
             $imageHandler->textLineSpacing = $c->textOnCollageLinespace;
+
+            // Set zone mode properties if enabled
+            $imageHandler->textZoneMode = $c->textZoneMode;
+            if ($c->textZoneMode) {
+                $imageHandler->textZoneX = $c->textZoneX;
+                $imageHandler->textZoneY = $c->textZoneY;
+                $imageHandler->textZoneW = $c->textZoneW;
+                $imageHandler->textZoneH = $c->textZoneH;
+                $imageHandler->textZonePadding = $c->textZonePadding;
+                $imageHandler->textZoneAlign = $c->textZoneAlign;
+                $imageHandler->textZoneValign = $c->textZoneValign;
+                $imageHandler->textZoneRotation = $c->textZoneRotation;
+            }
+
             $my_collage = $imageHandler->applyText($my_collage);
             if (!$my_collage instanceof \GdImage) {
                 throw new \Exception('Failed to apply text to collage resource.');
             }
+
+            // If this is a 2x* layout (images duplicated) also draw the text
+            // on the second half so both sides show the same caption.
+            if (strpos($c->collageLayout, '2x') === 0) {
+                if (self::$pictureOrientation === 'landscape') {
+                    // Landscape: duplicate horizontally (shift X to right half)
+                    $origX = $imageHandler->fontLocationX;
+                    $shift = (int) (self::$collageWidth / 2);
+                    $imageHandler->fontLocationX = $origX + $shift;
+
+                    // Apply text again with zone mode support
+                    if ($imageHandler->textZoneMode) {
+                        $origZoneX = $imageHandler->textZoneX;
+                        $imageHandler->textZoneX = $origZoneX + $shift;
+                        $my_collage = $imageHandler->applyText($my_collage);
+                        $imageHandler->textZoneX = $origZoneX;
+                    } else {
+                        $my_collage = $imageHandler->applyText($my_collage);
+                    }
+
+                    if (!$my_collage instanceof \GdImage) {
+                        throw new \Exception('Failed to apply duplicated text to collage resource.');
+                    }
+                    $imageHandler->fontLocationX = $origX;
+                } else {
+                    // Portrait: duplicate vertically (shift Y to bottom half)
+                    $origY = $imageHandler->fontLocationY;
+                    $shift = (int) (self::$collageHeight / 2);
+                    $imageHandler->fontLocationY = $origY + $shift;
+
+                    // Apply text again with zone mode support
+                    if ($imageHandler->textZoneMode) {
+                        $origZoneY = $imageHandler->textZoneY;
+                        $imageHandler->textZoneY = $origZoneY + $shift;
+                        $my_collage = $imageHandler->applyText($my_collage);
+                        $imageHandler->textZoneY = $origZoneY;
+                    } else {
+                        $my_collage = $imageHandler->applyText($my_collage);
+                    }
+
+                    if (!$my_collage instanceof \GdImage) {
+                        throw new \Exception('Failed to apply duplicated text to collage resource.');
+                    }
+                    $imageHandler->fontLocationY = $origY;
+                }
+            }
         }
 
         // Rotate image if needed
diff --git a/src/Configuration/Section/CollageConfiguration.php b/src/Configuration/Section/CollageConfiguration.php
index ab873b174..28ccf20ac 100644
--- a/src/Configuration/Section/CollageConfiguration.php
+++ b/src/Configuration/Section/CollageConfiguration.php
@@ -49,6 +49,20 @@ public static function getNode(): NodeDefinition
                         })
                         ->end()
                     ->end()
+                ->booleanNode('allow_selection')->defaultValue(false)->end()
+                ->arrayNode('layouts_enabled')
+                    ->enumPrototype()
+                        ->values(CollageLayoutEnum::cases())
+                        ->beforeNormalization()
+                            ->always(function ($value) {
+                                if (is_string($value)) {
+                                    $value = CollageLayoutEnum::from($value);
+                                }
+                                return $value;
+                            })
+                            ->end()
+                        ->end()
+                    ->end()
                 ->integerNode('limit')
                     ->defaultValue(4)
                     ->min(1)
diff --git a/src/Dto/CollageConfig.php b/src/Dto/CollageConfig.php
index a45a2f7f9..cb38dddc7 100644
--- a/src/Dto/CollageConfig.php
+++ b/src/Dto/CollageConfig.php
@@ -31,4 +31,16 @@ class CollageConfig
     public string $textOnCollageFontColor;
     public int $textOnCollageFontSize;
     public int $textOnCollageLinespace;
+    public bool $collageAllowSelection;
+
+    // Zone-based text alignment properties (when template uses text_alignment.mode = "zone")
+    public bool $textZoneMode = false;
+    public float $textZoneX = 0;
+    public float $textZoneY = 0;
+    public float $textZoneW = 0;
+    public float $textZoneH = 0;
+    public float $textZonePadding = 0;
+    public string $textZoneAlign = 'center';
+    public string $textZoneValign = 'middle';
+    public int $textZoneRotation = 0;
 }
diff --git a/src/Factory/CollageConfigFactory.php b/src/Factory/CollageConfigFactory.php
index 741c4c6fd..c4fb8df04 100644
--- a/src/Factory/CollageConfigFactory.php
+++ b/src/Factory/CollageConfigFactory.php
@@ -41,6 +41,7 @@ public static function fromConfig(array $config): CollageConfig
         $collageConfig->textOnCollageFontColor = $config['textoncollage']['font_color'];
         $collageConfig->textOnCollageFontSize = (int) $config['textoncollage']['font_size'];
         $collageConfig->textOnCollageLinespace = (int) $config['textoncollage']['linespace'];
+        $collageConfig->collageAllowSelection = $config['collage']['allow_selection'] === true;
 
         return $collageConfig;
     }
diff --git a/src/Helper.php b/src/Helper.php
index 3121c6db4..37079aa99 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -113,4 +113,24 @@ public static function doMath(string $expression): int
         eval('$o = ' . preg_replace('/[^0-9\+\-\*\/\(\)\.]/', '', $expression) . ';');
         return intval($o);
     }
+
+    /**
+     * Returns the prefixed filename if it exists
+     *
+     * @param string $filePath Original file path
+     * @param string $prefix   Prefix to add to the filename
+     * @return string          Prefixed file path if it exists, else original
+     */
+    public static function getPrefixedFile(string $filePath, string $prefix): string
+    {
+        if (empty($filePath) || !file_exists($filePath)) {
+            return $filePath;
+        }
+
+        $directory = dirname($filePath);
+        $filename = basename($filePath);
+        $prefixedFile = $directory . '/' . $prefix . '_' . $filename;
+
+        return file_exists($prefixedFile) ? $prefixedFile : $filePath;
+    }
 }
diff --git a/src/Image.php b/src/Image.php
index 4ea07f56f..2cbcee4df 100644
--- a/src/Image.php
+++ b/src/Image.php
@@ -97,6 +97,51 @@ class Image
      */
     public int $textLineSpacing = 90;
 
+    /**
+     * Zone-based text alignment mode (when template uses text_alignment.mode = "zone")
+     */
+    public bool $textZoneMode = false;
+
+    /**
+     * X-coordinate of the text zone (pixels)
+     */
+    public float $textZoneX = 0;
+
+    /**
+     * Y-coordinate of the text zone (pixels)
+     */
+    public float $textZoneY = 0;
+
+    /**
+     * Width of the text zone (pixels)
+     */
+    public float $textZoneW = 0;
+
+    /**
+     * Height of the text zone (pixels)
+     */
+    public float $textZoneH = 0;
+
+    /**
+     * Padding inside the text zone (pixels)
+     */
+    public float $textZonePadding = 0;
+
+    /**
+     * Horizontal alignment within the zone: 'left', 'center', 'right'
+     */
+    public string $textZoneAlign = 'center';
+
+    /**
+     * Vertical alignment within the zone: 'top', 'middle', 'bottom'
+     */
+    public string $textZoneValign = 'middle';
+
+    /**
+     * Rotation angle for zone text (currently only 0 supported)
+     */
+    public int $textZoneRotation = 0;
+
     /**
      *
      * Apply Frame to Image Difinitions
@@ -776,11 +821,7 @@ public function applyText(GdImage $sourceResource): GdImage
             $fontPath = PathUtility::getAbsolutePath($this->fontPath);
             $tempFontPath = $_SERVER['DOCUMENT_ROOT'] . '/tempfont.ttf';
             $isTempFont = false;
-            $fontSize = $this->fontSize;
-            $fontRotation = $this->fontRotation;
-            $fontLocationX = $this->fontLocationX;
-            $fontLocationY = $this->fontLocationY;
-            $textLineSpacing = $this->textLineSpacing;
+
             // Convert hex color string to RGB values
             $colorComponents = self::getColorComponents($this->fontColor);
             list($r, $g, $b) = $colorComponents;
@@ -801,29 +842,13 @@ public function applyText(GdImage $sourceResource): GdImage
                 $fontPath = FontUtility::getFontPath($this->fontPath);
             }
 
-            // Add first line of text
-            if (!empty($this->textLine1)) {
-                if (!imagettftext($sourceResource, $fontSize, $fontRotation, $fontLocationX, $fontLocationY, $color, $fontPath, $this->textLine1)) {
-                    throw new \Exception('Could not add first line of text to resource.');
-                }
-            }
-
-            // Add second line of text
-            if (!empty($this->textLine2)) {
-                $line2Y = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationY + $textLineSpacing : $fontLocationY;
-                $line2X = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationX : $fontLocationX + $textLineSpacing;
-                if (!imagettftext($sourceResource, $fontSize, $fontRotation, $line2X, $line2Y, $color, $fontPath, $this->textLine2)) {
-                    throw new \Exception('Could not add second line of text to resource.');
-                }
-            }
-
-            // Add third line of text
-            if (!empty($this->textLine3)) {
-                $line3Y = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationY + $textLineSpacing * 2 : $fontLocationY;
-                $line3X = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationX : $fontLocationX + $textLineSpacing * 2;
-                if (!imagettftext($sourceResource, $fontSize, $fontRotation, $line3X, $line3Y, $color, $fontPath, $this->textLine3)) {
-                    throw new \Exception('Could not add third line of text to resource.');
-                }
+            // Check if zone mode is enabled
+            if ($this->textZoneMode) {
+                // Zone-based text rendering
+                $this->applyTextInZone($sourceResource, $fontPath, $color);
+            } else {
+                // Legacy text rendering (original behavior)
+                $this->applyTextLegacy($sourceResource, $fontPath, $color);
             }
 
             if ($isTempFont && file_exists($tempFontPath)) {
@@ -847,6 +872,175 @@ public function applyText(GdImage $sourceResource): GdImage
         }
     }
 
+    /**
+     * Legacy text rendering (original behavior when not in zone mode)
+     */
+    private function applyTextLegacy(GdImage $sourceResource, string $fontPath, int $color): void
+    {
+        $fontSize = $this->fontSize;
+        $fontRotation = $this->fontRotation;
+        $fontLocationX = $this->fontLocationX;
+        $fontLocationY = $this->fontLocationY;
+        $textLineSpacing = $this->textLineSpacing;
+
+        // Add first line of text
+        if (!empty($this->textLine1)) {
+            if (!imagettftext($sourceResource, $fontSize, $fontRotation, $fontLocationX, $fontLocationY, $color, $fontPath, $this->textLine1)) {
+                throw new \Exception('Could not add first line of text to resource.');
+            }
+        }
+
+        // Add second line of text
+        if (!empty($this->textLine2)) {
+            $line2Y = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationY + $textLineSpacing : $fontLocationY;
+            $line2X = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationX : $fontLocationX + $textLineSpacing;
+            if (!imagettftext($sourceResource, $fontSize, $fontRotation, $line2X, $line2Y, $color, $fontPath, $this->textLine2)) {
+                throw new \Exception('Could not add second line of text to resource.');
+            }
+        }
+
+        // Add third line of text
+        if (!empty($this->textLine3)) {
+            $line3Y = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationY + $textLineSpacing * 2 : $fontLocationY;
+            $line3X = $fontRotation < 45 && $fontRotation > -45 ? $fontLocationX : $fontLocationX + $textLineSpacing * 2;
+            if (!imagettftext($sourceResource, $fontSize, $fontRotation, $line3X, $line3Y, $color, $fontPath, $this->textLine3)) {
+                throw new \Exception('Could not add third line of text to resource.');
+            }
+        }
+    }
+
+    /**
+     * Zone-based text rendering with auto-fit, proper alignment and baseline correction
+     */
+    private function applyTextInZone(GdImage $sourceResource, string $fontPath, int $color): void
+    {
+        // Collect non-empty text lines
+        $lines = [];
+        if (!empty(trim($this->textLine1))) {
+            $lines[] = trim($this->textLine1);
+        }
+        if (!empty(trim($this->textLine2))) {
+            $lines[] = trim($this->textLine2);
+        }
+        if (!empty(trim($this->textLine3))) {
+            $lines[] = trim($this->textLine3);
+        }
+
+        // Nothing to draw if no lines
+        if (count($lines) === 0) {
+            return;
+        }
+
+        // Calculate zone with padding
+        $padding = $this->textZonePadding;
+        $zoneX = $this->textZoneX + $padding;
+        $zoneY = $this->textZoneY + $padding;
+        $zoneW = $this->textZoneW - (2 * $padding);
+        $zoneH = $this->textZoneH - (2 * $padding);
+
+        // Ensure zone has positive dimensions
+        if ($zoneW <= 0 || $zoneH <= 0) {
+            return;
+        }
+
+        // Calculate line height factor from admin settings
+        $lineHeightFactor = $this->textLineSpacing > 0 && $this->fontSize > 0
+            ? $this->textLineSpacing / $this->fontSize
+            : 1.2;
+
+        // Auto-fit: find the largest font size that fits all text in the zone
+        $fontSize = $this->fontSize > 0 ? $this->fontSize : 50;
+        $minFontSize = 10; // Absolute minimum
+        $preferredMinFontSize = 18; // Preferred minimum for readability
+
+        $fitsInZone = false;
+        while ($fontSize >= $minFontSize && !$fitsInZone) {
+            $lineHeight = (int)($fontSize * $lineHeightFactor);
+            $maxLineWidth = 0;
+
+            // Measure all lines at current font size
+            foreach ($lines as $line) {
+                $bbox = @imagettfbbox($fontSize, 0, $fontPath, $line);
+                if ($bbox !== false) {
+                    $lineWidth = abs($bbox[2] - $bbox[0]);
+                    if ($lineWidth > $maxLineWidth) {
+                        $maxLineWidth = $lineWidth;
+                    }
+                }
+            }
+
+            // Calculate total block height
+            // Height = (n-1) * lineHeight + fontSize (last line doesn't need spacing below)
+            $blockHeight = (count($lines) - 1) * $lineHeight + $fontSize;
+
+            // Check if it fits
+            if ($maxLineWidth <= $zoneW && $blockHeight <= $zoneH) {
+                $fitsInZone = true;
+            } else {
+                $fontSize--;
+            }
+        }
+
+        // If even minimum font size doesn't fit, use minimum anyway
+        if (!$fitsInZone) {
+            $fontSize = $minFontSize;
+        }
+
+        // Recalculate with final font size
+        $lineHeight = (int)($fontSize * $lineHeightFactor);
+        $blockHeight = (count($lines) - 1) * $lineHeight + $fontSize;
+
+        // Get ascent for baseline correction
+        // The ascent is the distance from baseline to top of tallest character
+        $ascentBbox = @imagettfbbox($fontSize, 0, $fontPath, 'HgjpqyÄÖÜ');
+        $ascent = $ascentBbox !== false ? abs($ascentBbox[7]) : $fontSize;
+
+        // Calculate vertical start position based on valign
+        switch ($this->textZoneValign) {
+            case 'bottom':
+                $startTopY = $zoneY + $zoneH - $blockHeight;
+                break;
+            case 'middle':
+                $startTopY = $zoneY + ($zoneH - $blockHeight) / 2;
+                break;
+            case 'top':
+            default:
+                $startTopY = $zoneY;
+                break;
+        }
+
+        // Draw each line with individual horizontal alignment
+        foreach ($lines as $index => $line) {
+            // Measure this specific line
+            $bbox = @imagettfbbox($fontSize, 0, $fontPath, $line);
+            $lineWidth = $bbox !== false ? abs($bbox[2] - $bbox[0]) : 0;
+
+            // Calculate X position based on align
+            switch ($this->textZoneAlign) {
+                case 'right':
+                    $drawX = (int)($zoneX + $zoneW - $lineWidth);
+                    break;
+                case 'center':
+                    $drawX = (int)($zoneX + ($zoneW - $lineWidth) / 2);
+                    break;
+                case 'left':
+                default:
+                    $drawX = (int)$zoneX;
+                    break;
+            }
+
+            // Calculate Y position (baseline position)
+            // First line: startTopY + ascent (to position top of text at startTopY)
+            // Subsequent lines: add lineHeight for each
+            $drawY = (int)($startTopY + $ascent + ($index * $lineHeight));
+
+            // Draw the text (rotation is 0 for zone mode)
+            if (!imagettftext($sourceResource, $fontSize, 0, $drawX, $drawY, $color, $fontPath, $line)) {
+                throw new \Exception('Could not add line ' . ($index + 1) . ' of text to resource.');
+            }
+        }
+    }
+
     /**
      * Set the picture options for adding a picture to image resource.
      */
@@ -879,17 +1073,17 @@ public function addPicture(GdImage $imageResource, GdImage $destinationResource)
             }
 
             if (abs($degrees) == 90) {
-                $imageResource = self::resizeCropImage($imageResource, $height, $width);
+                $imageResource = $this->resizeCropImage($imageResource, $height, $width);
             } else {
-                $imageResource = self::resizeCropImage($imageResource, $width, $height);
+                $imageResource = $this->resizeCropImage($imageResource, $width, $height);
             }
 
             if ($this->addPictureApplyFrame) {
-                $imageResource = self::applyFrame($imageResource);
+                $imageResource = $this->applyFrame($imageResource);
             }
 
             if ($degrees != 0) {
-                $imageResource = self::rotateResizeImage(
+                $imageResource = $this->rotateResizeImage(
                     image: $imageResource,
                     degrees: $degrees,
                     useTransparentBackground: true
diff --git a/src/Logger/NamedLogger.php b/src/Logger/NamedLogger.php
index 508777efe..d8e60ccd0 100644
--- a/src/Logger/NamedLogger.php
+++ b/src/Logger/NamedLogger.php
@@ -7,8 +7,9 @@
 use Monolog\Level;
 use Monolog\Logger;
 use Photobooth\Utility\PathUtility;
+use Psr\Log\LoggerInterface;
 
-class NamedLogger
+class NamedLogger implements LoggerInterface
 {
     protected int $level;
     protected string $file;
@@ -41,17 +42,47 @@ public function __construct(string $name, int $level)
         $this->logger->pushHandler($stream);
     }
 
-    public function debug(string $message, array $context = []): void
+    public function debug(string|\Stringable $message, array $context = []): void
     {
         $this->logger->debug($message, $context);
     }
 
-    public function info(string $message, array $context = []): void
+    public function notice(string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->notice($message, $context);
+    }
+
+    public function warning(string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->warning($message, $context);
+    }
+
+    public function critical(string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->critical($message, $context);
+    }
+
+    public function alert(string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->alert($message, $context);
+    }
+
+    public function emergency(string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->emergency($message, $context);
+    }
+
+    public function log($level, string|\Stringable $message, array $context = []): void
+    {
+        $this->logger->log($level, $message, $context);
+    }
+
+    public function info(string|\Stringable $message, array $context = []): void
     {
         $this->logger->info($message, $context);
     }
 
-    public function error(string $message, array $context = []): void
+    public function error(string|\Stringable $message, array $context = []): void
     {
         $this->logger->error($message, $context);
     }
diff --git a/template/collage/community/template.json b/template/collage/community/template.json
index 20966a562..54e044280 100644
--- a/template/collage/community/template.json
+++ b/template/collage/community/template.json
@@ -5,6 +5,5 @@
   "width": "600",
   "height": "1800",
   "layout": [
-
-   ]
+  ]
 }
diff --git a/template/collage/landscape/1+2-1.json b/template/collage/landscape/1+2-1.json
index a11c227b3..c28ed3132 100644
--- a/template/collage/landscape/1+2-1.json
+++ b/template/collage/landscape/1+2-1.json
@@ -5,8 +5,19 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["0","y*0.055","x*0.55546","y*0.55546","10"],
-    ["x*0.555","y*0.055","x*0.40812","y*0.40812","0"],
-    ["x*0.555","y*0.5368","x*0.40812","y*0.40812","0"]
-  ]
+    ["0", "y*0.055", "x*0.55546", "y*0.55546", "10"],
+    ["x*0.555", "y*0.055", "x*0.40812", "y*0.40812", "0"],
+    ["x*0.555", "y*0.5368", "x*0.40812", "y*0.40812", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.1",
+    "y": "y*0.62",
+    "w": "x*0.35",
+    "h": "y*0.35",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/collage/landscape/1+3-1.json b/template/collage/landscape/1+3-1.json
index a073fbd47..54544f536 100644
--- a/template/collage/landscape/1+3-1.json
+++ b/template/collage/landscape/1+3-1.json
@@ -9,5 +9,16 @@
     ["x*0.02810","y*0.6178","x*0.3052","y*0.3052","0"],
     ["x*0.34736","y*0.6178","x*0.3052","y*0.3052","0"],
     ["x*0.66662","y*0.6178","x*0.3052","y*0.3052","0"]
-  ]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.02",
+    "y": "y*0.1",
+    "w": "x*0.42",
+    "h": "y*0.42",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/1+3-2.json b/template/collage/landscape/1+3-2.json
index eec27cf5d..d23b3d443 100644
--- a/template/collage/landscape/1+3-2.json
+++ b/template/collage/landscape/1+3-2.json
@@ -5,9 +5,20 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.02810","y*0.0800","x*0.4978","y*0.4978","0"],
-    ["x*0.02810","y*0.6178","x*0.3052","y*0.3052","0"],
-    ["x*0.34736","y*0.6178","x*0.3052","y*0.3052","0"],
-    ["x*0.66662","y*0.6178","x*0.3052","y*0.3052","0"]
-  ]
+    ["x*0.02810", "y*0.0800", "x*0.4978", "y*0.4978", "0"],
+    ["x*0.02810", "y*0.6178", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.34736", "y*0.6178", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.66662", "y*0.6178", "x*0.3052", "y*0.3052", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.55",
+    "y": "y*0.1",
+    "w": "x*0.42",
+    "h": "y*0.42",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/2+1-1.json b/template/collage/landscape/2+1-1.json
index 132d6a068..a786ebead 100644
--- a/template/collage/landscape/2+1-1.json
+++ b/template/collage/landscape/2+1-1.json
@@ -5,8 +5,19 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.1","y*0.1","x*0.375","y*0.375","0"],
-    ["x*0.525","y*0.1","x*0.375","y*0.375","0"],
-    ["x*0.1","y*0.525","x*0.375","y*0.375","0"]
-  ]
+    ["x*0.1", "y*0.1", "x*0.375", "y*0.375", "0"],
+    ["x*0.525", "y*0.1", "x*0.375", "y*0.375", "0"],
+    ["x*0.1", "y*0.525", "x*0.375", "y*0.375", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.5",
+    "y": "y*0.50",
+    "w": "x*0.42",
+    "h": "y*0.42",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/2+2-1.json b/template/collage/landscape/2+2-1.json
index f0250fb7b..b432ac379 100644
--- a/template/collage/landscape/2+2-1.json
+++ b/template/collage/landscape/2+2-1.json
@@ -5,9 +5,10 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["0","0","x/2","y/2","0"],
-    ["x/2","0","x/2","y/2","0"],
-    ["0","y/2","x/2","y/2","0"],
-    ["x/2","y/2","x/2","y/2","0"]
-  ]
+    ["0", "0", "x/2", "y/2", "0"],
+    ["x/2", "0", "x/2", "y/2", "0"],
+    ["0", "y/2", "x/2", "y/2", "0"],
+    ["x/2", "y/2", "x/2", "y/2", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/landscape/2+2-2.json b/template/collage/landscape/2+2-2.json
index df9479190..8843d975b 100644
--- a/template/collage/landscape/2+2-2.json
+++ b/template/collage/landscape/2+2-2.json
@@ -5,9 +5,10 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.08","y*0.08","x*0.4","y*0.4","0"],
-    ["x*0.52","y*0.08","x*0.4","y*0.4","0"],
-    ["x*0.08","y*0.52","x*0.4","y*0.4","0"],
-    ["x*0.52","y*0.52","x*0.4","y*0.4","0"]
-  ]
+    ["x*0.08", "y*0.08", "x*0.4", "y*0.4", "0"],
+    ["x*0.52", "y*0.08", "x*0.4", "y*0.4", "0"],
+    ["x*0.08", "y*0.52", "x*0.4", "y*0.4", "0"],
+    ["x*0.52", "y*0.52", "x*0.4", "y*0.4", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/landscape/2x3-1.json b/template/collage/landscape/2x3-1.json
index ee30cb4c0..229bd9891 100644
--- a/template/collage/landscape/2x3-1.json
+++ b/template/collage/landscape/2x3-1.json
@@ -11,5 +11,16 @@
     ["x*0.51","y*0.04194","x*0.49","y*0.21333","0"],
     ["x*0.51","y*0.27621","x*0.48","y*0.21333","0"],
     ["x*0.51","y*0.51048","x*0.48","y*0.21333","0"]
-  ]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.0125",
+    "y": "y*0.735",
+    "w": "x*0.48",
+    "h": "y*0.25",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/2x3-2.json b/template/collage/landscape/2x3-2.json
index 2bc9006b4..1f171287a 100644
--- a/template/collage/landscape/2x3-2.json
+++ b/template/collage/landscape/2x3-2.json
@@ -5,11 +5,22 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.01","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.28597","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.53000","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.28597","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.53000","x*0.48","y*0.21333","0"]
-  ]
+    ["x*0.01", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.28597", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.53000", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.28597", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.53000", "x*0.48", "y*0.21333", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.0125",
+    "y": "y*0.755",
+    "w": "x*0.48",
+    "h": "y*0.225",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/2x4-1.json b/template/collage/landscape/2x4-1.json
index e1c9edc9b..7c5f06555 100644
--- a/template/collage/landscape/2x4-1.json
+++ b/template/collage/landscape/2x4-1.json
@@ -13,5 +13,6 @@
     ["x*0.532787", "y*0.284375", "x*0.42855", "y*0.19047", "0"],
     ["x*0.532787", "y*0.521875", "x*0.42855", "y*0.19047", "0"],
     ["x*0.532787", "y*0.764844", "x*0.42855", "y*0.19047", "0"]
-  ]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/landscape/2x4-2.json b/template/collage/landscape/2x4-2.json
index 8695f3e4a..07b6408d3 100644
--- a/template/collage/landscape/2x4-2.json
+++ b/template/collage/landscape/2x4-2.json
@@ -13,5 +13,16 @@
     ["x*0.54333","y*0.23500","x*0.40125","y*0.17833","0"],
     ["x*0.54333","y*0.43611","x*0.40125","y*0.17833","0"],
     ["x*0.54333","y*0.63667","x*0.40125","y*0.17833","0"]
-  ]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.05",
+    "y": "y*0.82",
+    "w": "x*0.4",
+    "h": "y*0.175",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/landscape/2x4-3.json b/template/collage/landscape/2x4-3.json
index ec71db52e..a0ab5267d 100644
--- a/template/collage/landscape/2x4-3.json
+++ b/template/collage/landscape/2x4-3.json
@@ -5,13 +5,14 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.01","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.27621","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.51048","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.74475","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.27621","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.51048","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.74475","x*0.48","y*0.21333","0"]
-  ]
+    ["x*0.01", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.27621", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.51048", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.74475", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.27621", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.51048", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.74475", "x*0.48", "y*0.21333", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/landscape/2x4-4.json b/template/collage/landscape/2x4-4.json
index bcbc4457e..06c6577c2 100644
--- a/template/collage/landscape/2x4-4.json
+++ b/template/collage/landscape/2x4-4.json
@@ -5,13 +5,14 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.01","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.27621","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.51048","x*0.48","y*0.21333","0"],
-    ["x*0.01","y*0.74475","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.04194","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.27621","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.51048","x*0.48","y*0.21333","0"],
-    ["x*0.51","y*0.74475","x*0.48","y*0.21333","0"]
-  ]
+    ["x*0.01", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.27621", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.51048", "x*0.48", "y*0.21333", "0"],
+    ["x*0.01", "y*0.74475", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.04194", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.27621", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.51048", "x*0.48", "y*0.21333", "0"],
+    ["x*0.51", "y*0.74475", "x*0.48", "y*0.21333", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/landscape/3+1-1.json b/template/collage/landscape/3+1-1.json
index 2b2ac3d50..acb0d863f 100644
--- a/template/collage/landscape/3+1-1.json
+++ b/template/collage/landscape/3+1-1.json
@@ -5,9 +5,20 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.0281","y*0.4252","x*0.4978","y*0.4978","0"],
-    ["x*0.0281","y*0.08","x*0.3052","y*0.3052","0"],
-    ["x*0.34736","y*0.08","x*0.3052","y*0.3052","0"],
-    ["x*0.66662","y*0.08","x*0.3052","y*0.3052","0"]
-  ]
+    ["x*0.0281", "y*0.4252", "x*0.4978", "y*0.4978", "0"],
+    ["x*0.0281", "y*0.08", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.34736", "y*0.08", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.66662", "y*0.08", "x*0.3052", "y*0.3052", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.55",
+    "y": "y*0.47",
+    "w": "x*0.4",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/portrait/1+2-1.json b/template/collage/portrait/1+2-1.json
index f58457dad..943f52558 100644
--- a/template/collage/portrait/1+2-1.json
+++ b/template/collage/portrait/1+2-1.json
@@ -5,8 +5,19 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.055","0","x*0.55546","y*0.55546","-10"],
-    ["x*0.055","y*0.555","x*0.40812","y*0.40812","0"],
-    ["x*0.5368","y*0.555","x*0.40812","y*0.40812","0"]
-  ]
+    ["x*0.055", "0", "x*0.55546", "y*0.55546", "-10"],
+    ["x*0.055", "y*0.555", "x*0.40812", "y*0.40812", "0"],
+    ["x*0.5368", "y*0.555", "x*0.40812", "y*0.40812", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.60",
+    "y": "y*0.1",
+    "w": "x*0.35",
+    "h": "y*0.35",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/collage/portrait/1+3-1.json b/template/collage/portrait/1+3-1.json
index c931ddf3d..64f9bcb5d 100644
--- a/template/collage/portrait/1+3-1.json
+++ b/template/collage/portrait/1+3-1.json
@@ -5,9 +5,20 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.0800","y*0.47410","x*0.4978","y*0.4978","0"],
-    ["x*0.6178","y*0.02810","x*0.3052","y*0.3052","0"],
-    ["x*0.6178","y*0.34736","x*0.3052","y*0.3052","0"],
-    ["x*0.6178","y*0.66662","x*0.3052","y*0.3052","0"]
-  ]
+    ["x*0.0800", "y*0.47410", "x*0.4978", "y*0.4978", "0"],
+    ["x*0.6178", "y*0.02810", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.6178", "y*0.34736", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.6178", "y*0.66662", "x*0.3052", "y*0.3052", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.075",
+    "y": "y*0.025",
+    "w": "x*0.5",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/collage/portrait/1+3-2.json b/template/collage/portrait/1+3-2.json
index 7497213d3..6ebdaa428 100644
--- a/template/collage/portrait/1+3-2.json
+++ b/template/collage/portrait/1+3-2.json
@@ -5,9 +5,20 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.0800","y*0.02810","x*0.4978","y*0.4978","0"],
-    ["x*0.6178","y*0.02810","x*0.3052","y*0.3052","0"],
-    ["x*0.6178","y*0.34736","x*0.3052","y*0.3052","0"],
-    ["x*0.6178","y*0.66662","x*0.3052","y*0.3052","0"]
-  ]
+    ["x*0.0800", "y*0.02810", "x*0.4978", "y*0.4978", "0"],
+    ["x*0.6178", "y*0.02810", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.6178", "y*0.34736", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.6178", "y*0.66662", "x*0.3052", "y*0.3052", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.075",
+    "y": "y*0.57",
+    "w": "x*0.5",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/collage/portrait/2+1-1.json b/template/collage/portrait/2+1-1.json
index 20072d220..e842575d8 100644
--- a/template/collage/portrait/2+1-1.json
+++ b/template/collage/portrait/2+1-1.json
@@ -5,8 +5,19 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.1","y*0.1","x*0.375","y*0.375","0"],
-    ["x*0.1","y*0.525","x*0.375","y*0.375","0"],
-    ["x*0.525","y*0.1","x*0.375","y*0.375","0"]
-  ]
+    ["x*0.1", "y*0.1", "x*0.375", "y*0.375", "0"],
+    ["x*0.1", "y*0.525", "x*0.375", "y*0.375", "0"],
+    ["x*0.525", "y*0.1", "x*0.375", "y*0.375", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.5",
+    "y": "y*0.5",
+    "w": "x*0.425",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/collage/portrait/2+2-1.json b/template/collage/portrait/2+2-1.json
index ca14c5bcd..5e1fcbbfd 100644
--- a/template/collage/portrait/2+2-1.json
+++ b/template/collage/portrait/2+2-1.json
@@ -5,9 +5,10 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["0","0","x/2","y/2","0"],
-    ["x/2","0","x/2","y/2","0"],
-    ["0","y/2","x/2","y/2","0"],
-    ["x/2","y/2","x/2","y/2","0"]
-  ]
+    ["0", "0", "x/2", "y/2", "0"],
+    ["x/2", "0", "x/2", "y/2", "0"],
+    ["0", "y/2", "x/2", "y/2", "0"],
+    ["x/2", "y/2", "x/2", "y/2", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/portrait/2+2-2.json b/template/collage/portrait/2+2-2.json
index 83d0ec29d..bf554688a 100644
--- a/template/collage/portrait/2+2-2.json
+++ b/template/collage/portrait/2+2-2.json
@@ -5,9 +5,10 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.08","y*0.08","x*0.4","y*0.4","0"],
-    ["x*0.08","y*0.52","x*0.4","y*0.4","0"],
-    ["x*0.52","y*0.08","x*0.4","y*0.4","0"],
-    ["x*0.52","y*0.52","x*0.4","y*0.4","0"]
-  ]
+    ["x*0.08", "y*0.08", "x*0.4", "y*0.4", "0"],
+    ["x*0.08", "y*0.52", "x*0.4", "y*0.4", "0"],
+    ["x*0.52", "y*0.08", "x*0.4", "y*0.4", "0"],
+    ["x*0.52", "y*0.52", "x*0.4", "y*0.4", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/portrait/2x3-1.json b/template/collage/portrait/2x3-1.json
index 797dd246b..d25796236 100644
--- a/template/collage/portrait/2x3-1.json
+++ b/template/collage/portrait/2x3-1.json
@@ -5,11 +5,22 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.04194","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.04194","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.51","x*0.21333","y*0.48","0"]
-  ]
+    ["x*0.04194", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.04194", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.51", "x*0.21333", "y*0.48", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.73",
+    "y": "y*0.01",
+    "w": "x*0.265",
+    "h": "y*0.48",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/portrait/2x3-2.json b/template/collage/portrait/2x3-2.json
index 6a44c2d9f..53e601d65 100644
--- a/template/collage/portrait/2x3-2.json
+++ b/template/collage/portrait/2x3-2.json
@@ -5,11 +5,22 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.04194","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.28597","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.53000","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.04194","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.28597","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.53000","y*0.51","x*0.21333","y*0.48","0"]
-  ]
+    ["x*0.04194", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.28597", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.53000", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.04194", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.28597", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.53000", "y*0.51", "x*0.21333", "y*0.48", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.765",
+    "y": "y*0.01",
+    "w": "x*0.225",
+    "h": "y*0.48",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/portrait/2x4-1.json b/template/collage/portrait/2x4-1.json
index 31c51bb60..063e1178f 100644
--- a/template/collage/portrait/2x4-1.json
+++ b/template/collage/portrait/2x4-1.json
@@ -13,5 +13,6 @@
     ["x*0.284375", "y*0.532787", "x*0.19047", "y*0.42855", "0"],
     ["x*0.521875", "y*0.532787", "x*0.19047", "y*0.42855", "0"],
     ["x*0.764844", "y*0.532787", "x*0.19047", "y*0.42855", "0"]
-  ]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/portrait/2x4-2.json b/template/collage/portrait/2x4-2.json
index 96b570d9c..560ff01ba 100644
--- a/template/collage/portrait/2x4-2.json
+++ b/template/collage/portrait/2x4-2.json
@@ -5,13 +5,24 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.03556","y*0.05333","x*0.17833","y*0.40125","0"],
-    ["x*0.23500","y*0.05333","x*0.17833","y*0.40125","0"],
-    ["x*0.43611","y*0.05333","x*0.17833","y*0.40125","0"],
-    ["x*0.63667","y*0.05333","x*0.17833","y*0.40125","0"],
-    ["x*0.03556","y*0.54333","x*0.17833","y*0.40125","0"],
-    ["x*0.23500","y*0.54333","x*0.17833","y*0.40125","0"],
-    ["x*0.43611","y*0.54333","x*0.17833","y*0.40125","0"],
-    ["x*0.63667","y*0.54333","x*0.17833","y*0.40125","0"]
-  ]
+    ["x*0.03556", "y*0.05333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.23500", "y*0.05333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.43611", "y*0.05333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.63667", "y*0.05333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.03556", "y*0.54333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.23500", "y*0.54333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.43611", "y*0.54333", "x*0.17833", "y*0.40125", "0"],
+    ["x*0.63667", "y*0.54333", "x*0.17833", "y*0.40125", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.825",
+    "y": "y*0.05",
+    "w": "x*0.17",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": 0
+  }
 }
diff --git a/template/collage/portrait/2x4-3.json b/template/collage/portrait/2x4-3.json
index 94c60d9dd..9a540974c 100644
--- a/template/collage/portrait/2x4-3.json
+++ b/template/collage/portrait/2x4-3.json
@@ -5,13 +5,14 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.04194","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.74475","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.04194","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.74475","y*0.51","x*0.21333","y*0.48","0"]
-  ]
+    ["x*0.04194", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.74475", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.04194", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.74475", "y*0.51", "x*0.21333", "y*0.48", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/portrait/2x4-4.json b/template/collage/portrait/2x4-4.json
index b44a2f382..7318be4d7 100644
--- a/template/collage/portrait/2x4-4.json
+++ b/template/collage/portrait/2x4-4.json
@@ -5,13 +5,14 @@
   "width": "1800",
   "height": "1200",
   "layout": [
-    ["x*0.04194","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.74475","y*0.01","x*0.21333","y*0.48","0"],
-    ["x*0.04194","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.27621","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.51048","y*0.51","x*0.21333","y*0.48","0"],
-    ["x*0.74475","y*0.51","x*0.21333","y*0.48","0"]
-  ]
+    ["x*0.04194", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.74475", "y*0.01", "x*0.21333", "y*0.48", "0"],
+    ["x*0.04194", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.27621", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.51048", "y*0.51", "x*0.21333", "y*0.48", "0"],
+    ["x*0.74475", "y*0.51", "x*0.21333", "y*0.48", "0"]
+  ],
+  "text_disabled": true
 }
diff --git a/template/collage/portrait/3+1-1.json b/template/collage/portrait/3+1-1.json
index a710c67b7..2bbe43d56 100644
--- a/template/collage/portrait/3+1-1.json
+++ b/template/collage/portrait/3+1-1.json
@@ -5,9 +5,20 @@
   "width": "1200",
   "height": "1800",
   "layout": [
-    ["x*0.4252","y*0.0281","x*0.4978","y*0.4978","0"],
-    ["x*0.08","y*0.0281","x*0.3052","y*0.3052","0"],
-    ["x*0.08","y*0.34736","x*0.3052","y*0.3052","0"],
-    ["x*0.08","y*0.66662","x*0.3052","y*0.3052","0"]
-  ]
+    ["x*0.4252", "y*0.0281", "x*0.4978", "y*0.4978", "0"],
+    ["x*0.08", "y*0.0281", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.08", "y*0.34736", "x*0.3052", "y*0.3052", "0"],
+    ["x*0.08", "y*0.66662", "x*0.3052", "y*0.3052", "0"]
+  ],
+  "text_alignment": {
+    "mode": "zone",
+    "x": "x*0.425",
+    "y": "y*0.575",
+    "w": "x*0.5",
+    "h": "y*0.4",
+    "align": "center",
+    "valign": "middle",
+    "rotation": 0,
+    "padding": "x*0.01"
+  }
 }
diff --git a/template/components/collageSelection.php b/template/components/collageSelection.php
new file mode 100644
index 000000000..43afeee17
--- /dev/null
+++ b/template/components/collageSelection.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * @var array{collage: array} $config
+ */
+
+use Photobooth\Enum\CollageLayoutEnum;
+use Photobooth\Service\LanguageService;
+use Photobooth\Collage;
+
+/**
+ * Evaluate layout expression (e.g., "x*0.5" → 900 if x=1800)
+ */
+function evaluateLayoutExpression(string $expr, float $x, float $y): float
+{
+    // Replace x and y with actual values
+    $expr = str_replace(['x', 'y'], [(string)$x, (string)$y], $expr);
+
+    // Safely evaluate simple math expressions
+    try {
+        // Only allow numbers, operators, parentheses, and dots
+        if (preg_match('/^[\d\.\+\-\*\/\(\)\s]+$/', $expr)) {
+            return (float)eval("return $expr;");
+        }
+    } catch (\Throwable $e) {
+        // Fallback on error
+        return 0.0;
+    }
+
+    return (float)$expr;
+}
+
+/**
+ * Load collage layout from JSON file
+ */
+function loadCollageLayoutFromJson(CollageLayoutEnum $layout, string $orientation = 'landscape'): ?array
+{
+    // Get JSON path using Collage class method
+    $jsonPath = Collage::getCollageConfigPath($layout->value, $orientation);
+
+    if (!$jsonPath || !file_exists($jsonPath)) {
+        return null;
+    }
+
+    $jsonContent = file_get_contents($jsonPath);
+    if ($jsonContent === false) {
+        return null;
+    }
+
+    $data = json_decode($jsonContent, true);
+    if (!is_array($data) || !isset($data['layout'])) {
+        return null;
+    }
+
+    return $data;
+}
+
+/**
+ * Generate SVG preview for collage layout (dynamically from JSON)
+ */
+function getLayoutPreviewSvg(CollageLayoutEnum $layout, string $orientation = 'landscape'): string
+{
+    // Try to load layout from JSON
+    $layoutData = loadCollageLayoutFromJson($layout, $orientation);
+
+    if (!$layoutData) {
+        // Fallback to simple 2x2 grid if JSON can't be loaded
+        $width = 1800;
+        $height = 1200;
+        $positions = [
+            ['x' => 0, 'y' => 0, 'w' => 90, 'h' => 60, 'num' => 1],
+            ['x' => 90, 'y' => 0, 'w' => 90, 'h' => 60, 'num' => 2],
+            ['x' => 0, 'y' => 60, 'w' => 90, 'h' => 60, 'num' => 3],
+            ['x' => 90, 'y' => 60, 'w' => 90, 'h' => 60, 'num' => 4],
+        ];
+    } else {
+        // Extract dimensions from JSON
+        $width = (float)($layoutData['width'] ?? 1800);
+        $height = (float)($layoutData['height'] ?? 1200);
+
+        // Scale factor for SVG preview (typically /10 for nice numbers)
+        $scale = 0.1;
+
+        // Check if this is a photostrip layout (2x4 or 2x3) where photos are duplicated
+        $isPhotostrip = in_array($layout, [
+            CollageLayoutEnum::TWO_X_FOUR_1,
+            CollageLayoutEnum::TWO_X_FOUR_2,
+            CollageLayoutEnum::TWO_X_FOUR_3,
+            CollageLayoutEnum::TWO_X_FOUR_4,
+            CollageLayoutEnum::TWO_X_THREE_1,
+            CollageLayoutEnum::TWO_X_THREE_2,
+        ]);
+
+        // Calculate how many unique photos (half of total for photostrips)
+        $layoutCount = count($layoutData['layout']);
+        $uniquePhotoCount = $isPhotostrip ? (int)($layoutCount / 2) : $layoutCount;
+
+        // Process each photo position from layout array
+        $positions = [];
+        $photoNum = 1;
+
+        foreach ($layoutData['layout'] as $index => $photoLayout) {
+            // photoLayout format: [x, y, width, height, rotation, ?frame]
+            if (count($photoLayout) < 4) {
+                continue;
+            }
+
+            $x = evaluateLayoutExpression($photoLayout[0], $width, $height);
+            $y = evaluateLayoutExpression($photoLayout[1], $width, $height);
+            $w = evaluateLayoutExpression($photoLayout[2], $width, $height);
+            $h = evaluateLayoutExpression($photoLayout[3], $width, $height);
+
+            // For photostrips: reset numbering after first half
+            $displayNum = $isPhotostrip && $index >= $uniquePhotoCount
+                ? ($index - $uniquePhotoCount + 1)
+                : $photoNum;
+
+            // Scale to SVG coordinates
+            $positions[] = [
+                'x' => $x * $scale,
+                'y' => $y * $scale,
+                'w' => $w * $scale,
+                'h' => $h * $scale,
+                'num' => $displayNum,
+            ];
+
+            // Only increment if not in second half of photostrip
+            if (!$isPhotostrip || $index < $uniquePhotoCount - 1) {
+                $photoNum++;
+            } elseif ($index === $uniquePhotoCount - 1) {
+                $photoNum = 1; // Reset for second half
+            }
+        }
+    }
+
+    // Calculate viewBox from actual dimensions
+    $viewBoxWidth = $width * 0.1;
+    $viewBoxHeight = $height * 0.1;
+
+    // Start SVG with dynamic viewBox
+    $svg = sprintf(
+        '<svg class="collageSelector__preview" viewBox="0 0 %d %d" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">',
+        (int)round($viewBoxWidth),
+        (int)round($viewBoxHeight)
+    );
+
+    // Draw each position
+    foreach ($positions as $pos) {
+        // Rectangle with border
+        $svg .= sprintf(
+            '<rect x="%s" y="%s" width="%s" height="%s" fill="#4A90E2" stroke="#FFFFFF" stroke-width="2" rx="2"/>',
+            number_format($pos['x'] + 2, 1, '.', ''),
+            number_format($pos['y'] + 2, 1, '.', ''),
+            number_format($pos['w'] - 4, 1, '.', ''),
+            number_format($pos['h'] - 4, 1, '.', '')
+        );
+
+        // Number text centered
+        $centerX = $pos['x'] + $pos['w'] / 2;
+        $centerY = $pos['y'] + $pos['h'] / 2;
+        $svg .= sprintf(
+            '<text x="%s" y="%s" text-anchor="middle" dominant-baseline="middle" fill="#FFFFFF" font-size="28" font-weight="bold" font-family="Arial, sans-serif">%d</text>',
+            number_format($centerX, 1, '.', ''),
+            number_format($centerY + 2, 1, '.', ''),
+            $pos['num']
+        );
+    }
+
+    // Add cut line for 2x4 and 2x3 layouts (shows where strip is cut)
+    if (
+        $layout === CollageLayoutEnum::TWO_X_FOUR_1 ||
+        $layout === CollageLayoutEnum::TWO_X_FOUR_2 ||
+        $layout === CollageLayoutEnum::TWO_X_FOUR_3 ||
+        $layout === CollageLayoutEnum::TWO_X_FOUR_4 ||
+        $layout === CollageLayoutEnum::TWO_X_THREE_1 ||
+        $layout === CollageLayoutEnum::TWO_X_THREE_2
+    ) {
+        // Dashed line in middle showing where it will be cut
+        if ($width > $height) {
+            // Landscape layout (e.g. 1800x1200) -> Horizontal cut
+            $middleY = $viewBoxHeight / 2;
+            $svg .= sprintf(
+                '<line x1="0" y1="%s" x2="%s" y2="%s" stroke="#FF0000" stroke-width="2" stroke-dasharray="5,5" opacity="0.8"/>',
+                number_format($middleY, 1, '.', ''),
+                number_format($viewBoxWidth, 1, '.', ''),
+                number_format($middleY, 1, '.', '')
+            );
+            // Scissors icon or text
+            $svg .= sprintf(
+                '<text x="6" y="%s" text-anchor="middle" dominant-baseline="middle" fill="#FF0000" font-size="8" font-weight="bold">✂</text>',
+                number_format($middleY, 1, '.', '')
+            );
+        } else {
+            // Portrait layout (e.g. 1200x1800) -> Vertical cut
+            $middleX = $viewBoxWidth / 2;
+            $svg .= sprintf(
+                '<line x1="%s" y1="0" x2="%s" y2="%s" stroke="#FF0000" stroke-width="2" stroke-dasharray="5,5" opacity="0.8"/>',
+                number_format($middleX, 1, '.', ''),
+                number_format($middleX, 1, '.', ''),
+                number_format($viewBoxHeight, 1, '.', '')
+            );
+            // Scissors icon or text at middle
+            $svg .= sprintf(
+                '<text x="%s" y="6" text-anchor="middle" fill="#FF0000" font-size="8" font-weight="bold">✂</text>',
+                number_format($middleX, 1, '.', '')
+            );
+        }
+    }
+
+    // Add outer border to show final photo format
+    $svg .= sprintf(
+        '<rect x="0" y="0" width="%s" height="%s" fill="none" stroke="#666666" stroke-width="1" rx="2"/>',
+        number_format($viewBoxWidth, 1, '.', ''),
+        number_format($viewBoxHeight, 1, '.', '')
+    );
+    $svg .= '</svg>';
+    return $svg;
+}
+
+function renderCollageOptionsFromEnumWithLimit(array $collageConfig): string
+{
+    $languageService = LanguageService::getInstance();
+
+    $html = '<div id="collageSelector">';
+    $html .= '<div class="modal hidden" id="collageSelectorModal" aria-hidden="true" role="dialog" aria-labelledby="collageSelectorTitle">';
+    $html .= '<div class="modal-inner">';
+    $html .= '<div class="modal-body">';
+    $html .= '<h3 id="collageSelectorTitle">' . $languageService->translate('selectCollageLayout') . '</h3>';
+    $html .= '<div class="collageSelector__options">';
+
+    // Get orientation from config (landscape or portrait)
+    $orientation = $collageConfig['orientation'] ?? 'landscape';
+
+    foreach (CollageLayoutEnum::cases() as $layout) {
+        if (in_array($layout, $collageConfig['layouts_enabled'])) {
+            $collageConfig['layout'] = $layout->value;
+            $limitData = Collage::calculateLimit($collageConfig);
+            $limit = $limitData['limit'];
+
+            $html .= sprintf(
+                '<button type="button" class="collageSelector__option cursor-pointer" data-layout="%s" data-limit="%d">' .
+                '<div class="collageSelector__preview-container">%s</div>' .
+                '<div class="collageSelector__label">%s</div>' .
+                '</button>',
+                htmlspecialchars($layout->value),
+                $limit,
+                getLayoutPreviewSvg($layout, $orientation),
+                htmlspecialchars($layout->label())
+            );
+        }
+    }
+
+    $html .= '</div>'; // .collageSelector__options
+    $html .= '</div>'; // .modal-body
+    $html .= '<div class="modal-buttonbar">';
+    $html .= '<button type="button" class="modal-button" id="collageSelectorClose" data-modal-close>';
+    $html .= '<span class="modal-button--icon"><i class="fa fa-times"></i></span>';
+    $html .= '<span class="modal-button--label">' . $languageService->translate('close') . '</span>';
+    $html .= '</button>';
+    $html .= '</div>'; // .modal-buttonbar
+    $html .= '</div>'; // .modal-inner
+    $html .= '</div>'; // .modal
+    $html .= '</div>'; // #collageSelector
+
+    return $html;
+}
+
+echo renderCollageOptionsFromEnumWithLimit($config['collage']);
diff --git a/template/components/stage.start.php b/template/components/stage.start.php
index 12cf152fc..caa5364b1 100644
--- a/template/components/stage.start.php
+++ b/template/components/stage.start.php
@@ -39,6 +39,9 @@
     include PathUtility::getAbsolutePath('template/components/selfieAction.php');
 } else {
     include PathUtility::getAbsolutePath('template/components/actionBtn.php');
+    if ($config['collage']['enabled'] && $config['collage']['allow_selection']) {
+        include PathUtility::getAbsolutePath('template/components/collageSelection.php');
+    }
 }
 ?>
     </div>
diff --git a/test/index.php b/test/index.php
index a7a2bda42..083956d9a 100644
--- a/test/index.php
+++ b/test/index.php
@@ -39,6 +39,7 @@
 echo getMenuBtn(PathUtility::getPublicPath('test/phpinfo.php'), 'phpinfo', '');
 echo getMenuBtn(PathUtility::getPublicPath('test/photo.php'), 'pictureTest', '');
 echo getMenuBtn(PathUtility::getPublicPath('test/collage.php'), 'collageTest', '');
+echo getMenuBtn(PathUtility::getPublicPath('test/text-positions.php'), 'testTextPositions', '');
 echo getMenuBtn(PathUtility::getPublicPath('test/preview.php'), 'previewTest', '');
 echo getMenuBtn(PathUtility::getPublicPath('test/chroma.php'), 'chromaPreviewTest', '');
 echo getMenuBtn(PathUtility::getPublicPath('test/trigger.php'), 'remotebuzzerGetTrigger', '');
diff --git a/test/text-positions.php b/test/text-positions.php
new file mode 100644
index 000000000..0c44301fb
--- /dev/null
+++ b/test/text-positions.php
@@ -0,0 +1,213 @@
+<?php
+require_once __DIR__ . '/../lib/boot.php';
+
+use Photobooth\Service\ApplicationService;
+use Photobooth\Service\LanguageService;
+use Photobooth\Utility\PathUtility;
+
+$languageService = LanguageService::getInstance();
+use Photobooth\Collage;
+use Photobooth\Helper;
+
+// ---- Config holen (versionssicher) ----
+$config = null;
+
+if (isset($config) && is_array($config)) {
+    // boot.php hat $config gesetzt
+} elseif (isset($GLOBALS['config']) && is_array($GLOBALS['config'])) {
+    $config = $GLOBALS['config'];
+} elseif (class_exists('\Photobooth\Service\ConfigurationService')) {
+    $config = \Photobooth\Service\ConfigurationService::getInstance()->getConfiguration();
+} else {
+    die('Keine Config-Quelle gefunden.');
+}
+
+// ---- Orientation aus Config ----
+$orientation = $config['collage']['orientation']
+    ?? $config['collage']['format']
+    ?? 'landscape';
+
+$orientation = strtolower((string)$orientation);
+if (!in_array($orientation, ['landscape', 'portrait'], true)) {
+    $orientation = 'landscape';
+}
+
+// ---- Text aktivieren (aus Config) ----
+$config['textoncollage']['enabled'] = true;
+
+// Sicherstellen dass kein Placeholder aktiv ist (wuerde das Limit aendern)
+$config['collage']['placeholder'] = false;
+
+// Font setzen falls nicht vorhanden
+$font = __DIR__ . '/../resources/fonts/GreatVibes-Regular.ttf';
+if (file_exists($font) && empty($config['textoncollage']['font'])) {
+    $config['textoncollage']['font'] = $font;
+}
+
+function createTestImage(array $rgb, int $w, int $h, string $name): string
+{
+    $img = imagecreatetruecolor($w, $h);
+    $c = imagecolorallocate($img, $rgb[0], $rgb[1], $rgb[2]);
+    imagefill($img, 0, 0, $c);
+    $black = imagecolorallocate($img, 0, 0, 0);
+    imagestring($img, 5, (int)($w / 2 - 30), (int)($h / 2 - 8), $name, $black);
+    $file = __DIR__ . '/../data/tmp/' . $name . '.jpg';
+    imagejpeg($img, $file, 90);
+    imagedestroy($img);
+    return $file;
+}
+
+$colors = [
+    [255, 100, 100],
+    [100, 255, 100],
+    [100, 100, 255],
+    [255, 255, 100],
+];
+
+// Alle verfuegbaren Layouts (landscape + portrait)
+$pageTitle = 'Collage Text Positions - ' . ApplicationService::getInstance()->getTitle();
+include PathUtility::getAbsolutePath('admin/components/head.admin.php');
+include PathUtility::getAbsolutePath('admin/helper/index.php');
+
+$layouts = [
+    '1+3-1', '1+3-2', '3+1-1', '1+2-1', '2+1-1',
+    '2+2-1', '2+2-2',
+    '2x4-1', '2x4-2', '2x4-3', '2x4-4',
+    '2x3-1', '2x3-2',
+];
+
+?>
+<div class="w-full h-screen absolute bg-brand-2 px-6 py-12 overflow-x-hidden overflow-y-auto">
+    <div class="w-full flex items-center justify-center flex-col">
+        <div class="w-full max-w-7xl rounded-lg p-8 bg-white flex flex-col shadow-xl mb-8">
+            <div class="w-full flex flex-col items-center justify-center text-2xl font-bold text-brand-1 mb-4">
+                <?=$languageService->translate('testTextPositions')?>
+            </div>
+            <div class="text-center mb-4">
+                <span class="inline-block px-3 py-1 bg-gray-100 rounded-full text-sm mr-2">
+                    <strong>Orientation:</strong> <?=htmlspecialchars($orientation)?>
+                </span>
+                <span class="inline-block px-3 py-1 bg-purple-100 rounded-full text-sm">
+                    <span style="display:inline-block; width:12px; height:12px; background:rgba(255,0,255,0.5); border:1px solid #333; vertical-align:middle; margin-right:4px;"></span>
+                    <strong>Text-Zone</strong> (mode="zone")
+                </span>
+            </div>
+            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+
+<?php
+foreach ($layouts as $layout) {
+    $tmp = [];
+
+    // Config fuer dieses Layout vorbereiten
+    $testConfig = $config;
+    $testConfig['collage']['layout'] = $layout;
+    $testConfig['collage']['orientation'] = $orientation;
+    $testConfig['collage']['format'] = $orientation;
+    $testConfig['collage']['allow_selection'] = true;
+    $testConfig['collage']['placeholder'] = false;
+
+    // Template-Pfad pruefen
+    $templatePath = Collage::getCollageConfigPath($layout, $orientation);
+    if (!$templatePath || !file_exists($templatePath)) {
+        echo '<div class="flex flex-col bg-white border border-gray-200 rounded-lg p-4 shadow-sm">';
+        echo '<div class="text-lg font-bold text-brand-1 mb-2">' . htmlspecialchars($layout) . '</div>';
+        echo '<div style="color:#999">Nicht verfuegbar fuer ' . $orientation . '</div>';
+        echo '</div>';
+        continue;
+    }
+
+    // Korrekte Bildanzahl berechnen (fuer 2x Layouts: count/2)
+    $calcResult = Collage::calculateLimit($testConfig['collage']);
+    $imageCount = $calcResult['limit'];
+
+    // WICHTIG: limit in Config setzen damit CollageConfigFactory den richtigen Wert verwendet
+    $testConfig['collage']['limit'] = $imageCount;
+
+    // Template laden fuer Zone-Visualisierung
+    $json = json_decode(file_get_contents($templatePath), true);
+
+    $w = $orientation === 'portrait' ? 600 : 800;
+    $h = $orientation === 'portrait' ? 800 : 600;
+
+    for ($i = 0; $i < $imageCount; $i++) {
+        $tmp[] = createTestImage($colors[$i % 4], $w, $h, $layout . '_' . $i . '_' . $orientation);
+    }
+
+    $dest = __DIR__ . '/../data/images/preview_' . $layout . '_' . $orientation . '.jpg';
+
+    $ok = Collage::createCollage($testConfig, $tmp, $dest);
+
+    // Zone visualisieren falls vorhanden
+    $hasZone = false;
+    if ($ok && file_exists($dest)) {
+        if (isset($json['text_alignment']) && ($json['text_alignment']['mode'] ?? '') === 'zone') {
+            $hasZone = true;
+            $img = imagecreatefromjpeg($dest);
+
+            if ($img) {
+                $width = imagesx($img);
+                $height = imagesy($img);
+                $ta = $json['text_alignment'];
+
+                // Zone-Koordinaten berechnen
+                $rep = ['x' => $width, 'y' => $height];
+                $zoneX = isset($ta['x']) ? (int) Helper::doMath(str_replace(array_keys($rep), array_values($rep), (string)$ta['x'])) : 0;
+                $zoneY = isset($ta['y']) ? (int) Helper::doMath(str_replace(array_keys($rep), array_values($rep), (string)$ta['y'])) : 0;
+                $zoneW = isset($ta['w']) ? (int) Helper::doMath(str_replace(array_keys($rep), array_values($rep), (string)$ta['w'])) : 0;
+                $zoneH = isset($ta['h']) ? (int) Helper::doMath(str_replace(array_keys($rep), array_values($rep), (string)$ta['h'])) : 0;
+
+                // Magenta Zone zeichnen
+                imagesavealpha($img, true);
+                $fill = imagecolorallocatealpha($img, 255, 0, 255, 80);
+                $border = imagecolorallocate($img, 255, 255, 255);
+                imagefilledrectangle($img, $zoneX, $zoneY, $zoneX + $zoneW, $zoneY + $zoneH, $fill);
+                imagerectangle($img, $zoneX, $zoneY, $zoneX + $zoneW, $zoneY + $zoneH, $border);
+                imagerectangle($img, $zoneX + 1, $zoneY + 1, $zoneX + $zoneW - 1, $zoneY + $zoneH - 1, $border);
+
+                imagejpeg($img, $dest, 90);
+                imagedestroy($img);
+            }
+        }
+    }
+
+    echo '<div class="flex flex-col bg-white border border-gray-200 rounded-lg p-4 shadow-sm">';
+    echo '<div class="text-lg font-bold text-brand-1 mb-2">' . htmlspecialchars($layout) . '</div>';
+    if ($ok && file_exists($dest)) {
+        echo '<img src="/data/images/' . htmlspecialchars(basename($dest)) . '?' . time() . '" class="w-full h-auto rounded border border-gray-300">';
+        $size = getimagesize($dest);
+        echo '<div class="text-xs text-gray-600 mt-2">' . $size[0] . 'x' . $size[1];
+        if ($hasZone) {
+            echo ' | <span class="text-purple-600 font-bold">Zone</span>';
+        }
+        echo '</div>';
+    } else {
+        echo '<div style="color:red">Fehler beim Erstellen</div>';
+    }
+    echo '</div>';
+
+    foreach ($tmp as $f) {
+        @unlink($f);
+    }
+}
+?>
+
+            </div>
+        </div>
+
+        <div class="w-full max-w-xl my-12 border-b border-solid border-white border-opacity-20"></div>
+
+        <div class="w-full max-w-xl rounded-lg py-8 bg-white flex flex-col shadow-xl relative">
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4 px-4">
+            <?php
+echo getMenuBtn(PathUtility::getPublicPath('admin'), 'admin_panel', $config['icons']['admin']);
+echo getMenuBtn(PathUtility::getPublicPath('test'), 'testMenu', $config['icons']['admin']);
+echo getMenuBtn(PathUtility::getPublicPath('admin/generator'), 'layout_generator', $config['icons']['take_collage']);
+?>
+            </div>
+        </div>
+    </div>
+</div>
+
+<?php
+include PathUtility::getAbsolutePath('admin/components/footer.scripts.php');
+include PathUtility::getAbsolutePath('admin/components/footer.admin.php');
diff --git a/tools/lint_templates.py b/tools/lint_templates.py
new file mode 100644
index 000000000..946645930
--- /dev/null
+++ b/tools/lint_templates.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+import json, glob, sys
+
+paths = sorted(glob.glob("template/collage/**/*.json", recursive=True))
+errs = 0
+for f in paths:
+    try:
+        with open(f, "r", encoding="utf-8") as fh:
+            json.load(fh)
+    except Exception as e:
+        print(f + ": " + str(e))
+        errs += 1
+if errs:
+    print("\nFound {} invalid JSON files".format(errs))
+    sys.exit(2)
+else:
+    print("All template JSON files are valid ({} files)".format(len(paths)))
+    sys.exit(0)