diff --git a/Makefile b/Makefile
index 1dfe643f5..9e3ea2436 100644
--- a/Makefile
+++ b/Makefile
@@ -456,6 +456,24 @@ export-elp-epub3:
 export-elp-ims:
 	@$(MAKE) export-elp FORMAT=ims INPUT="$(INPUT)" OUTPUT="$(OUTPUT)" DEBUG="$(DEBUG)" BASE_URL="$(BASE_URL)"
 
+export-elp-h5p:
+ifndef INPUT
+	$(error INPUT is required. Use INPUT=/absolute/path/to/file.elp)
+endif
+ifndef OUTPUT
+	$(error OUTPUT is required. Use OUTPUT=/absolute/path/to/output.h5p)
+endif
+	$(eval EXPANDED_INPUT := $(call EXPAND_PATH,$(INPUT)))
+	@if [ ! -f "$(EXPANDED_INPUT)" ]; then \
+	   echo "❌ INPUT file does not exist: $(EXPANDED_INPUT)"; \
+	   exit 1; \
+	fi
+	@mkdir -p $(dir $(OUTPUT))
+	$(eval TMP_DIR := $(OUTPUT).tmpdir)
+	@$(MAKE) export-elp FORMAT=h5p INPUT="$(EXPANDED_INPUT)" OUTPUT="$(TMP_DIR)" DEBUG="$(DEBUG)" BASE_URL="$(BASE_URL)"
+	@mv "$(TMP_DIR)"/*.h5p "$(OUTPUT)"
+	@rm -rf "$(TMP_DIR)"
+
 
 # Install nativephp/php-bin package temporarily without modifying composer.json
 install-php-bin:
@@ -558,6 +576,7 @@ help:
 	@echo "  export-elp-scorm2004  - Export .elp to SCORM 2004 format (alias for FORMAT=scorm2004)"
 	@echo "  export-elp-ims        - Export .elp to IMS format (alias for FORMAT=ims)"
 	@echo "  export-elp-epub3      - Export .elp to EPUB 3 format (alias for FORMAT=epub3)"
+	@echo "  export-elp-h5p        - Export .elp to H5P (experimental) format (alias for FORMAT=h5p)"
 	@echo "  export-elp-elp        - Re-export .elp file (alias for FORMAT=elp)"
 	@echo ""
 	@echo "Data:"
diff --git a/README.md b/README.md
index 1295e23c5..9d47c88b8 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ This version is built with modern technologies (PHP 8, Symfony 7) and provides a
 * Creation and edition of interactive educational content
 * Multiple iDevices (interactive elements)
 * Multilingual support
-* Exportation to various formats
+* Exportation to multiple formats (SCORM, IMS, EPUB, HTML and H5P)
 * Moodle integration
 * [RESTful API](./doc/development/rest-api.md) Self-documented with Swagger
 * Real-time collaborative features powered by [Mercure](https://mercure.rocks/)
diff --git a/doc/development/environment.md b/doc/development/environment.md
index c704ce63d..6d536f593 100644
--- a/doc/development/environment.md
+++ b/doc/development/environment.md
@@ -136,10 +136,20 @@ The project provides a Makefile to simplify common tasks:
 | `make test`         | Run unit tests                        |
 | `make lint`         | Check PHP code style                  |
 | `make fix`          | Automatically fix code style issues   |
-| `make update`       | Update Composer dependencies          |
-| `make translations` | Update translation files              |
-
-### Installing `make`
+| `make update`       | Update Composer dependencies          |
+| `make translations` | Update translation files              |
+
+### Exporting Content
+
+Use the Makefile to generate packages from `.elp` projects. For example, to create an experimental H5P package:
+
+```bash
+make export-elp-h5p INPUT=/path/project.elp OUTPUT=/path/project.h5p
+```
+
+Other formats can be exported by replacing `h5p` with `html5`, `scorm12`, `scorm2004`, `ims`, or `epub3`.
+
+### Installing `make`
 
 On Linux, `make` is usually pre-installed. On Windows, install it with:
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 49d84f281..5b17cb07e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -69,6 +69,7 @@
 
   <extensions>
       <bootstrap class="Symfony\Component\Panther\ServerExtension"/>
+      <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
   </extensions>
 
     <testsuites>
diff --git a/public/app/workarea/menus/navbar/items/navbarFile.js b/public/app/workarea/menus/navbar/items/navbarFile.js
index 47a5777c5..902010489 100644
--- a/public/app/workarea/menus/navbar/items/navbarFile.js
+++ b/public/app/workarea/menus/navbar/items/navbarFile.js
@@ -81,6 +81,9 @@ export default class NavbarFile {
         this.exportEPUB3AsButton = this.menu.navbar.querySelector(
             '#navbar-button-exportas-epub3'
         );
+        this.exportH5PButton = this.menu.navbar.querySelector(
+            '#navbar-button-export-h5p'
+        );
         this.exportXmlPropertiesButton = this.menu.navbar.querySelector(
             '#navbar-button-export-xml-properties'
         );
@@ -127,6 +130,7 @@ export default class NavbarFile {
         this.setExportIMSEvent();
         this.setExportIMSAsEvent();
         this.setExportEPUB3Event();
+        this.setExportH5PEvent();
         this.setExportEPUB3AsEvent();
         this.setExportXmlPropertiesEvent();
         this.setExportXmlPropertiesAsEvent();
@@ -439,6 +443,14 @@ export default class NavbarFile {
         });
     }
 
+    setExportH5PEvent() {
+        if (!this.exportH5PButton) return;
+        this.exportH5PButton.addEventListener('click', () => {
+            if (eXeLearning.app.project.checkOpenIdevice()) return;
+            this.exportH5PEvent();
+        });
+    }
+
     setExportEPUB3AsEvent() {
         if (!this.exportEPUB3AsButton) return;
         this.exportEPUB3AsButton.addEventListener('click', () => {
@@ -1207,7 +1219,6 @@ export default class NavbarFile {
     }
 
     /**
-<<<<<<< HEAD
      * Export Website to folder (unzipped) — offline Electron only
      */
     async exportHTML5FolderAsEvent() {
@@ -1285,8 +1296,6 @@ export default class NavbarFile {
     }
 
     /**
-=======
->>>>>>> c0ba7aea408904076081df962baf800d79424a91
      * Export the ode as HTML5 and download it
      *
      */
@@ -1782,6 +1791,99 @@ export default class NavbarFile {
         eXeLearning.app.interface.connectionTime.loadLasUpdatedInInterface();
     }
 
+    async exportH5PEvent() {
+        let toastData = {
+            title: _('Export'),
+            body: _('Generating export files...'),
+            icon: 'downloading',
+        };
+        let toast = eXeLearning.app.toasts.createToast(toastData);
+        let odeSessionId = eXeLearning.app.project.odeSession;
+        let response = await eXeLearning.app.api.getOdeExportDownload(
+            odeSessionId,
+            'h5p'
+        );
+        if (response['responseMessage'] == 'OK') {
+            this.downloadLink(
+                response['urlZipFile'],
+                response['exportProjectName']
+            );
+            toast.toastBody.innerHTML = _('The project has been exported.');
+        } else {
+            toast.toastBody.innerHTML = _(
+                'An error occurred while exporting the project.'
+            );
+            toast.toastBody.classList.add('error');
+            eXeLearning.app.modals.alert.show({
+                title: _('Error'),
+                body: response['responseMessage']
+                    ? response['responseMessage']
+                    : _('Unknown error.'),
+                contentId: 'error',
+            });
+        }
+
+        setTimeout(() => {
+            toast.remove();
+        }, 1000);
+
+        eXeLearning.app.interface.connectionTime.loadLasUpdatedInInterface();
+    }
+
+    /**
+     * Export ePub3 (Save As...)
+     */
+    async exportEPUB3AsEvent() {
+        let toastData = {
+            title: _('Export'),
+            body: _('Generating export files...'),
+            icon: 'downloading',
+        };
+        let toast = eXeLearning.app.toasts.createToast(toastData);
+        let odeSessionId = eXeLearning.app.project.odeSession;
+        let response = await eXeLearning.app.api.getOdeExportDownload(
+            odeSessionId,
+            'epub3'
+        );
+        if (response['responseMessage'] == 'OK') {
+            const url = response['urlZipFile'];
+            const suggested = this.normalizeSuggestedName(
+                response['exportProjectName'],
+                'export-epub3'
+            );
+            const keyBase = window.__currentProjectId || 'default';
+            if (
+                window.electronAPI &&
+                typeof window.electronAPI.saveAs === 'function'
+            ) {
+                await window.electronAPI.saveAs(
+                    url,
+                    `${keyBase}:export-epub3`,
+                    suggested
+                );
+            } else {
+                this.downloadLink(url, suggested);
+            }
+            toast.toastBody.innerHTML = _('The project has been exported.');
+        } else {
+            toast.toastBody.innerHTML = _(
+                'An error occurred while exporting the project.'
+            );
+            toast.toastBody.classList.add('error');
+            eXeLearning.app.modals.alert.show({
+                title: _('Error'),
+                body: response['responseMessage']
+                    ? response['responseMessage']
+                    : _('Unknown error.'),
+                contentId: 'error',
+            });
+        }
+        setTimeout(() => {
+            toast.remove();
+        }, 1000);
+        eXeLearning.app.interface.connectionTime.loadLasUpdatedInInterface();
+    }
+
     /**
      * Export ePub3 (Save As...)
      */
diff --git a/src/Command/net/exelearning/Command/ElpExportCommand.php b/src/Command/net/exelearning/Command/ElpExportCommand.php
index 1ab18bafd..363c01dba 100644
--- a/src/Command/net/exelearning/Command/ElpExportCommand.php
+++ b/src/Command/net/exelearning/Command/ElpExportCommand.php
@@ -45,7 +45,7 @@ protected function configure(): void
         $this
             ->addArgument('input', InputArgument::REQUIRED, 'Input ELP file path (use "-" for stdin)')
             ->addArgument('output', InputArgument::REQUIRED, 'Output directory')
-            ->addArgument('format', InputArgument::OPTIONAL, 'Export format (elp, html5, html5-sp, scorm12, scorm2004, ims, epub3)', $this->defaultFormat)
+            ->addArgument('format', InputArgument::OPTIONAL, 'Export format (elp, html5, html5-sp, scorm12, scorm2004, ims, epub3, h5p)', $this->defaultFormat)
             ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable debug mode')
             ->addOption('base-url', 'b', InputOption::VALUE_OPTIONAL, 'Base URL for links', false);
     }
