diff --git a/app/Models/DeviceModel.php b/app/Models/DeviceModel.php
index 18750ea..0d3757b 100644
--- a/app/Models/DeviceModel.php
+++ b/app/Models/DeviceModel.php
@@ -31,7 +31,7 @@ final class DeviceModel extends Model
             return null;
         }
 
-        //if higher then 4 return 4bit
+        // if higher then 4 return 4bit
         if ($this->bit_depth > 4) {
             return '4bit';
         }
@@ -39,7 +39,7 @@ final class DeviceModel extends Model
         return $this->bit_depth.'bit';
     }
 
-/**
+    /**
      * Returns the scale level based on the device width.
      */
     public function getScaleLevelAttribute(): ?string
diff --git a/app/Models/Plugin.php b/app/Models/Plugin.php
index 7c6d2c1..f5f6928 100644
--- a/app/Models/Plugin.php
+++ b/app/Models/Plugin.php
@@ -350,15 +350,16 @@ class Plugin extends Model
                         'scaleLevel' => $device?->deviceModel?->scale_level,
                         'slot' => $renderedContent,
                     ])->render();
-                } else {
-                    return view('trmnl-layouts.mashup', [
-                        'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
-                        'colorDepth' => $device?->deviceModel?->color_depth,
-                        'deviceVariant' => $device?->deviceModel->name ?? 'og',
-                        'scaleLevel' => $device?->deviceModel?->scale_level,
-                        'slot' => $renderedContent,
-                    ])->render();
                 }
+
+                return view('trmnl-layouts.mashup', [
+                    'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
+                    'colorDepth' => $device?->deviceModel?->color_depth,
+                    'deviceVariant' => $device?->deviceModel->name ?? 'og',
+                    'scaleLevel' => $device?->deviceModel?->scale_level,
+                    'slot' => $renderedContent,
+                ])->render();
+
             }
 
             return $renderedContent;
diff --git a/app/Services/PluginImportService.php b/app/Services/PluginImportService.php
index c409d99..e824f35 100644
--- a/app/Services/PluginImportService.php
+++ b/app/Services/PluginImportService.php
@@ -267,38 +267,38 @@ class PluginImportService
 
         // If zipEntryPath is specified, look for files in that specific directory first
         if ($zipEntryPath) {
-            $targetDir = $tempDir . '/' . $zipEntryPath;
+            $targetDir = $tempDir.'/'.$zipEntryPath;
             if (File::exists($targetDir)) {
                 // Check if files are directly in the target directory
-                if (File::exists($targetDir . '/settings.yml')) {
-                    $settingsYamlPath = $targetDir . '/settings.yml';
-                    
-                    if (File::exists($targetDir . '/full.liquid')) {
-                        $fullLiquidPath = $targetDir . '/full.liquid';
-                    } elseif (File::exists($targetDir . '/full.blade.php')) {
-                        $fullLiquidPath = $targetDir . '/full.blade.php';
+                if (File::exists($targetDir.'/settings.yml')) {
+                    $settingsYamlPath = $targetDir.'/settings.yml';
+
+                    if (File::exists($targetDir.'/full.liquid')) {
+                        $fullLiquidPath = $targetDir.'/full.liquid';
+                    } elseif (File::exists($targetDir.'/full.blade.php')) {
+                        $fullLiquidPath = $targetDir.'/full.blade.php';
                     }
-                    
-                    if (File::exists($targetDir . '/shared.liquid')) {
-                        $sharedLiquidPath = $targetDir . '/shared.liquid';
+
+                    if (File::exists($targetDir.'/shared.liquid')) {
+                        $sharedLiquidPath = $targetDir.'/shared.liquid';
                     }
                 }
-                
+
                 // Check if files are in src subdirectory of target directory
-                if (!$settingsYamlPath && File::exists($targetDir . '/src/settings.yml')) {
-                    $settingsYamlPath = $targetDir . '/src/settings.yml';
-                    
-                    if (File::exists($targetDir . '/src/full.liquid')) {
-                        $fullLiquidPath = $targetDir . '/src/full.liquid';
-                    } elseif (File::exists($targetDir . '/src/full.blade.php')) {
-                        $fullLiquidPath = $targetDir . '/src/full.blade.php';
+                if (! $settingsYamlPath && File::exists($targetDir.'/src/settings.yml')) {
+                    $settingsYamlPath = $targetDir.'/src/settings.yml';
+
+                    if (File::exists($targetDir.'/src/full.liquid')) {
+                        $fullLiquidPath = $targetDir.'/src/full.liquid';
+                    } elseif (File::exists($targetDir.'/src/full.blade.php')) {
+                        $fullLiquidPath = $targetDir.'/src/full.blade.php';
                     }
-                    
-                    if (File::exists($targetDir . '/src/shared.liquid')) {
-                        $sharedLiquidPath = $targetDir . '/src/shared.liquid';
+
+                    if (File::exists($targetDir.'/src/shared.liquid')) {
+                        $sharedLiquidPath = $targetDir.'/src/shared.liquid';
                     }
                 }
-                
+
                 // If we found the required files in the target directory, return them
                 if ($settingsYamlPath && $fullLiquidPath) {
                     return [