diff --git a/app/Services/ImageGenerationService.php b/app/Services/ImageGenerationService.php
index fe6cdd4..762d449 100644
--- a/app/Services/ImageGenerationService.php
+++ b/app/Services/ImageGenerationService.php
@@ -43,13 +43,13 @@ class ImageGenerationService
             $browserStage = new BrowserStage($browsershotInstance);
             $browserStage->html($markup);
 
-            if (config('app.puppeteer_window_size_strategy') === 'v1') {
-                // default behaviour for Framework v1
-                $browserStage->useDefaultDimensions();
-            } else {
+            if (config('app.puppeteer_window_size_strategy') === 'v2') {
                 $browserStage
                     ->width($imageSettings['width'])
                     ->height($imageSettings['height']);
+            } else {
+                // default behaviour for Framework v1
+                $browserStage->useDefaultDimensions();
             }
 
             if (config('app.puppeteer_wait_for_network_idle')) {
diff --git a/resources/views/trmnl-layouts/mashup.blade.php b/resources/views/trmnl-layouts/mashup.blade.php
index fd22cdb..1d8321f 100644
--- a/resources/views/trmnl-layouts/mashup.blade.php
+++ b/resources/views/trmnl-layouts/mashup.blade.php
@@ -8,13 +8,7 @@
     'scaleLevel' => null,
 ])
 
-@if(config('app.puppeteer_window_size_strategy') === 'v1')
-    <x-trmnl::screen colorDepth="{{$colorDepth}}">
-        <x-trmnl::mashup mashup-layout="{{ $mashupLayout }}">
-            {!! $slot !!}
-        </x-trmnl::mashup>
-    </x-trmnl::screen>
-@else
+@if(config('app.puppeteer_window_size_strategy') === 'v2')
     <x-trmnl::screen colorDepth="{{$colorDepth}}" no-bleed="{{$noBleed}}" dark-mode="{{$darkMode}}"
                      device-variant="{{$deviceVariant}}" device-orientation="{{$deviceOrientation}}"
                      scale-level="{{$scaleLevel}}">
@@ -22,4 +16,10 @@
             {!! $slot !!}
         </x-trmnl::mashup>
     </x-trmnl::screen>
+@else
+    <x-trmnl::screen colorDepth="{{$colorDepth}}">
+        <x-trmnl::mashup mashup-layout="{{ $mashupLayout }}">
+            {!! $slot !!}
+        </x-trmnl::mashup>
+    </x-trmnl::screen>
 @endif
diff --git a/resources/views/trmnl-layouts/single.blade.php b/resources/views/trmnl-layouts/single.blade.php
index 84ec889..17ffe43 100644
--- a/resources/views/trmnl-layouts/single.blade.php
+++ b/resources/views/trmnl-layouts/single.blade.php
@@ -7,14 +7,14 @@
     'scaleLevel' => null,
 ])
 
-@if(config('app.puppeteer_window_size_strategy') === 'v1')
-    <x-trmnl::screen colorDepth="{{$colorDepth}}">
-        {!! $slot !!}
-    </x-trmnl::screen>
-@else
+@if(config('app.puppeteer_window_size_strategy') === 'v2')
     <x-trmnl::screen colorDepth="{{$colorDepth}}" no-bleed="{{$noBleed}}" dark-mode="{{$darkMode}}"
                      device-variant="{{$deviceVariant}}" device-orientation="{{$deviceOrientation}}"
                      scale-level="{{$scaleLevel}}">
         {!! $slot !!}
     </x-trmnl::screen>
+@else
+    <x-trmnl::screen colorDepth="{{$colorDepth}}">
+        {!! $slot !!}
+    </x-trmnl::screen>
 @endif