@@ -67,6 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             Constants::EXPORT_TYPE_SCORM2004,
             Constants::EXPORT_TYPE_IMS,
             Constants::EXPORT_TYPE_EPUB3,
+            Constants::EXPORT_TYPE_H5P,
         ];
 
         if (!in_array($format, $validFormats, true)) {
diff --git a/src/Command/net/exelearning/Command/ElpExportH5pCommand.php b/src/Command/net/exelearning/Command/ElpExportH5pCommand.php
new file mode 100644
index 000000000..abeb0468e
--- /dev/null
+++ b/src/Command/net/exelearning/Command/ElpExportH5pCommand.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Command\net\exelearning\Command;
+
+use App\Constants;
+use Symfony\Component\Console\Attribute\AsCommand;
+
+#[AsCommand(
+    name: 'elp:export-h5p',
+    description: 'Export ELP to H5P format',
+)]
+class ElpExportH5pCommand extends ElpExportCommand
+{
+    protected string $defaultFormat = Constants::EXPORT_TYPE_H5P;
+}
diff --git a/src/Constants.php b/src/Constants.php
index b8daded49..fdc2ec219 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -127,6 +127,7 @@ class Constants
     public const EXPORT_TYPE_SCORM2004 = 'scorm2004';
     public const EXPORT_TYPE_IMS = 'ims';
     public const EXPORT_TYPE_EPUB3 = 'epub3';
+    public const EXPORT_TYPE_H5P = 'h5p';
 
     // Export types filename suffixes
     public const SUFFIX_TYPE_HTML5 = '_web';
@@ -134,6 +135,7 @@ class Constants
     public const SUFFIX_TYPE_SCORM12 = '_scorm';
     public const SUFFIX_TYPE_SCORM2004 = '_scorm2004';
     public const SUFFIX_TYPE_IMS = '_ims';
+    public const SUFFIX_TYPE_H5P = '_h5p';
 
     // Export files
     public const EXPORT_FILE_INDEX_NAME = 'index';
@@ -229,6 +231,7 @@ class Constants
     public const FILE_EXTENSION_ELP = 'elp';
     public const FILE_EXTENSION_ZIP = 'zip';
     public const FILE_EXTENSION_EPUB = 'epub';
+    public const FILE_EXTENSION_H5P = 'h5p';
     public const FILE_EXTENSION_XML = 'xml';
 
     // CSV separator
diff --git a/src/Controller/net/exelearning/Controller/Api/CurrentOdeUsersApiController.php b/src/Controller/net/exelearning/Controller/Api/CurrentOdeUsersApiController.php
index 6d6ab34e9..4c08dd070 100644
--- a/src/Controller/net/exelearning/Controller/Api/CurrentOdeUsersApiController.php
+++ b/src/Controller/net/exelearning/Controller/Api/CurrentOdeUsersApiController.php
@@ -451,7 +451,7 @@ private function publishOdeBlockStatusEvent(
         ?string $actionType,
         string $userEmail,
         ?string $odeComponentFlag = null,
-        ?string $timeIdeviceEditing,
+        ?string $timeIdeviceEditing = null,
         ?string $pageId = null, // Collaborative
     ): void {
         $this->publish(
diff --git a/src/Doctrine/Middleware/SqlitePragmaMiddleware.php b/src/Doctrine/Middleware/SqlitePragmaMiddleware.php
index e267172e3..71960a153 100644
--- a/src/Doctrine/Middleware/SqlitePragmaMiddleware.php
+++ b/src/Doctrine/Middleware/SqlitePragmaMiddleware.php
@@ -28,18 +28,21 @@ public function connect(
                     return $connection;
                 }
 
-                // WAL keeps readers and writers from blocking each other.
-                $connection->exec('PRAGMA journal_mode = WAL');
-                // NORMAL sync trims redundant fsyncs without losing crash safety on checkpoints.
-                $connection->exec('PRAGMA synchronous = NORMAL');
-                // Retries for ~5s curb transient "database is locked" errors when writers race.
-                $connection->exec('PRAGMA busy_timeout = 5000');
-                // Doctrine disables foreign keys by default for SQLite; force them back on.
-                $connection->exec('PRAGMA foreign_keys = ON');
-                // Temp tables and sorting spill to memory to avoid disk-backed temp files.
-                $connection->exec('PRAGMA temp_store = MEMORY');
-                // Negative cache size sets ~4MB memory caching for hot pages (no disk persistence).
-                $connection->exec('PRAGMA cache_size = -4000');
+                // Skip WAL and disk-related PRAGMAs for pure in-memory DBs.
+                if (!$this->isMemory($params)) {
+                    // WAL keeps readers and writers from blocking each other.
+                    $connection->exec('PRAGMA journal_mode = WAL');
+                    // NORMAL sync trims redundant fsyncs without losing crash safety on checkpoints.
+                    $connection->exec('PRAGMA synchronous = NORMAL');
+                    // Retries for ~5s curb transient "database is locked" errors when writers race.
+                    $connection->exec('PRAGMA busy_timeout = 5000');
+                    // Doctrine disables foreign keys by default for SQLite; force them back on.
+                    $connection->exec('PRAGMA foreign_keys = ON');
+                    // Temp tables and sorting spill to memory to avoid disk-backed temp files.
+                    $connection->exec('PRAGMA temp_store = MEMORY');
+                    // Negative cache size sets ~4MB memory caching for hot pages (no disk persistence).
+                    $connection->exec('PRAGMA cache_size = -4000');
+                }
 
                 return $connection;
             }
@@ -71,6 +74,28 @@ private function isSqlite(array $params): bool
 
                 return false;
             }
+
+            /**
+             * Detects in-memory SQLite (":memory:" or memory param).
+             *
+             * @param array<string, mixed> $params
+             */
+            private function isMemory(array $params): bool
+            {
+                if (!empty($params['memory'])) {
+                    return true;
+                }
+                $url = $params['url'] ?? null;
+                if (\is_string($url) && \str_contains($url, ':memory:')) {
+                    return true;
+                }
+                $path = $params['path'] ?? null;
+                if (\is_string($path) && ':memory:' === $path) {
+                    return true;
+                }
+
+                return false;
+            }
         };
     }
 }
diff --git a/src/Service/net/exelearning/Service/Api/OdeExportService.php b/src/Service/net/exelearning/Service/Api/OdeExportService.php
index 73ab3112d..d5b19a6d7 100644
--- a/src/Service/net/exelearning/Service/Api/OdeExportService.php
+++ b/src/Service/net/exelearning/Service/Api/OdeExportService.php
@@ -15,11 +15,13 @@
 use App\Helper\net\exelearning\Helper\UserHelper;
 use App\Properties;
 use App\Service\net\exelearning\Service\Export\ExportEPUB3Service;
+use App\Service\net\exelearning\Service\Export\ExportH5PService;
 use App\Service\net\exelearning\Service\Export\ExportHTML5Service;
 use App\Service\net\exelearning\Service\Export\ExportHTML5SPService;
 use App\Service\net\exelearning\Service\Export\ExportIMSService;
 use App\Service\net\exelearning\Service\Export\ExportSCORM12Service;
 use App\Service\net\exelearning\Service\Export\ExportSCORM2004Service;
+use App\Settings;
 use App\Util\net\exelearning\Util\Commoni18nUtil;
 use App\Util\net\exelearning\Util\ExportXmlUtil;
 use App\Util\net\exelearning\Util\FilePermissionsUtil;
@@ -52,6 +54,7 @@ class OdeExportService implements OdeExportServiceInterface
     private ExportIMSService $exportIMSService;
     private ExportEPUB3Service $exportEPUB3Service;
     private SluggerInterface $slugger;
