diff --git a/Block/Adminhtml/Config/Form/Field/FixVirtualThemes.php b/Block/Adminhtml/Config/Form/Field/FixVirtualThemes.php
index eb11886..e5435cb 100644
--- a/Block/Adminhtml/Config/Form/Field/FixVirtualThemes.php
+++ b/Block/Adminhtml/Config/Form/Field/FixVirtualThemes.php
@@ -13,7 +13,7 @@ public function render(AbstractElement $element)
         return <<<HTML
 <tr>
     <td colspan="100">
-        <div class="button-container">
+        <div class="fix-themes-container">
             <button id="fix-all-themes" 
                 class="button action-configure" 
                 type="button"
diff --git a/Block/Adminhtml/Config/Form/Field/VirtualCheck.php b/Block/Adminhtml/Config/Form/Field/VirtualCheck.php
index 860931b..9c0b740 100644
--- a/Block/Adminhtml/Config/Form/Field/VirtualCheck.php
+++ b/Block/Adminhtml/Config/Form/Field/VirtualCheck.php
@@ -2,25 +2,68 @@
 
 namespace Swissup\Core\Block\Adminhtml\Config\Form\Field;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Data\Form\Element\AbstractElement;
-use Magento\Theme\Model\ResourceModel\Theme\Collection;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Theme\Model\ResourceModel\Theme\CollectionFactory;
+use Swissup\Core\Model\Theme\SourceFiles;
 
 class VirtualCheck extends \Magento\Config\Block\System\Config\Form\Field
 {
     protected $_template = 'config/field/virtual_check.phtml';
-    
+
+    private CollectionFactory $collectionFactory;
+
+    private SourceFiles $sourceFiles;
+
+    private ?array $themes = null;
+
+    public function __construct(
+        Context $context,
+        CollectionFactory $collectionFactory,
+        SourceFiles $sourceFiles,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+
+        $this->collectionFactory = $collectionFactory;
+        $this->sourceFiles = $sourceFiles;
+    }
+
     public function render(AbstractElement $element)
     {
         $this->assign('configElement', $element);
         $html = $this->toHtml();
-        
+
         return $this->_decorateRowHtml($element, "<td class='themes-table' colspan=\"3\">$html</td>");
     }
 
-    public function getVirtualThemes() 
+    public function getVirtualThemes(): array
     {
-        return ObjectManager::getInstance()->create(Collection::class)
-            ->addFieldToFilter('type', 1);
+        if ($this->themes === null) {
+            $this->themes = [];
+
+            $collection = $this->collectionFactory->create()
+                ->addFieldToFilter('type', ThemeInterface::TYPE_VIRTUAL);
+
+            foreach ($collection as $theme) {
+                $this->themes[] = $this->collectThemeData($theme);
+            }
+        }
+
+        return $this->themes;
+    }
+
+    private function collectThemeData(ThemeInterface $theme): array
+    {
+        $unreadable = $this->sourceFiles->getUnreadable($theme);
+
+        return [
+            'title'  => $theme->getThemeTitle(),
+            'path'   => $theme->getFullPath(),
+            'status' => $unreadable
+                ? __('Virtual (Magento can\'t read %1)', implode(', ', $unreadable))
+                : __('Virtual'),
+        ];
     }
 }
