diff --git a/config/config.inc.php b/config/config.inc.php
index ba4ef334c..6d5177eaf 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -51,6 +51,7 @@
 // use for example https://keycode.info to get the key code
 $config['photo_key'] = null;
 $config['collage_key'] = null;
+$config['collage_layout'] = '2x2'; //possible layouts are 2x2 or 2x4 (row x column)
 
 // LANGUAGE
 // possible values: de, en, es, fr, gr, hu
diff --git a/lib/collage.php b/lib/collage.php
index 50cd6de3b..3b6aa644d 100644
--- a/lib/collage.php
+++ b/lib/collage.php
@@ -1,41 +1,101 @@
 <?php
+require_once(__DIR__ . '/config.php');
+
+define('LAYOUT', $config['collage_layout']);
 
 function createCollage($srcImagePaths, $destImagePath, $takeFrame, $framePath) {
     if (!is_array($srcImagePaths) || count($srcImagePaths) !== 4) {
         return false;
     }
 
-    list($width, $height) = getimagesize($srcImagePaths[0]);
+    switch(LAYOUT) {
+        case '2x2':
+            list($width, $height) = getimagesize($srcImagePaths[0]);
 
-    $my_collage = imagecreatetruecolor($width, $height);
-    $background = imagecolorallocate($my_collage, 0, 0, 0);
-    imagecolortransparent($my_collage, $background);
+            $my_collage = imagecreatetruecolor($width, $height);
+            $background = imagecolorallocate($my_collage, 0, 0, 0);
+            imagecolortransparent($my_collage, $background);
 
-    $positions = [[0, 0], [$width / 2, 0], [0, $height / 2], [$width / 2, $height / 2]];
+            $positions = [[0, 0], [$width / 2, 0], [0, $height / 2], [$width / 2, $height / 2]];
 
-    for ($i = 0; $i < 4; $i++) {
-        $position = $positions[$i];
+            for ($i = 0; $i < 4; $i++) {
+                $position = $positions[$i];
 
-        if (!file_exists($srcImagePaths[$i])) {
-            return false;
-        }
+                if (!file_exists($srcImagePaths[$i])) {
+                    return false;
+                }
 
-        $tempSubImage = imagecreatefromjpeg($srcImagePaths[$i]);
+                $tempSubImage = imagecreatefromjpeg($srcImagePaths[$i]);
 
-        if ($takeFrame) {
-            $frame = imagecreatefrompng($framePath);
-            $frame = resizePngImage($frame, imagesx($tempSubImage), imagesy($tempSubImage));
-            $x = (imagesx($tempSubImage)/2) - (imagesx($frame)/2);
-            $y = (imagesy($tempSubImage)/2) - (imagesy($frame)/2);
-            imagecopy($tempSubImage, $frame, $x, $y, 0, 0, imagesx($frame), imagesy($frame));
-        }
+                if ($takeFrame) {
+                    $frame = imagecreatefrompng($framePath);
+                    $frame = resizePngImage($frame, imagesx($tempSubImage), imagesy($tempSubImage));
+                    $x = (imagesx($tempSubImage)/2) - (imagesx($frame)/2);
+                    $y = (imagesy($tempSubImage)/2) - (imagesy($frame)/2);
+                    imagecopy($tempSubImage, $frame, $x, $y, 0, 0, imagesx($frame), imagesy($frame));
+                }
 
-        imagecopyresized($my_collage, $tempSubImage, $position[0], $position[1], 0, 0, $width / 2, $height / 2, $width, $height);
-        imagedestroy($tempSubImage);
-    }
+                imagecopyresized($my_collage, $tempSubImage, $position[0], $position[1], 0, 0, $width / 2, $height / 2, $width, $height);
+                imagedestroy($tempSubImage);
+            }
 
-    imagejpeg($my_collage, $destImagePath);
-    imagedestroy($my_collage);
+            imagejpeg($my_collage, $destImagePath);
+            imagedestroy($my_collage);
+            break;
+        case '2x4':
+            $degrees = 90;
+            
+            list($width_before, $height_before) = getimagesize($srcImagePaths[0]);
+            
+            $my_collage_width = $width_before;
+            $my_collage_height = $height_before;
+            
+            $my_collage = imagecreatetruecolor($my_collage_width,$my_collage_height);
+            $background = imagecolorallocate($my_collage, 240, 240, 240);
+            imagefill($my_collage,0,0,$background);
+            
+            $images_rotated = array();
+            
+            for ($i = 0; $i < 4; $i++) {
+                $img_tmp = imagecreatefromjpeg($srcImagePaths[$i]);
+                
+                if ($takeFrame) {
+                    $frame = imagecreatefrompng($framePath);
+                    $frame = resizePngImage($frame, imagesx($img_tmp), imagesy($img_tmp));
+                    $x = (imagesx($img_tmp)/2) - (imagesx($frame)/2);
+                    $y = (imagesy($img_tmp)/2) - (imagesy($frame)/2);
+                    imagecopy($img_tmp, $frame, $x, $y, 0, 0, imagesx($frame), imagesy($frame));
+                }
+                
+                $img_rotate_tmp = imagerotate($img_tmp, $degrees, 0);
+                $images_rotated[] = resizeImage($img_rotate_tmp, $height_before/3.3, $width_before/3.5);
+            }
+
+            $new_width = imagesx($images_rotated[0]);
+            $new_height = imagesy($images_rotated[0]);
+            
+            $height_offset = ((($my_collage_height/2)-$new_height)/2);
+            $width_offset = (($my_collage_width-($new_width*4))/5);
+            
+            $positions_top = [[$width_offset, $height_offset], [($width_offset*2+$new_width), $height_offset], [($width_offset*3+2*$new_width), $height_offset], [($width_offset*4+3*$new_width), $height_offset]];
+            $positions_bottom = [[$width_offset, ($new_height+(3*$height_offset))], [($width_offset*2+$new_width), ($new_height+(3*$height_offset))], [($width_offset*3+2*$new_width), ($new_height+(3*$height_offset))], [($width_offset*4+3*$new_width), ($new_height+(3*$height_offset))]];
+        
+            for ($i = 0; $i < 4; $i++) {
+                $position_top = $positions_top[$i];
+                $position_bottom = $positions_bottom[$i];
+                
+                imagecopy( $my_collage, $images_rotated[$i],$position_top[0],$position_top[1],0,0,$new_width,$new_height);
+                imagecopy( $my_collage, $images_rotated[$i],$position_bottom[0],$position_bottom[1],0,0,$new_width,$new_height);
+            }
+            
+            imagescale($my_collage, $width_before, $height_before);
+            
+            imagejpeg($my_collage, $destImagePath);
+            imagedestroy($my_collage);          
+            break;
+        default:
+            break;
+    }
 
     return true;
-}
\ No newline at end of file
+}
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index 22fc8e88c..e551176f2 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -87,6 +87,16 @@
 			'placeholder' => '',
 			'value' => $config['collage_key']
 		],
+		'collage_layout' => [
+			'type' => 'select',
+			'name' => 'collage_layout',
+			'placeholder' => $defaultConfig['collage_layout'],
+			'options' => [
+				'2x2' => '2x2'
+				'2x4' => '2x4'
+			],
+			'value' => $config['collage_layout']
+		],
 		'collage_limit' => [
 			'type' => 'hidden',
 			'name' => 'collage_limit',