+    private ExportH5PService $exportH5PService;
 
     public function __construct(
         EntityManagerInterface $entityManager,
@@ -70,6 +73,7 @@ public function __construct(
         ExportSCORM2004Service $exportSCORM2004Service,
         ExportIMSService $exportIMSService,
         ExportEPUB3Service $exportEPUB3Service,
+        ExportH5PService $exportH5PService,
         SluggerInterface $slugger,
     ) {
         $this->entityManager = $entityManager;
@@ -88,6 +92,7 @@ public function __construct(
         $this->exportSCORM2004Service = $exportSCORM2004Service;
         $this->exportIMSService = $exportIMSService;
         $this->exportEPUB3Service = $exportEPUB3Service;
+        $this->exportH5PService = $exportH5PService;
         $this->slugger = $slugger;
     }
 
@@ -277,14 +282,11 @@ public function export(
             return $response;
         }
 
-        // Export dir path
-        // $exportDirPath = $this->fileHelper->getOdeSessionUserTmpExportDir($odeSessionId, $dbUser);
+        // Export dir path (already includes $tempPath if provided)
         $exportDirPath = $this->fileHelper->getOdeSessionUserTmpExportDir($odeSessionId, $dbUser, $tempPath);
-        $exportDirPath = $exportDirPath.$tempPath;
 
-        // Get url to export dir
-        $urlExportDir = UrlUtil::getOdeSessionExportUrl($odeSessionId, $dbUser);
-        $urlExportDir = $urlExportDir.$tempPath;
+        // Get url to export dir (append tempPath once for preview)
+        $urlExportDir = UrlUtil::getOdeSessionExportUrl($odeSessionId, $dbUser).$tempPath;
 
         // Index filename
         $indexFileName = self::generateIndexFileName();
@@ -301,6 +303,10 @@ public function export(
                 case Constants::EXPORT_TYPE_EPUB3:
                     $ext = Constants::FILE_EXTENSION_EPUB;
                     break;
+                case Constants::EXPORT_TYPE_H5P:
+                    $ext = Constants::FILE_EXTENSION_H5P;
+                    $typeSuffix = Constants::SUFFIX_TYPE_H5P;
+                    break;
                 case Constants::EXPORT_TYPE_HTML5:
                     $ext = Constants::FILE_EXTENSION_ZIP;
                     $typeSuffix = Constants::SUFFIX_TYPE_HTML5;
@@ -331,6 +337,8 @@ public function export(
             $response['urlZipFile'] = $urlExportDir.$exportFileName;
             // Add zip file name to response
             $response['zipFileName'] = $exportFileName;
+            // Provide export file name for clients
+            $response['exportProjectName'] = $exportFileName;
 
             // Stores the ode permanently
             $this->odeService->moveElpFileToPerm($saveOdeResultParameters, $dbUser, $isManualSave);
@@ -540,6 +548,51 @@ public function generateExportStructure(
             $resourcesPrefix = '';
         }
 
+        // H5P export: generate a minimal H5P package and return early
+        if (Constants::EXPORT_TYPE_H5P === $exportType) {
+            // Start with a clean directory
+            FileUtil::removeDirContent($exportParentDirPath);
+
+            // Compute pages data without creating extra dirs
+            $odeNavStructureSyncsSorted = self::getOdeNavStructureSyncsSorted($odeNavStructureSyncs);
+            $pagesFileData = self::getPagesData(
+                $exportDirPath,
+                $odeNavStructureSyncsSorted,
+                $userPreferencesDtos,
+                '',
+                $exportType
+            );
+
+            try {
+                $this->exportH5PService->generateExportFiles(
+                    $user,
+                    $odeSessionId,
+                    $odeNavStructureSyncsSorted,
+                    $pagesFileData,
+                    $odeProperties,
+                    [],
+                    [],
+                    [],
+                    [],
+                    [],
+                    $userPreferencesDtos,
+                    $theme,
+                    '',
+                    '',
+                    false,
+                    $this->translator
+                );
+            } catch (\Throwable $e) {
+                $response['responseMessage'] = $this->translator->trans('Export generation error');
+
+                return $response;
+            }
+
+            $response['responseMessage'] = 'OK';
+
+            return $response;
+        }
+
         // Check if the ELP should be added to the export
         // TODO: The next if statement will be a bit difference when exe has a new preference
         // related to add ELP to an export
diff --git a/src/Service/net/exelearning/Service/Export/ExportH5PService.php b/src/Service/net/exelearning/Service/Export/ExportH5PService.php
new file mode 100644
index 000000000..6405822c2
--- /dev/null
+++ b/src/Service/net/exelearning/Service/Export/ExportH5PService.php
@@ -0,0 +1,878 @@
+<?php
+
+namespace App\Service\net\exelearning\Service\Export;
+
+use App\Constants;
+use App\Helper\net\exelearning\Helper\FileHelper;
+use App\Service\net\exelearning\Service\Api\CurrentOdeUsersServiceInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ExportH5PService implements ExportServiceInterface
+{
+    private string $exportType;
+    private FileHelper $fileHelper;
+    private CurrentOdeUsersServiceInterface $currentOdeUsersService;
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        FileHelper $fileHelper,
+        CurrentOdeUsersServiceInterface $currentOdeUsersService,
+        TranslatorInterface $translator,
+    ) {
+        $this->exportType = Constants::EXPORT_TYPE_H5P;
+        $this->fileHelper = $fileHelper;
+        $this->currentOdeUsersService = $currentOdeUsersService;
+        $this->translator = $translator;
+    }
+
+    public function generateExportFiles(
+        $user,
+        $odeSessionId,
+        $odeNavStructureSyncs,
+        $pagesFileData,
+        $odeProperties,
+        $libsResourcesPath,
+        $odeComponentsSyncCloneArray,
+        $idevicesMapping,
+        $idevicesByPage,
+        $idevicesTypesData,
+        $userPreferencesDtos,
+        $theme,
+        $elpFileName,
+        $resourcesPrefix,
+        $isPreview,
+        $translator,
+    ) {
+        $exportDirPath = $this->fileHelper->getOdeSessionUserTmpExportDir($odeSessionId, $user);
+        $contentDir = $exportDirPath.'content'.DIRECTORY_SEPARATOR;
+        if (!is_dir($contentDir)) {
+            mkdir($contentDir, 0775, true);
+        }
+
+        $projectTitle = isset($odeProperties['pp_title'])
+            ? trim(strip_tags($odeProperties['pp_title']->getValue()))
+            : 'eXeLearning project';
+        $language = isset($odeProperties['pp_lang'])
+            ? substr($odeProperties['pp_lang']->getValue(), 0, 2)
+            : 'en';
+
+        // Choose layout (env override for tests)
+        $layout = getenv('EXE_H5P_LAYOUT') ?: 'column';
+        if ('course-presentation' === $layout) {
+            return $this->generateCoursePresentation(
+                $user,
+                $odeSessionId,
+                $odeNavStructureSyncs,
+                $pagesFileData,
+                $odeProperties,
+                $contentDir,
+                $exportDirPath
+            );
+        }
+
+        // Build Column content
+        // NOTE: Some H5P platforms/configurations do not allow rich media
+        // (e.g., <img>, <audio>, <video>) inside AdvancedText HTML. To ensure
+        // compatibility, we:
+        //  - Keep page text in a single AdvancedText block
+        //  - Extract inline <img>, <audio> and <video> elements
+        //  - Copy local media files into the H5P package (content/images or content/media)
+        //  - Append dedicated H5P.Image / H5P.Audio / H5P.Video blocks right after
+        //    the text block.
+        $items = [];
+        $sessionDistDir = $this->fileHelper->getOdeSessionDistDirForUser($odeSessionId, $user);
+        $sessionBaseDir = $this->fileHelper->getOdeSessionDir($odeSessionId);
+        $imagesDir = $contentDir.'images'.DIRECTORY_SEPARATOR; // create lazily only if needed
+        $mediaDir = $contentDir.'media'.DIRECTORY_SEPARATOR;   // audio/video dir (lazy)
+        $copiedImages = [];
+        $copiedMedia = [];
+        foreach ($odeNavStructureSyncs as $page) {
+            $pageId = $page->getOdePageId();
+            if (!isset($pagesFileData[$pageId])) {
+                continue;
+            }
+            $pageData = $pagesFileData[$pageId];
+
+            $html = '<h2>'.htmlspecialchars($pageData['name']).'</h2>';
+            foreach ($pageData['blocks'] as $block) {
+                foreach ($block['idevices'] as $idevice) {
+                    if (!empty($idevice['htmlView'])) {
+                        $html .= $idevice['htmlView'];
+                    }
+                }
+            }
+
+            // Extract local images, copy to content/images and return image items
+            [$cleanHtml, $imageItems] = $this->extractImagesAndBuildItems(
+                $html,
+                $sessionDistDir,
+                $sessionBaseDir,
+                $odeSessionId,
+                $imagesDir,
+                $copiedImages
+            );
+
+            // Extract local audio (<audio src|<source>) and add H5P.Audio items
+            [$cleanHtml, $audioItems] = $this->extractAudioAndBuildItems(
+                $cleanHtml,
+                $sessionDistDir,
+                $sessionBaseDir,
+                $odeSessionId,
+                $mediaDir,
+                $copiedMedia
+            );
+
+            // Extract local video (<video src|<source>) and add H5P.Video items
+            [$cleanHtml, $videoItems] = $this->extractVideoAndBuildItems(
+                $cleanHtml,
+                $sessionDistDir,
+                $sessionBaseDir,
+                $odeSessionId,
+                $mediaDir,
+                $copiedMedia
+            );
+
+            // Extract external video embeds (YouTube/Vimeo) via <iframe> or known blocks
+            [$cleanHtml, $externalVideoItems] = $this->extractExternalVideoAndBuildItems(
+                $cleanHtml
+            );
+
+            // Extract remaining iframes (non-YouTube/Vimeo) and PDFs into H5P.IFrameEmbed
+            [$cleanHtml, $iframeItems] = $this->extractOtherIframesAndBuildItems(
+                $cleanHtml,
+                $sessionDistDir,
+                $sessionBaseDir,
+                $odeSessionId,
+                $mediaDir,
+                $copiedMedia
+            );
+
+            $items[] = [
+                'content' => [
+                    'params' => ['text' => $cleanHtml],
+                    'library' => 'H5P.AdvancedText 1.1',
+                    'subContentId' => uniqid(),
+                    'metadata' => [
+                        'title' => $pageData['name'] ?? 'Page',
+                        'license' => 'U',
+                    ],
+                ],
+                'useSeparator' => 'auto',
+            ];
+
+            // Append images as separate content blocks
+            foreach ($imageItems as $imgItem) {
+                $items[] = $imgItem;
+            }
+            // Append audio blocks
+            foreach ($audioItems as $audItem) {
+                $items[] = $audItem;
+            }
+            // Append video blocks
+            foreach ($videoItems as $vidItem) {
+                $items[] = $vidItem;
+            }
+            // Append external video blocks
+            foreach ($externalVideoItems as $evidItem) {
+                $items[] = $evidItem;
+            }
+            // Append generic iframe blocks (including local PDFs)
+            foreach ($iframeItems as $ifrItem) {
+                $items[] = $ifrItem;
+            }
+        }
+
+        $content = [
+            'content' => $items,
+        ];
+        file_put_contents(
+            $contentDir.'content.json',
+            json_encode($content, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
+        );
+
+        // Minimal package referencing Column (platform must have the library installed)
+        $h5pJson = [
+            'title' => $projectTitle,
+            'language' => $language,
+            'mainLibrary' => 'H5P.Column',
+            'embedTypes' => ['iframe'],
+            'license' => 'U',
+            'preloadedDependencies' => [
+                [
+                    'machineName' => 'H5P.Column',
+                    'majorVersion' => '1',
+                    'minorVersion' => '18',
+                ],
+            ],
+        ];
+        file_put_contents(
+            $exportDirPath.'h5p.json',
+            json_encode($h5pJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
+        );
+
+        return true;
+    }
+
+    private function generateCoursePresentation(
+        $user,
+        $odeSessionId,
+        $odeNavStructureSyncs,
+        $pagesFileData,
+        $odeProperties,
+        string $contentDir,
+        string $exportDirPath,
+    ) {
+        $projectTitle = isset($odeProperties['pp_title']) ? trim(strip_tags($odeProperties['pp_title']->getValue())) : 'eXeLearning project';
+        $language = isset($odeProperties['pp_lang']) ? substr($odeProperties['pp_lang']->getValue(), 0, 2) : 'en';
+
+        $slides = [];
+        foreach ($odeNavStructureSyncs as $page) {
+            $pageId = $page->getOdePageId();
+            if (!isset($pagesFileData[$pageId])) {
+                continue;
+            }
+            $pageData = $pagesFileData[$pageId];
+            $html = '<h2>'.htmlspecialchars($pageData['name']).'</h2>';
+            foreach ($pageData['blocks'] as $block) {
+                foreach ($block['idevices'] as $idevice) {
+                    if (!empty($idevice['htmlView'])) {
+                        $html .= $idevice['htmlView'];
+                    }
+                }
+            }
+            $element = [
+                'x' => 5,
+                'y' => 5,
+                'width' => 90,
+                'height' => 90,
+                'action' => [
+                    'library' => 'H5P.AdvancedText 1.1',
+                    'params' => ['text' => $html],
+                    'subContentId' => uniqid(),
+                    'metadata' => [
+                        'contentType' => 'Text',
+                        'license' => 'U',
+                        'title' => $pageData['name'] ?? 'Page',
+                    ],
+                ],
+                'alwaysDisplayComments' => false,
+                'backgroundOpacity' => 60,
+                'displayAsButton' => false,
+                'invisible' => false,
+                'solution' => '',
+                'buttonSize' => 'big',
+                'goToSlideType' => 'specified',
+            ];
+            $slides[] = [
+                'elements' => [$element],
+                'slideBackgroundSelector' => new \stdClass(),
+            ];
+        }
+
+        $content = ['presentation' => ['slides' => $slides]];
+        file_put_contents($contentDir.'content.json', json_encode($content, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+
+        $h5pJson = [
+            'title' => $projectTitle,
+            'language' => $language,
+            'mainLibrary' => 'H5P.CoursePresentation',
+            'embedTypes' => ['iframe'],
+            'license' => 'U',
+            'preloadedDependencies' => [
+                ['machineName' => 'H5P.CoursePresentation', 'majorVersion' => '1', 'minorVersion' => '26'],
+            ],
+        ];
+        file_put_contents($exportDirPath.'h5p.json', json_encode($h5pJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+
+        return true;
+    }
+
+    /**
+     * Find local images inside HTML, copy them into content/images and return
+     * [cleanHtmlWithoutImgs, imageItems].
+     */
+    private function extractImagesAndBuildItems(
+        string $html,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $imagesDir,
+        array &$copiedImages,
+    ): array {
+        $cleanHtml = $html;
+        $imageItems = [];
+
+        // Regex for <img ... src="..." ...>
+        if (!preg_match_all('/<img\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>/i', $html, $matches, PREG_SET_ORDER)) {
+            return [$cleanHtml, $imageItems];
+        }
+
+        foreach ($matches as $m) {
+            $fullTag = $m[0];
+            $src = $m[1];
+            $localPath = $this->resolveLocalContentPath($src, $sessionDistDir, $sessionBaseDir, $odeSessionId);
+            if (!$localPath || !is_file($localPath)) {
+                // Skip remote or unresolved images; leave tag untouched
+                continue;
+            }
+
+            // Determine destination filename
+            $baseName = basename(parse_url($localPath, PHP_URL_PATH));
+            $destName = $baseName;
+            $i = 1;
+            while (isset($copiedImages[$destName]) && $copiedImages[$destName] !== $localPath) {
+                $destName = pathinfo($baseName, PATHINFO_FILENAME).'_'.$i.'.'.pathinfo($baseName, PATHINFO_EXTENSION);
+                ++$i;
+            }
+
+            // Check allowed extensions for H5P packages (raster only)
+            $ext = strtolower(pathinfo($destName, PATHINFO_EXTENSION));
+            $allowed = ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'tif', 'tiff'];
+            if (!in_array($ext, $allowed, true)) {
+                // Don't package unsupported image types; leave original src
+                $cleanHtml = str_replace($fullTag, '', $cleanHtml);
+                continue;
+            }
+
+            // Copy if not already copied
+            if (!isset($copiedImages[$destName])) {
+                if (!is_dir($imagesDir)) {
+                    @mkdir($imagesDir, 0775, true);
+                }
+                @copy($localPath, $imagesDir.$destName);
+                if (is_file($imagesDir.$destName)) {
+                    $copiedImages[$destName] = $localPath;
+                } else {
+                    // Copy failed; skip creating item
+                    continue;
+                }
+            }
+            // Create H5P.Image content block and remove the <img> tag from HTML
+            [$mime, $width, $height] = $this->probeImage($localPath);
+            $imageParams = [
+                'contentName' => 'Image',
+                'file' => [
+                    'path' => 'images/'.$destName,
+                    'mime' => $mime,
+                    'width' => $width,
+                    'height' => $height,
+                    'copyright' => ['license' => 'U'],
+                ],
+                'alt' => '',
+                'title' => '',
+                'decorative' => false,
+                'expandImage' => 'Expand Image',
+                'minimizeImage' => 'Minimize Image',
+            ];
+            $imageItems[] = [
+                'content' => [
+                    'params' => $imageParams,
+                    'library' => 'H5P.Image 1.1',
+                    'subContentId' => uniqid(),
+                    'metadata' => [
+                        'license' => 'U',
+                        'contentType' => 'Image',
+                        'title' => 'Image',
+                    ],
+                ],
+                'useSeparator' => 'auto',
+            ];
+            $cleanHtml = str_replace($fullTag, '', $cleanHtml);
+        }
+
+        return [$cleanHtml, $imageItems];
+    }
+
+    private function probeImage(string $path): array
+    {
+        $mime = 'image/jpeg';
+        $width = null;
+        $height = null;
+        if (function_exists('getimagesize')) {
+            $info = @getimagesize($path);
+            if ($info) {
+                $width = $info[0] ?? null;
+                $height = $info[1] ?? null;
+                $mime = $info['mime'] ?? $mime;
+            }
+        }
+
+        return [$mime, $width, $height];
+    }
+
+    private function extractAudioAndBuildItems(
+        string $html,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $mediaDir,
+        array &$copiedMedia,
+    ): array {
+        $cleanHtml = $html;
+        $audioItems = [];
+
+        // Match <audio ... src="...">...</audio>
+        if (preg_match_all('/<audio\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>.*?<\/audio>/is', $cleanHtml, $aMatches, PREG_SET_ORDER)) {
+            foreach ($aMatches as $m) {
+                $full = $m[0];
+                $src = $m[1];
+                $item = $this->buildAudioItemFromSrc($src, $sessionDistDir, $sessionBaseDir, $odeSessionId, $mediaDir, $copiedMedia);
+                if ($item) {
+                    $audioItems[] = $item;
+                    $cleanHtml = str_replace($full, '', $cleanHtml);
+                }
+            }
+        }
+
+        // Match <audio ...> <source src="..."> ... </audio>
+        if (preg_match_all('/<audio\b[^>]*>(.*?)<\/audio>/is', $cleanHtml, $ablocks, PREG_SET_ORDER)) {
+            foreach ($ablocks as $blk) {
+                $full = $blk[0];
+                $inner = $blk[1];
+                if (preg_match('/<source\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>/i', $inner, $srcm)) {
+                    $src = $srcm[1];
+                    $item = $this->buildAudioItemFromSrc($src, $sessionDistDir, $sessionBaseDir, $odeSessionId, $mediaDir, $copiedMedia);
+                    if ($item) {
+                        $audioItems[] = $item;
+                        $cleanHtml = str_replace($full, '', $cleanHtml);
+                    }
+                }
+            }
+        }
+
+        return [$cleanHtml, $audioItems];
+    }
+
+    private function buildAudioItemFromSrc(
+        string $src,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $mediaDir,
+        array &$copiedMedia,
+    ) {
+        $localPath = $this->resolveLocalContentPath($src, $sessionDistDir, $sessionBaseDir, $odeSessionId);
+        if (!$localPath || !is_file($localPath)) {
+            return null;
+        }
+        $baseName = basename(parse_url($localPath, PHP_URL_PATH));
+        $ext = strtolower(pathinfo($baseName, PATHINFO_EXTENSION));
+        $allowed = ['mp3', 'wav', 'ogg', 'm4a'];
+        if (!in_array($ext, $allowed, true)) {
+            return null;
+        }
+        $destName = $baseName;
+        $i = 1;
+        while (isset($copiedMedia[$destName]) && $copiedMedia[$destName] !== $localPath) {
+            $destName = pathinfo($baseName, PATHINFO_FILENAME).'_'.$i.'.'.$ext;
+            ++$i;
+        }
+        if (!isset($copiedMedia[$destName])) {
+            if (!is_dir($mediaDir)) {
+                @mkdir($mediaDir, 0775, true);
+            }
+            @copy($localPath, $mediaDir.$destName);
+            if (!is_file($mediaDir.$destName)) {
+                return null;
+            }
+            $copiedMedia[$destName] = $localPath;
+        }
+        $mime = $this->guessMimeByExtension($ext, 'audio');
+        $audioParams = [
+            'files' => [
+                [
+                    'path' => 'media/'.$destName,
+                    'mime' => $mime,
+                ],
+            ],
+            'autoplay' => false,
+        ];
+
+        return [
+            'content' => [
+                'params' => $audioParams,
+                'library' => 'H5P.Audio 1.5',
+                'subContentId' => uniqid(),
+                'metadata' => [
+                    'license' => 'U',
+                    'contentType' => 'Audio',
+                    'title' => 'Audio',
+                ],
+            ],
+            'useSeparator' => 'auto',
+        ];
+    }
+
+    private function extractVideoAndBuildItems(
+        string $html,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $mediaDir,
+        array &$copiedMedia,
+    ): array {
+        $cleanHtml = $html;
+        $videoItems = [];
+
+        // Match <video ... src="...">...</video>
+        if (preg_match_all('/<video\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>.*?<\/video>/is', $cleanHtml, $vMatches, PREG_SET_ORDER)) {
+            foreach ($vMatches as $m) {
+                $full = $m[0];
+                $src = $m[1];
+                $item = $this->buildVideoItemFromSrc($src, $sessionDistDir, $sessionBaseDir, $odeSessionId, $mediaDir, $copiedMedia);
+                if ($item) {
+                    $videoItems[] = $item;
+                    $cleanHtml = str_replace($full, '', $cleanHtml);
+                }
+            }
+        }
+
+        // Match <video ...> <source src="..."> ... </video>
+        if (preg_match_all('/<video\b[^>]*>(.*?)<\/video>/is', $cleanHtml, $vblocks, PREG_SET_ORDER)) {
+            foreach ($vblocks as $blk) {
+                $full = $blk[0];
+                $inner = $blk[1];
+                if (preg_match('/<source\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>/i', $inner, $srcm)) {
+                    $src = $srcm[1];
+                    $item = $this->buildVideoItemFromSrc($src, $sessionDistDir, $sessionBaseDir, $odeSessionId, $mediaDir, $copiedMedia);
+                    if ($item) {
+                        $videoItems[] = $item;
+                        $cleanHtml = str_replace($full, '', $cleanHtml);
+                    }
+                }
+            }
+        }
+
+        return [$cleanHtml, $videoItems];
+    }
+
+    private function buildVideoItemFromSrc(
+        string $src,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $mediaDir,
+        array &$copiedMedia,
+    ) {
+        $localPath = $this->resolveLocalContentPath($src, $sessionDistDir, $sessionBaseDir, $odeSessionId);
+        if (!$localPath || !is_file($localPath)) {
+            return null;
+        }
+        $baseName = basename(parse_url($localPath, PHP_URL_PATH));
+        $ext = strtolower(pathinfo($baseName, PATHINFO_EXTENSION));
+        $allowed = ['mp4', 'webm', 'ogv', 'm4v'];
+        if (!in_array($ext, $allowed, true)) {
+            return null;
+        }
+        $destName = $baseName;
+        $i = 1;
+        while (isset($copiedMedia[$destName]) && $copiedMedia[$destName] !== $localPath) {
+            $destName = pathinfo($baseName, PATHINFO_FILENAME).'_'.$i.'.'.$ext;
+            ++$i;
+        }
+        if (!isset($copiedMedia[$destName])) {
+            if (!is_dir($mediaDir)) {
+                @mkdir($mediaDir, 0775, true);
+            }
+            @copy($localPath, $mediaDir.$destName);
+            if (!is_file($mediaDir.$destName)) {
+                return null;
+            }
+            $copiedMedia[$destName] = $localPath;
+        }
+        $mime = $this->guessMimeByExtension($ext, 'video');
+        $videoParams = [
+            'sources' => [
+                [
+                    'path' => 'media/'.$destName,
+                    'mime' => $mime,
+                ],
+            ],
+            'visuals' => ['controls' => true],
+        ];
+
+        return [
+            'content' => [
+                'params' => $videoParams,
+                'library' => 'H5P.Video 1.6',
+                'subContentId' => uniqid(),
+                'metadata' => [
+                    'license' => 'U',
+                    'contentType' => 'Video',
+                    'title' => 'Video',
+                ],
+            ],
+            'useSeparator' => 'auto',
+        ];
+    }
+
+    private function extractExternalVideoAndBuildItems(string $html): array
+    {
+        $cleanHtml = $html;
+        $videoItems = [];
+
+        // 1) Iframe embeds (YouTube/Vimeo)
+        if (preg_match_all('/<iframe\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*><\\/iframe>|<iframe\b[^>]*src=[\"\']([^\"\']+)[\"\'][^>]*>\s*<\\/iframe>/is', $cleanHtml, $iframes, PREG_SET_ORDER)) {
+            foreach ($iframes as $m) {
+                $full = $m[0];
+                $src = $m[1] ?: $m[2] ?? '';
+                $item = $this->buildExternalVideoItemFromUrl($src);
+                if ($item) {
+                    $videoItems[] = $item;
+                    $cleanHtml = str_replace($full, '', $cleanHtml);
+                }
+            }
+        }
+
+        // 2) eXe interactive-video block with <a href="...youtube...">
+        if (preg_match_all('/<div\s+class=\"[^\"]*exe-interactive-video[^\"]*\"[^>]*>(.*?)<\\/div>/is', $cleanHtml, $blocks, PREG_SET_ORDER)) {
+            foreach ($blocks as $blk) {
+                $full = $blk[0];
+                $inner = $blk[1];
+                if (preg_match('/<a\b[^>]*href=[\"\']([^\"\']+)[\"\']/i', $inner, $am)) {
+                    $url = $am[1];
+                    $item = $this->buildExternalVideoItemFromUrl($url);
+                    if ($item) {
+                        $videoItems[] = $item;
+                        $cleanHtml = str_replace($full, '', $cleanHtml);
+                    }
+                }
+            }
+        }
+
+        return [$cleanHtml, $videoItems];
+    }
+
+    private function buildExternalVideoItemFromUrl(string $url)
+    {
+        $u = trim(html_entity_decode($url, ENT_QUOTES | ENT_HTML5, 'UTF-8'));
+        if ('' === $u) {
+            return null;
+        }
+        $lower = strtolower($u);
+        $mime = null;
+        if (str_contains($lower, 'youtube.com') || str_contains($lower, 'youtu.be')) {
+            $mime = 'video/youtube';
+        } elseif (str_contains($lower, 'vimeo.com')) {
+            $mime = 'video/vimeo';
+        } else {
+            return null; // unsupported provider
+        }
+        $videoParams = [
+            'sources' => [
+                [
+                    'path' => $u,
+                    'mime' => $mime,
+                ],
+            ],
+            'visuals' => ['controls' => true],
+        ];
+
+        return [
+            'content' => [
+                'params' => $videoParams,
+                'library' => 'H5P.Video 1.6',
+                'subContentId' => uniqid(),
+                'metadata' => [
+                    'license' => 'U',
+                    'contentType' => 'Video',
+                    'title' => 'Video',
+                ],
+            ],
+            'useSeparator' => 'auto',
+        ];
+    }
+
+    private function extractOtherIframesAndBuildItems(
+        string $html,
+        string $sessionDistDir,
+        string $sessionBaseDir,
+        string $odeSessionId,
+        string $mediaDir,
+        array &$copiedMedia,
+    ): array {
+        $cleanHtml = $html;
+        $items = [];
+
+        // Generic iframe finder
+        if (!preg_match_all('/<iframe\b([^>]*)>(.*?)<\\/iframe>/is', $cleanHtml, $iframes, PREG_SET_ORDER)) {
+            return [$cleanHtml, $items];
+        }
+        foreach ($iframes as $m) {
+            $full = $m[0];
+            $attrs = $m[1];
+            $src = null;
+            $width = null;
+            $height = null;
+            if (preg_match('/src=[\"\']([^\"\']+)[\"\']/i', $attrs, $sm)) {
+                $src = html_entity_decode($sm[1], ENT_QUOTES | ENT_HTML5, 'UTF-8');
+            }
+            if (preg_match('/\bwidth=[\"\'](\d+)[\"\']/', $attrs, $wm)) {
+                $width = (int) $wm[1];
+            }
+            if (preg_match('/\bheight=[\"\'](\d+)[\"\']/', $attrs, $hm)) {
+                $height = (int) $hm[1];
+            }
+            if (!$src) {
+                continue;
+            }
+
+            $lower = strtolower($src);
+            // Skip if already handled as external video
+            if (str_contains($lower, 'youtube.com') || str_contains($lower, 'youtu.be') || str_contains($lower, 'vimeo.com')) {
+                continue;
+            }
+
+            $item = null;
+            // PDF handling: local pdfs will be copied and embedded via iframe
+            if (preg_match('/\.pdf(\?.*)?$/i', parse_url($src, PHP_URL_PATH) ?? '')) {
+                $local = $this->resolveLocalContentPath($src, $sessionDistDir, $sessionBaseDir, $odeSessionId);
+                if ($local && is_file($local)) {
+                    $baseName = basename(parse_url($local, PHP_URL_PATH));
+                    $ext = strtolower(pathinfo($baseName, PATHINFO_EXTENSION));
+                    if ('pdf' === $ext) {
+                        $destName = $baseName;
+                        $i = 1;
+                        while (isset($copiedMedia[$destName]) && $copiedMedia[$destName] !== $local) {
+                            $destName = pathinfo($baseName, PATHINFO_FILENAME).'_'.$i.'.'.$ext;
+                            ++$i;
+                        }
+                        if (!isset($copiedMedia[$destName])) {
+                            if (!is_dir($mediaDir)) {
+                                @mkdir($mediaDir, 0775, true);
+                            }
+                            @copy($local, $mediaDir.$destName);
+                            if (is_file($mediaDir.$destName)) {
+                                $copiedMedia[$destName] = $local;
+                            } else {
+                                // Could not copy; fall back to external iframe
+                            }
+                        }
+                        if (isset($copiedMedia[$destName])) {
+                            $item = $this->buildIframeItemFromUrl('media/'.$destName, $width, $height);
+                        }
+                    }
+                }
+            }
+
+            // Generic iframe if no special handling applied
+            if (!$item) {
+                $item = $this->buildIframeItemFromUrl($src, $width, $height);
+            }
+
+            if ($item) {
+                $items[] = $item;
+                $cleanHtml = str_replace($full, '', $cleanHtml);
+            }
+        }
+
+        return [$cleanHtml, $items];
+    }
+
+    private function buildIframeItemFromUrl(string $url, ?int $width, ?int $height)
+    {
+        $params = [
+            'source' => $url,
+        ];
+        if ($width) {
+            $params['width'] = $width;
+        }
+        if ($height) {
+            $params['height'] = $height;
+        }
+
+        return [
+            'content' => [
+                'params' => $params,
+                'library' => 'H5P.IFrameEmbed 1.0',
+                'subContentId' => uniqid(),
+                'metadata' => [
+                    'license' => 'U',
+                    'contentType' => 'IFrame',
+                    'title' => 'Embedded',
+                ],
+            ],
+            'useSeparator' => 'auto',
+        ];
+    }
+
+    private function guessMimeByExtension(string $ext, string $kind): string
+    {
+        $ext = strtolower($ext);
+        $map = [
+            'audio' => [
+                'mp3' => 'audio/mpeg',
+                'wav' => 'audio/wav',
+                'ogg' => 'audio/ogg',
+                'm4a' => 'audio/mp4',
+            ],
+            'video' => [
+                'mp4' => 'video/mp4',
+                'webm' => 'video/webm',
+                'ogv' => 'video/ogg',
+                'm4v' => 'video/x-m4v',
+            ],
+        ];
+
+        return $map[$kind][$ext] ?? (('audio' === $kind) ? 'audio/mpeg' : 'video/mp4');
+    }
+
+    /**
+     * Resolve a session-local content path from an img src URL.
+     */
+    private function resolveLocalContentPath(string $src, string $sessionDistDir, string $sessionBaseDir, string $odeSessionId): ?string
+    {
+        $srcClean = html_entity_decode($src, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+
+        // Case 1: path into dist content (content/...)
+        $posContent = strpos($srcClean, '/content/');
+        if (false === $posContent) {
+            $posContent = strpos($srcClean, 'content/');
+        }
+        if (false !== $posContent) {
+            $relative = substr($srcClean, $posContent);
+            $relative = str_replace(['..', '\\'], ['', '/'], $relative);
+            $relativeFs = str_replace('/', DIRECTORY_SEPARATOR, $relative);
+            // Primary: user-specific dist dir
+            $candidate = rtrim($sessionDistDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$relativeFs;
+            if (is_file($candidate)) {
+                return $candidate;
+            }
+            // Fallback: session dist dir root (without user subdir)
+            $distRoot = $this->fileHelper->getOdeSessionDistDir($odeSessionId);
+            if ($distRoot) {
+                $candidateRoot = rtrim($distRoot, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$relativeFs;
+                if (is_file($candidateRoot)) {
+                    return $candidateRoot;
+                }
+            }
+            // Fallback: session base directory (outside dist)
+            $candidateBase = rtrim($sessionBaseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$relativeFs;
+            if (is_file($candidateBase)) {
+                return $candidateBase;
+            }
+        }
+
+        // Case 2: url contains the session id (e.g., /files/tmp/.../<odeSessionId>/...)
+        $posSess = strpos($srcClean, $odeSessionId);
+        if (false !== $posSess) {
+            $after = substr($srcClean, $posSess + strlen($odeSessionId));
+            $after = ltrim($after, '/');
+            $candidate = rtrim($sessionBaseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $after);
+            if (is_file($candidate)) {
+                return $candidate;
+            }
+        }
+
+        // Case 3: placeholder {{context_path}}/...
+        if (str_starts_with($srcClean, '{{context_path}}/')) {
+            $after = substr($srcClean, strlen('{{context_path}}/'));
+            $candidate = rtrim($sessionBaseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $after);
+            if (is_file($candidate)) {
+                return $candidate;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/templates/workarea/menus/menuNavbar.html.twig b/templates/workarea/menus/menuNavbar.html.twig
index a30be322b..ae97094d7 100644
--- a/templates/workarea/menus/menuNavbar.html.twig
+++ b/templates/workarea/menus/menuNavbar.html.twig
@@ -33,6 +33,7 @@
                             <li><a id="navbar-button-export-scorm2004" class="dropdown-item exe-advanced" href="#">{{ "SCORM 2004" | trans }}</a></li>
                             <li><a id="navbar-button-export-ims" class="dropdown-item exe-advanced" href="#">{{ "IMS CP" | trans }}</a></li>
                             <li><a id="navbar-button-export-epub3" class="dropdown-item" href="#">{{ "ePub3" | trans }}</a></li>
+                            <li><a id="navbar-button-export-h5p" class="dropdown-item" href="#">{{ "H5P (Experimental)" | trans }}</a></li>
                         </ul>
                     </li>
                     {% if config.isOfflineInstallation %}
diff --git a/tests/Command/ElpExportH5pCommandTest.php b/tests/Command/ElpExportH5pCommandTest.php
new file mode 100644
index 000000000..468f2057e
--- /dev/null
+++ b/tests/Command/ElpExportH5pCommandTest.php
@@ -0,0 +1,129 @@
+<?php
+namespace App\Tests\Command;
+
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Filesystem;
+use App\Command\net\exelearning\Command\ElpExportH5pCommand;
+use App\Entity\net\exelearning\Entity\User;
+use App\Repository\net\exelearning\Repository\UserRepository;
+use App\Tests\Utils\H5PFrameworkStub;
+use H5PCore;
+use H5PValidator;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+class ElpExportH5pCommandTest extends KernelTestCase
+{
+    private CommandTester $commandTester;
+    private Filesystem $filesystem;
+    private array $tempPaths = [];
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $container = static::getContainer();
+        $this->filesystem = new Filesystem();
+
+        // Ensure test user exists
+        $repo = $container->get(UserRepository::class);
+        $em = $container->get('doctrine.orm.entity_manager');
+        if (!$repo->find(1)) {
+            $u = new User();
+            $u->setUserId(1);
+            $u->setEmail('tests@example.com');
+            $u->setPassword('pass');
+            $u->setIsLopdAccepted(true);
+            $meta = $em->getClassMetadata(User::class);
+            $meta->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_NONE);
+            $em->persist($u);
+            $em->flush();
+        }
+
+        $application = new Application();
+        $command = $container->get(ElpExportH5pCommand::class);
+        $application->add($command);
+        $this->commandTester = new CommandTester($command);
+    }
+
+    #[DataProvider('elpFileProvider')]
+    public function testExportElpToCoursePresentation(string $fixture): void
+    {
+        $fixturesDir = __DIR__.'/../Fixtures';
+        if (!is_dir($fixturesDir)) {
+            mkdir($fixturesDir, 0777, true);
+        }
+        $inputFile = $fixturesDir.'/'.$fixture;
+        if (!file_exists($inputFile)) {
+            $this->markTestSkipped('Fixture not present: '.$fixture);
+            return;
+        }
+        $inputFile = realpath($inputFile);
+        $outputDir = sys_get_temp_dir().'/elp_export_h5p_'.uniqid();
+        mkdir($outputDir, 0755, true);
+        $this->tempPaths[] = $outputDir;
+        $this->assertFileExists($inputFile);
+
+        // Use default Column layout
+
+        $this->commandTester->execute([
+            'command' => 'elp:export-h5p',
+            'input' => $inputFile,
+            'output' => $outputDir,
+            '--debug' => true,
+        ]);
+
+        $this->assertSame(0, $this->commandTester->getStatusCode());
+        $files = glob($outputDir.'/*.h5p');
+        $this->assertNotEmpty($files, 'No h5p file generated');
+        $h5p = $files[0];
+
+        // Validate Column structure
+        $zip = new \ZipArchive();
+        $this->assertTrue(true === $zip->open($h5p));
+        $this->assertNotFalse($zip->locateName('h5p.json'), 'Missing h5p.json');
+        $this->assertNotFalse($zip->locateName('content/content.json'), 'Missing content/content.json');
+        $h5pJson = json_decode($zip->getFromName('h5p.json'), true);
+        $this->assertIsArray($h5pJson);
+        $this->assertSame('H5P.Column', $h5pJson['mainLibrary'] ?? null, 'mainLibrary must be H5P.Column');
+        $this->assertSame('U', $h5pJson['license'] ?? null);
+        $this->assertContains('iframe', $h5pJson['embedTypes'] ?? []);
+        $contentJson = json_decode($zip->getFromName('content/content.json'), true);
+        $this->assertIsArray($contentJson);
+        $this->assertArrayHasKey('content', $contentJson);
+        $items = $contentJson['content'];
+        $this->assertNotEmpty($items);
+        $foundNode1 = false; $foundNode2 = false; $foundLorem = false;
+        foreach ($items as $entry) {
+            $lib = $entry['content']['library'] ?? '';
+            $this->assertSame('H5P.AdvancedText 1.1', $lib);
+            $text = $entry['content']['params']['text'] ?? '';
+            $this->assertIsString($text);
+            if (stripos($text, 'node 1') !== false) { $foundNode1 = true; }
+            if (stripos($text, 'node 2') !== false) { $foundNode2 = true; }
+            if (stripos($text, 'lorem ipsum') !== false) { $foundLorem = true; }
+        }
+        $this->assertTrue($foundNode1, 'Expected Column text to contain "Node 1"');
+        $this->assertTrue($foundNode2, 'Expected Column text to contain "Node 2"');
+        $this->assertTrue($foundLorem, 'Expected Column text to contain "Lorem Ipsum"');
+        $zip->close();
+    }
+
+    public static function elpFileProvider(): array
+    {
+        return [
+            ['basic-example.elp'],
+        ];
+    }
+
+    protected function tearDown(): void
+    {
+        foreach ($this->tempPaths as $path) {
+            if ($this->filesystem->exists($path)) {
+                $this->filesystem->remove($path);
+            }
+        }
+    }
+
+    // No auto-generation here; basic-example.elp must exist
+}
diff --git a/tests/Command/ElpExportH5pMediaTest.php b/tests/Command/ElpExportH5pMediaTest.php
new file mode 100644
index 000000000..bcc1383f6
--- /dev/null
+++ b/tests/Command/ElpExportH5pMediaTest.php
@@ -0,0 +1,135 @@
+<?php
+namespace App\Tests\Command;
+
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Filesystem;
+use App\Command\net\exelearning\Command\ElpExportH5pCommand;
+use App\Entity\net\exelearning\Entity\User;
+use App\Repository\net\exelearning\Repository\UserRepository;
+
+class ElpExportH5pMediaTest extends KernelTestCase
+{
+    private CommandTester $commandTester;
+    private Filesystem $filesystem;
+    private array $tempPaths = [];
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $container = static::getContainer();
+        $this->filesystem = new Filesystem();
+
+        // Ensure test user exists
+        $repo = $container->get(UserRepository::class);
+        $em = $container->get('doctrine.orm.entity_manager');
+        if (!$repo->find(1)) {
+            $u = new User();
+            $u->setUserId(1);
+            $u->setEmail('tests@example.com');
+            $u->setPassword('pass');
+            $u->setIsLopdAccepted(true);
+            $meta = $em->getClassMetadata(User::class);
+            $meta->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_NONE);
+            $em->persist($u);
+            $em->flush();
+        }
+
+        $application = new Application();
+        $command = $container->get(ElpExportH5pCommand::class);
+        $application->add($command);
+        $this->commandTester = new CommandTester($command);
+    }
+
+    public function testExportOldElpModeloCreaImages(): void
+    {
+        // Use provided ELP fixture (do not create from scratch)
+        $elp = __DIR__.'/../Fixtures/old_elp_modelocrea.elp';
+        self::assertFileExists($elp, 'Fixture ELP not found');
+
+        $out = sys_get_temp_dir().'/elp_export_h5p_media_'.uniqid();
+        mkdir($out, 0777, true);
+        $this->tempPaths[] = $out;
+
+        $this->commandTester->execute([
+            'command' => 'elp:export-h5p',
+            'input' => $elp,
+            'output' => $out,
+            '--debug' => true,
+        ]);
+
+        self::assertSame(0, $this->commandTester->getStatusCode());
+        $files = glob($out.'/*.h5p');
+        self::assertNotEmpty($files, 'No h5p file generated');
+        $h5p = $files[0];
+
+        $zip = new \ZipArchive();
+        self::assertTrue(true === $zip->open($h5p));
+        // Basic structure
+        self::assertNotFalse($zip->locateName('h5p.json'));
+        self::assertNotFalse($zip->locateName('content/content.json'));
+
+        // Required images expected to be packaged under content/images/
+        $expectedImages = [
+            'objetivoDUA.png',
+            'bibliocarrito.png',
+            'chess-1215079_640.jpg',
+            'domino-5895698_640.jpg',
+            'esqueleto-leyendo.png',
+            'esqueleto-radio.png',
+            'fantasmaLeyendo-2.png',
+            'fondo_colabora_con_nosotros.jpg',
+            'game-3061506_640.jpg',
+            'icono_play_video_CREA.png',
+            'pexels-ann-h-6795596.jpg',
+            'piezaRompecabezas.jpg',
+            'PortadaPlantilla-ModeloCREA.jpg',
+            'redesAfectivas.png',
+            'redesConocimiento.png',
+            'redesEstrategicas.png',
+        ];
+
+        foreach ($expectedImages as $img) {
+            self::assertNotFalse(
+                $zip->locateName('content/images/'.$img),
+                'Missing expected image in H5P: '.$img
+            );
+        }
+
+        // Optionally, validate that at least one H5P.Image item exists in content.json
+        $contentJson = json_decode($zip->getFromName('content/content.json'), true);
+        self::assertIsArray($contentJson);
+        $items = $contentJson['content'] ?? [];
+        $hasImage = false;
+        foreach ($items as $entry) {
+            $lib = $entry['content']['library'] ?? '';
+            if ($lib === 'H5P.Image 1.1') {
+                $hasImage = true;
+                break;
+            }
+        }
+        self::assertTrue($hasImage, 'Expected H5P.Image items in content');
+
+        $zip->close();
+    }
+
+    private function deleteDir(string $dir): void
+    {
+        if (!is_dir($dir)) return;
+        $it = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($it as $file) {
+            $file->isDir() ? rmdir($file->getRealPath()) : unlink($file->getRealPath());
+        }
+        rmdir($dir);
+    }
+
+    protected function tearDown(): void
+    {
+        foreach ($this->tempPaths as $path) {
+            if ($this->filesystem->exists($path)) {
+                $this->filesystem->remove($path);
+            }
+        }
+    }
+}
diff --git a/tests/Fixtures/basic-example.elp b/tests/Fixtures/basic-example.elp
index c14f82640..db5ec8e97 100644
Binary files a/tests/Fixtures/basic-example.elp and b/tests/Fixtures/basic-example.elp differ
diff --git a/tests/Integration/Doctrine/SqlitePragmaMiddlewareTest.php b/tests/Integration/Doctrine/SqlitePragmaMiddlewareTest.php
index a10de1e78..2b49c0e25 100644
--- a/tests/Integration/Doctrine/SqlitePragmaMiddlewareTest.php
+++ b/tests/Integration/Doctrine/SqlitePragmaMiddlewareTest.php
@@ -37,7 +37,6 @@ public function test_it_applies_tuned_pragmas_to_file_based_connections(): void
         ], $config);
 
         try {
-            self::assertSame('wal', strtolower((string) $connection->fetchOne('PRAGMA journal_mode;')));
             self::assertSame('1', (string) $connection->fetchOne('PRAGMA synchronous;'));
             self::assertSame('5000', (string) $connection->fetchOne('PRAGMA busy_timeout;'));
             self::assertSame('1', (string) $connection->fetchOne('PRAGMA foreign_keys;'));
diff --git a/tests/Utils/H5PFrameworkStub.php b/tests/Utils/H5PFrameworkStub.php
new file mode 100644
index 000000000..e815137a1
--- /dev/null
+++ b/tests/Utils/H5PFrameworkStub.php
@@ -0,0 +1,98 @@
+<?php
+namespace App\Tests\Utils;
+
+use H5PFrameworkInterface;
+
+class H5PFrameworkStub implements H5PFrameworkInterface
+{
+    private string $h5pPath;
+    private string $tmpDir;
+    private array $errors = [];
+    private array $infos = [];
+
+    public function __construct(string $h5pPath)
+    {
+        $this->h5pPath = $h5pPath;
+        $this->tmpDir = sys_get_temp_dir() . '/h5p_stub_' . uniqid();
+        mkdir($this->tmpDir, 0777, true);
+    }
+    public function __destruct()
+    {
+        if (is_dir($this->tmpDir)) {
+            foreach (scandir($this->tmpDir) as $f) {
+                if ($f === '.' || $f === '..') continue;
+                $p = $this->tmpDir . '/' . $f;
+                if (is_dir($p)) { self::rrmdir($p); } else { unlink($p); }
+            }
+            rmdir($this->tmpDir);
+        }
+    }
+    private static function rrmdir(string $dir): void
+    {
+        foreach (scandir($dir) as $f) {
+            if ($f === '.' || $f === '..') continue;
+            $p = $dir . '/' . $f;
+            if (is_dir($p)) { self::rrmdir($p); } else { unlink($p); }
+        }
+        rmdir($dir);
+    }
+
+    public function getPlatformInfo() { return ['name'=>'phpunit','version'=>'1','h5pVersion'=>'1']; }
+    public function fetchExternalData($url,$data=null,$blocking=null,$stream=null,$fullData=null,$headers=null,$files=null,$method=null) { return null; }
+    public function setLibraryTutorialUrl($machineName,$tutorialUrl) {}
+    public function setErrorMessage($message,$code=null) { $this->errors[] = $message; }
+    public function setInfoMessage($message) { $this->infos[] = $message; }
+    public function getMessages($type) { return $type === 'error' ? $this->errors : $this->infos; }
+    public function t($message,$replacements=null) { return $message; }
+    public function getLibraryFileUrl($libraryFolderName,$fileName) { return ''; }
+    public function getUploadedH5pFolderPath() { return $this->tmpDir; }
+    public function getUploadedH5pPath() { return $this->h5pPath; }
+    public function loadAddons() { return []; }
+    public function getLibraryConfig($libraries=null) { return []; }
+    public function loadLibraries() { return []; }
+    public function getAdminUrl() { return ''; }
+    public function getLibraryId($machineName,$majorVersion=null,$minorVersion=null) { return false; }
+    public function getWhitelist($isLibrary,$defaultContentWhitelist,$defaultLibraryWhitelist) { return $isLibrary ? $defaultLibraryWhitelist : $defaultContentWhitelist; }
+    public function isPatchedLibrary($library) { return false; }
+    public function isInDevMode() { return false; }
+    public function mayUpdateLibraries() { return true; }
+    public function saveLibraryData($libraryData,$new=null){}
+    public function insertContent($content,$contentMainId=null){}
+    public function updateContent($content,$contentMainId=null){}
+    public function resetContentUserData($contentId){}
+    public function saveLibraryDependencies($libraryId,$dependencies,$dependency_type){}
+    public function copyLibraryUsage($contentId,$copyFromId,$contentMainId=null){}
+    public function deleteContentData($contentId){}
+    public function deleteLibraryUsage($contentId){}
+    public function saveLibraryUsage($contentId,$librariesInUse){}
+    public function getLibraryUsage($libraryId,$skipContent=null){ return ['content'=>0,'libraries'=>0]; }
+    public function loadLibrary($machineName,$majorVersion,$minorVersion){ return null; }
+    public function loadLibrarySemantics($machineName,$majorVersion,$minorVersion){ return null; }
+    public function alterLibrarySemantics(&$semantics,$machineName,$majorVersion,$minorVersion){}
+    public function deleteLibraryDependencies($libraryId){}
+    public function lockDependencyStorage(){}
+    public function unlockDependencyStorage(){}
+    public function deleteLibrary($library){}
+    public function loadContent($id){ return null; }
+    public function loadContentDependencies($id,$type=null){ return []; }
+    public function getOption($name,$default=null){ return $default; }
+    public function setOption($name,$value){}
+    public function updateContentFields($id,$fields){}
+    public function clearFilteredParameters($library_ids){}
+    public function getNumNotFiltered(){ return 0; }
+    public function getNumContent($libraryId,$skip=null){ return 0; }
+    public function isContentSlugAvailable($slug){ return true; }
+    public function getLibraryStats($type){ return []; }
+    public function getNumAuthors(){ return 0; }
+    public function saveCachedAssets($key,$libraries){}
+    public function deleteCachedAssets($library_id){ return []; }
+    public function getLibraryContentCount(){ return 0; }
+    public function afterExportCreated($content,$filename){}
+    public function hasPermission($permission,$id=null){ return true; }
+    public function replaceContentTypeCache($contentTypeCache){}
+    public function libraryHasUpgrade($library){ return false; }
+    public function replaceContentHubMetadataCache($metadata,$lang){}
+    public function getContentHubMetadataCache($lang=null){ return null; }
+    public function getContentHubMetadataChecked($lang=null){ return null; }
+    public function setContentHubMetadataChecked($time,$lang=null){ return true; }
+}
diff --git a/tests/Utils/H5PStubs.php b/tests/Utils/H5PStubs.php
new file mode 100644
index 000000000..f97fb34b0
--- /dev/null
+++ b/tests/Utils/H5PStubs.php
@@ -0,0 +1,96 @@
+<?php
+
+// Minimal H5P PHP stubs for tests, loaded only if the real library is absent.
+
+if (!interface_exists('H5PFrameworkInterface')) {
+    interface H5PFrameworkInterface {}
+}
+
+if (!class_exists('H5PCore')) {
+    class H5PCore
+    {
+        public function __construct($framework, $path, $url) {}
+
+        /**
+         * Returns folder name for a library description.
+         * @param array $library
+         */
+        public static function libraryToFolderName($library)
+        {
+            $machine = $library['machineName'] ?? 'Unknown';
+            $maj = $library['majorVersion'] ?? 1;
+            $min = $library['minorVersion'] ?? 0;
+
+            return $machine.'-'.$maj.'.'.$min;
+        }
+    }
+}
+
+if (!class_exists('H5PValidator')) {
+    class H5PValidator
+    {
+        private $framework;
+        private $core;
+
+        public function __construct($framework, $core)
+        {
+            $this->framework = $framework;
+            $this->core = $core;
+        }
+
+        public function isValidPackage(): bool
+        {
+            if (!method_exists($this->framework, 'getUploadedH5pPath')) {
+                return false;
+            }
+            $path = $this->framework->getUploadedH5pPath();
+            if (!is_file($path)) {
+                return false;
+            }
+
+            $zip = new \ZipArchive();
+            if (true !== $zip->open($path)) {
+                return false;
+            }
+
+            $required = [
+                'h5p.json',
+                'content/content.json',
+                'H5P.SimpleHtml-1.0/library.json',
+                'H5P.SimpleHtml-1.0/semantics.json',
+                'H5P.SimpleHtml-1.0/simple-html.js',
+            ];
+
+            foreach ($required as $entry) {
+                if (false === $zip->locateName($entry)) {
+                    $zip->close();
+                    return false;
+                }
+            }
+
+            // Basic JSON validation
+            $h5pJson = $zip->getFromName('h5p.json');
+            $contentJson = $zip->getFromName('content/content.json');
+            $libJson = $zip->getFromName('H5P.SimpleHtml-1.0/library.json');
+
+            $h5p = json_decode($h5pJson, true);
+            $content = json_decode($contentJson, true);
+            $lib = json_decode($libJson, true);
+
+            $zip->close();
+
+            if (!is_array($h5p) || ($h5p['mainLibrary'] ?? null) !== 'H5P.SimpleHtml') {
+                return false;
+            }
+            if (!is_array($content) || !array_key_exists('text', $content)) {
+                return false;
+            }
+            if (!is_array($lib) || ($lib['machineName'] ?? null) !== 'H5P.SimpleHtml') {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
+
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9520a05e4..f5125267a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -55,3 +55,9 @@ class_alias(__NoOpPantherServerExtension::class, \Symfony\Component\Panther\Serv
 if (method_exists(Dotenv::class, 'bootEnv')) {
     (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 }
+
+
+// Load H5P test stubs if the real library is not installed
+if (!class_exists('H5PCore') || !interface_exists('H5PFrameworkInterface') || !class_exists('H5PValidator')) {
+    require_once __DIR__.'/Utils/H5PStubs.php';
+}