diff --git a/Controller/Adminhtml/Theme/FixVirtualThemes.php b/Controller/Adminhtml/Theme/FixVirtualThemes.php
index 43759c4..f635809 100644
--- a/Controller/Adminhtml/Theme/FixVirtualThemes.php
+++ b/Controller/Adminhtml/Theme/FixVirtualThemes.php
@@ -4,30 +4,71 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Theme\Model\ResourceModel\Theme\CollectionFactory;
+use Swissup\Core\Model\Theme\SourceFiles;
 
 class FixVirtualThemes extends \Magento\Backend\App\Action
 {
     private CollectionFactory $collectionFactory;
 
+    private SourceFiles $sourceFiles;
+
     public function __construct(
         Context $context,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        SourceFiles $sourceFiles
     ) {
         parent::__construct($context);
         $this->collectionFactory = $collectionFactory;
+        $this->sourceFiles = $sourceFiles;
     }
 
     public function execute()
-    {        
-        $virtualThemes = $this->collectionFactory->create()->addFieldToFilter('type', 1);
+    {
+        $virtualThemes = $this->collectionFactory->create()
+            ->addFieldToFilter('type', ThemeInterface::TYPE_VIRTUAL);
+
+        $fixed = 0;
+        $skipped = [];
         foreach ($virtualThemes as $theme) {
-            $theme->setType(0)->save();
+            // Physical theme without source files breaks the storefront with
+            // "Required parameter 'theme_dir' was not passed"
+            if (!$this->sourceFiles->makeReadable($theme)) {
+                $skipped[] = $theme->getThemeTitle();
+                continue;
+            }
+
+            $theme->setType(ThemeInterface::TYPE_PHYSICAL)->save();
+            $fixed++;
         }
 
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-        $resultJson->setData(['message' => 'Virtual themes fixed. Please, clear the cache!']);
+        $resultJson->setData([
+            'fixed' => $fixed,
+            'skipped' => count($skipped),
+            'message' => $this->getMessage($fixed, $skipped),
+        ]);
 
         return $resultJson;
     }
+
+    private function getMessage(int $fixed, array $skipped): string
+    {
+        if (!$skipped) {
+            return (string) __('Virtual themes fixed.');
+        }
+
+        $skippedList = implode(', ', $skipped);
+
+        if (!$fixed) {
+            return (string) __('Nothing was fixed. Magento is unable to read the source files of: %1', $skippedList);
+        }
+
+        return (string) __(
+            '%1 theme(s) fixed. Magento is unable to read the source files of: %2',
+            $fixed,
+            $skippedList
+        );
+    }
 }
diff --git a/Model/Theme/SourceFiles.php b/Model/Theme/SourceFiles.php
new file mode 100644
index 0000000..8bfebc1
--- /dev/null
+++ b/Model/Theme/SourceFiles.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Swissup\Core\Model\Theme;
+
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\View\Design\ThemeInterface;
+
+class SourceFiles
+{
+    const THEME_FILES = ['registration.php', 'theme.xml'];
+
+    const READABLE_FILE_MODE = 0644;
+
+    private ComponentRegistrarInterface $registrar;
+
+    private File $filesystemDriver;
+
+    public function __construct(
+        ComponentRegistrarInterface $registrar,
+        File $filesystemDriver
+    ) {
+        $this->registrar = $registrar;
+        $this->filesystemDriver = $filesystemDriver;
+    }
+
+    public function getUnreadable(ThemeInterface $theme): array
+    {
+        $directory = $this->getDirectory($theme);
+
+        $unreadable = [];
+        foreach (self::THEME_FILES as $filename) {
+            if (!$directory || !$this->isReadable($directory . '/' . $filename)) {
+                $unreadable[] = $filename;
+            }
+        }
+
+        return $unreadable;
+    }
+
+    public function makeReadable(ThemeInterface $theme): bool
+    {
+        $directory = $this->getDirectory($theme);
+        if (!$directory) {
+            return false;
+        }
+
+        foreach (self::THEME_FILES as $filename) {
+            $path = $directory . '/' . $filename;
+            if ($this->isReadable($path)) {
+                continue;
+            }
+
+            if (!$this->changePermissions($path) || !$this->isReadable($path)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Themes created in admin have no theme_path. Theme with unreadable
+     * directory is not registered either - it is silently skipped by the glob
+     * in app/etc/NonComposerComponentRegistration.php, so an unregistered theme
+     * never means a removed one.
+     */
+    private function getDirectory(ThemeInterface $theme): ?string
+    {
+        $fullPath = $theme->getFullPath();
+
+        return $fullPath
+            ? $this->registrar->getPath(ComponentRegistrar::THEME, $fullPath)
+            : null;
+    }
+
+    private function changePermissions(string $path): bool
+    {
+        try {
+            return $this->filesystemDriver->changePermissions($path, self::READABLE_FILE_MODE);
+        } catch (FileSystemException $e) {
+            return false;
+        }
+    }
+
+    private function isReadable(string $path): bool
+    {
+        try {
+            return $this->filesystemDriver->isReadable($path);
+        } catch (FileSystemException $e) {
+            return false;
+        }
+    }
+}
diff --git a/view/adminhtml/templates/config/field/modules.phtml b/view/adminhtml/templates/config/field/modules.phtml
index 0943e40..ebacf62 100644
--- a/view/adminhtml/templates/config/field/modules.phtml
+++ b/view/adminhtml/templates/config/field/modules.phtml
@@ -6,7 +6,7 @@ $items = $block->getItems();
 <?php if (!$items): ?>
     <p><?= $escaper->escapeHtml(__('No Swissup modules are installed.')) ?></p>
 <?php else: ?>
-<table class="swissup-modules-table" data-role="swissup-modules">
+<table class="swissup-config-table swissup-modules-table" data-role="swissup-modules">
     <thead>
         <tr>
             <th><?= $escaper->escapeHtml(__('Package')) ?></th>
@@ -18,7 +18,7 @@ $items = $block->getItems();
     <tbody>
         <?php foreach ($items as $item): ?>
         <tr data-code="<?= $escaper->escapeHtmlAttr($item['code']) ?>"<?= $item['is_outdated'] ? ' class="outdated"' : '' ?>>
-            <td class="package"><?= $escaper->escapeHtml($item['name']) ?></td>
+            <td class="package font-mono"><?= $escaper->escapeHtml($item['name']) ?></td>
             <td class="version"><?= $escaper->escapeHtml($item['version']) ?></td>
             <td class="latest"><span
                 class="version<?= $item['is_outdated'] ? ' outdated' : '' ?>"
diff --git a/view/adminhtml/templates/config/field/virtual_check.phtml b/view/adminhtml/templates/config/field/virtual_check.phtml
index 55f9b16..12d83e8 100644
--- a/view/adminhtml/templates/config/field/virtual_check.phtml
+++ b/view/adminhtml/templates/config/field/virtual_check.phtml
@@ -1,33 +1,39 @@
+<?php /** @var \Swissup\Core\Block\Adminhtml\Config\Form\Field\VirtualCheck $block */ ?>
 <?php /** @var \Magento\Framework\Escaper $escaper */ ?>
 <style>
-#swissup_core_troubleshooting .button-container { margin-top: 20px; }
-#swissup_core_troubleshooting .themes-table h4 {padding-left: 0}
-#swissup_core_troubleshooting .themes-table table {max-width: 500px}
-#swissup_core_troubleshooting .themes-table td	{ text-align-last: left; }
-#swissup_core_troubleshooting .themes-table th { text-align-last: left; }
-#swissup_core_troubleshooting .themes-table td.virtual::before {
+#swissup_core_troubleshooting:has(.swissup-virtualfix-success) .fix-themes-container { display: none }
+#swissup_core_troubleshooting .fix-themes-container { margin-top: 20px; }
+#swissup_core_troubleshooting .themes-table .swissup-badge::before {
     display:inline-block;
     content: '';
-    width: 15px;
-    height: 15px;
-    background-color: red;
+    width: 10px;
+    height: 10px;
+    background-color: #cc1017;
     border-radius: 50%;
-    margin-right: 10px;
+    margin-right: 6px;
     vertical-align: middle;
 }
 </style>
 
-<h4>Virtual Theme Check</h4>
+<?php $themes = $block->getVirtualThemes(); ?>
 
-<?php if (!$block->getVirtualThemes()->getSize()): ?>
-    <p style="color: green;">No virtual themes found. Check: passed!</p>
+<?php if (!$themes): ?>
+    <p class="swissup-virtualfix-success" style="color: green;">No virtual themes found. Check: passed!</p>
 <?php else: ?>
-    <table>
+    <table class="swissup-config-table">
+        <thead>
+            <tr>
+                <th scope="col"><?= $escaper->escapeHtml(__('Theme')) ?></th>
+                <th scope="col"><?= $escaper->escapeHtml(__('Path')) ?></th>
+                <th scope="col"><?= $escaper->escapeHtml(__('Status')) ?></th>
+            </tr>
+        </thead>
     	<tbody>
-            <?php foreach ($block->getVirtualThemes() as $theme): ?>
+            <?php foreach ($themes as $theme): ?>
     		<tr>
-                <td scope="row"><?= $escaper->escapeHtml($theme->getThemeTitle()) ?></td>
-                <td class="virtual">Virtual</td>
+                <td><?= $escaper->escapeHtml($theme['title']) ?></td>
+                <td class="font-mono"><?= $escaper->escapeHtml($theme['path'] ?: '—') ?></td>
+                <td><span class="swissup-badge"><?= $escaper->escapeHtml($theme['status']) ?></span></td>
             </tr>
             <?php endforeach; ?>
     	</tbody>
diff --git a/view/adminhtml/web/css/system-config/modules.less b/view/adminhtml/web/css/system-config/modules.less
index 050ca40..e6d5a96 100644
--- a/view/adminhtml/web/css/system-config/modules.less
+++ b/view/adminhtml/web/css/system-config/modules.less
@@ -67,7 +67,7 @@
     }
 }
 
-.swissup-modules-table {
+.swissup-config-table {
     thead {
         position: sticky;
         top: 75px;
@@ -88,11 +88,12 @@
         color: #303030;
         font-weight: 600;
     }
-
-    .package {
+    .font-mono {
         font-family: 'Menlo', 'Consolas', monospace;
     }
+}
 
+.swissup-modules-table {
     .latest .version {
         color: #a6a6a6;
 
@@ -100,7 +101,6 @@
             font-weight: 600;
         }
     }
-
     .links a + a {
         margin-left: 1.5rem;
     }
diff --git a/view/adminhtml/web/js/virtualfix.js b/view/adminhtml/web/js/virtualfix.js
index 1cec982..2887e0e 100644
--- a/view/adminhtml/web/js/virtualfix.js
+++ b/view/adminhtml/web/js/virtualfix.js
@@ -4,19 +4,20 @@ define([
 ], function ($, alert) {
     'use strict';
 
-    var self, url, cacheUrl;
+    var self, url, cacheUrl,
+        rowSelector = '#row_swissup_core_troubleshooting_virtualcheck';
 
     return {
-        init: function(ajaxCallUrl, cacheUrlPath, assignBtn) {
+        init: function (ajaxCallUrl, cacheUrlPath, assignBtn) {
             self = this;
             url = ajaxCallUrl;
             cacheUrl = cacheUrlPath;
 
-            $(assignBtn).on('click', function() {
+            $(assignBtn).on('click', function () {
                 self.virtualfix();
             });
         },
-        virtualfix: function() {
+        virtualfix: function () {
             $.ajax({
                 url: url,
                 method: 'POST',
@@ -26,17 +27,35 @@ define([
                     form_key:   window.FORM_KEY
                 }
             })
-            .done(function(data) {
-                $('#row_swissup_core_troubleshooting_virtualcheck .themes-table table').hide();
-                $('#fix-all-themes').hide();
-                $('<tr><td>Success! Please, <a href="' + cacheUrl + '" target=_blank>clear the cache</a></td></tr>').insertAfter('#row_swissup_core_troubleshooting_virtualcheck');
+            .done(function (data) {
+                var $message = $('<tr class="swissup-virtualfix-message"><td colspan="100"></td></tr>'),
+                    $cell = $message.find('td');
+
+                $('.swissup-virtualfix-message').remove();
+
+                $cell.text(data.message);
+
+                if (data.fixed) {
+                    $(rowSelector + ' .themes-table table').hide();
+                    $cell.append(' ', $('<a/>', {
+                        href: cacheUrl,
+                        target: '_blank',
+                        text: $.mage.__('Clear the cache')
+                    }));
+                }
+
+                if (!data.skipped) {
+                    $('#fix-all-themes').hide();
+                }
+
+                $message.insertAfter(rowSelector);
             })
-            .fail(function(jqXHR, textStatus, errorThrown) {
+            .fail(function (jqXHR, textStatus, errorThrown) {
                 alert({
                     title: $.mage.__('Error'),
                     content: $.mage.__('An error occured: ') + errorThrown
                 });
-            });  
+            });
         }
-    }
+    };
 });
