diff --git a/assets/vue/composables/datatableList.js b/assets/vue/composables/datatableList.js
index 8b89494f091..94f039b56ea 100644
--- a/assets/vue/composables/datatableList.js
+++ b/assets/vue/composables/datatableList.js
@@ -36,7 +36,7 @@ export function useDatatableList(servicePrefix) {
     if (!isEmpty(route.query.filetype) && route.query.filetype === "certificate") {
       filters.value.filetype = "certificate"
     } else {
-      filters.value.filetype = ["file", "folder"]
+      filters.value.filetype = ["file", "folder", "video"]
     }
 
     let params = { ...filters.value }
diff --git a/assets/vue/views/documents/AddVariation.vue b/assets/vue/views/documents/AddVariation.vue
index 585c9f2944a..be47c91b16f 100644
--- a/assets/vue/views/documents/AddVariation.vue
+++ b/assets/vue/views/documents/AddVariation.vue
@@ -9,17 +9,29 @@
       />
     </SectionHeader>
 
-    <div v-if="originalFile" class="bg-gray-100 p-4 rounded-md shadow-md">
-      <h3 class="text-lg font-semibold">{{ t('Original File') }}</h3>
-      <p><strong>{{ t('Title:') }}</strong> {{ originalFile.originalName }}</p>
-      <p><strong>{{ t('Format:') }}</strong> {{ originalFile.mimeType }}</p>
-      <p><strong>{{ t('Size:') }}</strong> {{ prettyBytes(originalFile.size) }}</p>
+    <div
+      v-if="originalFile"
+      class="bg-gray-100 p-4 rounded-md shadow-md"
+    >
+      <h3 class="text-lg font-semibold">{{ t("Original File") }}</h3>
+      <p>
+        <strong>{{ t("Title:") }}</strong> {{ originalFile.originalName }}
+      </p>
+      <p>
+        <strong>{{ t("Format:") }}</strong> {{ originalFile.mimeType }}
+      </p>
+      <p>
+        <strong>{{ t("Size:") }}</strong> {{ prettyBytes(originalFile.size) }}
+      </p>
     </div>
 
     <div class="space-y-6">
-      <h3 class="text-xl font-bold">{{ t('Upload New Variation') }}</h3>
+      <h3 class="text-xl font-bold">{{ t("Upload New Variation") }}</h3>
 
-      <form @submit.prevent="uploadVariation" class="flex flex-col space-y-4">
+      <form
+        @submit.prevent="uploadVariation"
+        class="flex flex-col space-y-4"
+      >
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
           <BaseFileUpload
             @file-selected="onFileSelected"
@@ -52,37 +64,69 @@
     </div>
 
     <div>
-      <h3 class="text-xl font-bold mb-4">{{ t('Current Variations') }}</h3>
-      <DataTable :value="variations" class="w-full">
-        <Column field="title" :header="t('Title')" />
-        <Column field="mimeType" :header="t('Format')" />
-        <Column field="size" :header="t('Size')">
+      <h3 class="text-xl font-bold mb-4">{{ t("Current Variations") }}</h3>
+      <DataTable
+        :value="variations"
+        class="w-full"
+      >
+        <Column
+          field="title"
+          :header="t('Title')"
+        />
+        <Column
+          field="mimeType"
+          :header="t('Format')"
+        />
+        <Column
+          field="size"
+          :header="t('Size')"
+        >
           <template #body="slotProps">
             {{ prettyBytes(slotProps.data.size) }}
           </template>
         </Column>
-        <Column field="updatedAt" :header="t('Updated At')" />
-        <Column field="url" :header="t('URL')">
+        <Column
+          field="updatedAt"
+          :header="t('Updated At')"
+        />
+        <Column
+          field="url"
+          :header="t('URL')"
+        >
           <template #body="slotProps">
+            <video
+              v-if="slotProps.data.mimeType.startsWith('video/')"
+              controls
+              class="max-w-xs"
+            >
+              <source :src="slotProps.data.path" />
+            </video>
             <a
+              v-else
               :href="slotProps.data.path"
               target="_blank"
               class="text-blue-500 hover:underline"
             >
-              {{ t('View') }}
+              {{ t("View") }}
             </a>
           </template>
         </Column>
-        <Column field="creator" :header="t('Creator')" />
-        <Column field="accessUrl" :header="t('Associated URL')">
+        <Column
+          field="creator"
+          :header="t('Creator')"
+        />
+        <Column
+          field="accessUrl"
+          :header="t('Associated URL')"
+        >
           <template #body="slotProps">
             <span>
-              {{ slotProps.data.url ? slotProps.data.url : t('Default (No URL)') }}
+              {{ slotProps.data.url ? slotProps.data.url : t("Default (No URL)") }}
             </span>
           </template>
         </Column>
         <Column>
-          <template #header>{{ t('Actions') }}</template>
+          <template #header>{{ t("Actions") }}</template>
           <template #body="slotProps">
             <BaseButton
               :label="t('Delete')"
@@ -99,15 +143,15 @@
 
 <script setup>
 import { ref, onMounted, computed } from "vue"
-import { useRoute, useRouter } from 'vue-router'
-import { useI18n } from 'vue-i18n'
-import axios from 'axios'
-import DataTable from 'primevue/datatable'
-import Column from 'primevue/column'
+import { useRoute, useRouter } from "vue-router"
+import { useI18n } from "vue-i18n"
+import axios from "axios"
+import DataTable from "primevue/datatable"
+import Column from "primevue/column"
 import SectionHeader from "../../components/layout/SectionHeader.vue"
 import BaseButton from "../../components/basecomponents/BaseButton.vue"
 import BaseFileUpload from "../../components/basecomponents/BaseFileUpload.vue"
-import prettyBytes from 'pretty-bytes'
+import prettyBytes from "pretty-bytes"
 import { useCidReq } from "../../composables/cidReq"
 import { useSecurityStore } from "../../store/securityStore"
 
@@ -126,7 +170,7 @@ const isAdmin = computed(() => securityStore.isAdmin)
 
 onMounted(async () => {
   if (!isAdmin.value) {
-    await router.push({ name: 'DocumentsList' })
+    await router.push({ name: "DocumentsList" })
     return
   }
 
@@ -137,7 +181,7 @@ onMounted(async () => {
 
 async function fetchVariations() {
   if (!originalFile.value?.resourceNode?.id) {
-    console.error('ResourceNodeId is undefined. Cannot fetch variations.')
+    console.error("ResourceNodeId is undefined. Cannot fetch variations.")
     return
   }
 
@@ -146,24 +190,22 @@ async function fetchVariations() {
     const response = await axios.get(`/r/resource_files/${resourceNodeId}/variants`)
     variations.value = response.data
   } catch (error) {
-    console.error('Error fetching variations:', error)
+    console.error("Error fetching variations:", error)
   }
 }
 
 async function fetchAccessUrls() {
   try {
-    const response = await axios.get('/api/access_urls')
-    if (Array.isArray(response.data['hydra:member'])) {
+    const response = await axios.get("/api/access_urls")
+    if (Array.isArray(response.data["hydra:member"])) {
       const currentAccessUrlId = window.access_url_id
 
-      accessUrls.value = response.data['hydra:member'].filter(
-        (url) => url.id !== currentAccessUrlId
-      )
+      accessUrls.value = response.data["hydra:member"].filter((url) => url.id !== currentAccessUrlId)
     } else {
       accessUrls.value = []
     }
   } catch (error) {
-    console.error('Error fetching access URLs:', error)
+    console.error("Error fetching access URLs:", error)
     accessUrls.value = []
   }
 }
@@ -173,42 +215,42 @@ async function fetchOriginalFile() {
     const response = await axios.get(`/api/resource_files/${resourceFileId}`)
     originalFile.value = response.data
   } catch (error) {
-    console.error('Error fetching original file:', error)
+    console.error("Error fetching original file:", error)
   }
 }
 
 async function uploadVariant(file, resourceNodeId, accessUrlId) {
   if (!resourceNodeId) {
-    console.error('ResourceNodeId is undefined. Check originalFile:', originalFile.value)
+    console.error("ResourceNodeId is undefined. Check originalFile:", originalFile.value)
     return
   }
 
   const formData = new FormData()
-  formData.append('file', file)
-  formData.append('resourceNodeId', resourceNodeId)
+  formData.append("file", file)
+  formData.append("resourceNodeId", resourceNodeId)
   if (accessUrlId) {
-    formData.append('accessUrlId', accessUrlId)
+    formData.append("accessUrlId", accessUrlId)
   }
 
   try {
-    const response = await axios.post('/api/resource_files/add_variant', formData)
-    console.log('Variant uploaded or updated successfully:', response.data)
+    const response = await axios.post("/api/resource_files/add_variant", formData)
+    console.log("Variant uploaded or updated successfully:", response.data)
 
     await fetchVariations()
     file.value = null
     selectedAccessUrl.value = null
   } catch (error) {
-    console.error('Error uploading variant:', error)
+    console.error("Error uploading variant:", error)
   }
 }
 
 async function deleteVariant(variantId) {
   try {
     await axios.delete(`/r/resource_files/${variantId}/delete_variant`)
-    console.log('Variant deleted successfully.')
+    console.log("Variant deleted successfully.")
     await fetchVariations()
   } catch (error) {
-    console.error('Error deleting variant:', error)
+    console.error("Error deleting variant:", error)
   }
 }
 
diff --git a/assets/vue/views/documents/CreateFile.vue b/assets/vue/views/documents/CreateFile.vue
index 48ce22d43b0..7d9037478e8 100644
--- a/assets/vue/views/documents/CreateFile.vue
+++ b/assets/vue/views/documents/CreateFile.vue
@@ -57,7 +57,10 @@ export default {
   },
   mixins: [CreateMixin],
   data() {
-    const filetype = this.$route.query.filetype === "certificate" ? "certificate" : "file"
+    const allowedFiletypes = ["file", "video", "audio", "certificate"]
+    const filetypeQuery = this.$route.query.filetype
+    const filetype = allowedFiletypes.includes(filetypeQuery) ? filetypeQuery : "file"
+
     const finalTags = this.getCertificateTags()
     return {
       item: {
diff --git a/assets/vue/views/documents/DocumentShow.vue b/assets/vue/views/documents/DocumentShow.vue
index 0b2607496a1..08f500841e3 100644
--- a/assets/vue/views/documents/DocumentShow.vue
+++ b/assets/vue/views/documents/DocumentShow.vue
@@ -30,7 +30,7 @@
           </video>
 
           <iframe
-            v-if="'text/html' === item.resourceNode.firstResourceFile.mimeType"
+            v-else-if="'text/html' === item.resourceNode.firstResourceFile.mimeType"
             :src="item['contentUrl']"
           />
         </div>
diff --git a/assets/vue/views/documents/DocumentsList.vue b/assets/vue/views/documents/DocumentsList.vue
index f7a91afb4c3..7de18fc6634 100644
--- a/assets/vue/views/documents/DocumentsList.vue
+++ b/assets/vue/views/documents/DocumentsList.vue
@@ -183,12 +183,15 @@
             @click="openMoveDialog(slotProps.data)"
           />
           <BaseButton
-            :disabled="slotProps.data.filetype !== 'file'"
-            :title="slotProps.data.filetype !== 'file' ? t('Replace (files only)') : t('Replace file')"
+            :disabled="!(slotProps.data.filetype === 'file' || slotProps.data.filetype === 'video')"
+            :title="getReplaceButtonTitle(slotProps.data)"
             icon="file-swap"
             size="small"
             type="secondary"
-            @click="slotProps.data.filetype === 'file' && openReplaceDialog(slotProps.data)"
+            @click="
+              (slotProps.data.filetype === 'file' || slotProps.data.filetype === 'video') &&
+              openReplaceDialog(slotProps.data)
+            "
           />
           <BaseButton
             :title="t('Information')"
@@ -486,7 +489,9 @@ const router = useRouter()
 const securityStore = useSecurityStore()
 
 const platformConfigStore = usePlatformConfig()
-const allowAccessUrlFiles = computed(() => "false" !== platformConfigStore.getSetting("course.access_url_specific_files"))
+const allowAccessUrlFiles = computed(
+  () => "false" !== platformConfigStore.getSetting("course.access_url_specific_files"),
+)
 
 const { t } = useI18n()
 const { filters, options, onUpdateOptions, deleteItem } = useDatatableList("Documents")
@@ -570,6 +575,7 @@ const documentToReplace = ref(null)
 onMounted(async () => {
   isAllowedToEdit.value = await checkIsAllowedToEdit(true, true, true)
   filters.value.loadNode = 1
+  filters.value.filetype = ["file", "folder", "video"]
 
   // Set resource node.
   let nodeId = route.params.node
@@ -610,7 +616,7 @@ const showBackButtonIfNotRootFolder = computed(() => {
 function goToAddVariation(item) {
   const resourceFileId = item.resourceNode.firstResourceFile.id
   router.push({
-    name: 'DocumentsAddVariation',
+    name: "DocumentsAddVariation",
     params: { resourceFileId, node: route.params.node },
     query: { cid, sid, gid },
   })
@@ -677,6 +683,16 @@ function confirmDeleteItem(itemToDelete) {
   isDeleteItemDialogVisible.value = true
 }
 
+function getReplaceButtonTitle(item) {
+  if (item.filetype === "file") {
+    return t("Replace file")
+  }
+  if (item.filetype === "video") {
+    return t("Replace video")
+  }
+  return t("Replace (files or videos only)")
+}
+
 async function downloadSelectedItems() {
   if (!selectedItems.value.length) {
     notification.showErrorNotification(t("No items selected."))
@@ -688,8 +704,8 @@ async function downloadSelectedItems() {
   try {
     const response = await axios.post(
       "/api/documents/download-selected",
-      { ids: selectedItems.value.map(item => item.iid) },
-      { responseType: "blob" }
+      { ids: selectedItems.value.map((item) => item.iid) },
+      { responseType: "blob" },
     )
 
     const url = window.URL.createObjectURL(new Blob([response.data]))
@@ -705,7 +721,7 @@ async function downloadSelectedItems() {
     console.error("Error downloading selected items:", error)
     notification.showErrorNotification(t("Error downloading selected items."))
   } finally {
-    isDownloading.value = false;
+    isDownloading.value = false
   }
 }
 
@@ -884,19 +900,19 @@ async function replaceDocument() {
     return
   }
 
-  if (documentToReplace.value.filetype !== 'file') {
-    notification.showErrorNotification(t("Only files can be replaced."))
+  if (!(documentToReplace.value.filetype === "file" || documentToReplace.value.filetype === "video")) {
+    notification.showErrorNotification(t("Only files or videos can be replaced."))
     return
   }
 
   const formData = new FormData()
   console.log(selectedReplaceFile.value)
-  formData.append('file', selectedReplaceFile.value)
+  formData.append("file", selectedReplaceFile.value)
 
   try {
     await axios.post(`/api/documents/${documentToReplace.value.iid}/replace`, formData, {
       headers: {
-        'Content-Type': 'multipart/form-data',
+        "Content-Type": "multipart/form-data",
       },
     })
     notification.showSuccessNotification(t("File replaced"))
@@ -911,7 +927,7 @@ async function replaceDocument() {
 async function fetchFolders(nodeId = null, parentPath = "") {
   const foldersList = [
     {
-      label: t('Documents'),
+      label: t("Documents"),
       value: nodeId || route.params.node || route.query.node || "root-node-id",
     },
   ]
diff --git a/assets/vue/views/documents/DocumentsUpload.vue b/assets/vue/views/documents/DocumentsUpload.vue
index c63e9f52efa..8316f746265 100644
--- a/assets/vue/views/documents/DocumentsUpload.vue
+++ b/assets/vue/views/documents/DocumentsUpload.vue
@@ -79,7 +79,9 @@ const router = useRouter()
 const { gid, sid, cid } = useCidReq()
 const { onCreated, onError } = useUpload()
 const { t } = useI18n()
-const filetype = route.query.filetype === "certificate" ? "certificate" : "file"
+const allowedFiletypes = ["file", "video", "certificate"]
+const filetypeQuery = route.query.filetype
+const filetype = allowedFiletypes.includes(filetypeQuery) ? filetypeQuery : "file"
 
 const showAdvancedSettings = ref(false)
 const isUncompressZipEnabled = ref(false)
@@ -155,8 +157,10 @@ uppy.value.setMeta({
 
 if (filetype === "certificate") {
   uppy.value.opts.restrictions.allowedFileTypes = [".html"]
-} else {
-  uppy.value.use(Webcam)
+} else if (filetype === "video") {
+  uppy.value.opts.restrictions.allowedFileTypes = ["video/*"]
+} else if (filetype === "file") {
+  uppy.value.opts.restrictions.allowedFileTypes = null
 }
 
 watch(isUncompressZipEnabled, () => {
diff --git a/assets/vue/views/documents/UpdateFile.vue b/assets/vue/views/documents/UpdateFile.vue
index 6bc8016f116..ea0ec8ea39e 100644
--- a/assets/vue/views/documents/UpdateFile.vue
+++ b/assets/vue/views/documents/UpdateFile.vue
@@ -26,7 +26,7 @@
           />
         </DocumentsForm>
         <Panel
-          v-if="$route.query.filetype === 'certificate'"
+          v-if="filetype === 'certificate'"
           :header="
             $t(
               'Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:',
@@ -93,11 +93,16 @@ export default {
     }
   },
   data() {
-    const finalTags = this.getCertificateTags()
+    const allowedFiletypes = ["file", "certificate", "video"]
+    const filetypeQuery = this.$route.query.filetype
+    const filetype = allowedFiletypes.includes(filetypeQuery) ? filetypeQuery : "file"
+    const finalTags = filetype === "certificate" ? this.getCertificateTags() : ""
+
     return {
       templates: [],
       finalTags,
       isAllowedToEdit: ref(false),
+      filetype,
     }
   },
   computed: {
diff --git a/public/main/inc/ajax/lp.ajax.php b/public/main/inc/ajax/lp.ajax.php
index c07b8ca2a2b..7aec90aa760 100644
--- a/public/main/inc/ajax/lp.ajax.php
+++ b/public/main/inc/ajax/lp.ajax.php
@@ -95,6 +95,7 @@
                     $title = Exercise::format_title_variable($title);
                     break;
                 case TOOL_DOCUMENT:
+                case 'video':
                     $repo = Container::getDocumentRepository();
                     /** @var CDocument $document */
                     $document = $repo->getResourceFromResourceNode($id);
diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php
index 761cf863777..89518f4317f 100644
--- a/public/main/inc/lib/document.lib.php
+++ b/public/main/inc/lib/document.lib.php
@@ -1028,7 +1028,7 @@ public static function is_visible(
             $em = Database::getManager();
 
             $repo = $em->getRepository(CDocument::class);
-            /** @var \Chamilo\CourseBundle\Entity\CDocument $document */
+            /** @var CDocument $document */
             $document = $repo->find($row['iid']);
             if (ResourceLink::VISIBILITY_PUBLISHED === $document->getVisibility()) {
                 $is_visible = api_is_allowed_in_course() || api_is_platform_admin();
@@ -2212,18 +2212,20 @@ public static function generateMediaPreview($file, $extension)
      */
     public static function get_document_preview(
         Course $course,
-        $lp_id = false,
-        $target = '',
-        $session_id = 0,
-        $add_move_button = false,
-        $filter_by_folder = null,
-        $overwrite_url = '',
-        $showInvisibleFiles = false,
-        $showOnlyFolders = false,
-        $folderId = false,
-        $addCloseButton = true,
-        $addAudioPreview = false,
-        $filterByExtension = []
+               $lp_id = false,
+               $target = '',
+               $session_id = 0,
+               $add_move_button = false,
+               $filter_by_folder = null,
+               $overwrite_url = '',
+               $showInvisibleFiles = false,
+               $showOnlyFolders = false,
+               $folderId = false,
+               $addCloseButton = true,
+               $addAudioPreview = false,
+               $filterByExtension = [],
+               $excludeByExtension = [],
+               $filterByFiletype = null
     ) {
         $repo = Container::getDocumentRepository();
         $nodeRepository = $repo->getResourceNodeRepository();
@@ -2231,41 +2233,36 @@ public static function get_document_preview(
         $icon = '<i class="mdi-cursor-move mdi ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" title="'.htmlentities(get_lang('Move')).'"></i>';
         $folderIcon = Display::getMdiIcon(ObjectIcon::CHAPTER, 'ch-tool-icon', null, ICON_SIZE_SMALL);
 
+        $lpItemType = ($filterByFiletype === 'video') ? 'video' : 'document';
         $options = [
             'decorate' => true,
             'rootOpen' => '<ul id="doc_list" class="list-group lp_resource">',
             'rootClose' => '</ul>',
-            //'childOpen' => '<li class="doc_resource lp_resource_element ">',
-            'childOpen' => function ($child) {;
+            'childOpen' => function ($child) {
                 $id = $child['id'];
                 $disableDrag = '';
-                if (!$child['resourceFiles']) {
+                if (empty($child['resourceFiles'])) {
                     $disableDrag = ' disable_drag ';
                 }
 
                 return '<li
-                    id="'.$id.'"
-                    data-id="'.$id.'"
-                    class=" '.$disableDrag.' list-group-item nested-'.$child['level'].'"
-                >';
+                id="'.$id.'"
+                data-id="'.$id.'"
+                class="'.$disableDrag.' list-group-item nested-'.$child['level'].'"
+            >';
             },
             'childClose' => '</li>',
-            'nodeDecorator' => function ($node) use ($icon, $folderIcon) {
+            'nodeDecorator' => function ($node) use ($icon, $folderIcon, $lpItemType) {
                 $disableDrag = '';
-                if (!$node['resourceFiles']) {
+                if (empty($node['resourceFiles'])) {
                     $disableDrag = ' disable_drag ';
                 }
 
                 $link = '<div class="flex flex-row gap-1 h-4 item_data '.$disableDrag.' ">';
-                $file = $node['resourceFiles'] ? current($node['resourceFiles']) : null;
-                $extension = '';
-                if ($file) {
-                    $extension = pathinfo($file['title'], PATHINFO_EXTENSION);
-                }
-
+                $file = !empty($node['resourceFiles']) ? current($node['resourceFiles']) : null;
                 $folder = $folderIcon;
 
-                if ($node['resourceFiles']) {
+                if (!empty($node['resourceFiles'])) {
                     $link .= '<a class="moved ui-sortable-handle" href="#">';
                     $link .= $icon;
                     $link .= '</a>';
@@ -2273,10 +2270,10 @@ class=" '.$disableDrag.' list-group-item nested-'.$child['level'].'"
                 }
 
                 $link .= '<a
-                    data_id="'.$node['id'].'"
-                    data_type="document"
-                    class="moved ui-sortable-handle link_with_id"
-                >';
+                data_id="'.$node['id'].'"
+                data_type="'.$lpItemType.'"
+                class="moved ui-sortable-handle link_with_id"
+            >';
                 $link .= $folder.'&nbsp;';
                 $link .= '</a>';
                 $link .= cut(addslashes($node['title']), 30);
@@ -2290,17 +2287,25 @@ class="moved ui-sortable-handle link_with_id"
         $em = Database::getManager();
         $qb = $em
             ->createQueryBuilder()
-            ->select('node')
+            ->select('node, files')
             ->from(ResourceNode::class, 'node')
             ->innerJoin('node.resourceType', 'type')
             ->innerJoin('node.resourceLinks', 'links')
             ->innerJoin('node.resourceFiles', 'files')
-            ->addSelect('files')
+            ->innerJoin(
+                CDocument::class,
+                'doc',
+                'WITH',
+                'doc.resourceNode = node'
+            )
             ->where('type = :type')
             ->andWhere('links.course = :course')
-            ->setParameters(['type' => $type, 'course' => $course])
-            ->orderBy('node.parent', 'ASC')
-        ;
+            ->setParameters([
+                'type' => $type,
+                'course' => $course,
+            ])
+            ->orderBy('node.parent', 'ASC');
+
 
         $sessionId = api_get_session_id();
         if (empty($sessionId)) {
@@ -2308,18 +2313,46 @@ class="moved ui-sortable-handle link_with_id"
         } else {
             $qb
                 ->andWhere('links.session = :session')
-                ->setParameter('session', $sessionId)
-            ;
+                ->setParameter('session', $sessionId);
+        }
+
+        if ($filterByFiletype !== null) {
+            if (is_array($filterByFiletype)) {
+                $qb->andWhere('doc.filetype IN (:filetypes)');
+                $qb->setParameter('filetypes', $filterByFiletype);
+            } else {
+                $qb->andWhere('doc.filetype = :filetype');
+                $qb->setParameter('filetype', $filterByFiletype);
+            }
         }
 
         if (!empty($filterByExtension)) {
             $orX = $qb->expr()->orX();
             foreach ($filterByExtension as $extension) {
-                $orX->add($qb->expr()->like('file.originalName', ':'.$extension));
-                $qb->setParameter($extension, '%'.$extension);
+                $paramName = 'ext_' . $extension;
+                $orX->add(
+                    $qb->expr()->like(
+                        'LOWER(files.originalName)',
+                        ':' . $paramName
+                    )
+                );
+                $qb->setParameter($paramName, '%.' . strtolower($extension));
             }
             $qb->andWhere($orX);
         }
+
+        if (!empty($excludeByExtension)) {
+            foreach ($excludeByExtension as $extension) {
+                $qb->andWhere(
+                    $qb->expr()->notLike(
+                        'LOWER(files.originalName)',
+                        ':exclude_' . $extension
+                    )
+                );
+                $qb->setParameter('exclude_' . $extension, '%.' . strtolower($extension));
+            }
+        }
+
         $query = $qb->getQuery();
 
         return $nodeRepository->buildTree($query->getArrayResult(), $options);
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index 5d3e24701eb..61f8b9d8ed3 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -121,6 +121,7 @@ class learnpath
     public $categoryId;
     public $scormUrl;
     public $entity;
+    public $auto_forward_video = 1;
 
     public function __construct(CLp $entity = null, $course_info, $user_id)
     {
@@ -159,6 +160,7 @@ public function __construct(CLp $entity = null, $course_info, $user_id)
             $this->created_on = $entity->getCreatedOn()->format('Y-m-d H:i:s');
             $this->modified_on = $entity->getModifiedOn()->format('Y-m-d H:i:s');
             $this->ref = $entity->getRef();
+            $this->auto_forward_video = $entity->getAutoForwardVideo();
             $this->categoryId = 0;
             if ($entity->getCategory()) {
                 $this->categoryId = $entity->getCategory()->getIid();
@@ -5224,6 +5226,7 @@ public function display_item($lpItem, $msg = null, $show_actions = true)
                 $return .= $this->getSavedFinalItem();
                 break;
             case TOOL_DOCUMENT:
+            case 'video':
             case TOOL_READOUT_TEXT:
                 $repo = Container::getDocumentRepository();
                 /** @var CDocument $document */
@@ -5268,6 +5271,7 @@ public function display_edit_item($lpItem, $excludeExtraFields = [])
                 break;
             case TOOL_LP_FINAL_ITEM:
             case TOOL_DOCUMENT:
+            case 'video':
             case TOOL_READOUT_TEXT:
                 $return .= $this->displayItemMenu($lpItem);
                 $return .= $this->displayDocumentForm('edit', $lpItem);
@@ -6014,6 +6018,7 @@ public function display_move_item($lpItem)
                     );
                     break;
                 case TOOL_DOCUMENT:
+                case 'video':
                     $return .= $this->displayItemMenu($lpItem);
                     $return .= $this->displayDocumentForm('move', $lpItem);
                     break;
@@ -6331,7 +6336,13 @@ public function get_documents($showInvisibleFiles = false)
             null,
             null,
             $showInvisibleFiles,
-            true
+            true,
+            false,
+            true,
+            false,
+            [],
+            [],
+            ['file', 'folder']
         );
 
         $form = new FormValidator(
@@ -6407,25 +6418,47 @@ public function get_documents($showInvisibleFiles = false)
         ;
         $new = $this->displayDocumentForm('add', $lpItem);
 
-        /*$lpItem = new CLpItem();
-        $lpItem->setItemType(TOOL_READOUT_TEXT);
-        $frmReadOutText = $this->displayDocumentForm('add');*/
-
+        $videosTree = $this->get_videos();
         $headers = [
             get_lang('Files'),
+            get_lang('Videos'),
             get_lang('Create a new document'),
-            //get_lang('Create read-out text'),
             get_lang('Upload'),
         ];
 
         return Display::tabs(
             $headers,
-            [$documentTree, $new, $form->returnForm()],
+            [$documentTree, $videosTree, $new, $form->returnForm()],
             'subtab',
             ['class' => 'mt-2']
         );
     }
 
+    public function get_videos()
+    {
+        $sessionId = api_get_session_id();
+
+        $documentTree = DocumentManager::get_document_preview(
+            api_get_course_entity(),
+            $this->lp_id,
+            null,
+            $sessionId,
+            true,
+            null,
+            null,
+            false,
+            false,
+            false,
+            true,
+            false,
+            [],
+            [],
+            'video'
+        );
+
+        return $documentTree ?: get_lang('No videos found');
+    }
+
     /**
      * Creates a list with all the exercises (quiz) in it.
      *
@@ -7977,6 +8010,7 @@ public static function rl_get_resource_link_for_learnpath(
                 return api_get_path(WEB_CODE_PATH).
                     'lp/readout_text.php?&id='.$id.'&lp_id='.$learningPathId.'&'.$extraParams;
             case TOOL_DOCUMENT:
+            case 'video':
                 $repo = Container::getDocumentRepository();
                 $document = $repo->find($rowItem->getPath());
                 if ($document) {
@@ -8157,6 +8191,7 @@ public static function rl_get_resource_name($course_code, $learningPathId, $id_i
                 break;
             case 'dir':
             case TOOL_DOCUMENT:
+            case 'video':
                 $title = $row_item['title'];
                 $output = '-';
                 if (!empty($title)) {
@@ -8883,4 +8918,42 @@ public function recalculateResultsForLp(int $userId): void
             }
         }
     }
+
+    /**
+     * Returns the video player HTML for a video-type document LP item.
+     *
+     * @param int $lpItemId
+     * @param string $autostart
+     *
+     * @return string
+     */
+    public function getVideoPlayer(CDocument $document, string $autostart = 'true'): string
+    {
+        $resourceNode = $document->getResourceNode();
+        $resourceFile = $resourceNode?->getFirstResourceFile();
+
+        if (!$resourceNode || !$resourceFile) {
+            return '';
+        }
+
+        $resourceNodeRepository = Container::getResourceNodeRepository();
+        $videoUrl = $resourceNodeRepository->getResourceFileUrl($resourceNode);
+
+        if (empty($videoUrl)) {
+            return '';
+        }
+
+        $fileName = $resourceFile->getTitle();
+        $ext = pathinfo($fileName, PATHINFO_EXTENSION);
+        $mimeType = $resourceFile->getMimeType() ?: 'video/mp4';
+        $autoplayAttr = ($autostart === 'true') ? 'autoplay muted playsinline' : '';
+
+        $html = '';
+        $html .= '
+        <video id="lp-video" width="100%" height="auto" controls '.$autoplayAttr.'>
+            <source src="'.$videoUrl.'" type="$mimeType">
+        </video>';
+
+        return $html;
+    }
 }
diff --git a/public/main/lp/learnpathItem.class.php b/public/main/lp/learnpathItem.class.php
index f6e5bd54d51..b15b301c037 100644
--- a/public/main/lp/learnpathItem.class.php
+++ b/public/main/lp/learnpathItem.class.php
@@ -174,9 +174,9 @@ public function __construct($id, $item_content = null)
             }
 
 /*
-	    // Xapian full text search does not work 
+	    // Xapian full text search does not work
 	    // and if the option is activated it generates an error
-	    // So I comment this part of the code to avoid unnecesary errors 
+	    // So I comment this part of the code to avoid unnecesary errors
             // Get search_did.
             if ('true' === api_get_setting('search_enabled')) {
                 $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
@@ -490,6 +490,7 @@ public function get_file_path($path_to_scorm_dir = '')
                 case 'dir':
                     return '';
                 case TOOL_DOCUMENT:
+                case 'video':
                     $table_doc = Database::get_course_table(TABLE_DOCUMENT);
                     $sql = 'SELECT path
                             FROM '.$table_doc.'
diff --git a/public/main/lp/lp_controller.php b/public/main/lp/lp_controller.php
index 4f9c2757fb3..886b296cbd3 100644
--- a/public/main/lp/lp_controller.php
+++ b/public/main/lp/lp_controller.php
@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Entity\CLp;
 use Chamilo\CourseBundle\Entity\CLpItem;
 use ChamiloSession as Session;
@@ -304,7 +305,7 @@
 
         if (isset($_POST['submit_button']) && !empty($post_title)) {
             Session::write('post_time', $_POST['post_time']);
-            $directoryParentId = isset($_POST['directory_parent_id']) ? $_POST['directory_parent_id'] : 0;
+            $directoryParentId = $_POST['directory_parent_id'] ?? 0;
 
             if (empty($directoryParentId) || '/' === $directoryParentId) {
                 $result = $oLP->generate_lp_folder($courseInfo);
@@ -326,8 +327,8 @@
             $prerequisites = $_POST['prerequisites'] ?? '';
             $maxTimeAllowed = $_POST['maxTimeAllowed'] ?? '';
 
-            if (TOOL_DOCUMENT === $_POST['type']) {
-                if (isset($_POST['path']) && isset($_GET['id']) && !empty($_GET['id'])) {
+            if (in_array($_POST['type'], [TOOL_DOCUMENT, 'video'])) {
+                if (isset($_POST['path']) && !empty($_GET['id'])) {
                     $document_id = $_POST['path'];
                 } else {
                     if ($_POST['content_lp']) {
@@ -341,6 +342,12 @@
                     }
                 }
 
+                $documentRepo = Database::getManager()->getRepository(CDocument::class);
+                $document = $documentRepo->find((int)$document_id);
+                if ($document && $document->getFiletype() === 'video') {
+                    $type = 'video';
+                }
+
                 $oLP->add_item(
                     $parent,
                     $previous,
diff --git a/public/main/lp/lp_video_view.php b/public/main/lp/lp_video_view.php
new file mode 100644
index 00000000000..0f0c43e320b
--- /dev/null
+++ b/public/main/lp/lp_video_view.php
@@ -0,0 +1,46 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+use Chamilo\CourseBundle\Entity\CDocument;
+use ChamiloSession as Session;
+require_once __DIR__.'/../inc/global.inc.php';
+
+api_protect_course_script();
+
+$lpId = (int) ($_GET['lp_id'] ?? 0);
+$lpItemId = (int) ($_GET['lp_item_id'] ?? 0);
+$autostart = 'true';
+
+if (empty($lpId) || empty($lpItemId)) {
+    api_not_allowed();
+}
+
+/** @var learnpath $oLP */
+$oLP = Session::read('oLP');
+
+$lpItem = $oLP->items[$lpItemId] ?? null;
+
+if (!$lpItem) {
+    echo get_lang('Invalid LP Item');
+    exit;
+}
+
+$documentIid = (int) $lpItem->get_path();
+
+if (empty($documentIid)) {
+    echo get_lang('Document not found');
+    exit;
+}
+
+$em = Database::getManager();
+$document = $em->getRepository(CDocument::class)
+    ->find($documentIid);
+
+if (!$document instanceof CDocument) {
+    echo get_lang('Document not found');
+    exit;
+}
+
+$html = $oLP->getVideoPlayer($document, $autostart);
+
+echo $html;
diff --git a/public/main/lp/lp_view.php b/public/main/lp/lp_view.php
index 2ae04bd1fdc..ba1afe3e8bb 100644
--- a/public/main/lp/lp_view.php
+++ b/public/main/lp/lp_view.php
@@ -561,6 +561,13 @@
 $template->assign('disable_js_in_lp_view', (int) ('true' === api_get_setting('lp.disable_js_in_lp_view')));
 $template->assign('lp_preview_image', '<img src="'.$lpPreviewImagePath.'" alt="'.$oLP->getNameNoTags().'" />');
 
+if ('video' === $itemType) {
+    $src = api_get_path(WEB_CODE_PATH)
+        . "lp/lp_video_view.php?lp_id=$lp_id&lp_item_id=$lpCurrentItemId&" . api_get_cidreq();
+}
+$htmlHeadXtra[] = '<script>
+    olms.lms_item_types["i'.$lpCurrentItemId.'"] = "'.$itemType.'";
+</script>';
 $frameReady = Display::getFrameReadyBlock(
     '#content_id, #content_id_blank',
     $itemType,
diff --git a/public/main/lp/scorm_api.php b/public/main/lp/scorm_api.php
index 20810183463..8b9ba3e5512 100644
--- a/public/main/lp/scorm_api.php
+++ b/public/main/lp/scorm_api.php
@@ -204,6 +204,7 @@ function APIobject() {
 olms.userlname = '<?php echo addslashes(trim($user['lastname'])); ?>';
 olms.execute_stats = false;
 olms.lms_lp_item_parents = '';
+olms.lms_auto_forward_video = <?php echo (int) $oLP->auto_forward_video; ?>;
 
 var courseUrl = '?cid='+olms.lms_course_id+'&sid='+olms.lms_session_id;
 var statsUrl = 'lp_controller.php' + courseUrl + '&action=stats';
@@ -292,7 +293,7 @@ function LMSInitialize() {
             'start_time': 0
         };
 
-        if (olms.lms_lp_type == 1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document') {
+        if (olms.lms_lp_type == 1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document' || olms.lms_item_type == 'video') {
             params['start_time'] = 1;
             //xajax_start_timer();
         }
@@ -305,6 +306,16 @@ function LMSInitialize() {
             async: false,
             success:function(data) {
                 $('video:not(.skip), audio:not(.skip)').mediaelementplayer();
+                if (olms.lms_item_type === 'video') {
+                    var cont_f = document.getElementById("content_id");
+                    if (cont_f && (cont_f.contentDocument || cont_f.contentWindow.document).readyState === "complete") {
+                        onIframeLoaded(cont_f);
+                    } else {
+                        $("#content_id").on("load", function() {
+                            onIframeLoaded(this);
+                        });
+                    }
+                }
             }
         });
 
@@ -368,6 +379,96 @@ function LMSInitialize() {
     }
 }
 
+/**
+* Handles post-processing once the SCORM content iframe has loaded.
+* Specifically, detects video elements and attaches logic to
+* automatically display a MediaElement postroll and switch to
+* the next learning path item 10 seconds after the video ends.
+*
+* @param {HTMLIFrameElement} iframe - The iframe DOM element containing the SCORM content.
+*/
+function onIframeLoaded(iframe) {
+    var contentDocument = iframe.contentDocument || iframe.contentWindow.document;
+    var $video = $("video:not(.skip)", contentDocument);
+    if ($video.length > 0) {
+        $video.each(function() {
+            var videoElement = this;
+
+            // Create overlay DIV in iframe
+            var overlayHtml = `
+            <div id="postroll-overlay" style="
+                                    position: absolute;
+                                    top: 0;
+                                    left: 0;
+                                    width: 100%;
+                                    height: 100%;
+                                    background: rgba(0, 0, 0, 0.8);
+                                    color: white;
+                                    text-align: center;
+                                    display: none;
+                                    justify-content: center;
+                                    align-items: center;
+                                    flex-direction: column;
+                                    z-index: 9999;
+                                ">
+                <p style="font-size: 24px; margin-bottom: 10px;"><?php echo get_lang('Video finished!') ?></p>
+                `;
+
+                if (olms.lms_auto_forward_video == 1) {
+                    overlayHtml += `
+                    <p style="font-size: 18px;"><?php echo get_lang('Advancing in') ?> <span id="postroll-counter">10</span> <?php echo get_lang('seconds') ?>...</p>
+                    `;
+                }
+
+                overlayHtml += `
+                    <button id="postroll-next-btn" style="
+                                            margin-top: 20px;
+                                            padding: 10px 20px;
+                                            font-size: 18px;
+                                            background-color: #337ab7;
+                                            border: none;
+                                            color: white;
+                                            cursor: pointer;
+                                        "><?php echo get_lang('Next lesson') ?></button>
+                    </div>
+                `;
+
+            var $overlay = $(overlayHtml);
+            $(contentDocument.body).append($overlay);
+            videoElement.addEventListener("ended", function () {
+                $overlay.show();
+                if (olms.lms_auto_forward_video == 1) {
+                    startPostrollCountdown(contentDocument);
+                } else {
+                    console.log("Auto-forward disabled, waiting for user click.");
+                }
+            });
+
+            // Click on next button
+            $(contentDocument).on("click", "#postroll-next-btn", function () {
+                switch_item(olms.lms_item_id, olms.lms_next_item);
+            });
+        });
+    }
+}
+
+/**
+* Starts the countdown timer displayed in the postroll overlay.
+*
+* @param {Document} doc - The iframe's document where the countdown is displayed.
+*/
+function startPostrollCountdown(doc) {
+    var seconds = 10;
+    var interval = setInterval(function() {
+        seconds--;
+        $(doc).find("#postroll-counter").text(seconds);
+        if (seconds <= 0) {
+            clearInterval(interval);
+            switch_item(olms.lms_item_id, olms.lms_next_item);
+        }
+    }, 1000);
+}
+
 /**
  * Twin sister of LMSInitialize(). Only provided for backwards compatibility.
  * this is the initialize function of all APIobjects
@@ -1115,7 +1216,7 @@ function addListeners(){
         return;
     }
     //assign event handlers to objects
-    if (olms.lms_lp_type==1 || olms.lms_item_type=='asset' || olms.lms_item_type == 'document') {
+    if (olms.lms_lp_type==1 || olms.lms_item_type=='asset' || olms.lms_item_type == 'document' || olms.lms_item_type == 'video') {
         logit_lms('Chamilo LP or asset');
         //if this path is a Chamilo learnpath, then start manual save
         //when something is loaded in there
@@ -1171,7 +1272,7 @@ function lms_save_asset() {
     }
 
     //For scorms do not show stats
-    if (olms.lms_lp_type == 2 && olms.lms_lp_item_type != 'document') {
+    if (olms.lms_lp_type == 2 && olms.lms_lp_item_type != 'document' && olms.lms_lp_item_type != 'video') {
        olms.execute_stats = false;
     }
 
@@ -1179,7 +1280,7 @@ function lms_save_asset() {
         olms.execute_stats = true;
     }
 
-    if (olms.lms_lp_type == 1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document') {
+    if (olms.lms_lp_type == 1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document' || olms.lms_item_type == 'video') {
         logit_lms('lms_save_asset');
         logit_lms('execute_stats :'+ olms.execute_stats);
         xajax_save_item(
@@ -1685,7 +1786,7 @@ function switch_item(current_item, next_item)
     } ?>
 
     let startTime = 0;
-    if (olms.lms_lp_type==1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document') {
+    if (olms.lms_lp_type==1 || olms.lms_item_type == 'asset' || olms.lms_item_type == 'document' || olms.lms_item_type == 'video') {
         startTime = 1;
         //xajax_start_timer();
     }
@@ -1902,7 +2003,7 @@ function xajax_save_item(
     params += '&switch_next='+switchNext;
     params += '&load_nav='+loadNav;
 
-    if (olms.lms_lp_type == 1 || item_type == 'document' || item_type == 'asset') {
+    if (olms.lms_lp_type == 1 || item_type == 'document' || item_type == 'video' || item_type == 'asset') {
         logit_lms('xajax_save_item with params:' + params, 3);
         return $.ajax({
             type:"POST",
diff --git a/src/CoreBundle/Controller/Api/BaseResourceFileAction.php b/src/CoreBundle/Controller/Api/BaseResourceFileAction.php
index 74b12f7b50d..3979ce13f66 100644
--- a/src/CoreBundle/Controller/Api/BaseResourceFileAction.php
+++ b/src/CoreBundle/Controller/Api/BaseResourceFileAction.php
@@ -383,9 +383,20 @@ public function handleCreateFileRequest(
             $resource->setResourceLinkArray($resourceLinkList);
         }
 
+        // Detect if file is a video
+        $filetypeResult = $fileType;
+
+        if (isset($uploadedFile) && $uploadedFile instanceof UploadedFile) {
+            $mimeType = $uploadedFile->getMimeType();
+            if (str_starts_with($mimeType, 'video/')) {
+                $filetypeResult = 'video';
+                $comment = trim($comment . ' [video]');
+            }
+        }
+
         return [
             'title' => $title,
-            'filetype' => $fileType,
+            'filetype' => $filetypeResult,
             'comment' => $comment,
         ];
     }
@@ -566,6 +577,14 @@ private function saveZipContentsAsDocuments(array $folderStructure, EntityManage
                         $fileName
                     );
 
+                    $mimeType = $uploadedFile->getMimeType();
+                    if (str_starts_with($mimeType, 'video/')) {
+                        $document->setFiletype('video');
+                        $document->setComment('[video]');
+                    } else {
+                        $document->setFiletype('file');
+                    }
+
                     $document->setUploadFile($uploadedFile);
                     $em->persist($document);
                     $em->flush();
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20201210100010.php b/src/CoreBundle/Migrations/Schema/V200/Version20201210100010.php
new file mode 100644
index 00000000000..70e12ce2e56
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20201210100010.php
@@ -0,0 +1,28 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+class Version20201210100010 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Add auto_forward_video column to c_lp table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE c_lp ADD auto_forward_video TINYINT(1) DEFAULT 0 NOT NULL;');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE c_lp DROP COLUMN auto_forward_video;');
+    }
+}
diff --git a/src/CoreBundle/Resources/views/LearnPath/view.html.twig b/src/CoreBundle/Resources/views/LearnPath/view.html.twig
index 7477e2e04bc..8ea76edaf42 100644
--- a/src/CoreBundle/Resources/views/LearnPath/view.html.twig
+++ b/src/CoreBundle/Resources/views/LearnPath/view.html.twig
@@ -4,7 +4,8 @@
 
 {% block content %}
     {% autoescape false %}
-        <div id="learning_path_main" class="{{ is_allowed_to_edit ? 'lp-view-include-breadcrumb' }} {{ lp_mode == 'embedframe' ? 'lp-view-collapsed' : '' }}">
+        <div id="learning_path_main"
+             class="{{ is_allowed_to_edit ? 'lp-view-include-breadcrumb' }} {{ lp_mode == 'embedframe' ? 'lp-view-collapsed' : '' }}">
             {% if show_left_column == 1 %}
                 <div id="learning_path_left_zone" class="sidebar-scorm">
                     <div class="lp-view-zone-container">
@@ -56,27 +57,23 @@
                                         }
                                     </style>
                                     <script>
-                                      $(function() {
+                                      $(function () {
                                         var timerData = {
                                           hour: parseInt($("#hour").text()),
                                           minute: parseInt($("#minute").text()),
                                           second: parseInt($("#second").text())
                                         }
                                         clearInterval(window.timerInterval)
-                                        window.timerInterval = setInterval(function() {
-                                          // Seconds
+                                        window.timerInterval = setInterval(function () {
                                           timerData.second++
                                           if (timerData.second >= 60) {
                                             timerData.second = 0
                                             timerData.minute++
                                           }
-
-                                          // Minutes
                                           if (timerData.minute >= 60) {
                                             timerData.minute = 0
                                             timerData.hour++
                                           }
-
                                           $("#hour").text(timerData.hour < 10 ? "0" + timerData.hour : timerData.hour)
                                           $("#minute").text(timerData.minute < 10 ? "0" + timerData.minute : timerData.minute)
                                           $("#second").text(timerData.second < 10 ? "0" + timerData.second : timerData.second)
@@ -85,9 +82,7 @@
                                     </script>
                                     <div class="row">
                                         <div class="col-xs-4">
-                                            <b>
-                                                {{ "Progress"|trans|format(lp_accumulate_work_time) }}
-                                            </b>
+                                            <b>{{ "Progress"|trans|format(lp_accumulate_work_time) }}</b>
                                         </div>
                                         <div class="col-xs-8">
                                             <div id="progress_bar">
@@ -97,9 +92,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-xs-4">
-                                            <b>
-                                                {{ "Time spent in the learning path"|trans|format(lp_accumulate_work_time) }}
-                                            </b>
+                                            <b>{{ "Time spent in the learning path"|trans|format(lp_accumulate_work_time) }}</b>
                                         </div>
                                         <div class="col-xs-8">
                                             <div id="timer">
@@ -125,7 +118,6 @@
                                 {% endif %}
 
                                 {% if gamification_mode == 1 %}
-                                    <!--- gamification -->
                                     <div id="scorm-gamification">
                                         <div class="row">
                                             <div class="col-xs-6">
@@ -134,7 +126,6 @@
                                                         <i class="level mdi-star-face mdi" aria-hidden="true"></i>
                                                     {% endfor %}
                                                 {% endif %}
-
                                                 {% if gamification_stars < 4 %}
                                                     {% for i in 1..4 - gamification_stars %}
                                                         <i class="mdi-home-outline mdi" aria-hidden="true"></i>
@@ -151,7 +142,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <!--- end gamification -->
                                 {% else %}
                                     {{ lp_progress }}
                                 {% endif %}
@@ -159,9 +149,8 @@
                                 {{ teacher_toc_buttons }}
                             </div>
                         </div>
-                        {# TOC layout #}
+
                         <div id="toc_id" class="scorm-body" name="toc_name">
-                            {# div#flab-mobile is to know when the user is on mobile view. Don't delete. #}
                             <div id="flag-mobile" class="visible-xs-block" aria-hidden="true"></div>
                             {% include '@ChamiloCore/LearnPath/scorm_list.html.twig' %}
                         </div>
@@ -169,8 +158,8 @@
                 </div>
             {% endif %}
 
-            {# Right zone #}
-            <div id="learning_path_right_zone" class="{{ show_left_column == 1 ? 'content-scorm' : 'no-right-col' }}">
+            <div id="learning_path_right_zone"
+                 class="{{ show_left_column == 1 ? 'content-scorm' : 'no-right-col' }}">
                 <div class="lp-view-zone-container">
                     <div class="lp-view-tabs">
                         <div id="navTabBar" class="nav-tabs-bar">
@@ -182,22 +171,6 @@
                                     {% endfor %}
                                 </div>
                             </div>
-                            <!--ul id="navTabs" class="nav nav-tabs tabs-right" role="tablist">
-                            <li role="presentation" class="active">
-                                <a href="#lp-view-content" title="{{ 'Lesson'|trans }}"
-                                   aria-controls="lp-view-content" role="tab" data-toggle="tab">
-                                    <i class="mdi-book mdi" aria-hidden="true"></i>
-                                    <span class="sr-only">{{ 'Lesson'|trans }}</span>
-                                </a>
-                            </li>
-                            <li role="presentation">
-                                <a href="#lp-view-forum" title="{{ 'Forum'|trans }}"
-                                   aria-controls="lp-view-forum" role="tab" data-toggle="tab">
-                                    <i class="mdi-message-reply-text mdi" aria-hidden="true"></i>
-                                    <span class="sr-only">{{ 'Forum'|trans }}</span>
-                                </a>
-                            </li>
-                        </ul-->
                         </div>
 
                         {% include '@ChamiloCore/LearnPath/menubar.html.twig' %}
@@ -209,19 +182,16 @@
                                         <iframe id="content_id_blank" name="content_name_blank" src="blank.php"
                                                 style="width:100%; height:100%" border="0" frameborder="0"
                                                 allowfullscreen="true" webkitallowfullscreen="true"
-                                                mozallowfullscreen="true">
-                                        </iframe>
+                                                mozallowfullscreen="true"></iframe>
                                     {% else %}
                                         <iframe id="content_id" name="content_name" src="{{ iframe_src }}"
                                                 style="width:100%; height:100%" border="0" frameborder="0"
                                                 allowfullscreen="true" webkitallowfullscreen="true"
-                                                mozallowfullscreen="true">
-                                        </iframe>
+                                                mozallowfullscreen="true"></iframe>
                                     {% endif %}
                                 </div>
                             </div>
-                            <div role="tabpanel" class="tab-pane" id="lp-view-forum">
-                            </div>
+                            <div role="tabpanel" class="tab-pane" id="lp-view-forum"></div>
                         </div>
                     </div>
                 </div>
@@ -422,4 +392,7 @@
           });
         </script>
     {% endautoescape %}
+    <script>
+      window.lpCurrentItemId = {{ lp_current_item_id }};
+    </script>
 {% endblock %}
diff --git a/src/CourseBundle/Entity/CDocument.php b/src/CourseBundle/Entity/CDocument.php
index 7dd2061ae11..7d5905946f4 100644
--- a/src/CourseBundle/Entity/CDocument.php
+++ b/src/CourseBundle/Entity/CDocument.php
@@ -219,7 +219,7 @@ class CDocument extends AbstractResource implements ResourceInterface, ResourceS
     protected ?string $comment;
 
     #[Groups(['document:read', 'document:write'])]
-    #[Assert\Choice(['folder', 'file', 'certificate'], message: 'Choose a valid filetype.')]
+    #[Assert\Choice(['folder', 'file', 'certificate', 'video'], message: 'Choose a valid filetype.')]
     #[ORM\Column(name: 'filetype', type: 'string', length: 15, nullable: false)]
     protected string $filetype;
 
diff --git a/src/CourseBundle/Entity/CLp.php b/src/CourseBundle/Entity/CLp.php
index 16e9debf1f4..dbeb639e9b5 100644
--- a/src/CourseBundle/Entity/CLp.php
+++ b/src/CourseBundle/Entity/CLp.php
@@ -158,6 +158,9 @@ class CLp extends AbstractResource implements ResourceInterface, ResourceShowCou
     #[ORM\Column(name: 'duration', type: 'integer', nullable: true)]
     protected ?int $duration = null;
 
+    #[ORM\Column(name: 'auto_forward_video', type: 'boolean', options: ['default' => 0])]
+    protected bool $autoForwardVideo = false;
+
     public function __construct()
     {
         $now = new DateTime();
@@ -647,6 +650,18 @@ public function setDuration(?int $duration): self
         return $this;
     }
 
+    public function getAutoForwardVideo(): bool
+    {
+        return $this->autoForwardVideo;
+    }
+
+    public function setAutoForwardVideo(bool $autoForwardVideo): self
+    {
+        $this->autoForwardVideo = $autoForwardVideo;
+
+        return $this;
+    }
+
     public function getResourceIdentifier(): int|Uuid
     {
         return $this->getIid();