diff --git a/assets/vue/components/basecomponents/BaseTable.vue b/assets/vue/components/basecomponents/BaseTable.vue
index 8ff71f151ad..1837221c836 100644
--- a/assets/vue/components/basecomponents/BaseTable.vue
+++ b/assets/vue/components/basecomponents/BaseTable.vue
@@ -98,10 +98,10 @@ function parseRowList(val) {
   return [5, 10, 20, 50]
 }
 
-const rowListRaw = computed(() => getSetting("platform.table_row_list", [5, 10, 20, 50]))
+const rowListRaw = computed(() => getSetting("display.table_row_list", [5, 10, 20, 50]))
 
 const defaultRowSetting = computed(() => {
-  const raw = getSetting("platform.table_default_row", DEFAULT_FALLBACK_ROWS)
+  const raw = getSetting("display.table_default_row", DEFAULT_FALLBACK_ROWS)
   const n = Number(raw)
   if (!Number.isFinite(n) || n <= 0) return DEFAULT_FALLBACK_ROWS
   return n
diff --git a/assets/vue/components/course/CourseTool.vue b/assets/vue/components/course/CourseTool.vue
index 4d7760a28ad..e0efbbf6709 100644
--- a/assets/vue/components/course/CourseTool.vue
+++ b/assets/vue/components/course/CourseTool.vue
@@ -30,7 +30,7 @@
           isAllowedToEdit &&
           !isSorting &&
           !isCustomizing &&
-          (session?.id ? 'true' === getSetting('course.allow_edit_tool_visibility_in_session') : true)
+          (session?.id ? 'true' === getSetting('session.allow_edit_tool_visibility_in_session') : true)
         "
         @click="changeVisibility(tool)"
       >
diff --git a/assets/vue/components/layout/TopbarLoggedIn.vue b/assets/vue/components/layout/TopbarLoggedIn.vue
index 37148a579b1..32a99c74db0 100644
--- a/assets/vue/components/layout/TopbarLoggedIn.vue
+++ b/assets/vue/components/layout/TopbarLoggedIn.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="app-topbar__items">
       <BaseAppLink
-        v-if="!isAnonymous && 'false' !== platformConfigStore.getSetting('display.show_link_ticket_notification')"
+        v-if="!isAnonymous && 'false' !== platformConfigStore.getSetting('ticket.show_link_ticket_notification')"
         :url="ticketUrl"
         class="item-button"
       >
@@ -121,7 +121,7 @@ const userSubmenuItems = computed(() => {
     },
   ]
 
-  const tabs = platformConfigStore.getSetting("platform.show_tabs") || ""
+  const tabs = platformConfigStore.getSetting("display.show_tabs") || ""
   if (tabs.indexOf("topbar_certificate") > -1) {
     items[0].items.push({
       label: t("My General Certificate"),
diff --git a/assets/vue/composables/sidebarMenu.js b/assets/vue/composables/sidebarMenu.js
index c158b4602c7..1d114456474 100644
--- a/assets/vue/composables/sidebarMenu.js
+++ b/assets/vue/composables/sidebarMenu.js
@@ -17,14 +17,14 @@ export function useSidebarMenu() {
   const allowSocialTool = computed(() => platformConfigStore.getSetting("social.allow_social_tool") !== "false")
 
   const showTabs = computed(() => {
-    const defaultTabs = platformConfigStore.getSetting("platform.show_tabs") || []
-    const tabsPerRoleJson = platformConfigStore.getSetting("platform.show_tabs_per_role") || ""
+    const defaultTabs = platformConfigStore.getSetting("display.show_tabs") || []
+    const tabsPerRoleJson = platformConfigStore.getSetting("display.show_tabs_per_role") || ""
 
     let tabsPerRole = {}
     try {
       tabsPerRole = JSON.parse(tabsPerRoleJson)
     } catch (e) {
-      console.warn("[Sidebar] Invalid JSON in platform.show_tabs_per_role", e)
+      console.warn("[Sidebar] Invalid JSON in display.show_tabs_per_role", e)
     }
 
     const roleMap = {
diff --git a/assets/vue/pages/Home.vue b/assets/vue/pages/Home.vue
index 1f24662dae5..2575781173e 100644
--- a/assets/vue/pages/Home.vue
+++ b/assets/vue/pages/Home.vue
@@ -51,7 +51,7 @@ import * as userRelCourseVoteService from "../services/userRelCourseVoteService"
 
 const router = useRouter()
 const platformConfigStore = usePlatformConfig()
-const redirectValue = platformConfigStore.getSetting("platform.redirect_index_to_url_for_logged_users")
+const redirectValue = platformConfigStore.getSetting("workflows.redirect_index_to_url_for_logged_users")
 
 if (typeof redirectValue === "string" && redirectValue.trim() !== "") {
   router.replace(`/${redirectValue}`)
diff --git a/assets/vue/views/course/CourseHome.vue b/assets/vue/views/course/CourseHome.vue
index 364f75cd75c..71cd7c5a652 100644
--- a/assets/vue/views/course/CourseHome.vue
+++ b/assets/vue/views/course/CourseHome.vue
@@ -455,6 +455,6 @@ const onStudentViewChanged = async () => {
 const allowEditToolVisibilityInSession = computed(() => {
   const isInASession = session.value?.id
 
-  return isInASession ? "true" === getSetting.value("course.allow_edit_tool_visibility_in_session") : true
+  return isInASession ? "true" === getSetting.value("session.allow_edit_tool_visibility_in_session") : true
 })
 </script>
diff --git a/assets/vue/views/documents/DocumentsList.vue b/assets/vue/views/documents/DocumentsList.vue
index 4727742286f..e3e4baaa6f8 100644
--- a/assets/vue/views/documents/DocumentsList.vue
+++ b/assets/vue/views/documents/DocumentsList.vue
@@ -512,7 +512,7 @@ const securityStore = useSecurityStore()
 
 const platformConfigStore = usePlatformConfig()
 const allowAccessUrlFiles = computed(
-  () => "false" !== platformConfigStore.getSetting("course.access_url_specific_files"),
+  () => "false" !== platformConfigStore.getSetting("document.access_url_specific_files"),
 )
 
 const { t } = useI18n()
@@ -579,7 +579,7 @@ const defaultCertificateId = ref(null)
 const isCurrentTeacher = computed(() => securityStore.isCurrentTeacher)
 
 function resolveDefaultRows(total = 0) {
-  const raw = platformConfigStore.getSetting("platform.table_default_row", 10)
+  const raw = platformConfigStore.getSetting("display.table_default_row", 10)
   const def = Number(raw)
   if (def === 0) return total || Number.MAX_SAFE_INTEGER // “All”
   return Number.isFinite(def) && def > 0 ? def : 10
@@ -624,7 +624,7 @@ onMounted(async () => {
 })
 
 watch(totalItems, (n) => {
-  const def = Number(platformConfigStore.getSetting("platform.table_default_row", 10))
+  const def = Number(platformConfigStore.getSetting("display.table_default_row", 10))
   if (def === 0 && n) {
     options.value.itemsPerPage = n
     onUpdateOptions(options.value)
diff --git a/assets/vue/views/lp/LpList.vue b/assets/vue/views/lp/LpList.vue
index 84a2a58f625..054115c18dd 100644
--- a/assets/vue/views/lp/LpList.vue
+++ b/assets/vue/views/lp/LpList.vue
@@ -239,12 +239,12 @@ const showExportDialog = ref(false)
 const exportTarget = ref(null)
 
 const canExportScorm = computed(() => {
-  const isScormEnabled = platformConfig.getSetting("hide_scorm_export_link") !== "true"
+  const isScormEnabled = platformConfig.getSetting("lp.hide_scorm_export_link") !== "true"
   return canEdit.value && isScormEnabled
 })
 
 const canExportPdf = computed(() => {
-  const hidden = platformConfig.getSetting("course.hide_scorm_pdf_link") === "true"
+  const hidden = platformConfig.getSetting("lp.hide_scorm_pdf_link") === "true"
   return !hidden
 })
 
diff --git a/assets/vue/views/sessionadmin/RegisterStudent.vue b/assets/vue/views/sessionadmin/RegisterStudent.vue
index 43f1a8bb847..5e46f2ce54b 100644
--- a/assets/vue/views/sessionadmin/RegisterStudent.vue
+++ b/assets/vue/views/sessionadmin/RegisterStudent.vue
@@ -239,7 +239,7 @@ const PLACEHOLDER = "/img/session_default.svg"
 const dynamicExtraField = ref("")
 const platformConfigStore = usePlatformConfig()
 const extraFieldKey = platformConfigStore.getSetting(
-  "platform.session_admin_user_subscription_search_extra_field_to_search",
+  "workflows.session_admin_user_subscription_search_extra_field_to_search",
 )
 
 const isFetching = ref(true)
diff --git a/public/main/admin/add_users_to_usergroup.php b/public/main/admin/add_users_to_usergroup.php
index 8c0ab3e5c72..98d6f2b04c0 100644
--- a/public/main/admin/add_users_to_usergroup.php
+++ b/public/main/admin/add_users_to_usergroup.php
@@ -218,7 +218,7 @@ function change_select(val) {
     $order = ['firstname'];
 }
 
-$orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 if ('true' === $orderListByOfficialCode) {
     $order = ['official_code', 'lastname'];
 }
@@ -263,7 +263,7 @@ function change_select(val) {
                     $item['lastname']
                 ) . ' (' . $item['username'] . ') ' . $officialCode;
 
-            $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+            $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
             if ('true' === $orderListByOfficialCode) {
                 $officialCode = !empty($item['official_code']) ? $item['official_code'] . ' - ' : '? - ';
                 $person_name = $officialCode . api_get_person_name(
@@ -310,7 +310,7 @@ function change_select(val) {
             $item['lastname']
         ).' ('.$item['username'].') '.$officialCode;
 
-        $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+        $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
         if ('true' === $orderListByOfficialCode) {
             $officialCode = !empty($item['official_code']) ? $item['official_code'].' - ' : '? - ';
             $person_name = $officialCode.api_get_person_name(
diff --git a/public/main/admin/career_diagram.php b/public/main/admin/career_diagram.php
index b5fd2953a99..19f71d2929d 100644
--- a/public/main/admin/career_diagram.php
+++ b/public/main/admin/career_diagram.php
@@ -14,7 +14,7 @@
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
-if ('false' === api_get_setting('profile.allow_career_diagram')) {
+if ('false' === api_get_setting('session.allow_career_diagram')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/admin/careers.php b/public/main/admin/careers.php
index 5c8cf358bee..e6715ed79c1 100644
--- a/public/main/admin/careers.php
+++ b/public/main/admin/careers.php
@@ -76,7 +76,7 @@
 $extra_params['height'] = 'auto';
 
 $diagramLink = '';
-$allow = ('true' === api_get_setting('profile.allow_career_diagram'));
+$allow = ('true' === api_get_setting('session.allow_career_diagram'));
 if ($allow) {
     $diagramLink = '<a
         href="'.api_get_path(WEB_CODE_PATH).'admin/career_diagram.php?id=\'+options.rowId+\'">'.
diff --git a/public/main/admin/course_add.php b/public/main/admin/course_add.php
index b18ac3eec4f..c88b8ec621e 100644
--- a/public/main/admin/course_add.php
+++ b/public/main/admin/course_add.php
@@ -112,7 +112,7 @@
     $form->addSelectLanguage('course_language', get_lang('Language'));
 }
 
-if ('true' === api_get_setting('teacher_can_select_course_template')) {
+if ('true' === api_get_setting('workflows.teacher_can_select_course_template')) {
     $form->addSelectAjax(
         'course_template',
         [
diff --git a/public/main/admin/course_edit.php b/public/main/admin/course_edit.php
index e4580a122f9..cdee0d191ec 100644
--- a/public/main/admin/course_edit.php
+++ b/public/main/admin/course_edit.php
@@ -192,7 +192,7 @@
     );
 }
 
-$allowEditSessionCoaches = ('false' === api_get_setting('course.disabled_edit_session_coaches_course_editing_course'));
+$allowEditSessionCoaches = ('false' === api_get_setting('workflows.disabled_edit_session_coaches_course_editing_course'));
 $coursesInSession = SessionManager::get_session_by_course($courseInfo['real_id']);
 if (!empty($coursesInSession) && $allowEditSessionCoaches) {
     foreach ($coursesInSession as $session) {
diff --git a/public/main/admin/index.php b/public/main/admin/index.php
index 5445f33be0f..6b5b70ac926 100644
--- a/public/main/admin/index.php
+++ b/public/main/admin/index.php
@@ -100,7 +100,7 @@
     }
     $items[] = ['url' => 'extra_fields.php?type=user', 'label' => get_lang('Profiling')];
     $items[] = ['url' => 'usergroups.php', 'label' => get_lang('Classes')];
-    if ('true' !== api_get_setting('profile.disable_gdpr')) {
+    if ('true' !== api_get_setting('privacy.disable_gdpr')) {
         $items[] = ['url' => 'user_list_consent.php', 'label' => get_lang('Users in consent list')];
     }
     if ('true' === api_get_setting('admin.show_link_request_hrm_user')) {
diff --git a/public/main/admin/subscribe_user2course.php b/public/main/admin/subscribe_user2course.php
index c9e5b38c8be..8a9d10f158c 100644
--- a/public/main/admin/subscribe_user2course.php
+++ b/public/main/admin/subscribe_user2course.php
@@ -199,7 +199,7 @@ function validate_filter() {
 $target_name = 'lastname';
 $orderBy = $target_name;
 $showOfficialCode = false;
-$orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 if ('true' === $orderListByOfficialCode) {
     $showOfficialCode = true;
     $orderBy = " official_code, lastname, firstname";
diff --git a/public/main/admin/user_import.php b/public/main/admin/user_import.php
index bfcabe01158..6f00aaaec60 100644
--- a/public/main/admin/user_import.php
+++ b/public/main/admin/user_import.php
@@ -748,7 +748,7 @@ function reload() {
     }
 }
 
-if ('true' === api_get_setting('admin.plugin_redirection_enabled')) {
+if ('true' === api_get_setting('workflows.plugin_redirection_enabled')) {
     $list[] = 'Redirection';
     $list_reponse[] = api_get_path(WEB_PATH);
 }
diff --git a/public/main/admin/user_information.php b/public/main/admin/user_information.php
index a86a8e5ea29..4e4b1e446eb 100644
--- a/public/main/admin/user_information.php
+++ b/public/main/admin/user_information.php
@@ -694,7 +694,7 @@
     0,
     0
 );
-if ('true' === api_get_setting('profile.allow_career_users')) {
+if ('true' === api_get_setting('session.allow_career_users')) {
     $careers = UserManager::getUserCareers($userId);
     if (!empty($careers)) {
         echo Display::page_subheader(get_lang('Careers'), null, 'h3', ['class' => 'section-title']);
diff --git a/public/main/auth/my_progress.php b/public/main/auth/my_progress.php
index 4fd92d10a79..b00e5d93a16 100644
--- a/public/main/auth/my_progress.php
+++ b/public/main/auth/my_progress.php
@@ -12,7 +12,7 @@
 
 api_block_anonymous_users();
 
-if (('true' === api_get_setting('platform.block_my_progress_page'))) {
+if (('true' === api_get_setting('tracking.block_my_progress_page'))) {
     api_not_allowed(true);
 }
 
@@ -110,7 +110,7 @@
     $message = Display::return_message(get_lang('No data available'), 'warning');
 }
 
-$show = ('true' === api_get_setting('profile.allow_career_users'));
+$show = ('true' === api_get_setting('session.allow_career_users'));
 
 if ($show) {
     $careers = UserManager::getUserCareers($user_id);
diff --git a/public/main/auth/registration.php b/public/main/auth/registration.php
index 669779262f8..fbee99669d9 100644
--- a/public/main/auth/registration.php
+++ b/public/main/auth/registration.php
@@ -186,7 +186,7 @@
 if ('true' === api_get_setting('allow_terms_conditions')) {
     $userAlreadyRegisteredShowTerms = isset($termRegistered['user_id']);
     // Ofaj change
-    if (true === api_is_anonymous() &&  'course' === api_get_setting('load_term_conditions_section')) {
+    if (true === api_is_anonymous() &&  'course' === api_get_setting('workflows.load_term_conditions_section')) {
         $userAlreadyRegisteredShowTerms = false;
     }
 }
@@ -663,7 +663,7 @@ function ($email) {
         false
     );
 } else {
-    $allow = ('true' === api_get_setting('platform.allow_double_validation_in_registration'));
+    $allow = ('true' === api_get_setting('registration.allow_double_validation_in_registration'));
     ChamiloHelper::addLegalTermsFields($form, $userAlreadyRegisteredShowTerms);
     if ($allow && !$termActivated) {
         $htmlHeadXtra[] = '<script>
@@ -1022,7 +1022,7 @@ function ($email) {
     ];
 
     if ('true' === api_get_setting('allow_terms_conditions') && $userAlreadyRegisteredShowTerms) {
-        if ('login' === api_get_setting('load_term_conditions_section')) {
+        if ('login' === api_get_setting('workflows.load_term_conditions_section')) {
             header('Location: /home');
             exit;
             //$formData['action'] = api_get_path(WEB_PATH).'user_portal.php';
diff --git a/public/main/auth/reset.php b/public/main/auth/reset.php
index f0f14deb3d9..385e59841b1 100644
--- a/public/main/auth/reset.php
+++ b/public/main/auth/reset.php
@@ -61,7 +61,7 @@
         Database::getManager()->persist($user);
         Database::getManager()->flush();
 
-        if ('true' === api_get_setting('platform.force_renew_password_at_first_login')) {
+        if ('true' === api_get_setting('security.force_renew_password_at_first_login')) {
             $extraFieldValue = new ExtraFieldValue('user');
             $value = $extraFieldValue->get_values_by_handler_and_field_variable($user->getId(), 'ask_new_password');
             if (!empty($value) && isset($value['value']) && 1 === (int) $value['value']) {
diff --git a/public/main/auth/tc.php b/public/main/auth/tc.php
index fa6308ff6d3..0d88aeb3a99 100644
--- a/public/main/auth/tc.php
+++ b/public/main/auth/tc.php
@@ -21,7 +21,7 @@
 
 $isPlatformAdmin = api_is_platform_admin();
 if ('true' === api_get_setting('registration.allow_terms_conditions') && !$isPlatformAdmin) {
-    if ('true' === api_get_setting('ticket.show_terms_if_profile_completed')) {
+    if ('true' === api_get_setting('profile.show_terms_if_profile_completed')) {
         if (!empty($userId)) {
             $userInfo = api_get_user_info($userId);
             if ($userInfo && ANONYMOUS != $userInfo['status']) {
diff --git a/public/main/course_info/infocours.php b/public/main/course_info/infocours.php
index 92c6a5495eb..bf06926f43d 100644
--- a/public/main/course_info/infocours.php
+++ b/public/main/course_info/infocours.php
@@ -595,7 +595,7 @@
     $globalGroup[get_lang("Enable course themes")] = $group;
 }
 
-$allowLPReturnLink = api_get_setting('allow_lp_return_link');
+$allowLPReturnLink = api_get_setting('lp.allow_lp_return_link');
 if ('true' === $allowLPReturnLink) {
     $group = [
         $form->createElement(
@@ -727,7 +727,7 @@
     false
 );
 
-if ('true' === api_get_setting('allow_public_certificates')) {
+if ('true' === api_get_setting('certificate.allow_public_certificates')) {
     $group = [];
     $group[] = $form->createElement(
         'radio',
diff --git a/public/main/create_course/add_course.php b/public/main/create_course/add_course.php
index 09aa7bbbd14..0289c2622fa 100644
--- a/public/main/create_course/add_course.php
+++ b/public/main/create_course/add_course.php
@@ -270,7 +270,7 @@ function MM_openBrWindow(theURL, winName, features) { //v2.0
 $obj = new GradeModel();
 $obj->fill_grade_model_select_in_form($form);
 
-if ('true' === api_get_setting('teacher_can_select_course_template')) {
+if ('true' === api_get_setting('workflows.teacher_can_select_course_template')) {
     $form->addElement(
         'select_ajax',
         'course_template',
diff --git a/public/main/forum/forumfunction.inc.php b/public/main/forum/forumfunction.inc.php
index bca015eed03..f856bf91c0b 100644
--- a/public/main/forum/forumfunction.inc.php
+++ b/public/main/forum/forumfunction.inc.php
@@ -5363,7 +5363,7 @@ function getReportRecipients()
 
                     break;
                 case 'community_managers':
-                    $managers = api_get_setting('profile.community_managers_user_list', true);
+                    $managers = api_get_setting('forum.community_managers_user_list', true);
                     if (!empty($managers) && isset($managers['users'])) {
                         $users = array_merge($users, $managers['users']);
                     }
diff --git a/public/main/gamification/my_progress.php b/public/main/gamification/my_progress.php
index 615a074df47..8e8f51e4dbb 100644
--- a/public/main/gamification/my_progress.php
+++ b/public/main/gamification/my_progress.php
@@ -17,7 +17,7 @@
 
 api_block_anonymous_users();
 
-if ('0' == api_get_setting('gamification_mode')) {
+if ('0' == api_get_setting('workflows.gamification_mode')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/gradebook/get_badges.php b/public/main/gradebook/get_badges.php
index c844fe28b81..088114a80ea 100644
--- a/public/main/gradebook/get_badges.php
+++ b/public/main/gradebook/get_badges.php
@@ -42,7 +42,7 @@
 
 $backpack = 'https://backpack.openbadges.org/';
 
-$configBackpack = api_get_setting('openbadges_backpack');
+$configBackpack = api_get_setting('skill.openbadges_backpack');
 if (0 !== strcmp($backpack, $configBackpack)) {
     $backpack = $configBackpack;
     if ('/' !== substr($backpack, -1)) {
diff --git a/public/main/gradebook/gradebook_display_certificate.php b/public/main/gradebook/gradebook_display_certificate.php
index c3fb3af38de..cc3d0c7b26f 100644
--- a/public/main/gradebook/gradebook_display_certificate.php
+++ b/public/main/gradebook/gradebook_display_certificate.php
@@ -45,7 +45,7 @@ function confirmation() {
 $url = api_get_self().'?'.api_get_cidreq().'&cat_id='.$categoryId.'&filter='.$filterOfficialCode;
 $courseInfo = api_get_course_info();
 
-$filter = api_get_setting('certificate_filter_by_official_code');
+$filter = api_get_setting('certificate.certificate_filter_by_official_code');
 $userList = [];
 $filterForm = null;
 $certificate_list = [];
@@ -289,7 +289,7 @@ function confirmation() {
     $url.'&action=delete_all_certificates'
 );
 
-$hideCertificateExport = api_get_setting('hide_certificate_export_link');
+$hideCertificateExport = api_get_setting('certificate.hide_certificate_export_link');
 
 if (count($certificate_list) > 0 && 'true' !== $hideCertificateExport) {
     $actions .= Display::url(
diff --git a/public/main/gradebook/index.php b/public/main/gradebook/index.php
index 94947c64d9a..ffe245c3010 100644
--- a/public/main/gradebook/index.php
+++ b/public/main/gradebook/index.php
@@ -808,7 +808,7 @@ function confirmation() {
 // Show certificate link.
 $certificate = [];
 $actionsLeft = '';
-$hideCertificateExport = api_get_setting('hide_certificate_export_link');
+$hideCertificateExport = api_get_setting('certificate.hide_certificate_export_link');
 $category = null;
 if (!empty($selectCat)) {
     $repo = Container::getGradeBookCategoryRepository();
diff --git a/public/main/gradebook/lib/be/category.class.php b/public/main/gradebook/lib/be/category.class.php
index eb39341db84..c1401b02ca0 100644
--- a/public/main/gradebook/lib/be/category.class.php
+++ b/public/main/gradebook/lib/be/category.class.php
@@ -2127,7 +2127,7 @@ public static function generateUserCertificate(
                     );
                 }
 
-                $hideExportLink = api_get_setting('gradebook.hide_certificate_export_link');
+                $hideExportLink = api_get_setting('certificate.hide_certificate_export_link');
                 $hideExportLinkStudent = api_get_setting('gradebook.hide_certificate_export_link_students');
                 if ('true' === $hideExportLink || (api_is_student() && 'true' === $hideExportLinkStudent)) {
                     $exportToPDF = null;
@@ -2195,7 +2195,7 @@ public static function getUserScoreForEvaluation(int $userId, int $evaluationId)
      */
     public static function exportAllCertificates($catId, $userList = [])
     {
-        $orientation = api_get_setting('document.certificate_pdf_orientation');
+        $orientation = api_get_setting('certificate.certificate_pdf_orientation');
 
         $params['orientation'] = 'landscape';
         if (!empty($orientation)) {
diff --git a/public/main/gradebook/my_certificates.php b/public/main/gradebook/my_certificates.php
index da6dcd36ee3..5090985048d 100644
--- a/public/main/gradebook/my_certificates.php
+++ b/public/main/gradebook/my_certificates.php
@@ -32,8 +32,8 @@
     );
 }
 
-$hideExportLink = api_get_setting('hide_certificate_export_link');
-$hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
+$hideExportLink = api_get_setting('certificate.hide_certificate_export_link');
+$hideExportLinkStudent = api_get_setting('certificate.hide_certificate_export_link_students');
 $allowExport = true;
 if ('true' === $hideExportLink ||
     (api_is_student() && 'true' === $hideExportLinkStudent)
@@ -48,7 +48,7 @@
 $templateName = $template->get_template('gradebook/my_certificates.tpl');
 $content = $template->fetch($templateName);
 
-if ('true' === api_get_setting('allow_public_certificates')) {
+if ('true' === api_get_setting('certificate.allow_public_certificates')) {
     $template->assign(
         'actions',
         Display::toolbarButton(
diff --git a/public/main/gradebook/search.php b/public/main/gradebook/search.php
index 8d91835e2f6..fc2a482ef4b 100644
--- a/public/main/gradebook/search.php
+++ b/public/main/gradebook/search.php
@@ -10,7 +10,7 @@
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if ('true' != api_get_setting('allow_public_certificates')) {
+if ('true' != api_get_setting('certificate.allow_public_certificates')) {
     api_not_allowed(
         true,
         Display::return_message(get_lang('Certificates are not publicly available'), 'warning')
diff --git a/public/main/group/member_settings.php b/public/main/group/member_settings.php
index 1d2c5a0d0ac..2ba50fcd3d5 100644
--- a/public/main/group/member_settings.php
+++ b/public/main/group/member_settings.php
@@ -29,7 +29,7 @@
  */
 function sort_users($user_a, $user_b)
 {
-    $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+    $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
     if ('true' === $orderListByOfficialCode) {
         $cmp = api_strcmp($user_a['official_code'], $user_b['official_code']);
         if (0 !== $cmp) {
@@ -116,7 +116,7 @@ function check_group_members($value)
     $subscribedTutors = array_column($subscribedTutors, 'user_id');
 }
 
-$orderUserListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderUserListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 $possible_users = [];
 $userGroup = new UserGroupModel();
 
diff --git a/public/main/group/tutor_settings.php b/public/main/group/tutor_settings.php
index 60d165cb150..44cae4c3fe3 100644
--- a/public/main/group/tutor_settings.php
+++ b/public/main/group/tutor_settings.php
@@ -33,7 +33,7 @@
  */
 function sort_users($user_a, $user_b)
 {
-    $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+    $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
     if ('true' === $orderListByOfficialCode) {
         $cmp = api_strcmp($user_a['official_code'], $user_b['official_code']);
         if (0 !== $cmp) {
@@ -108,7 +108,7 @@ function sort_users($user_a, $user_b)
     $subscribedUsers = array_column($subscribedUsers, 'user_id');
 }
 
-$orderUserListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderUserListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 if (!empty($complete_user_list)) {
     usort($complete_user_list, 'sort_users');
     foreach ($complete_user_list as $index => $user) {
diff --git a/public/main/inc/ajax/model.ajax.php b/public/main/inc/ajax/model.ajax.php
index 6e63417e458..298136e4ade 100644
--- a/public/main/inc/ajax/model.ajax.php
+++ b/public/main/inc/ajax/model.ajax.php
@@ -1440,7 +1440,7 @@ function getWhereClause($col, $oper, $val)
         break;
     case 'get_work_user_list_all':
         $plagiarismColumns = [];
-        if (('true' === api_get_setting('document.allow_compilatio_tool'))) {
+        if (('true' === api_get_setting('work.allow_compilatio_tool'))) {
             $plagiarismColumns = ['compilatio'];
         }
         if (isset($_GET['type']) && 'simple' === $_GET['type']) {
@@ -1485,7 +1485,7 @@ function getWhereClause($col, $oper, $val)
             exit;
         }
         $plagiarismColumns = [];
-        if (('true' === api_get_setting('document.allow_compilatio_tool'))) {
+        if (('true' === api_get_setting('work.allow_compilatio_tool'))) {
             $plagiarismColumns = ['compilatio'];
         }
         $columns = [
@@ -1514,7 +1514,7 @@ function getWhereClause($col, $oper, $val)
         break;
     case 'get_work_user_list_others':
         $plagiarismColumns = [];
-        if (('true' === api_get_setting('document.allow_compilatio_tool'))) {
+        if (('true' === api_get_setting('work.allow_compilatio_tool'))) {
             $plagiarismColumns = ['compilatio'];
         }
 
@@ -1554,7 +1554,7 @@ function getWhereClause($col, $oper, $val)
         break;
     case 'get_work_user_list':
         $plagiarismColumns = [];
-        if (('true' === api_get_setting('document.allow_compilatio_tool')) && api_is_allowed_to_edit()) {
+        if (('true' === api_get_setting('work.allow_compilatio_tool')) && api_is_allowed_to_edit()) {
             $plagiarismColumns = ['compilatio'];
         }
         if (isset($_GET['type']) && 'simple' == $_GET['type']) {
diff --git a/public/main/inc/lib/Compilatio.php b/public/main/inc/lib/Compilatio.php
index a9b9fcf7236..211abd85888 100644
--- a/public/main/inc/lib/Compilatio.php
+++ b/public/main/inc/lib/Compilatio.php
@@ -27,7 +27,7 @@ class Compilatio
      */
     public function __construct()
     {
-        if (('true' !== api_get_setting('document.allow_compilatio_tool')) ||
+        if (('true' !== api_get_setting('work.allow_compilatio_tool')) ||
             empty(api_get_setting('document.compilatio_tool', true))
         ) {
             throw new Exception('Compilatio not available');
@@ -474,7 +474,7 @@ public static function isMd5($hash)
      */
     public static function plagiarismDeleteDoc($courseId, $itemId)
     {
-        if ('true' !== api_get_setting('document.allow_compilatio_tool')) {
+        if ('true' !== api_get_setting('work.allow_compilatio_tool')) {
             return false;
         }
 
diff --git a/public/main/inc/lib/SkillModel.php b/public/main/inc/lib/SkillModel.php
index 2bede6ad3e8..0e27bcc96af 100644
--- a/public/main/inc/lib/SkillModel.php
+++ b/public/main/inc/lib/SkillModel.php
@@ -2371,7 +2371,7 @@ public function addSkillToUserBadge(
     public static function setBackPackJs(&$htmlHeadXtra)
     {
         $backpack = 'https://backpack.openbadges.org/';
-        $configBackpack = api_get_setting('openbadges_backpack');
+        $configBackpack = api_get_setting('skill.openbadges_backpack');
 
         if (0 !== strcmp($backpack, $configBackpack)) {
             $backpack = $configBackpack;
diff --git a/public/main/inc/lib/add_course.lib.inc.php b/public/main/inc/lib/add_course.lib.inc.php
index 8f599db6ad4..889070fee45 100644
--- a/public/main/inc/lib/add_course.lib.inc.php
+++ b/public/main/inc/lib/add_course.lib.inc.php
@@ -307,7 +307,7 @@ private static function insertCourseSettings(Course $course): void
             'enable_document_auto_launch' => ['default' => 0, 'category' => 'document'],
             'pdf_export_watermark_text' => ['default' => '', 'category' => 'learning_path'],
             'allow_public_certificates' => [
-                'default' => 'true' === api_get_setting('allow_public_certificates') ? 1 : '',
+                'default' => 'true' === api_get_setting('certificate.allow_public_certificates') ? 1 : '',
                 'category' => 'certificates',
             ],
             'documents_default_visibility' => ['default' => 'visible', 'category' => 'document'],
diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
index 8d289d9aa4d..e43fd1f84dd 100644
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -2924,7 +2924,7 @@ function api_is_allowed_to_create_course()
 
     // Teachers can only create courses
     if (api_is_teacher()) {
-        if ('true' === api_get_setting('allow_users_to_create_courses')) {
+        if ('true' === api_get_setting('workflows.allow_users_to_create_courses')) {
             return true;
         } else {
             return false;
@@ -6196,7 +6196,6 @@ function api_get_locked_settings()
         'upload_extensions_whitelist',
         'upload_extensions_skip',
         'upload_extensions_replace_by',
-        'hide_dltt_markup',
         'split_users_upload_directory',
         'permissions_for_new_directories',
         'permissions_for_new_files',
@@ -7652,7 +7651,7 @@ function(e, val) {
 
 function api_protect_webservices()
 {
-    if (api_get_configuration_value('disable_webservices')) {
+    if ('true' === api_get_setting('webservice.disable_webservices')) {
         echo "Webservices are disabled. \n";
         echo "To enable, add \$_configuration['disable_webservices'] = true; in configuration.php";
         exit;
diff --git a/public/main/inc/lib/certificate.lib.php b/public/main/inc/lib/certificate.lib.php
index 1243b87fb95..46485898cf8 100644
--- a/public/main/inc/lib/certificate.lib.php
+++ b/public/main/inc/lib/certificate.lib.php
@@ -99,7 +99,7 @@ public function __construct(
             //$this->qr_file = $this->certification_user_path.$pathinfo['filename'].'_qr.png';
         } else {
             //$this->checkCertificatePath();
-            if ('true' === api_get_setting('document.allow_general_certificate')) {
+            if ('true' === api_get_setting('certificate.allow_general_certificate')) {
                 // General certificate
                 $categoryId = isset($this->certificate_data['cat_id']) ? (int) $this->certificate_data['cat_id'] : 0;
                 $name = hash('sha256', $this->user_id . $categoryId);
@@ -481,7 +481,7 @@ public function isVisible()
             return true;
         }
 
-        if ('true' != api_get_setting('allow_public_certificates')) {
+        if ('true' != api_get_setting('certificate.allow_public_certificates')) {
             // The "non-public" setting is set, so do not print
             return false;
         }
@@ -737,7 +737,7 @@ public function generateCustomCertificate(string $fileName = ''): string
      */
     public function generatePdfFromCustomCertificate(): void
     {
-        $orientation = api_get_setting('document.certificate_pdf_orientation');
+        $orientation = api_get_setting('certificate.certificate_pdf_orientation');
 
         $params['orientation'] = 'landscape';
         if (!empty($orientation)) {
diff --git a/public/main/inc/lib/course.lib.php b/public/main/inc/lib/course.lib.php
index d44f55d494d..a9c45985bc2 100644
--- a/public/main/inc/lib/course.lib.php
+++ b/public/main/inc/lib/course.lib.php
@@ -5331,7 +5331,7 @@ public static function getCourseSettingVariables(AppPlugin $appPlugin = null)
             $courseSettings[] = 'score_model_id';
         }
 
-        $allowLPReturnLink = api_get_setting('allow_lp_return_link');
+        $allowLPReturnLink = api_get_setting('lp.allow_lp_return_link');
         if ('true' === $allowLPReturnLink) {
             $courseSettings[] = 'lp_return_link';
         }
@@ -6293,7 +6293,7 @@ public static function useTemplateAsBasisIfRequired(string $courseCode, int $cou
     {
         $template = api_get_setting('course_creation_use_template');
         $template = is_numeric($template) ? intval($template) : null;
-        $teacherCanSelectCourseTemplate = 'true' === api_get_setting('teacher_can_select_course_template');
+        $teacherCanSelectCourseTemplate = 'true' === api_get_setting('workflows.teacher_can_select_course_template');
         $courseTemplate = isset($courseTemplate) ? intval($courseTemplate) : 0;
 
         $useTemplate = false;
diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
index cb3f0a714ec..14f80e759e0 100644
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -1217,7 +1217,7 @@ public static function grid_js(
         // Default row quantity
         if (!isset($extra_params['rowList'])) {
             $defaultRowList = [20, 50, 100, 500, 1000, $all_value];
-            $rowList = api_get_setting('platform.table_row_list', true);
+            $rowList = api_get_setting('display.table_row_list', true);
             if (is_array($rowList) && isset($rowList['options']) && is_array($rowList['options'])) {
                 $rowList = $rowList['options'];
                 $rowList[] = $all_value;
@@ -1227,7 +1227,7 @@ public static function grid_js(
             $extra_params['rowList'] = $rowList;
         }
 
-        $defaultRow = (int) api_get_setting('platform.table_default_row');
+        $defaultRow = (int) api_get_setting('display.table_default_row');
         if ($defaultRow > 0) {
             $obj->rowNum = $defaultRow;
         }
@@ -1339,7 +1339,7 @@ public static function grid_js(
         $json_encode = str_replace('"formatter":"extra_formatter"', 'formatter:extra_formatter', $json_encode);
         $json_encode = str_replace(['{"first":"first",', '"end":"end"}'], '', $json_encode);
 
-        if (('true' === api_get_setting('document.allow_compilatio_tool')) &&
+        if (('true' === api_get_setting('work.allow_compilatio_tool')) &&
             (false !== strpos($_SERVER['REQUEST_URI'], 'work/work.php') ||
              false != strpos($_SERVER['REQUEST_URI'], 'work/work_list_all.php')
             )
diff --git a/public/main/inc/lib/groupmanager.lib.php b/public/main/inc/lib/groupmanager.lib.php
index d0370b4cfa3..cd5fbda25a6 100644
--- a/public/main/inc/lib/groupmanager.lib.php
+++ b/public/main/inc/lib/groupmanager.lib.php
@@ -1613,7 +1613,7 @@ public static function get_subscribed_users(CGroup $group)
         if (api_sort_by_first_name()) {
             $order = ['firstname' => Criteria::ASC, 'lastname' => Criteria::ASC];
         }
-        $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+        $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
         if ('true' === $orderListByOfficialCode) {
             //$order = ' ORDER BY u.official_code, u.firstname, u.lastname';
             $order = ['officialCode' => Criteria::ASC, 'firstname' => Criteria::ASC, 'lastname' => Criteria::ASC];
diff --git a/public/main/inc/lib/legal.lib.php b/public/main/inc/lib/legal.lib.php
index a9884e4e91a..b878b0310d0 100644
--- a/public/main/inc/lib/legal.lib.php
+++ b/public/main/inc/lib/legal.lib.php
@@ -412,9 +412,7 @@ public static function sendLegal(int $userId, int $coachId)
             }
         }
 
-        $enforceProfileCompleted =
-            api_get_setting('ticket.show_terms_if_profile_completed') === 'true'
-            || api_get_setting('registration.show_terms_if_profile_completed') === 'true';
+        $enforceProfileCompleted = api_get_setting('profile.show_terms_if_profile_completed') === 'true';
 
         if ($enforceProfileCompleted) {
             $allValues = $extraFieldValue->getAllValuesByItem($userId);
diff --git a/public/main/inc/lib/link.lib.php b/public/main/inc/lib/link.lib.php
index 5022a477ff7..e6b31b1db95 100644
--- a/public/main/inc/lib/link.lib.php
+++ b/public/main/inc/lib/link.lib.php
@@ -1723,7 +1723,7 @@ public static function checkUrl($url)
             CURLOPT_TIMEOUT => 4,
         ];
 
-        $proxySettings = api_get_setting('platform.proxy_settings', true);
+        $proxySettings = api_get_setting('security.proxy_settings', true);
 
         if (!empty($proxySettings) &&
             isset($proxySettings['curl_setopt_array'])
diff --git a/public/main/inc/lib/pdf.lib.php b/public/main/inc/lib/pdf.lib.php
index cc8f12cbd49..889dc14377b 100644
--- a/public/main/inc/lib/pdf.lib.php
+++ b/public/main/inc/lib/pdf.lib.php
@@ -699,7 +699,7 @@ public function set_header($courseInfo)
 
             $logoSrc = Container::getThemeHelper()->getAssetBase64Encoded('images/header-logo.png');
             // Use custom logo image.
-            $pdfLogo = api_get_setting('platform.pdf_logo_header');
+            $pdfLogo = api_get_setting('display.pdf_logo_header');
             if ('true' === $pdfLogo) {
                 $logoSrc = Container::getThemeHelper()->getAssetBase64Encoded('images/pdf_logo_header.png') ?: $logoSrc;
             }
diff --git a/public/main/inc/lib/plugin.class.php b/public/main/inc/lib/plugin.class.php
index 9f8af414f20..0388f43d453 100644
--- a/public/main/inc/lib/plugin.class.php
+++ b/public/main/inc/lib/plugin.class.php
@@ -755,7 +755,7 @@ public function addTab(string $tabName, string $url, ?string $userFilter = null)
             $pluginInUrl->setConfiguration($pluginConf);
         }
 
-        $showTabsSetting = $settingsManager->getSetting('platform.show_tabs', true);
+        $showTabsSetting = $settingsManager->getSetting('display.show_tabs', true);
 
 //        $subkey = 'custom_tab_'.$tabNum;
 //
@@ -773,7 +773,7 @@ public function addTab(string $tabName, string $url, ?string $userFilter = null)
         }
 
         try {
-            $settingsManager->updateSetting('platform.show_tabs', $showTabsSetting);
+            $settingsManager->updateSetting('display.show_tabs', $showTabsSetting);
 
             Container::getEntityManager()->flush();
         } catch (OptimisticLockException|ORMException) {
@@ -794,7 +794,7 @@ public function deleteTab($tabName): bool
     {
         $settingsManager = Container::getSettingsManager();
 
-        $showTabsSetting = $settingsManager->getSetting('platform.show_tabs', true);
+        $showTabsSetting = $settingsManager->getSetting('display.show_tabs', true);
 
         try {
             if (in_array($tabName, $showTabsSetting)) {
@@ -807,7 +807,7 @@ public function deleteTab($tabName): bool
                 }
             }
 
-            $settingsManager->updateSetting('platform.show_tabs', $showTabsSetting);
+            $settingsManager->updateSetting('display.show_tabs', $showTabsSetting);
         } catch (OptimisticLockException|ORMException) {
             return false;
         }
diff --git a/public/main/inc/lib/redirect.class.php b/public/main/inc/lib/redirect.class.php
index a8672bba2aa..0615ec98ba4 100644
--- a/public/main/inc/lib/redirect.class.php
+++ b/public/main/inc/lib/redirect.class.php
@@ -77,7 +77,7 @@ public static function session_request_uri($logging_in = false, $userInfo = null
         ) {
             if (isset($userInfo) && !empty($userInfo)) {
                 $userId = $userInfo['user_id'];
-                $allow = ('true' === api_get_setting('admin.plugin_redirection_enabled'));
+                $allow = ('true' === api_get_setting('workflows.plugin_redirection_enabled'));
                 if ($allow) {
                     RedirectionPlugin::redirectUser($userId);
                 }
diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php
index 1cb23ba2cf6..fb5d760eb04 100644
--- a/public/main/inc/lib/social.lib.php
+++ b/public/main/inc/lib/social.lib.php
@@ -524,7 +524,7 @@ public static function display_user_list($user_list, $wrap = true)
             $course_url = '&amp;cidReq='.Security::remove_XSS($_GET['cidReq']);
         }
 
-        $hide = ('true' === api_get_setting('platform.hide_complete_name_in_whoisonline'));
+        $hide = ('true' === api_get_setting('display.hide_complete_name_in_whoisonline'));
         foreach ($user_list as $uid) {
             $user_info = api_get_user_info($uid, true);
             $lastname = $user_info['lastname'];
@@ -1040,7 +1040,7 @@ public static function setSocialUserBlock(
             $template->assign('vcard_user_link', $vCardUserLink);
         }
 
-        if ('1' === api_get_setting('gamification_mode')) {
+        if ('1' === api_get_setting('workflows.gamification_mode')) {
             $gamificationPoints = GamificationUtils::getTotalUserPoints(
                 $userId,
                 $userInfo['status']
diff --git a/public/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php
index 19c2a2c418a..06424104413 100644
--- a/public/main/inc/lib/sortable_table.class.php
+++ b/public/main/inc/lib/sortable_table.class.php
@@ -158,7 +158,7 @@ public function __construct(
         $this->defaultItemsPerPage = $default_items_per_page;
         $this->hideItemSelector = false;
 
-        $defaultRow = (int) api_get_setting('platform.table_default_row');
+        $defaultRow = (int) api_get_setting('display.table_default_row');
         if ($defaultRow > 0) {
             $this->defaultItemsPerPage = $default_items_per_page = $defaultRow;
         }
@@ -786,7 +786,7 @@ public function get_page_select_form(): string
             .'per_page" onchange="javascript: this.form.submit();">';
         $list = [10, 20, 50, 100, 500, 1000];
 
-        $rowList = api_get_setting('platform.table_row_list', true);
+        $rowList = api_get_setting('display.table_row_list', true);
         if (is_array($rowList) && isset($rowList['options'])) {
             $list = $rowList['options'];
         }
diff --git a/public/main/inc/lib/template.lib.php b/public/main/inc/lib/template.lib.php
index c4ce9fd6ce9..ba9395b47ea 100644
--- a/public/main/inc/lib/template.lib.php
+++ b/public/main/inc/lib/template.lib.php
@@ -117,7 +117,7 @@ public function __construct(
             'institution_url' => api_get_setting('InstitutionUrl'),
             'date' => api_format_date('now', DATE_FORMAT_LONG),
             'timezone' => api_get_timezone(),
-            'gamification_mode' => api_get_setting('gamification_mode'),
+            'gamification_mode' => api_get_setting('workflows.gamification_mode'),
         ];
         $this->assign('_s', $_s);
 
@@ -450,7 +450,7 @@ public static function getGlobals()
                 'system_version' => api_get_configuration_value('system_version'),
                 'site_name' => api_get_setting('siteName'),
                 'institution' => api_get_setting('Institution'),
-                'gamification_mode' => api_get_setting('gamification_mode'),
+                'gamification_mode' => api_get_setting('workflows.gamification_mode'),
             ],
             'template' => 'default', // @todo setup template folder in config.yml;
         ];
@@ -482,7 +482,7 @@ public function setCssFiles()
             'mediaelement/plugins/vrview/vrview.css',
         ];
 
-        $features = api_get_setting('platform.video_features', true);
+        $features = api_get_setting('document.video_features', true);
         $defaultFeatures = ['playpause', 'current', 'progress', 'duration', 'tracks', 'volume', 'fullscreen', 'vrview'];
 
         if (!empty($features) && isset($features['features'])) {
@@ -634,7 +634,7 @@ public function set_js_files()
             'mediaelement/plugins/vrview/vrview.js',
         ];
 
-        $features = api_get_setting('platform.video_features', true);
+        $features = api_get_setting('document.video_features', true);
         if (!empty($features) && isset($features['features'])) {
             foreach ($features['features'] as $feature) {
                 if ('vrview' === $feature) {
@@ -1008,7 +1008,7 @@ public function assignBugNotification()
         //@todo move this in the template
         $rightFloatMenu = '';
         $iconBug = Display::getMdiIcon(ToolIcon::BUG_REPORT, 'ch-tool-icon', null, ICON_SIZE_LARGE, get_lang('Report a bug'));
-        if ('true' === api_get_setting('show_link_bug_notification') && $this->user_is_logged_in) {
+        if ('true' === api_get_setting('ticket.show_link_bug_notification') && $this->user_is_logged_in) {
             $rightFloatMenu = '<div class="report">
 		        <a href="https://github.com/chamilo/chamilo-lms/wiki/How-to-report-issues" target="_blank">
                     '.$iconBug.'
@@ -1016,7 +1016,7 @@ public function assignBugNotification()
 		        </div>';
         }
 
-        if ('true' === api_get_setting('show_link_ticket_notification') &&
+        if ('true' === api_get_setting('ticket.show_link_ticket_notification') &&
             $this->user_is_logged_in
         ) {
             // by default is project_id = 1
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index 19d63e6b168..3123355b28d 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -346,7 +346,7 @@ public static function create_user(
             'false'
         );
 
-        if (!empty($redirectToURLAfterLogin) && ('true' === api_get_setting('admin.plugin_redirection_enabled'))) {
+        if (!empty($redirectToURLAfterLogin) && ('true' === api_get_setting('workflows.plugin_redirection_enabled'))) {
             RedirectionPlugin::insert($userId, $redirectToURLAfterLogin);
         }
 
@@ -2703,7 +2703,7 @@ public static function get_sessions_by_category(
         $order = 'ORDER BY sc.title, s.title';
 
         // Order by date if showing all sessions
-        $showAllSessions = ('true' === api_get_setting('course.show_all_sessions_on_my_course_page'));
+        $showAllSessions = ('true' === api_get_setting('session.show_all_sessions_on_my_course_page'));
         if ($showAllSessions) {
             $order = 'ORDER BY s.accessStartDate';
         }
@@ -5431,7 +5431,7 @@ public static function getUsersByName($firstname, $lastname)
      */
     public static function getUserSubscriptionTab($optionSelected = 1)
     {
-        $allowAdmin = api_get_setting('allow_user_course_subscription_by_course_admin');
+        $allowAdmin = api_get_setting('workflows.allow_user_course_subscription_by_course_admin');
         if (('true' === $allowAdmin && api_is_allowed_to_edit()) ||
             api_is_platform_admin()
         ) {
@@ -6155,7 +6155,7 @@ public static function getUserCareers($userId)
      */
     public static function addUserCareer($userId, $careerId)
     {
-        if ('true' !== api_get_setting('profile.allow_career_users')) {
+        if ('true' !== api_get_setting('session.allow_career_users')) {
             return false;
         }
 
@@ -6176,7 +6176,7 @@ public static function addUserCareer($userId, $careerId)
      */
     public static function updateUserCareer($userCareerId, $data)
     {
-        if ('true' !== api_get_setting('profile.allow_career_users')) {
+        if ('true' !== api_get_setting('session.allow_career_users')) {
             return false;
         }
 
@@ -6403,7 +6403,7 @@ public static function countUsersWhoFinishedCoursesInSessions()
 
     public static function redirectToResetPassword($userId): void
     {
-        if ('true' !== api_get_setting('platform.force_renew_password_at_first_login')) {
+        if ('true' !== api_get_setting('security.force_renew_password_at_first_login')) {
             return;
         }
         $askPassword = self::get_extra_user_data_by_field(
diff --git a/public/main/inc/lib/userportal.lib.php b/public/main/inc/lib/userportal.lib.php
index 3726bacc604..b504ce3a480 100644
--- a/public/main/inc/lib/userportal.lib.php
+++ b/public/main/inc/lib/userportal.lib.php
@@ -186,7 +186,7 @@ public function returnSkillLinks()
                 'title' => get_lang('My certificates'),
             ];
         }
-        if ('true' == api_get_setting('allow_public_certificates')) {
+        if ('true' == api_get_setting('certificate.allow_public_certificates')) {
             $items[] = [
                 'icon' => Display::getMdiIcon(ActionIcon::SEARCH, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Search')),
                 'link' => api_get_path(WEB_CODE_PATH).'gradebook/search.php',
@@ -664,7 +664,7 @@ public function return_search_block()
      */
     public function returnClassesBlock()
     {
-        if ('true' !== api_get_setting('show_groups_to_users')) {
+        if ('true' !== api_get_setting('group.show_groups_to_users')) {
             return '';
         }
 
@@ -745,7 +745,7 @@ public function return_navigation_links()
             unset($this->tpl->menu_navigation['myprofile']);
         }
 
-        $hideMenu = ('true' === api_get_setting('platform.hide_main_navigation_menu'));
+        $hideMenu = ('true' === api_get_setting('display.hide_main_navigation_menu'));
         if (true === $hideMenu) {
             return '';
         }
@@ -884,12 +884,12 @@ public function returnCoursesAndSessions(
         $useUserLanguageFilterIfAvailable = true,
         $loadHistory = false
     ) {
-        $gameModeIsActive = api_get_setting('gamification_mode');
+        $gameModeIsActive = api_get_setting('workflows.gamification_mode');
         $viewGridCourses = ('true' === api_get_setting('course.view_grid_courses'));
-        $showSimpleSessionInfo = ('true' === api_get_setting('course.show_simple_session_info'));
+        $showSimpleSessionInfo = ('true' === api_get_setting('session.show_simple_session_info'));
         $coursesWithoutCategoryTemplate = '/user_portal/classic_courses_without_category.tpl';
         $coursesWithCategoryTemplate = '/user_portal/classic_courses_with_category.tpl';
-        $showAllSessions = ('true' === api_get_setting('course.show_all_sessions_on_my_course_page'));
+        $showAllSessions = ('true' === api_get_setting('session.show_all_sessions_on_my_course_page'));
 
         if ($loadHistory) {
             // Load sessions in category in *history*
@@ -1160,7 +1160,7 @@ public function returnCoursesAndSessions(
 
         $extraFieldValue = new ExtraFieldValue('session');
         if ($showSessions) {
-            $coursesListSessionStyle = api_get_setting('course.courses_list_session_title_link');
+            $coursesListSessionStyle = api_get_setting('session.courses_list_session_title_link');
             $coursesListSessionStyle = false === $coursesListSessionStyle ? 1 : $coursesListSessionStyle;
             if (api_is_drh()) {
                 $coursesListSessionStyle = 1;
diff --git a/public/main/install/profiles/dev.json b/public/main/install/profiles/dev.json
index bb7df8194cb..dcb2cee7879 100644
--- a/public/main/install/profiles/dev.json
+++ b/public/main/install/profiles/dev.json
@@ -23,11 +23,6 @@
             "subkey": "",
             "selected_value": "true"
         },
-        {
-            "variable": "hide_dltt_markup",
-            "subkey": "",
-            "selected_value": "false"
-        },
         {
             "variable": "profile",
             "subkey": "email",
@@ -44,4 +39,4 @@
             "selected_value": "true"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index 15989fcf12d..68f1836307e 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -7775,7 +7775,7 @@ public function fixBlockedLinks($src)
                     CURLOPT_MAXREDIRS => 10,
                 ];
 
-                $proxySettings = api_get_setting('platform.proxy_settings', true);
+                $proxySettings = api_get_setting('security.proxy_settings', true);
                 if (!empty($proxySettings) &&
                     isset($proxySettings['curl_setopt_array'])
                 ) {
diff --git a/public/main/lp/lp_controller.php b/public/main/lp/lp_controller.php
index a2f7d5ecb39..09380a4e398 100644
--- a/public/main/lp/lp_controller.php
+++ b/public/main/lp/lp_controller.php
@@ -746,7 +746,7 @@
             api_not_allowed(true);
         }
 
-        $hideScormCopyLink = api_get_setting('hide_scorm_copy_link');
+        $hideScormCopyLink = api_get_setting('lp.hide_scorm_copy_link');
         if ('true' === $hideScormCopyLink) {
             api_not_allowed(true);
         }
@@ -762,7 +762,7 @@
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        $hideScormExportLink = api_get_setting('hide_scorm_export_link');
+        $hideScormExportLink = api_get_setting('lp.hide_scorm_export_link');
         if ('true' === $hideScormExportLink) {
             api_not_allowed(true);
         }
@@ -774,7 +774,7 @@
         }
         break;
     case 'export_to_pdf':
-        $hideScormPdfLink = api_get_setting('hide_scorm_pdf_link');
+        $hideScormPdfLink = api_get_setting('lp.hide_scorm_pdf_link');
         if ('true' === $hideScormPdfLink) {
            api_not_allowed(true);
         }
diff --git a/public/main/lp/lp_list.php b/public/main/lp/lp_list.php
index 6e3f7c8ff9b..caa52cc508a 100644
--- a/public/main/lp/lp_list.php
+++ b/public/main/lp/lp_list.php
@@ -170,9 +170,9 @@ function confirmation(name) {
 $ending = true;
 $allLpTimeValid = true;
 $isInvitee = api_is_invitee();
-$hideScormExportLink = api_get_setting('course.hide_scorm_export_link');
-$hideScormCopyLink = api_get_setting('course.hide_scorm_copy_link');
-$hideScormPdfLink = api_get_setting('course.hide_scorm_pdf_link');
+$hideScormExportLink = api_get_setting('lp.hide_scorm_export_link');
+$hideScormCopyLink = api_get_setting('lp.hide_scorm_copy_link');
+$hideScormPdfLink = api_get_setting('lp.hide_scorm_pdf_link');
 $options = learnpath::getIconSelect();
 $cidReq = api_get_cidreq();
 
@@ -185,7 +185,7 @@ function confirmation(name) {
 $courseSettingsDisableIcon = Display::getMdiIcon('hammer-wrench', 'ch-tool-icon-disabled', '', 22, get_lang('Course settings'));
 
 $enableAutoLaunch = api_get_course_setting('enable_lp_auto_launch');
-$gameMode = api_get_setting('gamification_mode');
+$gameMode = api_get_setting('workflows.gamification_mode');
 
 $data = [];
 $shortcutRepository = Container::getShortcutRepository();
diff --git a/public/main/lp/lp_stats.php b/public/main/lp/lp_stats.php
index 41535f52297..d20fe7b1cca 100644
--- a/public/main/lp/lp_stats.php
+++ b/public/main/lp/lp_stats.php
@@ -25,7 +25,7 @@
 $export = isset($_GET['export']) && 'csv' === $_GET['export'];
 $allowExtend = $_GET['allow_extend'] ?? 1;
 
-$lpReportType = api_get_setting('lp_show_reduced_report');
+$lpReportType = api_get_setting('lp.lp_show_reduced_report');
 $type = 'classic';
 if ('true' === $lpReportType) {
     $type = 'simple';
diff --git a/public/main/lp/lp_view.php b/public/main/lp/lp_view.php
index 395c58f650b..b81a7690acb 100644
--- a/public/main/lp/lp_view.php
+++ b/public/main/lp/lp_view.php
@@ -456,7 +456,7 @@
 $template->assign('glossary_tool_available_list', ['true', 'lp', 'exercise_and_lp']);
 
 // If the global gamification mode is enabled...
-$gamificationMode = api_get_setting('gamification_mode');
+$gamificationMode = api_get_setting('workflows.gamification_mode');
 // ...AND this learning path is set in gamification mode, then change the display
 $gamificationMode = $gamificationMode && $lp->getSeriousgameMode();
 
diff --git a/public/main/my_space/index.php b/public/main/my_space/index.php
index b8b2e23d505..594e52e147e 100644
--- a/public/main/my_space/index.php
+++ b/public/main/my_space/index.php
@@ -27,7 +27,7 @@
 $is_platform_admin = api_is_platform_admin();
 $is_drh = api_is_drh();
 $is_session_admin = api_is_session_admin();
-$skipData = ('true' === api_get_setting('platform.tracking_skip_generic_data'));
+$skipData = ('true' === api_get_setting('tracking.tracking_skip_generic_data'));
 
 $logInfo = [
     'tool' => SECTION_TRACKING,
diff --git a/public/main/my_space/myStudents.php b/public/main/my_space/myStudents.php
index 884cd87d9fe..0bda69dcbaa 100644
--- a/public/main/my_space/myStudents.php
+++ b/public/main/my_space/myStudents.php
@@ -45,7 +45,7 @@
     .'&origin='.$origin.'&details='.$details.'&cid='.$courseId;
 $allowMessages = ('true' === api_get_setting('message.private_messages_about_user'));
 $workingTime = api_get_setting('work.considered_working_time');
-$workingTimeEdit = api_get_configuration_value('allow_working_time_edition');
+$workingTimeEdit = api_get_setting('workflows.allow_working_time_edition');
 
 $allowToQualify = api_is_allowed_to_edit(null, true) ||
     api_is_course_tutor() ||
diff --git a/public/main/my_space/my_career.php b/public/main/my_space/my_career.php
index 9e89bba4f86..59a4fc86469 100644
--- a/public/main/my_space/my_career.php
+++ b/public/main/my_space/my_career.php
@@ -5,7 +5,7 @@
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if ('false' === api_get_setting('profile.allow_career_diagram')) {
+if ('false' === api_get_setting('session.allow_career_diagram')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/session/add_edit_users_to_session.php b/public/main/session/add_edit_users_to_session.php
index 23432937587..381c4fc5e56 100644
--- a/public/main/session/add_edit_users_to_session.php
+++ b/public/main/session/add_edit_users_to_session.php
@@ -95,7 +95,7 @@ function search_users($needle, $type)
         $order_clause = ' ORDER BY lastname, firstname, username';
         $showOfficialCode = false;
 
-        $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+        $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
         if ('true' === $orderListByOfficialCode) {
             $showOfficialCode = true;
             $order_clause = ' ORDER BY official_code, lastname, firstname, username';
@@ -360,7 +360,7 @@ function change_select(val) {
 $order_clause = ' ORDER BY lastname, firstname, username';
 
 $showOfficialCode = false;
-$orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 if ('true' === $orderListByOfficialCode) {
     $showOfficialCode = true;
     $order_clause = ' ORDER BY official_code, lastname, firstname, username';
diff --git a/public/main/session/add_users_to_session_course.php b/public/main/session/add_users_to_session_course.php
index 47c68494a8b..53ac8c243ab 100644
--- a/public/main/session/add_users_to_session_course.php
+++ b/public/main/session/add_users_to_session_course.php
@@ -102,7 +102,7 @@ function search_users($needle, $type)
         $order_clause = ' ORDER BY lastname, firstname, username';
         $showOfficialCode = false;
 
-        $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+        $orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
         if ('true' === $orderListByOfficialCode) {
             $showOfficialCode = true;
             $order_clause = ' ORDER BY official_code, lastname, firstname, username';
@@ -382,7 +382,7 @@ function change_select(val) {
 $order_clause = ' ORDER BY lastname, firstname, username';
 
 $showOfficialCode = false;
-$orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
+$orderListByOfficialCode = api_get_setting('display.order_user_list_by_official_code');
 if ('true' === $orderListByOfficialCode) {
     $showOfficialCode = true;
     $order_clause = ' ORDER BY official_code, lastname, firstname, username';
diff --git a/public/main/session/index.php b/public/main/session/index.php
index d5f2c868ba9..d066347da68 100644
--- a/public/main/session/index.php
+++ b/public/main/session/index.php
@@ -190,7 +190,7 @@
 }
 
 $entityManager = Database::getManager();
-$sessionTitleLink = api_get_setting('course.courses_list_session_title_link');
+$sessionTitleLink = api_get_setting('session.courses_list_session_title_link');
 
 if (2 == $sessionTitleLink && 1 === $session->getNbrCourses()) {
     $sessionCourses = $session->getCourses();
diff --git a/public/main/skills/skill_badge.php b/public/main/skills/skill_badge.php
index 87f6e483a9c..b49636a3480 100644
--- a/public/main/skills/skill_badge.php
+++ b/public/main/skills/skill_badge.php
@@ -19,7 +19,7 @@
 
 $backpack = 'https://backpack.openbadges.org/';
 
-$configBackpack = api_get_setting('openbadges_backpack');
+$configBackpack = api_get_setting('skill.openbadges_backpack');
 if (0 !== strcmp($backpack, $configBackpack)) {
     $backpack = $configBackpack;
 }
diff --git a/public/main/social/personal_data.php b/public/main/social/personal_data.php
index 3e22d54ba02..5b8b569f6e5 100644
--- a/public/main/social/personal_data.php
+++ b/public/main/social/personal_data.php
@@ -13,7 +13,7 @@
 api_set_more_memory_and_time_limits();
 api_block_anonymous_users();
 
-if ('true' === api_get_setting('profile.disable_gdpr')) {
+if ('true' === api_get_setting('privacy.disable_gdpr')) {
     api_not_allowed(true);
 }
 
@@ -416,9 +416,9 @@
     $personalData['treatment'][$item]['content'] = $legalTermContent;
 }*/
 
-$officerName = api_get_setting('profile.data_protection_officer_name');
-$officerRole = api_get_setting('profile.data_protection_officer_role');
-$officerEmail = api_get_setting('profile.data_protection_officer_email');
+$officerName = api_get_setting('privacy.data_protection_officer_name');
+$officerRole = api_get_setting('privacy.data_protection_officer_role');
+$officerEmail = api_get_setting('privacy.data_protection_officer_email');
 if (!empty($officerName)) {
     $personalData['officer_name'] = $officerName;
     $personalData['officer_role'] = $officerRole;
diff --git a/public/main/tracking/courseLog.php b/public/main/tracking/courseLog.php
index 8ee76a78d7a..217496b3cf2 100644
--- a/public/main/tracking/courseLog.php
+++ b/public/main/tracking/courseLog.php
@@ -203,7 +203,7 @@ function(index) {
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
 $TABLEQUIZ = Database::get_course_table(TABLE_QUIZ_TEST);
 
-$userEditionExtraFieldToCheck = 'true' === api_get_setting('platform.user_edition_extra_field_to_check');
+$userEditionExtraFieldToCheck = 'true' === api_get_setting('workflows.user_edition_extra_field_to_check');
 // Breadcrumbs.
 if ('resume_session' === $origin) {
     $interbreadcrumb[] = [
diff --git a/public/main/user/career_diagram.php b/public/main/user/career_diagram.php
index 8f8c0d68df3..3f806d78fb0 100644
--- a/public/main/user/career_diagram.php
+++ b/public/main/user/career_diagram.php
@@ -13,7 +13,7 @@
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if ('false' === api_get_setting('profile.allow_career_diagram')) {
+if ('false' === api_get_setting('session.allow_career_diagram')) {
     api_not_allowed(true);
 }
 api_block_anonymous_users();
diff --git a/public/main/user/subscribe_user.php b/public/main/user/subscribe_user.php
index 9220511be7d..5ba89e758dd 100644
--- a/public/main/user/subscribe_user.php
+++ b/public/main/user/subscribe_user.php
@@ -20,7 +20,7 @@
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-if ('false' === api_get_setting('allow_user_course_subscription_by_course_admin')) {
+if ('false' === api_get_setting('workflows.allow_user_course_subscription_by_course_admin')) {
     if (!api_is_platform_admin()) {
         api_not_allowed(true);
     }
@@ -193,7 +193,7 @@
         Display::getMdiIcon(ActionIcon::RESET, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Clear filter results')).' '.get_lang('Clear filter results').'</a>';
 }
 $extraForm = '';
-if ('true' === api_get_setting('profiling_filter_adding_users')) {
+if ('true' === api_get_setting('course.profiling_filter_adding_users')) {
     $extraForm = display_extra_profile_fields_filter();
 }
 
@@ -354,7 +354,7 @@ function get_number_of_users()
             // we change the SQL when we have a filter
             if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
-                'true' === api_get_setting('profiling_filter_adding_users')
+                'true' === api_get_setting('course.profiling_filter_adding_users')
             ) {
                 $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
                 $sql .= "
@@ -402,7 +402,7 @@ function get_number_of_users()
         )";
 
         // we also want to search for users who have something in their profile fields that matches the keyword
-        if ('true' === api_get_setting('profiling_filter_adding_users')) {
+        if ('true' === api_get_setting('course.profiling_filter_adding_users')) {
             $additional_users = search_additional_profile_fields($keyword);
         }
 
@@ -501,7 +501,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
             // applying the filter of the additional user profile fields
             if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
-                'true' === api_get_setting('profiling_filter_adding_users')
+                'true' === api_get_setting('course.profiling_filter_adding_users')
             ) {
                 $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
                 $sql .= "
@@ -529,7 +529,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
             // applying the filter of the additional user profile fields
             if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
-                'true' === api_get_setting('profiling_filter_adding_users')
+                'true' === api_get_setting('course.profiling_filter_adding_users')
             ) {
                 $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
                 $sql .= "
@@ -557,7 +557,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
                     // applying the filter of the additional user profile fields
                     if (isset($_GET['subscribe_user_filter_value']) &&
                         !empty($_GET['subscribe_user_filter_value']) &&
-                        'true' === api_get_setting('profiling_filter_adding_users')
+                        'true' === api_get_setting('course.profiling_filter_adding_users')
                     ) {
                         $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
                         $sql .= "
@@ -652,7 +652,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
                     // applying the filter of the additional user profile fields
                     if (isset($_GET['subscribe_user_filter_value']) &&
                         !empty($_GET['subscribe_user_filter_value']) &&
-                        'true' === api_get_setting('profiling_filter_adding_users')
+                        'true' === api_get_setting('course.profiling_filter_adding_users')
                     ) {
                         $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
                         $sql .= "
@@ -688,7 +688,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
                     )
                 ";
 
-        if ('true' === api_get_setting('profiling_filter_adding_users')) {
+        if ('true' === api_get_setting('course.profiling_filter_adding_users')) {
             // we also want to search for users who have something in
             // their profile fields that matches the keyword
             $additional_users = search_additional_profile_fields($keyword);
diff --git a/public/main/user/user.php b/public/main/user/user.php
index 079e89aea72..33a28a78614 100644
--- a/public/main/user/user.php
+++ b/public/main/user/user.php
@@ -41,7 +41,7 @@
 $courseCode = $course_info['code'];
 $courseId = $course_info['real_id'];
 $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT;
-$canEditUsers = 'true' === api_get_setting('allow_user_course_subscription_by_course_admin') || api_is_platform_admin();
+$canEditUsers = 'true' === api_get_setting('workflows.allow_user_course_subscription_by_course_admin') || api_is_platform_admin();
 $canEdit = api_is_allowed_to_edit(null, true);
 $canRead = api_is_allowed_to_edit(null, true) || api_is_coach();
 
@@ -51,7 +51,7 @@
 }
 
 $disableUsers = 3 === (int) $course_info['visibility'] &&
-    ('true' === api_get_setting('profile.disable_change_user_visibility_for_public_courses'));
+    ('true' === api_get_setting('privacy.disable_change_user_visibility_for_public_courses'));
 
 if (false === $canEdit && $disableUsers) {
     api_not_allowed(true);
@@ -1031,7 +1031,7 @@ function active_filter($active, $urlParams, $row)
  */
 function modify_filter($user_id, $row, $data)
 {
-    $canEditUsers = 'true' === api_get_setting('allow_user_course_subscription_by_course_admin') || api_is_platform_admin();
+    $canEditUsers = 'true' === api_get_setting('workflows.allow_user_course_subscription_by_course_admin') || api_is_platform_admin();
     $is_allowed_to_track = api_is_allowed_to_edit(true, true);
     $user_id = $data[0];
     $userInfo = api_get_user_info($user_id);
diff --git a/public/main/user/user_import.php b/public/main/user/user_import.php
index 4fcc8362244..1f2190830eb 100644
--- a/public/main/user/user_import.php
+++ b/public/main/user/user_import.php
@@ -7,7 +7,7 @@
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-if ('false' == api_get_setting('allow_user_course_subscription_by_course_admin')) {
+if ('false' == api_get_setting('workflows.allow_user_course_subscription_by_course_admin')) {
     if (!api_is_platform_admin()) {
         api_not_allowed(true);
     }
diff --git a/public/main/work/work.lib.php b/public/main/work/work.lib.php
index a5ee944c1ca..19ff7954801 100644
--- a/public/main/work/work.lib.php
+++ b/public/main/work/work.lib.php
@@ -1985,7 +1985,7 @@ function get_work_user_list(
 
     $column = !empty($column) ? Database::escape_string($column) : 'sent_date';
     $compilation = null;
-    if ('true' === api_get_setting('document.allow_compilatio_tool')) {
+    if ('true' === api_get_setting('work.allow_compilatio_tool')) {
         $compilation = new Compilatio();
     }
 
diff --git a/public/main/work/work_list_all.php b/public/main/work/work_list_all.php
index 64b9a242b08..34e095c865b 100644
--- a/public/main/work/work_list_all.php
+++ b/public/main/work/work_list_all.php
@@ -230,7 +230,7 @@
 
 $plagiarismListJqgridColumn = [];
 $plagiarismListJqgridLine = [];
-$allowAntiPlagiarism = ('true' === api_get_setting('document.allow_compilatio_tool'));
+$allowAntiPlagiarism = ('true' === api_get_setting('work.allow_compilatio_tool'));
 if ($allowAntiPlagiarism) {
     $plagiarismListJqgridColumn = ['Compilatio'];
     $plagiarismListJqgridLine = [
diff --git a/src/CoreBundle/Controller/AccountController.php b/src/CoreBundle/Controller/AccountController.php
index a7cb0fa50a4..38e92d3a6ff 100644
--- a/src/CoreBundle/Controller/AccountController.php
+++ b/src/CoreBundle/Controller/AccountController.php
@@ -82,7 +82,7 @@ public function edit(
                 }
             }
 
-            $showTermsIfProfileCompleted = ('true' === $settingsManager->getSetting('show_terms_if_profile_completed'));
+            $showTermsIfProfileCompleted = ('true' === $settingsManager->getSetting('profile.show_terms_if_profile_completed'));
             $user->setProfileCompleted($showTermsIfProfileCompleted);
 
             $userRepository->updateUser($user);
diff --git a/src/CoreBundle/Controller/Admin/IndexBlocksController.php b/src/CoreBundle/Controller/Admin/IndexBlocksController.php
index 02d78e6d4cd..f4b4daa1345 100644
--- a/src/CoreBundle/Controller/Admin/IndexBlocksController.php
+++ b/src/CoreBundle/Controller/Admin/IndexBlocksController.php
@@ -111,7 +111,7 @@ public function __invoke(): JsonResponse
             }
 
             // Data protection
-            if ('true' !== $this->settingsManager->getSetting('profile.disable_gdpr')) {
+            if ('true' !== $this->settingsManager->getSetting('privacy.disable_gdpr')) {
                 $json['data_privacy'] = [
                     'id' => 'block-admin-privacy',
                     'editable' => false,
diff --git a/src/CoreBundle/Controller/Admin/SessionAdminController.php b/src/CoreBundle/Controller/Admin/SessionAdminController.php
index 94690595f23..0b18572385c 100644
--- a/src/CoreBundle/Controller/Admin/SessionAdminController.php
+++ b/src/CoreBundle/Controller/Admin/SessionAdminController.php
@@ -106,7 +106,7 @@ public function listCompleted(
 
         $user = $this->userHelper->getCurrent();
 
-        $allowPublic = 'true' === $this->settingsManager->getSetting('course.allow_public_certificates', true);
+        $allowPublic = 'true' === $this->settingsManager->getSetting('certificate.allow_public_certificates', true);
         $allowSessionAdmin = 'true' === $this->settingsManager->getSetting('certificate.session_admin_can_download_all_certificates', true);
         $isSessionAdmin = $user && $user->isSessionAdmin();
 
@@ -349,7 +349,7 @@ public function searchUsers(
         $extraFilters = $request->query->all('extraFilters');
 
         $configuredExtraFieldVariable = $settingsManager->getSetting(
-            'platform.session_admin_user_subscription_search_extra_field_to_search',
+            'workflows.session_admin_user_subscription_search_extra_field_to_search',
             true
         );
 
diff --git a/src/CoreBundle/Controller/Admin/SettingsController.php b/src/CoreBundle/Controller/Admin/SettingsController.php
index ba0693f9a5a..783e3c37d21 100644
--- a/src/CoreBundle/Controller/Admin/SettingsController.php
+++ b/src/CoreBundle/Controller/Admin/SettingsController.php
@@ -66,6 +66,7 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
         }
 
         $schemas = $manager->getSchemas();
+        [$ordered, $labelMap] = $this->computeOrderedNamespacesByTranslatedLabel($schemas, $request);
 
         if ('' === $keyword) {
             return $this->render('@ChamiloCore/Admin/Settings/search.html.twig', [
@@ -76,6 +77,8 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
                 'search_form' => $searchForm->createView(),
                 'template_map' => $templateMap,
                 'template_map_by_category' => $templateMapByCategory,
+                'ordered_namespaces' => $ordered,
+                'namespace_labels' => $labelMap,
             ]);
         }
 
@@ -125,6 +128,8 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
             'search_form' => $searchForm->createView(),
             'template_map' => $templateMap,
             'template_map_by_category' => $templateMapByCategory,
+            'ordered_namespaces' => $ordered,
+            'namespace_labels' => $labelMap,
         ]);
     }
 
@@ -188,6 +193,8 @@ public function updateSetting(Request $request, AccessUrlHelper $accessUrlHelper
         }
 
         $schemas = $manager->getSchemas();
+        [$ordered, $labelMap] = $this->computeOrderedNamespacesByTranslatedLabel($schemas, $request);
+
 
         $templateMap = [];
         $settingsRepo = $this->entityManager->getRepository(SettingsCurrent::class);
@@ -207,6 +214,8 @@ public function updateSetting(Request $request, AccessUrlHelper $accessUrlHelper
             'keyword' => $keyword,
             'search_form' => $this->getSearchForm()->createView(),
             'template_map' => $templateMap,
+            'ordered_namespaces' => $ordered,
+            'namespace_labels' => $labelMap,
         ]);
     }
 
@@ -256,4 +265,46 @@ private function getSearchForm()
 
         return $builder->getForm();
     }
+
+    private function computeOrderedNamespacesByTranslatedLabel(array $schemas, Request $request): array
+    {
+        $namespaces = array_map(
+            static fn($k) => str_replace('chamilo_core.settings.', '', $k),
+            array_keys($schemas)
+        );
+
+        $labelMap = [];
+        foreach ($namespaces as $ns) {
+            if ($ns === 'cas') {
+                $labelMap[$ns] = 'CAS';
+                continue;
+            }
+            if ($ns === 'lp') {
+                $labelMap[$ns] = $this->translator->trans('Learning path');
+                continue;
+            }
+            if ($ns === 'ai_helpers') {
+                $labelMap[$ns] = $this->translator->trans('AI helpers');
+                continue;
+            }
+
+            $key = ucfirst(str_replace('_', ' ', $ns));
+            $labelMap[$ns] = $this->translator->trans($key);
+        }
+
+        $collator = class_exists(\Collator::class) ? new \Collator($request->getLocale()) : null;
+        usort($namespaces, function ($a, $b) use ($labelMap, $collator) {
+            return $collator
+                ? $collator->compare($labelMap[$a], $labelMap[$b])
+                : strcasecmp($labelMap[$a], $labelMap[$b]);
+        });
+
+        $idx = array_search('ai_helpers', $namespaces, true);
+        if ($idx !== false) {
+            array_splice($namespaces, $idx, 1);
+            array_splice($namespaces, 1, 0, ['ai_helpers']);
+        }
+
+        return [$namespaces, $labelMap];
+    }
 }
diff --git a/src/CoreBundle/Controller/Api/CheckCLinkAction.php b/src/CoreBundle/Controller/Api/CheckCLinkAction.php
index aa47fe64d35..cde022b1605 100644
--- a/src/CoreBundle/Controller/Api/CheckCLinkAction.php
+++ b/src/CoreBundle/Controller/Api/CheckCLinkAction.php
@@ -48,7 +48,7 @@ private function checkUrl(string $url, SettingsManager $settingsManager): bool
         ];
 
         // Check for proxy settings in your application configuration
-        $proxySettings = $settingsManager->getSetting('platform.proxy_settings', true);
+        $proxySettings = $settingsManager->getSetting('security.proxy_settings', true);
         if ($proxySettings && isset($proxySettings['curl_setopt_array'])) {
             $defaults[CURLOPT_PROXY] = $proxySettings['curl_setopt_array']['CURLOPT_PROXY'];
             $defaults[CURLOPT_PROXYPORT] = $proxySettings['curl_setopt_array']['CURLOPT_PROXYPORT'];
diff --git a/src/CoreBundle/Controller/CertificateController.php b/src/CoreBundle/Controller/CertificateController.php
index bb2499bf2a7..f53bf9fbd74 100644
--- a/src/CoreBundle/Controller/CertificateController.php
+++ b/src/CoreBundle/Controller/CertificateController.php
@@ -52,7 +52,7 @@ public function view(string $hash): Response
         }
 
         // Check if public access is globally allowed and certificate is marked as published
-        $allowPublic = 'true' === $this->settingsManager->getSetting('course.allow_public_certificates', true);
+        $allowPublic = 'true' === $this->settingsManager->getSetting('certificate.allow_public_certificates', true);
         $allowSessionAdmin = 'true' === $this->settingsManager->getSetting('certificate.session_admin_can_download_all_certificates', true);
         $user = $this->userHelper->getCurrent();
         $securityUser = $this->getUser();
@@ -114,7 +114,7 @@ public function downloadPdf(string $hash): Response
             throw $this->createNotFoundException('The requested certificate does not exist.');
         }
 
-        $allowPublic = 'true' === $this->settingsManager->getSetting('course.allow_public_certificates', true);
+        $allowPublic = 'true' === $this->settingsManager->getSetting('certificate.allow_public_certificates', true);
         $allowSessionAdmin = 'true' === $this->settingsManager->getSetting('certificate.session_admin_can_download_all_certificates', true);
         $user = $this->userHelper->getCurrent();
         $securityUser = $this->getUser();
diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php
index e46d1f7764f..5b44fe16a70 100644
--- a/src/CoreBundle/Controller/CourseController.php
+++ b/src/CoreBundle/Controller/CourseController.php
@@ -99,7 +99,7 @@ public function checkTermsAndConditionJson(
 
         if ($user->isStudent()
             && 'true' === $settingsManager->getSetting('registration.allow_terms_conditions', true)
-            && 'course' === $settingsManager->getSetting('platform.load_term_conditions_section', true)
+            && 'course' === $settingsManager->getSetting('workflows.load_term_conditions_section', true)
         ) {
             $termAndConditionStatus = false;
             $extraValue = $extraFieldValuesRepository->findLegalAcceptByItemId($user->getId());
@@ -758,7 +758,7 @@ public function checkEnrollments(EntityManagerInterface $em, SettingsManager $se
         $isEnrolledInSessions = $this->isUserEnrolledInAnySession($user, $em);
 
         if (!$isEnrolledInCourses && !$isEnrolledInSessions) {
-            $defaultMenuEntry = $settingsManager->getSetting('platform.default_menu_entry_for_course_or_session');
+            $defaultMenuEntry = $settingsManager->getSetting('workflows.default_menu_entry_for_course_or_session');
             $isEnrolledInCourses = 'my_courses' === $defaultMenuEntry;
             $isEnrolledInSessions = 'my_sessions' === $defaultMenuEntry;
         }
diff --git a/src/CoreBundle/Controller/PlatformConfigurationController.php b/src/CoreBundle/Controller/PlatformConfigurationController.php
index 965aa3d0e5e..4f6292fff65 100644
--- a/src/CoreBundle/Controller/PlatformConfigurationController.php
+++ b/src/CoreBundle/Controller/PlatformConfigurationController.php
@@ -105,9 +105,9 @@ public function list(
                 'platform.timezone',
                 'platform.registered',
                 'platform.donotlistcampus',
-                'platform.load_term_conditions_section',
+                'workflows.load_term_conditions_section',
                 'platform.cookie_warning',
-                'platform.show_tabs',
+                'display.show_tabs',
                 'catalog.show_courses_sessions',
                 'admin.administrator_name',
                 'admin.administrator_surname',
@@ -124,11 +124,11 @@ public function list(
                 'gradebook.gradebook_dependency',
                 'course.course_validation',
                 'course.student_view_enabled',
-                'course.allow_edit_tool_visibility_in_session',
+                'session.allow_edit_tool_visibility_in_session',
                 'session.limit_session_admin_role',
                 'session.allow_session_admin_read_careers',
                 'session.limit_session_admin_list_users',
-                'platform.redirect_index_to_url_for_logged_users',
+                'workflows.redirect_index_to_url_for_logged_users',
                 'language.platform_language',
                 'language.language_priority_1',
                 'language.language_priority_2',
@@ -143,38 +143,38 @@ public function list(
                 'attendance.multilevel_grading',
                 'attendance.enable_sign_attendance_sheet',
                 'exercise.allow_exercise_auto_launch',
-                'course.access_url_specific_files',
+                'document.access_url_specific_files',
                 'catalog.show_courses_descriptions_in_catalog',
                 'session.session_automatic_creation_user_id',
                 'session.session_list_view_remaining_days',
                 'profile.use_users_timezone',
                 'registration.redirect_after_login',
-                'platform.show_tabs_per_role',
-                'platform.session_admin_user_subscription_search_extra_field_to_search',
+                'display.show_tabs_per_role',
+                'workflows.session_admin_user_subscription_search_extra_field_to_search',
                 'platform.push_notification_settings',
                 'session.user_session_display_mode',
                 'course.resource_sequence_show_dependency_in_course_intro',
                 'message.allow_message_tool',
-                'course.hide_scorm_export_link',
+                'lp.hide_scorm_export_link',
                 'ai_helpers.enable_ai_helpers',
-                'course.hide_scorm_pdf_link',
-                'platform.table_default_row',
-                'platform.table_row_list',
+                'lp.hide_scorm_pdf_link',
+                'display.table_default_row',
+                'display.table_row_list',
                 'social.allow_social_tool',
                 'chat.allow_global_chat',
             ];
 
             $user = $this->userHelper->getCurrent();
 
-            $configuration['settings']['display.show_link_ticket_notification'] = 'false';
+            $configuration['settings']['ticket.show_link_ticket_notification'] = 'false';
 
             if (!empty($user)) {
                 $userIsAllowedInProject = $this->ticketProjectHelper->userIsAllowInProject(1);
 
                 if ($userIsAllowedInProject
-                    && 'true' === $settingsManager->getSetting('display.show_link_ticket_notification')
+                    && 'true' === $settingsManager->getSetting('ticket.show_link_ticket_notification')
                 ) {
-                    $configuration['settings']['display.show_link_ticket_notification'] = 'true';
+                    $configuration['settings']['ticket.show_link_ticket_notification'] = 'true';
                 }
             }
 
diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php
index 38581cc7994..6d9fde5d91e 100644
--- a/src/CoreBundle/Controller/ResourceController.php
+++ b/src/CoreBundle/Controller/ResourceController.php
@@ -162,7 +162,7 @@ public function view(
         }
 
         if (!$resourceFile) {
-            $accessUrlSpecificFiles = $settingsManager->getSetting('course.access_url_specific_files') && $accessUrlHelper->isMultiple();
+            $accessUrlSpecificFiles = $settingsManager->getSetting('document.access_url_specific_files') && $accessUrlHelper->isMultiple();
             $currentUrl = $accessUrlHelper->getCurrent()?->getUrl();
 
             $resourceFiles = $resourceNode->getResourceFiles();
@@ -272,7 +272,7 @@ public function download(
             $this->trans('Unauthorised access to resource')
         );
 
-        $accessUrlSpecificFiles = $settingsManager->getSetting('course.access_url_specific_files') && $accessUrlHelper->isMultiple();
+        $accessUrlSpecificFiles = $settingsManager->getSetting('document.access_url_specific_files') && $accessUrlHelper->isMultiple();
         $currentUrl = $accessUrlHelper->getCurrent()?->getUrl();
 
         $resourceFiles = $resourceNode->getResourceFiles();
@@ -668,13 +668,6 @@ private function processFile(Request $request, ResourceNode $resourceNode, strin
                             $content = str_replace('</head>', $js.'</head>', $content);
                         }
                     }
-                    if ('true' === $this->getSettingsManager()->getSetting('course.enable_bootstrap_in_documents_html')) {
-                        // It adds the bootstrap and awesome css
-                        $links = '<link href="'.api_get_path(WEB_PATH).'libs/bootstrap/bootstrap.min.css" rel="stylesheet">';
-                        $links .= '<link href="'.api_get_path(WEB_PATH).'libs/bootstrap/font-awesome.min.css" rel="stylesheet">';
-                        // Insert inside the head tag.
-                        $content = str_replace('</head>', $links.'</head>', $content);
-                    }
                     $response->setContent($content);
 
                     return $response;
diff --git a/src/CoreBundle/Controller/SecurityController.php b/src/CoreBundle/Controller/SecurityController.php
index 020fb903dab..c0e66189d72 100644
--- a/src/CoreBundle/Controller/SecurityController.php
+++ b/src/CoreBundle/Controller/SecurityController.php
@@ -112,7 +112,7 @@ public function loginJson(
         if (
             $user->isStudent()
             && 'true' === $this->settingsManager->getSetting('allow_terms_conditions', true)
-            && 'login' === $this->settingsManager->getSetting('load_term_conditions_section', true)
+            && 'login' === $this->settingsManager->getSetting('workflows.load_term_conditions_section', true)
         ) {
             $termAndConditionStatus = false;
             $extraValue = $extraFieldValuesRepository->findLegalAcceptByItemId($user->getId());
@@ -286,7 +286,7 @@ private function calculateRedirectUrl(
             };
         }
 
-        if ('true' !== $this->settingsManager->getSetting('course.go_to_course_after_login')) {
+        if ('true' !== $this->settingsManager->getSetting('workflows.go_to_course_after_login')) {
             return $url;
         }
 
diff --git a/src/CoreBundle/Controller/SocialController.php b/src/CoreBundle/Controller/SocialController.php
index 4ecf2c55553..225a6b2d987 100644
--- a/src/CoreBundle/Controller/SocialController.php
+++ b/src/CoreBundle/Controller/SocialController.php
@@ -64,9 +64,9 @@ public function getPersonalData(
         $properties = $propertiesToJson ? json_decode($propertiesToJson, true) : [];
 
         $officerData = [
-            ['name' => $settingsManager->getSetting('profile.data_protection_officer_name')],
-            ['role' => $settingsManager->getSetting('profile.data_protection_officer_role')],
-            ['email' => $settingsManager->getSetting('profile.data_protection_officer_email')],
+            ['name' => $settingsManager->getSetting('privacy.data_protection_officer_name')],
+            ['role' => $settingsManager->getSetting('privacy.data_protection_officer_role')],
+            ['email' => $settingsManager->getSetting('privacy.data_protection_officer_email')],
         ];
         $properties['officer_data'] = $officerData;
 
@@ -1022,7 +1022,7 @@ public function checkTermsRestrictions(
         $infoMessage = '';
 
         if (!$isAdmin) {
-            if ('true' === $settingsManager->getSetting('ticket.show_terms_if_profile_completed')) {
+            if ('true' === $settingsManager->getSetting('profile.show_terms_if_profile_completed')) {
                 $extraFieldValue = new ExtraFieldValue('user');
                 $value = $extraFieldValue->get_values_by_handler_and_field_variable($userId, 'termactivated');
                 if (isset($value['value'])) {
diff --git a/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php b/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
index 0c34975046d..f9a06943cd1 100644
--- a/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
+++ b/src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php
@@ -114,6 +114,31 @@ public static function getExistingSettings(): array
                 ],
             ],
             'session' => [
+                [
+                    'name' => 'career_diagram_disclaimer',
+                    'title' => 'Display a disclaimer below the career diagram',
+                    'comment' => "Add a disclaimer below the career diagram. A language variable called 'Career diagram disclaimer' must exist in your sub-language.",
+                ],
+                [
+                    'name' => 'career_diagram_legend',
+                    'title' => 'Display a legend below the career diagram',
+                    'comment' => "Add a career legend below the career diagram. A language variable called 'Career diagram legend' must exist in your sub-language.",
+                ],
+                [
+                    'name' => 'allow_career_users',
+                    'title' => 'Enable career diagrams for users',
+                    'comment' => 'If career diagrams are enabled, users can only see them (and only the diagrams that correspond to their studies) if you enable this option.',
+                ],
+                [
+                    'name' => 'allow_edit_tool_visibility_in_session',
+                    'title' => 'Allow tool visibility edition in sessions',
+                    'comment' => 'When using sessions, the default behaviour is to use the tool visibility defined in the base course. This setting changes that to allow coaches in session courses to adapt tool visibilities to their needs.',
+                ],
+                [
+                    'name' => 'courses_list_session_title_link',
+                    'title' => 'Type of link for the session title',
+                    'comment' => 'On the courses/sessions page, the session title can be either of the following : 0 = no link (hide session title) ; 1 = link title to a special session page ; 2 = link to the course if there is only one course ; 3 = session title makes the courses list foldable ; 4 = no link (show session title).',
+                ],
                 [
                     'name' => 'user_session_display_mode',
                     'title' => 'My Sessions display mode',
@@ -164,11 +189,6 @@ public static function getExistingSettings(): array
                     'title' => 'Prevent session admins to manage all users',
                     'comment' => 'By enabling this option, session admins will only be able to see, in the administration page, the users they created.',
                 ],
-                [
-                    'name' => 'show_groups_to_users',
-                    'title' => 'Show classes to users',
-                    'comment' => 'Show the classes to users. Classes are a feature that allow you to register/unregister groups of users into a session or a course directly, reducing the administrative hassle. When you pick this option, learners will be able to see in which class they are through their social network interface.',
-                ],
                 [
                     'name' => 'allow_session_course_copy_for_teachers',
                     'title' => 'Allow session-to-session copy for teachers',
@@ -248,26 +268,21 @@ public static function getExistingSettings(): array
                 ],
             ],
             'course' => [
+                [
+                    'name' => 'profiling_filter_adding_users',
+                    'title' => 'Filter users on profile fields on subscription to course',
+                    'comment' => 'Allow teachers to filter the users based on extra fields on the page to subscribe users to their course.',
+                ],
                 [
                     'name' => 'course_sequence_valid_only_in_same_session',
                     'title' => 'Validate prerequisites only within the same session',
                     'comment' => 'When enabled, a course will be considered validated only if passed within the current session. If disabled, courses passed in other sessions will also unlock dependent courses.',
                 ],
-                [
-                    'name' => 'access_url_specific_files',
-                    'title' => 'Enable URL-specific files',
-                    'comment' => 'When this feature is enabled on a multi-URL configuration, you can go to the main URL and provide URL-specific versions of any file (in the documents tool). The original file will be replaced by the alternative whenever seeing it from a different URL. This allows you to customize each URL even further, while enjoying the advantage of re-using the same courses many times.',
-                ],
                 [
                     'name' => 'allow_course_theme',
                     'title' => 'Allow course themes',
                     'comment' => "Allows course graphical themes and makes it possible to change the style sheet used by a course to any of the possible style sheets available to Chamilo. When a user enters the course, the style sheet of the course will have priority over the user's own style sheet and the platform's default style sheet.",
                 ],
-                [
-                    'name' => 'allow_users_to_create_courses',
-                    'title' => 'Allow non admin to create courses',
-                    'comment' => 'Allow non administrators (teachers) to create new courses on the server',
-                ],
                 [
                     'name' => 'breadcrumbs_course_homepage',
                     'title' => 'Course homepage breadcrumb',
@@ -293,11 +308,6 @@ public static function getExistingSettings(): array
                     'title' => 'Example material on course creation',
                     'comment' => 'Create example material automatically when creating a new course',
                 ],
-                [
-                    'name' => 'go_to_course_after_login',
-                    'title' => 'Go directly to the course after login',
-                    'comment' => 'When a user is registered in one course, go directly to the course after login',
-                ],
                 [
                     'name' => 'send_email_to_admin_when_create_course',
                     'title' => 'E-mail alert on course creation',
@@ -318,16 +328,6 @@ public static function getExistingSettings(): array
                     'title' => 'Enable learner view',
                     'comment' => 'Enable the learner view, which allows a teacher or admin to see a course as a learner would see it',
                 ],
-                [
-                    'name' => 'allow_public_certificates',
-                    'title' => 'Allow public certificates',
-                    'comment' => 'User certificates can be view by unregistered users.',
-                ],
-                [
-                    'name' => 'allow_user_course_subscription_by_course_admin',
-                    'title' => 'Allow User Course Subscription By Course Admininistrator',
-                    'comment' => 'Activate this option will allow course administrator to subscribe users inside a course',
-                ],
                 [
                     'name' => 'course_hide_tools',
                     'title' => 'Hide tools from teachers',
@@ -353,11 +353,6 @@ public static function getExistingSettings(): array
                     'title' => 'Cumulative session time for SCORM',
                     'comment' => 'When enabled, the session time for SCORM Learning Paths will be cumulative, otherwise, it will only be counted from the last update time. This is a global setting. It is used when creating a new Learning Path but can then be redefined for each one.',
                 ],
-                [
-                    'name' => 'allow_lp_return_link',
-                    'title' => 'Show learning paths return link',
-                    'comment' => "Disable this option to hide the 'Return to homepage' button in the learning paths",
-                ],
                 [
                     'name' => 'course_creation_use_template',
                     'title' => 'Use template course for new courses',
@@ -368,31 +363,6 @@ public static function getExistingSettings(): array
                     'title' => 'Courses custom icons',
                     'comment' => 'Use course images as the course icon in courses lists (instead of the default green blackboard icon).',
                 ],
-                [
-                    'name' => 'hide_scorm_copy_link',
-                    'title' => 'Hide SCORM Copy',
-                    'comment' => 'Hide the Learning Path Copy icon from the Learning Paths list',
-                ],
-                [
-                    'name' => 'hide_scorm_export_link',
-                    'title' => 'Hide SCORM Export',
-                    'comment' => 'Hide the SCORM Export icon from the Learning Paths list',
-                ],
-                [
-                    'name' => 'hide_scorm_pdf_link',
-                    'title' => 'Hide Learning Path PDF export',
-                    'comment' => 'Hide the Learning Path PDF Export icon from the Learning Paths list',
-                ],
-                [
-                    'name' => 'lp_show_reduced_report',
-                    'title' => 'Learning paths: show reduced report',
-                    'comment' => 'Inside the learning paths tool, when a user reviews his own progress (through the stats icon), show a shorten (less detailed) version of the progress report.',
-                ],
-                [
-                    'name' => 'teacher_can_select_course_template',
-                    'title' => 'Teacher can select a course as template',
-                    'comment' => 'Allow pick a course as template for the new course that teacher is creating',
-                ],
             ],
             'editor' => [
                 [
@@ -482,6 +452,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'group' => [
+                [
+                    'name' => 'show_groups_to_users',
+                    'title' => 'Show classes to users',
+                    'comment' => 'Show the classes to users. Classes are a feature that allow you to register/unregister groups of users into a session or a course directly, reducing the administrative hassle. When you pick this option, learners will be able to see in which class they are through their social network interface.',
+                ],
                 [
                     'name' => 'allow_group_categories',
                     'title' => 'Group categories',
@@ -494,6 +469,16 @@ public static function getExistingSettings(): array
                 ],
             ],
             'registration' => [
+                [
+                    'name' => 'user_hide_never_expire_option',
+                    'title' => "Hide 'never expires' option for users",
+                    'comment' => "Remove the option 'never expires' when creating/editing a user account.",
+                ],
+                [
+                    'name' => 'extldap_config',
+                    'title' => 'LDAP connection configuration',
+                    'comment' => 'Array defining host and port for the LDAP server.',
+                ],
                 [
                     'name' => 'redirect_after_login',
                     'title' => 'Redirect after login (per profile)',
@@ -598,9 +583,24 @@ public static function getExistingSettings(): array
             ],
             'display' => [
                 [
-                    'name' => 'allow_user_headings',
-                    'title' => 'Allow users profiling inside courses',
-                    'comment' => 'Can a teacher define learner profile fields to retrieve additional information?',
+                    'name' => 'show_tabs',
+                    'title' => 'Tabs in the header',
+                    'comment' => 'Check the tabs you want to see appear in the header. The unchecked tabs will appear on the right hand menu on the portal homepage and my courses page if these need to appear',
+                ],
+                [
+                    'name' => 'show_tabs_per_role',
+                    'title' => 'Show tabs per role',
+                    'comment' => 'Define header tabs visibility per role.',
+                ],
+                [
+                    'name' => 'pdf_logo_header',
+                    'title' => 'PDF header logo',
+                    'comment' => 'Whether to use the image at var/themes/[your-theme]/images/pdf_logo_header.png as the PDF header logo for all PDF exports (instead of the normal portal logo)',
+                ],
+                [
+                    'name' => 'gravatar_type',
+                    'title' => 'Gravatar avatar type',
+                    'comment' => "If the Gravatar option is enabled and the user doesn't have a picture configured on Gravatar, this option allows you to choose the type of avatar that Gravatar will generate for each user. Check <a href='http://en.gravatar.com/site/implement/images#default-image'>http://en.gravatar.com/site/implement/images#default-image</a> for avatar types examples.",
                 ],
                 [
                     'name' => 'display_categories_on_homepage',
@@ -677,16 +677,6 @@ public static function getExistingSettings(): array
                     'title' => 'Show hot courses',
                     'comment' => 'The hot courses list will be added in the index page',
                 ],
-                [
-                    'name' => 'show_link_bug_notification',
-                    'title' => 'Show link to report bug',
-                    'comment' => 'Show a link in the header to report a bug inside of our support platform (http://support.chamilo.org). When clicking on the link, the user is sent to the support platform, on a wiki page that describes the bug reporting process.',
-                ],
-                [
-                    'name' => 'show_link_ticket_notification',
-                    'title' => 'Show ticket creation link',
-                    'comment' => 'Show the ticket creation link to users on the right side of the portal',
-                ],
                 [
                     'name' => 'hide_home_top_when_connected',
                     'title' => 'Hide top content on homepage when logged in',
@@ -734,11 +724,6 @@ public static function getExistingSettings(): array
                     'title' => 'Allow definition and use of sub-languages',
                     'comment' => "By enabling this option, you will be able to define variations for each of the language terms used in the platform's interface, in the form of a new language based on and extending an existing language. You'll find this option in the languages section of the administration panel.",
                 ],
-                [
-                    'name' => 'hide_dltt_markup',
-                    'title' => 'Hide DLTT Markup',
-                    'comment' => 'Hide the [= ... =] markup when a language variable is not translated',
-                ],
                 [
                     'name' => 'show_different_course_language',
                     'title' => 'Show course languages',
@@ -751,6 +736,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'document' => [
+                [
+                    'name' => 'access_url_specific_files',
+                    'title' => 'Enable URL-specific files',
+                    'comment' => 'When this feature is enabled on a multi-URL configuration, you can go to the main URL and provide URL-specific versions of any file (in the documents tool). The original file will be replaced by the alternative whenever seeing it from a different URL. This allows you to customize each URL even further, while enjoying the advantage of re-using the same courses many times.',
+                ],
                 [
                     'name' => 'default_document_quotum',
                     'title' => 'Default hard disk space',
@@ -811,11 +801,6 @@ public static function getExistingSettings(): array
                     'title' => 'Document visibility defined in course',
                     'comment' => 'The default document visibility for all courses',
                 ],
-                [
-                    'name' => 'enable_webcam_clip',
-                    'title' => 'Enable Webcam Clip',
-                    'comment' => 'Webcam Clip allow to users capture images from his webcam and send them to server in JPEG (.jpg or .jpeg) format',
-                ],
                 [
                     'name' => 'pdf_export_watermark_by_course',
                     'title' => 'Enable watermark definition by course',
@@ -868,6 +853,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'forum' => [
+                [
+                    'name' => 'community_managers_user_list',
+                    'title' => 'Community managers list',
+                    'comment' => 'Provide an array of user IDs that will be considered community managers in the special course designated as global forum. Community managers have additional privileges on the global forum.',
+                ],
                 [
                     'name' => 'default_forum_view',
                     'title' => 'Default forum view',
@@ -989,36 +979,11 @@ public static function getExistingSettings(): array
                     'title' => 'Teachers can change the Gradebook score settings',
                     'comment' => 'When editing the Gradebook settings',
                 ],
-                [
-                    'name' => 'add_gradebook_certificates_cron_task_enabled',
-                    'title' => 'Certificates auto-generation on WS call',
-                    'comment' => 'When enabled, and when using the WSCertificatesList webservice, this option will make sure that all certificates have been generated by users if they reached the sufficient score in all items defined in gradebooks for all courses and sessions (this might consume considerable processing resources on your server).',
-                ],
-                [
-                    'name' => 'certificate_filter_by_official_code',
-                    'title' => 'Certificates filter by official code',
-                    'comment' => 'Add a filter on the students official code to the certificates list.',
-                ],
                 [
                     'name' => 'gradebook_detailed_admin_view',
                     'title' => 'Show additional columns in gradebook',
                     'comment' => 'Show additional columns in the student view of the gradebook with the best score of all students, the relative position of the student looking at the report and the average score of the whole group of students.',
                 ],
-                [
-                    'name' => 'hide_certificate_export_link',
-                    'title' => 'Certificates: hide PDF export link for all',
-                    'comment' => 'Enable to completely remove the possibility to export certificates to PDF (for all users). If enabled, this includes hiding it from students.',
-                ],
-                [
-                    'name' => 'hide_certificate_export_link_students',
-                    'title' => 'Certificates: hide export link from students',
-                    'comment' => "If enabled, students won't be able to export their certificates to PDF. This option is available because, depending on the precise HTML structure of the certificate template, the PDF export might be of low quality. In this case, it is best to only show the HTML certificate to students.",
-                ],
-                [
-                    'name' => 'openbadges_backpack',
-                    'title' => 'OpenBadges backpack URL',
-                    'comment' => 'The URL of the OpenBadges backpack server that will be used by default for all users wanting to export their badges. This defaults to the open and free Mozilla Foundation backpack repository: https://backpack.openbadges.org/',
-                ],
                 [
                     'name' => 'student_publication_to_take_in_gradebook',
                     'title' => 'Assignment considered for gradebook',
@@ -1026,6 +991,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'platform' => [
+                [
+                    'name' => 'disable_copy_paste',
+                    'title' => 'Disable copy-pasting',
+                    'comment' => 'When enabled, this option disables as well as possible the copy-pasting mechanisms. Useful in restrictive exams setups.',
+                ],
                 [
                     'name' => 'session_admin_access_to_all_users_on_all_urls',
                     'title' => 'Allow session admins to see all users on all URLs',
@@ -1046,11 +1016,6 @@ public static function getExistingSettings(): array
                     'title' => 'Do not list this campus on chamilo.org',
                     'comment' => 'By default, Chamilo portals are automatically registered in a public list at chamilo.org, just using the title you gave to this portal (not the URL nor any private data). Check this box to avoid having the title of your portal appear.',
                 ],
-                [
-                    'name' => 'session_admin_user_subscription_search_extra_field_to_search',
-                    'title' => 'Extra user field used to search and name sessions',
-                    'comment' => 'This setting defines the extra user field key (e.g., "company") that will be used to search for users and to define the name of the session when registering students from /admin-dashboard/register.',
-                ],
                 [
                     'name' => 'timezone',
                     'title' => 'Default timezone',
@@ -1081,11 +1046,6 @@ public static function getExistingSettings(): array
                     'title' => 'Server Type',
                     'comment' => 'Defines the environment type: "prod" (normal production), "validation" (like production but without reporting statistics), or "test" (debug mode with developer tools such as untranslated string indicators).',
                 ],
-                [
-                    'name' => 'show_tabs',
-                    'title' => 'Tabs in the header',
-                    'comment' => 'Check the tabs you want to see appear in the header. The unchecked tabs will appear on the right hand menu on the portal homepage and my courses page if these need to appear',
-                ],
                 [
                     'name' => 'site_name',
                     'title' => 'E-learning portal name',
@@ -1106,41 +1066,11 @@ public static function getExistingSettings(): array
                     'title' => 'Cookie privacy notification',
                     'comment' => 'If enabled, this option shows a banner on top of your platform that asks users to acknowledge that the platform is using cookies necessary to provide the user experience. The banner can easily be acknowledged and hidden by the user. This allows Chamilo to comply with EU web cookies regulations.',
                 ],
-                [
-                    'name' => 'gamification_mode',
-                    'title' => 'Gamification mode',
-                    'comment' => 'Activate the stars achievement in learning paths',
-                ],
-                [
-                    'name' => 'gravatar_enabled',
-                    'title' => 'Gravatar user pictures',
-                    'comment' => "Enable this option to search into the Gravatar repository for pictures of the current user, if the user hasn't defined a picture locally. This is great to auto-fill pictures on your site, in particular if your users are active internet users. Gravatar pictures can be configured easily, based on the e-mail address of a user, at http://en.gravatar.com/",
-                ],
-                [
-                    'name' => 'gravatar_type',
-                    'title' => 'Gravatar avatar type',
-                    'comment' => "If the Gravatar option is enabled and the user doesn't have a picture configured on Gravatar, this option allows you to choose the type of avatar that Gravatar will generate for each user. Check <a href='http://en.gravatar.com/site/implement/images#default-image'>http://en.gravatar.com/site/implement/images#default-image</a> for avatar types examples.",
-                ],
                 [
                     'name' => 'institution_address',
                     'title' => 'Institution address',
                     'comment' => 'Address',
                 ],
-                [
-                    'name' => 'load_term_conditions_section',
-                    'title' => 'Load term conditions section',
-                    'comment' => 'The legal agreement will appear during the login or when enter to a course.',
-                ],
-                [
-                    'name' => 'order_user_list_by_official_code',
-                    'title' => 'Order users by official code',
-                    'comment' => "Use the 'official code' to sort most students list on the platform, instead of their lastname or firstname.",
-                ],
-                [
-                    'name' => 'pdf_logo_header',
-                    'title' => 'PDF header logo',
-                    'comment' => 'Whether to use the image at var/themes/[your-theme]/images/pdf_logo_header.png as the PDF header logo for all PDF exports (instead of the normal portal logo)',
-                ],
             ],
             'mail' => [
                 [
@@ -1225,6 +1155,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'skill' => [
+                [
+                    'name' => 'openbadges_backpack',
+                    'title' => 'OpenBadges backpack URL',
+                    'comment' => 'The URL of the OpenBadges backpack server that will be used by default for all users wanting to export their badges. This defaults to the open and free Mozilla Foundation backpack repository: https://backpack.openbadges.org/',
+                ],
                 [
                     'name' => 'allow_hr_skills_management',
                     'title' => 'Allow HR skills management',
@@ -1326,6 +1261,21 @@ public static function getExistingSettings(): array
                 ],
             ],
             'security' => [
+                [
+                    'name' => 'hide_breadcrumb_if_not_allowed',
+                    'title' => "Hide breadcrumb if 'not allowed'",
+                    'comment' => 'If the user is not allowed to access a specific page, also hide the breadcrumb. This increases security by avoiding the display of unnecessary information.',
+                ],
+                [
+                    'name' => 'force_renew_password_at_first_login',
+                    'title' => 'Force password renewal at first login',
+                    'comment' => 'This is one simple measure to increase the security of your portal by asking users to immediately change their password, so the one that was transfered by e-mail is no longer valid and they then will use one that they came up with and that they are the only person to know.',
+                ],
+                [
+                    'name' => 'login_max_attempt_before_blocking_account',
+                    'title' => 'Max login attempts before lockdown',
+                    'comment' => 'Number of failed login attempts to tolerate before the user account is locked and has to be unlocked by an admin.',
+                ],
                 [
                     'name' => '2fa_enable',
                     'title' => 'Enable 2FA',
@@ -1378,6 +1328,21 @@ public static function getExistingSettings(): array
                 ],
             ],
             'tracking' => [
+                [
+                    'name' => 'my_progress_course_tools_order',
+                    'title' => "Order of tools on 'My progress' page",
+                    'comment' => "Change the order of tools shown on the 'My progress' page for learners. Options include 'quizzes', 'learning_paths' and 'skills'.",
+                ],
+                [
+                    'name' => 'block_my_progress_page',
+                    'title' => "Prevent access to 'My progress'",
+                    'comment' => "In specific implementations like online exams, you might want to prevent user access to the 'My progress' page.",
+                ],
+                [
+                    'name' => 'tracking_skip_generic_data',
+                    'title' => 'Skip generic data in learner self-tracking page',
+                    'comment' => "If the 'My progress' page takes too long to load, you might want to remove the processing of generic statistics for the user. In this case enable this setting.",
+                ],
                 [
                     'name' => 'footer_extra_content',
                     'title' => 'Extra content in footer',
@@ -1423,10 +1388,25 @@ public static function getExistingSettings(): array
             ],
             'webservice' => [
                 [
-                    'name' => 'allow_download_documents_by_api_key',
-                    'title' => 'Allow download course documents by API Key',
-                    'comment' => 'Download documents verifying the REST API key for a user',
-                ],
+                    'name' => 'webservice_return_user_field',
+                    'title' => 'Webservices return user field',
+                    'comment' => "Ask REST webservices (v2.php) to return another identifier for fields related to user ID. This is useful if the external system doesn't really deal with user IDs as they are in Chamilo, as it helps the external system match the user data return with some external data that is know to Chamilo. For example, if you use an external authentication system, you can return the extra field used to match the user with the external authentication system rather than user.id.",
+                ],
+                [
+                    'name' => 'webservice_enable_adminonly_api',
+                    'title' => 'Enable admin-only web services',
+                    'comment' => 'Some REST web services are marked for admins only and are disabled by default. Enable this feature to give access to these web services (to users with admin credentials, obviously).',
+                ],
+                [
+                    'name' => 'disable_webservices',
+                    'title' => 'Disable web services',
+                    'comment' => 'If you do not use web services, enable this to avoid any unnecessary security risk.',
+                ],
+                [
+                    'name' => 'allow_download_documents_by_api_key',
+                    'title' => 'Allow download course documents by API Key',
+                    'comment' => 'Download documents verifying the REST API key for a user',
+                ],
                 [
                     'name' => 'messaging_allow_send_push_notification',
                     'title' => 'Allow Push Notifications to the Chamilo Messaging mobile app',
@@ -1474,9 +1454,14 @@ public static function getExistingSettings(): array
             ],
             'ticket' => [
                 [
-                    'name' => 'show_terms_if_profile_completed',
-                    'title' => 'Terms and conditions only if profile complete',
-                    'comment' => "By enabling this option, terms and conditions will be available to the user only when the extra profile fields that start with 'terms_' and set to visible are completed.",
+                    'name' => 'show_link_bug_notification',
+                    'title' => 'Show link to report bug',
+                    'comment' => 'Show a link in the header to report a bug inside of our support platform (http://support.chamilo.org). When clicking on the link, the user is sent to the support platform, on a wiki page that describes the bug reporting process.',
+                ],
+                [
+                    'name' => 'show_link_ticket_notification',
+                    'title' => 'Show ticket creation link',
+                    'comment' => 'Show the ticket creation link to users on the right side of the portal',
                 ],
                 [
                     'name' => 'ticket_allow_category_edition',
@@ -1583,11 +1568,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Use course categories from top URL',
                     'comment' => 'In multi-URL settings, allow admins and teachers to assign categories from the top URL to courses in the children URLs.',
                 ],
-                [
-                    'name' => 'allow_edit_tool_visibility_in_session',
-                    'title' => 'Allow tool visibility edition in sessions',
-                    'comment' => 'When using sessions, the default behaviour is to use the tool visibility defined in the base course. This setting changes that to allow coaches in session courses to adapt tool visibilities to their needs.',
-                ],
                 [
                     'name' => 'allow_public_course_with_no_terms_conditions',
                     'title' => 'Access public courses with terms and conditions',
@@ -1668,26 +1648,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Course student info display',
                     'comment' => 'On the ‘My courses’/’My sessions’ pages, show additional information regarding the score, progress and/or certificate acquisition by the student.',
                 ],
-                [
-                    'name' => 'course_visibility_change_only_admin',
-                    'title' => 'Course visibility changes for admins only',
-                    'comment' => 'Remove the possibility for non-admins to change the course visibility. Visibility can be an issue when there are too many teachers to control directly. Forcing visibilities allows the organization to better manage courses catalogues.',
-                ],
-                [
-                    'name' => 'courses_list_session_title_link',
-                    'title' => 'Type of link for the session title',
-                    'comment' => 'On the courses/sessions page, the session title can be either of the following : 0 = no link (hide session title) ; 1 = link title to a special session page ; 2 = link to the course if there is only one course ; 3 = session title makes the courses list foldable ; 4 = no link (show session title).',
-                ],
-                [
-                    'name' => 'disabled_edit_session_coaches_course_editing_course',
-                    'title' => 'Disable the ability to edit course coaches',
-                    'comment' => 'When disabled, admins do not have a link to quickly assign coaches to session-courses on the course edition page.',
-                ],
-                [
-                    'name' => 'enable_bootstrap_in_documents_html',
-                    'title' => 'Add Bootstrap lib headers to HTML documents viewer',
-                    'comment' => "When this setting is set to 'Yes', the HTML documents viewer adds the HTML headers for the inclusion of Bootstrap and Font Awesome, which were used in Chamilo 1. This might help compatibility between old content and a newer version of the platform.",
-                ],
                 [
                     'name' => 'enable_unsubscribe_button_on_my_course_page',
                     'title' => 'Show unsubscribe button in ‘My courses’',
@@ -1718,16 +1678,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Show dependencies in course intro',
                     'comment' => 'When using resources sequencing with courses or sessions, show the dependencies of the course on the course’s homepage.',
                 ],
-                [
-                    'name' => 'show_all_sessions_on_my_course_page',
-                    'title' => "Show all sessions on 'My courses' page",
-                    'comment' => 'If enabled, this option show all sessions of the user in calendar-based view.',
-                ],
-                [
-                    'name' => 'show_simple_session_info',
-                    'title' => 'Show simple session info',
-                    'comment' => "Add coach and dates to the session's subtitle in the sessions' list.",
-                ],
                 [
                     'name' => 'view_grid_courses',
                     'title' => 'View courses in a grid layout',
@@ -1755,23 +1705,48 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Allow session admins to download private certificates',
                     'comment' => 'If enabled, session administrators can download certificates even if they are not publicly published.',
                 ],
-            ],
-            'admin' => [
                 [
-                    'name' => 'drh_allow_access_to_all_students',
-                    'title' => 'HRM can access all students from reporting pages',
-                    'comment' => '',
+                    'name' => 'allow_public_certificates',
+                    'title' => 'Allow public certificates',
+                    'comment' => 'User certificates can be view by unregistered users.',
+                ],
+                [
+                    'name' => 'certificate_pdf_orientation',
+                    'title' => 'PDF orientation for certificates',
+                    'comment' => 'Set ‘portrait’ or ‘landscape’ (technical terms) for PDF certificates.',
+                ],
+                [
+                    'name' => 'allow_general_certificate',
+                    'title' => 'Enable general certificate',
+                    'comment' => 'A general certificate is a certificate grouping all the accomplishments by the user in the courses (s)he followed.',
+                ],
+                [
+                    'name' => 'hide_certificate_export_link',
+                    'title' => 'Certificates: hide PDF export link for all',
+                    'comment' => 'Enable to completely remove the possibility to export certificates to PDF (for all users). If enabled, this includes hiding it from students.',
+                ],
+                [
+                    'name' => 'add_gradebook_certificates_cron_task_enabled',
+                    'title' => 'Certificates auto-generation on WS call',
+                    'comment' => 'When enabled, and when using the WSCertificatesList webservice, this option will make sure that all certificates have been generated by users if they reached the sufficient score in all items defined in gradebooks for all courses and sessions (this might consume considerable processing resources on your server).',
+                ],
+                [
+                    'name' => 'certificate_filter_by_official_code',
+                    'title' => 'Certificates filter by official code',
+                    'comment' => 'Add a filter on the students official code to the certificates list.',
                 ],
+                [
+                    'name' => 'hide_certificate_export_link_students',
+                    'title' => 'Certificates: hide export link from students',
+                    'comment' => "If enabled, students won't be able to export their certificates to PDF. This option is available because, depending on the precise HTML structure of the certificate template, the PDF export might be of low quality. In this case, it is best to only show the HTML certificate to students.",
+                ],
+            ],
+            'admin' => [
                 [
                     'name' => 'max_anonymous_users',
                     'title' => 'Multiple anonymous users',
                     'comment' => 'Enable this option to allow multiple system users for anonymous users. This is useful when using this platform as a public showroom for some courses. Having multiple anonymous users will let tracking work for the duration of the experience for several users without mixing their data (which could otherwise confuse them).',
                 ],
-                [
-                    'name' => 'plugin_redirection_enabled',
-                    'title' => 'Enable only if you are using the Redirection plugin',
-                    'comment' => '',
-                ],
                 [
                     'name' => 'chamilo_latest_news',
                     'title' => 'Latest news',
@@ -1802,21 +1777,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Define which roles are hidden to normal users',
                     'comment' => "The roles set to 'true' will only appear to administrators. Other users will not be able to see them.",
                 ],
-                [
-                    'name' => 'usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe',
-                    'title' => 'Disable user unsubscription from course/session on user unsubscription from group/class',
-                    'comment' => '',
-                ],
-                [
-                    'name' => 'usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe',
-                    'title' => 'Disable user unsubscription from course on course removal from group/class',
-                    'comment' => '',
-                ],
-                [
-                    'name' => 'usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe',
-                    'title' => 'Disable user unsubscription from session on session removal from group/class',
-                    'comment' => '',
-                ],
             ],
             'agenda' => [
                 [
@@ -1911,32 +1871,12 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Hide the option to send an announcement copy to HRM',
                     'comment' => "In the announcements form, an option normally appears to allow teachers to send a copy of the announcement to the user's HRM. Set this to 'Yes' to remote the option (and *not* send the copy).",
                 ],
-                [
-                    'name' => 'send_all_emails_to',
-                    'title' => 'Send all e-mails to',
-                    'comment' => 'Give a list of e-mail addresses to whom *all* e-mails sent from the platform will be sent. The e-mails are sent to these addresses as a visible destination.',
-                ],
             ],
             'document' => [
                 [
-                    'name' => 'allow_compilatio_tool',
-                    'title' => 'Enable Compilatio',
-                    'comment' => 'Compilatio is an anti-cheating service that compares text between two submissions and reports if there is a high probability the content (usually assignments) is not genuine.',
-                ],
-                [
-                    'name' => 'allow_general_certificate',
-                    'title' => 'Enable general certificate',
-                    'comment' => 'A general certificate is a certificate grouping all the accomplishments by the user in the courses (s)he followed.',
-                ],
-                [
-                    'name' => 'certificate_pdf_orientation',
-                    'title' => 'PDF orientation for certificates',
-                    'comment' => 'Set ‘portrait’ or ‘landscape’ (technical terms) for PDF certificates.',
-                ],
-                [
-                    'name' => 'compilatio_tool',
-                    'title' => 'Compilatio settings',
-                    'comment' => 'Configure the Compilatio connection details here.',
+                    'name' => 'video_features',
+                    'title' => 'Video features',
+                    'comment' => "Array of extra features you can enable for the video player in Chamilo. Options include 'speed', which allows you to change the playback speed of a video.",
                 ],
                 [
                     'name' => 'documents_custom_cloud_link_list',
@@ -1998,25 +1938,40 @@ public static function getNewConfigurationSettings(): array
             ],
             'display' => [
                 [
-                    'name' => 'bug_report_link',
-                    'title' => 'Bug report link',
-                    'comment' => 'Provide link to a bug reporting platform if not using the internal ticket manager.',
+                    'name' => 'table_row_list',
+                    'title' => 'Default offered pagination numbers in tables',
+                    'comment' => 'Set the options you want to appear in the navigation around a table to show less or more rows on one page. e.g. [50, 100, 200, 500].',
                 ],
                 [
-                    'name' => 'disable_copy_paste',
-                    'title' => 'Disable copy-pasting',
-                    'comment' => 'When enabled, this option disables as well as possible the copy-pasting mechanisms. Useful in restrictive exams setups.',
+                    'name' => 'table_default_row',
+                    'title' => 'Default number of table rows',
+                    'comment' => 'How many rows should be shown in all tables by default.',
+                ],
+                [
+                    'name' => 'hide_complete_name_in_whoisonline',
+                    'title' => "Hide the complete username in 'who is online'",
+                    'comment' => "The 'who is online' page (if enabled) will show a picture and a name for each user currently online. Enable this option to hide the names.",
+                ],
+                [
+                    'name' => 'hide_main_navigation_menu',
+                    'title' => 'Hide main navigation menu',
+                    'comment' => 'When using Chamilo for a specific purpose (like one massive online exam), you might want to reduce distraction even more by removing the side menu.',
+                ],
+                [
+                    'name' => 'order_user_list_by_official_code',
+                    'title' => 'Order users by official code',
+                    'comment' => "Use the 'official code' to sort most students list on the platform, instead of their lastname or firstname.",
+                ],
+                [
+                    'name' => 'gravatar_enabled',
+                    'title' => 'Gravatar user pictures',
+                    'comment' => "Enable this option to search into the Gravatar repository for pictures of the current user, if the user hasn't defined a picture locally. This is great to auto-fill pictures on your site, in particular if your users are active internet users. Gravatar pictures can be configured easily, based on the e-mail address of a user, at http://en.gravatar.com/",
                 ],
                 [
                     'name' => 'hide_social_media_links',
                     'title' => 'Hide social media links',
                     'comment' => 'Some pages allow you to promote the portal or a course on social networks. Enable this setting to remove the links.',
                 ],
-                [
-                    'name' => 'use_virtual_keyboard',
-                    'title' => 'Use virtual keyboard',
-                    'comment' => 'Make a virtual keyboard appear. This is useful when setting up restrictive exams in a physical room where students have no keyboard to limit their ability to cheat.',
-                ],
             ],
             'editor' => [
                 [
@@ -2078,81 +2033,21 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'platform' => [
+                [
+                    'name' => 'use_virtual_keyboard',
+                    'title' => 'Use virtual keyboard',
+                    'comment' => 'Make a virtual keyboard appear. This is useful when setting up restrictive exams in a physical room where students have no keyboard to limit their ability to cheat.',
+                ],
                 [
                     'name' => 'hosting_limit_identical_email',
                     'title' => 'Limit identical email usage',
                     'comment' => 'Maximum number of accounts allowed to share the same e-mail address. Set to 0 to disable this limit.',
                 ],
-                [
-                    'name' => 'allow_double_validation_in_registration',
-                    'title' => 'Double validation for registration process',
-                    'comment' => 'Simply display a confirmation request on the registration page before going forward with the user creation.',
-                ],
-                [
-                    'name' => 'allow_working_time_edition',
-                    'title' => 'Enable edition of course work time',
-                    'comment' => 'Enable this feature to let teachers manually update the time spent in the course by learners.',
-                ],
-                [
-                    'name' => 'block_my_progress_page',
-                    'title' => "Prevent access to 'My progress'",
-                    'comment' => "In specific implementations like online exams, you might want to prevent user access to the 'My progress' page.",
-                ],
-                [
-                    'name' => 'default_menu_entry_for_course_or_session',
-                    'title' => 'Default menu entry for courses',
-                    'comment' => "Define the default sub-elements of the 'Courses' entry to display if user is not registered to any course nor session.",
-                ],
-                [
-                    'name' => 'disable_user_conditions_sender_id',
-                    'title' => 'Internal ID of the user used to send disabled account notifications',
-                    'comment' => "Avoid being too personal with users by using a 'bot' account to send e-mails to users when their account is disabled for some reason.",
-                ],
-                [
-                    'name' => 'disable_webservices',
-                    'title' => 'Disable web services',
-                    'comment' => 'If you do not use web services, enable this to avoid any unnecessary security risk.',
-                ],
-                [
-                    'name' => 'extldap_config',
-                    'title' => 'LDAP connection configuration',
-                    'comment' => 'Array defining host and port for the LDAP server.',
-                ],
-                [
-                    'name' => 'force_renew_password_at_first_login',
-                    'title' => 'Force password renewal at first login',
-                    'comment' => 'This is one simple measure to increase the security of your portal by asking users to immediately change their password, so the one that was transfered by e-mail is no longer valid and they then will use one that they came up with and that they are the only person to know.',
-                ],
                 [
                     'name' => 'generate_random_login',
                     'title' => 'Generate random username',
                     'comment' => 'When importing users (batch processes), automatically generate a random string for username. Otherwise, the username will be generated on the basis of the firstname and lastname, or the prefix of the e-mail.',
                 ],
-                [
-                    'name' => 'hide_breadcrumb_if_not_allowed',
-                    'title' => "Hide breadcrumb if 'not allowed'",
-                    'comment' => 'If the user is not allowed to access a specific page, also hide the breadcrumb. This increases security by avoiding the display of unnecessary information.',
-                ],
-                [
-                    'name' => 'hide_complete_name_in_whoisonline',
-                    'title' => "Hide the complete username in 'who is online'",
-                    'comment' => "The 'who is online' page (if enabled) will show a picture and a name for each user currently online. Enable this option to hide the names.",
-                ],
-                [
-                    'name' => 'hide_main_navigation_menu',
-                    'title' => 'Hide main navigation menu',
-                    'comment' => 'When using Chamilo for a specific purpose (like one massive online exam), you might want to reduce distraction even more by removing the side menu.',
-                ],
-                [
-                    'name' => 'login_max_attempt_before_blocking_account',
-                    'title' => 'Max login attempts before lockdown',
-                    'comment' => 'Number of failed login attempts to tolerate before the user account is locked and has to be unlocked by an admin.',
-                ],
-                [
-                    'name' => 'multiple_url_hide_disabled_settings',
-                    'title' => 'Hide disabled settings in sub-URLs',
-                    'comment' => 'Set to yes to hide settings completely in a sub-URL if the setting is disabled in the main URL (where the access_url_changeable field = 0)',
-                ],
                 [
                     'name' => 'pdf_img_dpi',
                     'title' => 'PDF export resolution',
@@ -2168,66 +2063,21 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Enable portfolio advanced sharing',
                     'comment' => 'Decide who can view the posts and comments of the portfolio.',
                 ],
-                [
-                    'name' => 'proxy_settings',
-                    'title' => 'Proxy settings',
-                    'comment' => 'Some features of Chamilo will connect to the exterior from the server. For example to make sure an external content exists when creating a link or showing an embedded page in the learning path. If your Chamilo server uses a proxy to get out of its network, this would be the place to configure it.',
-                ],
-                [
-                    'name' => 'redirect_index_to_url_for_logged_users',
-                    'title' => 'Redirect index.php to given URL for authenticated users',
-                    'comment' => 'If you do not want to use the index page (announcements, popular courses, etc), you can define here the script (from the document root) where users will be redirected when trying to load the index.',
-                ],
-                [
-                    'name' => 'table_default_row',
-                    'title' => 'Default number of table rows',
-                    'comment' => 'How many rows should be shown in all tables by default.',
-                ],
-                [
-                    'name' => 'table_row_list',
-                    'title' => 'Default offered pagination numbers in tables',
-                    'comment' => 'Set the options you want to appear in the navigation around a table to show less or more rows on one page. e.g. [50, 100, 200, 500].',
-                ],
                 [
                     'name' => 'timepicker_increment',
                     'title' => 'Timepicker increment',
                     'comment' => 'Minimal time increment (in minutes) when selecting a date and time with the timepicker widget. For example, it might not be useful to have less than 5 or 15 minutes increments when talking about assignment submission, availability of a test, start time of a session, etc.',
                 ],
-                [
-                    'name' => 'tracking_skip_generic_data',
-                    'title' => 'Skip generic data in learner self-tracking page',
-                    'comment' => "If the 'My progress' page takes too long to load, you might want to remove the processing of generic statistics for the user. In this case enable this setting.",
-                ],
                 [
                     'name' => 'unoconv_binaries',
                     'title' => 'UNO converter binaries',
                     'comment' => 'Give the system path to the UNO converter library to enable some extra exporting features.',
                 ],
-                [
-                    'name' => 'update_student_expiration_x_date',
-                    'title' => 'Set expiration date on first login',
-                    'comment' => "Array defining the 'days' and 'months' to set the account expiration date when the user first logs in.",
-                ],
                 [
                     'name' => 'use_career_external_id_as_identifier_in_diagrams',
                     'title' => 'Use external career ID in diagrams',
                     'comment' => 'If using career diagrams, show an extra field instead of the internal career ID.',
                 ],
-                [
-                    'name' => 'user_edition_extra_field_to_check',
-                    'title' => 'Set an extra field as trigger for registration as ex-learner',
-                    'comment' => 'Give an extra field label here. If this extra field is updated for any user, a process is triggered to check the access to this user to courses with the same given extra field.',
-                ],
-                [
-                    'name' => 'user_hide_never_expire_option',
-                    'title' => "Hide 'never expires' option for users",
-                    'comment' => "Remove the option 'never expires' when creating/editing a user account.",
-                ],
-                [
-                    'name' => 'user_number_of_days_for_default_expiration_date_per_role',
-                    'title' => 'Default expiration days by role',
-                    'comment' => 'An array of role = > number which represents the number of days an account has before expiration, depending on the role.',
-                ],
                 [
                     'name' => 'user_status_show_option',
                     'title' => 'Roles display options',
@@ -2238,21 +2088,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Selective display of roles',
                     'comment' => 'Enable to use an array to define which roles should be clearly displayed and which should be hidden.',
                 ],
-                [
-                    'name' => 'video_features',
-                    'title' => 'Video features',
-                    'comment' => "Array of extra features you can enable for the video player in Chamilo. Options include 'speed', which allows you to change the playback speed of a video.",
-                ],
-                [
-                    'name' => 'webservice_enable_adminonly_api',
-                    'title' => 'Enable admin-only web services',
-                    'comment' => 'Some REST web services are marked for admins only and are disabled by default. Enable this feature to give access to these web services (to users with admin credentials, obviously).',
-                ],
-                [
-                    'name' => 'webservice_return_user_field',
-                    'title' => 'Webservices return user field',
-                    'comment' => "Ask REST webservices (v2.php) to return another identifier for fields related to user ID. This is useful if the external system doesn't really deal with user IDs as they are in Chamilo, as it helps the external system match the user data return with some external data that is know to Chamilo. For example, if you use an external authentication system, you can return the extra field used to match the user with the external authentication system rather than user.id.",
-                ],
                 [
                     'name' => 'access_to_personal_file_for_all',
                     'title' => 'Access to personal file for all',
@@ -2282,6 +2117,31 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'lp' => [
+                [
+                    'name' => 'lp_show_reduced_report',
+                    'title' => 'Learning paths: show reduced report',
+                    'comment' => 'Inside the learning paths tool, when a user reviews his own progress (through the stats icon), show a shorten (less detailed) version of the progress report.',
+                ],
+                [
+                    'name' => 'hide_scorm_pdf_link',
+                    'title' => 'Hide Learning Path PDF export',
+                    'comment' => 'Hide the Learning Path PDF Export icon from the Learning Paths list',
+                ],
+                [
+                    'name' => 'hide_scorm_copy_link',
+                    'title' => 'Hide SCORM Copy',
+                    'comment' => 'Hide the Learning Path Copy icon from the Learning Paths list',
+                ],
+                [
+                    'name' => 'hide_scorm_export_link',
+                    'title' => 'Hide SCORM Export',
+                    'comment' => 'Hide the SCORM Export icon from the Learning Paths list',
+                ],
+                [
+                    'name' => 'allow_lp_return_link',
+                    'title' => 'Show learning paths return link',
+                    'comment' => "Disable this option to hide the 'Return to homepage' button in the learning paths",
+                ],
                 [
                     'name' => 'lp_prerequisite_on_quiz_unblock_if_max_attempt_reached',
                     'title' => 'Unlock prerequisites after last test attempt',
@@ -2317,11 +2177,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Hide time from learning paths records',
                     'comment' => 'Hide learning paths time spent in reports in general.',
                 ],
-                [
-                    'name' => 'lp_category_accordion',
-                    'title' => "Foldable learning paths' categories",
-                    'comment' => 'Enable to allow users to fold the categories in the learning paths list.',
-                ],
                 [
                     'name' => 'lp_minimum_time',
                     'title' => 'Minimum time to complete learning path',
@@ -2452,11 +2307,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Learning path display settings',
                     'comment' => "Configure additional options for the learning paths display. Options include 'show_reporting_icon', 'hide_lp_arrow_navigation', 'show_toolbar_by_default', 'navigation_in_the_middle' and 'add_extra_quit_to_home_icon'.",
                 ],
-                [
-                    'name' => 'my_progress_course_tools_order',
-                    'title' => "Order of tools on 'My progress' page",
-                    'comment' => "Change the order of tools shown on the 'My progress' page for learners. Options include 'quizzes', 'learning_paths' and 'skills'.",
-                ],
                 [
                     'name' => 'scorm_api_extrafield_to_use_as_student_id',
                     'title' => 'Use extra field as student_id in SCORM communication',
@@ -2947,6 +2797,16 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'profile' => [
+                [
+                    'name' => 'show_terms_if_profile_completed',
+                    'title' => 'Terms and conditions only if profile complete',
+                    'comment' => "By enabling this option, terms and conditions will be available to the user only when the extra profile fields that start with 'terms_' and set to visible are completed.",
+                ],
+                [
+                    'name' => 'allow_user_headings',
+                    'title' => 'Allow users profiling inside courses',
+                    'comment' => 'Can a teacher define learner profile fields to retrieve additional information?',
+                ],
                 [
                     'name' => 'visible_options',
                     'title' => 'List of visible fields in profile',
@@ -2957,46 +2817,11 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Pre-fill the mail with user and course info in footer contact',
                     'comment' => 'Add subject and body in the mailto: footer.',
                 ],
-                [
-                    'name' => 'allow_career_diagram',
-                    'title' => 'Enable career diagrams',
-                    'comment' => 'Career diagrams allow you to display diagrams of careers, skills and courses.',
-                ],
                 [
                     'name' => 'changeable_options',
                     'title' => 'Fields users are allowed to change in their profile',
                     'comment' => 'Select the fields users will be able to change on their profile page.',
                 ],
-                [
-                    'name' => 'data_protection_officer_email',
-                    'title' => 'Data protection officer e-mail address',
-                    'comment' => '',
-                ],
-                [
-                    'name' => 'data_protection_officer_name',
-                    'title' => 'Data protection officer name',
-                    'comment' => '',
-                ],
-                [
-                    'name' => 'data_protection_officer_role',
-                    'title' => 'Data protection officer role',
-                    'comment' => '',
-                ],
-                [
-                    'name' => 'disable_change_user_visibility_for_public_courses',
-                    'title' => 'Disable making tool users visible in public courses',
-                    'comment' => "Avoid anyone making the 'users' tool visible in a public course.",
-                ],
-                [
-                    'name' => 'disable_gdpr',
-                    'title' => 'Disable GDPR features',
-                    'comment' => 'If you already manage your personal data protection declaration to users elsewhere, you can safely disable this feature.',
-                ],
-                [
-                    'name' => 'hide_user_field_from_list',
-                    'title' => 'Hide fields from users list in course',
-                    'comment' => 'By default, we show all data from users in the users tool in the course. This array allows you to specify which fields you do not want to display. Only affects main fields (not extra fields).',
-                ],
                 [
                     'name' => 'hide_username_in_course_chat',
                     'title' => 'Hide username in course chat',
@@ -3017,21 +2842,11 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Custom page for password reminder',
                     'comment' => 'Set your own URL to a password reset page. Useful when using a federated account management system.',
                 ],
-                [
-                    'name' => 'profiling_filter_adding_users',
-                    'title' => 'Filter users on profile fields on subscription to course',
-                    'comment' => 'Allow teachers to filter the users based on extra fields on the page to subscribe users to their course.',
-                ],
                 [
                     'name' => 'registration_add_helptext_for_2_names',
                     'title' => 'Add helper to add two names in registration',
                     'comment' => 'Add help text for users to enter two names in the registration form when double lastnames are common.',
                 ],
-                [
-                    'name' => 'allow_career_users',
-                    'title' => 'Enable career diagrams for users',
-                    'comment' => 'If career diagrams are enabled, users can only see them (and only the diagrams that correspond to their studies) if you enable this option.',
-                ],
                 [
                     'name' => 'allow_social_map_fields',
                     'title' => 'Users geolocation on a map',
@@ -3042,21 +2857,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Allow teachers to manage classes',
                     'comment' => '',
                 ],
-                [
-                    'name' => 'career_diagram_disclaimer',
-                    'title' => 'Display a disclaimer below the career diagram',
-                    'comment' => "Add a disclaimer below the career diagram. A language variable called 'Career diagram disclaimer' must exist in your sub-language.",
-                ],
-                [
-                    'name' => 'career_diagram_legend',
-                    'title' => 'Display a legend below the career diagram',
-                    'comment' => "Add a career legend below the career diagram. A language variable called 'Career diagram legend' must exist in your sub-language.",
-                ],
-                [
-                    'name' => 'community_managers_user_list',
-                    'title' => 'Community managers list',
-                    'comment' => 'Provide an array of user IDs that will be considered community managers in the special course designated as global forum. Community managers have additional privileges on the global forum.',
-                ],
                 [
                     'name' => 'linkedin_organization_id',
                     'title' => 'LinkedIn Orgnization ID',
@@ -3185,6 +2985,11 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'security' => [
+                [
+                    'name' => 'proxy_settings',
+                    'title' => 'Proxy settings',
+                    'comment' => 'Some features of Chamilo will connect to the exterior from the server. For example to make sure an external content exists when creating a link or showing an embedded page in the learning path. If your Chamilo server uses a proxy to get out of its network, this would be the place to configure it.',
+                ],
                 [
                     'name' => 'password_rotation_days',
                     'title' => 'Password rotation interval (days)',
@@ -3272,6 +3077,21 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'session' => [
+                [
+                    'name' => 'allow_career_diagram',
+                    'title' => 'Enable career diagrams',
+                    'comment' => 'Career diagrams allow you to display diagrams of careers, skills and courses.',
+                ],
+                [
+                    'name' => 'show_all_sessions_on_my_course_page',
+                    'title' => "Show all sessions on 'My courses' page",
+                    'comment' => 'If enabled, this option show all sessions of the user in calendar-based view.',
+                ],
+                [
+                    'name' => 'show_simple_session_info',
+                    'title' => 'Show simple session info',
+                    'comment' => "Add coach and dates to the session's subtitle in the sessions' list.",
+                ],
                 [
                     'name' => 'duplicate_specific_session_content_on_session_copy',
                     'title' => 'Enable the copy of session-specific content to another session',
@@ -3474,6 +3294,11 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'registration' => [
+                [
+                    'name' => 'allow_double_validation_in_registration',
+                    'title' => 'Double validation for registration process',
+                    'comment' => 'Simply display a confirmation request on the registration page before going forward with the user creation.',
+                ],
                 [
                     'name' => 'allow_fields_inscription',
                     'title' => 'Restrict fields shown during registration',
@@ -3501,6 +3326,16 @@ public static function getNewConfigurationSettings(): array
                 ],
             ],
             'work' => [
+                [
+                    'name' => 'compilatio_tool',
+                    'title' => 'Compilatio settings',
+                    'comment' => 'Configure the Compilatio connection details here.',
+                ],
+                [
+                    'name' => 'allow_compilatio_tool',
+                    'title' => 'Enable Compilatio',
+                    'comment' => 'Compilatio is an anti-cheating service that compares text between two submissions and reports if there is a high probability the content (usually assignments) is not genuine.',
+                ],
                 [
                     'name' => 'allow_my_student_publication_page',
                     'title' => 'Enable My assignments page',
@@ -3705,6 +3540,155 @@ public static function getNewConfigurationSettings(): array
                     'comment' => 'Show a tag on any content or feedback that has been generated or co-generated by any AI system, evidencing to the user that the content was built with the help of some AI system. Details about which AI system was used in which case are kept inside the database for audit, but are not directly accessible by the final user.',
                 ],
             ],
+            'privacy' => [
+                [
+                    'name' => 'data_protection_officer_email',
+                    'title' => 'Data protection officer e-mail address',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'data_protection_officer_name',
+                    'title' => 'Data protection officer name',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'data_protection_officer_role',
+                    'title' => 'Data protection officer role',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'hide_user_field_from_list',
+                    'title' => 'Hide fields from users list in course',
+                    'comment' => 'By default, we show all data from users in the users tool in the course. This array allows you to specify which fields you do not want to display. Only affects main fields (not extra fields).',
+                ],
+                [
+                    'name' => 'disable_gdpr',
+                    'title' => 'Disable GDPR features',
+                    'comment' => 'If you already manage your personal data protection declaration to users elsewhere, you can safely disable this feature.',
+                ],
+                [
+                    'name' => 'disable_change_user_visibility_for_public_courses',
+                    'title' => 'Disable making tool users visible in public courses',
+                    'comment' => "Avoid anyone making the 'users' tool visible in a public course.",
+                ],
+            ],
+            'workflows' => [
+                [
+                    'name' => 'plugin_redirection_enabled',
+                    'title' => 'Enable redirection plugin',
+                    'comment' => 'Enable only if you are using the Redirection plugin',
+                ],
+                [
+                    'name' => 'usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe',
+                    'title' => 'Disable user unsubscription from course/session on user unsubscription from group/class',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe',
+                    'title' => 'Disable user unsubscription from course on course removal from group/class',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe',
+                    'title' => 'Disable user unsubscription from session on session removal from group/class',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'drh_allow_access_to_all_students',
+                    'title' => 'HRM can access all students from reporting pages',
+                    'comment' => '',
+                ],
+                [
+                    'name' => 'send_all_emails_to',
+                    'title' => 'Send all e-mails to',
+                    'comment' => 'Give a list of e-mail addresses to whom *all* e-mails sent from the platform will be sent. The e-mails are sent to these addresses as a visible destination.',
+                ],
+                [
+                    'name' => 'go_to_course_after_login',
+                    'title' => 'Go directly to the course after login',
+                    'comment' => 'When a user is registered in one course, go directly to the course after login',
+                ],
+                [
+                    'name' => 'allow_users_to_create_courses',
+                    'title' => 'Allow non admin to create courses',
+                    'comment' => 'Allow non administrators (teachers) to create new courses on the server',
+                ],
+                [
+                    'name' => 'allow_user_course_subscription_by_course_admin',
+                    'title' => 'Allow User Course Subscription By Course Admininistrator',
+                    'comment' => 'Activate this option will allow course administrator to subscribe users inside a course',
+                ],
+                [
+                    'name' => 'teacher_can_select_course_template',
+                    'title' => 'Teacher can select a course as template',
+                    'comment' => 'Allow pick a course as template for the new course that teacher is creating',
+                ],
+                [
+                    'name' => 'disabled_edit_session_coaches_course_editing_course',
+                    'title' => 'Disable the ability to edit course coaches',
+                    'comment' => 'When disabled, admins do not have a link to quickly assign coaches to session-courses on the course edition page.',
+                ],
+                [
+                    'name' => 'course_visibility_change_only_admin',
+                    'title' => 'Course visibility changes for admins only',
+                    'comment' => 'Remove the possibility for non-admins to change the course visibility. Visibility can be an issue when there are too many teachers to control directly. Forcing visibilities allows the organization to better manage courses catalogues.',
+                ],
+                [
+                    'name' => 'multiple_url_hide_disabled_settings',
+                    'title' => 'Hide disabled settings in sub-URLs',
+                    'comment' => 'Set to yes to hide settings completely in a sub-URL if the setting is disabled in the main URL (where the access_url_changeable field = 0)',
+                ],
+                [
+                    'name' => 'gamification_mode',
+                    'title' => 'Gamification mode',
+                    'comment' => 'Activate the stars achievement in learning paths',
+                ],
+                [
+                    'name' => 'load_term_conditions_section',
+                    'title' => 'Load term conditions section',
+                    'comment' => 'The legal agreement will appear during the login or when enter to a course.',
+                ],
+                [
+                    'name' => 'update_student_expiration_x_date',
+                    'title' => 'Set expiration date on first login',
+                    'comment' => "Array defining the 'days' and 'months' to set the account expiration date when the user first logs in.",
+                ],
+                [
+                    'name' => 'user_number_of_days_for_default_expiration_date_per_role',
+                    'title' => 'Default expiration days by role',
+                    'comment' => 'An array of role => number which represents the number of days an account has before expiration, depending on the role.',
+                ],
+                [
+                    'name' => 'user_edition_extra_field_to_check',
+                    'title' => 'Set an extra field as trigger for registration as ex-learner',
+                    'comment' => 'Give an extra field label here. If this extra field is updated for any user, a process is triggered to check the access to this user to courses with the same given extra field.',
+                ],
+                [
+                    'name' => 'allow_working_time_edition',
+                    'title' => 'Enable edition of course work time',
+                    'comment' => 'Enable this feature to let teachers manually update the time spent in the course by learners.',
+                ],
+                [
+                    'name' => 'disable_user_conditions_sender_id',
+                    'title' => 'Internal ID of the user used to send disabled account notifications',
+                    'comment' => "Avoid being too personal with users by using a 'bot' account to send e-mails to users when their account is disabled for some reason.",
+                ],
+                [
+                    'name' => 'redirect_index_to_url_for_logged_users',
+                    'title' => 'Redirect index.php to given URL for authenticated users',
+                    'comment' => 'If you do not want to use the index page (announcements, popular courses, etc), you can define here the script (from the document root) where users will be redirected when trying to load the index.',
+                ],
+                [
+                    'name' => 'default_menu_entry_for_course_or_session',
+                    'title' => 'Default menu entry for courses',
+                    'comment' => "Define the default sub-elements of the 'Courses' entry to display if user is not registered to any course nor session.",
+                ],
+                [
+                    'name' => 'session_admin_user_subscription_search_extra_field_to_search',
+                    'title' => 'Extra user field used to search and name sessions',
+                    'comment' => 'This setting defines the extra user field key (e.g., "company") that will be used to search for users and to define the name of the session when registering students from /admin-dashboard/register.',
+                ],
+            ],
         ];
     }
 }
diff --git a/src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php b/src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php
index 03b86e18617..92026d1a7f2 100644
--- a/src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php
+++ b/src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php
@@ -28,6 +28,37 @@ public static function getGroups(): array
     public static function getTemplatesGrouped(): array
     {
         return [
+            'forum' => [
+                [
+                    'variable' => 'community_managers_user_list',
+                    'json_example' => [
+                        'users' => [1],
+                    ],
+                ],
+            ],
+            'tracking' => [
+                [
+                    'variable' => 'my_progress_course_tools_order',
+                    'json_example' => [
+                        'order' => ['quizzes', 'learning_paths', 'skills'],
+                    ],
+                ],
+            ],
+            'display' => [
+                [
+                    'variable' => 'show_tabs_per_role',
+                    'json_example' => [
+                        'SESSIONADMIN' => ['session_admin', 'my_courses'],
+                        'ADMIN' => ['platform_administration'],
+                    ],
+                ],
+                [
+                    'variable' => 'table_row_list',
+                    'json_example' => [
+                        'options' => [50, 100, 200, 500],
+                    ],
+                ],
+            ],
             'catalog' => [
                 [
                     'variable' => 'only_show_course_from_selected_category',
@@ -83,47 +114,6 @@ public static function getTemplatesGrouped(): array
                         'vapid_private_key' => 'UgS5-xSneOcSyNJVq4c9wmEGaCoE1Y8oh-7ZGXPgs8o',
                     ],
                 ],
-                [
-                    'variable' => 'proxy_settings',
-                    'json_example' => [
-                        'stream_context_create' => [
-                            'http' => [
-                                'proxy' => 'tcp://example.com:8080',
-                                'request_fulluri' => true,
-                            ],
-                        ],
-                        'curl_setopt_array' => [
-                            'CURLOPT_PROXY' => 'http://example.com',
-                            'CURLOPT_PROXYPORT' => '8080',
-                        ],
-                    ],
-                ],
-                [
-                    'variable' => 'video_features',
-                    'json_example' => [
-                        'features' => ['speed'],
-                    ],
-                ],
-                [
-                    'variable' => 'table_row_list',
-                    'json_example' => [
-                        'options' => [50, 100, 200, 500],
-                    ],
-                ],
-                [
-                    'variable' => 'extldap_config',
-                    'json_example' => [
-                        'host' => '',
-                        'port' => '',
-                    ],
-                ],
-                [
-                    'variable' => 'update_student_expiration_x_date',
-                    'json_example' => [
-                        'days' => 0,
-                        'months' => 0,
-                    ],
-                ],
                 [
                     'variable' => 'user_status_show_option',
                     'json_example' => [
@@ -135,24 +125,6 @@ public static function getTemplatesGrouped(): array
                         'INVITEE' => false,
                     ],
                 ],
-                [
-                    'variable' => 'user_number_of_days_for_default_expiration_date_per_role',
-                    'json_example' => [
-                        'COURSEMANAGER' => 365,
-                        'STUDENT' => 31,
-                        'DRH' => 31,
-                        'SESSIONADMIN' => 60,
-                        'STUDENT_BOSS' => 60,
-                        'INVITEE' => 31,
-                    ],
-                ],
-                [
-                    'variable' => 'show_tabs_per_role',
-                    'json_example' => [
-                        'SESSIONADMIN' => ['session_admin', 'my_courses'],
-                        'ADMIN' => ['platform_administration'],
-                    ],
-                ],
             ],
             'agenda' => [
                 [
@@ -233,7 +205,25 @@ public static function getTemplatesGrouped(): array
                     ],
                 ],
             ],
-            'announcement' => [
+            'work' => [
+                [
+                    'variable' => 'compilatio_tool',
+                    'json_example' => [
+                        'settings' => [
+                            'key' => '',
+                            'soap_url' => '',
+                            'proxy_host' => '',
+                            'proxy_port' => '',
+                            'max_filesize' => '',
+                            'transport_mode' => '',
+                            'wget_uri' => '',
+                            'wget_login' => '',
+                            'wget_password' => '',
+                        ],
+                    ],
+                ],
+            ],
+            'workflows' => [
                 [
                     'variable' => 'send_all_emails_to',
                     'json_example' => [
@@ -243,6 +233,24 @@ public static function getTemplatesGrouped(): array
                         ],
                     ],
                 ],
+                [
+                    'variable' => 'update_student_expiration_x_date',
+                    'json_example' => [
+                        'days' => 0,
+                        'months' => 0,
+                    ],
+                ],
+                [
+                    'variable' => 'user_number_of_days_for_default_expiration_date_per_role',
+                    'json_example' => [
+                        'COURSEMANAGER' => 365,
+                        'STUDENT' => 31,
+                        'DRH' => 31,
+                        'SESSIONADMIN' => 60,
+                        'STUDENT_BOSS' => 60,
+                        'INVITEE' => 31,
+                    ],
+                ],
             ],
             'course' => [
                 [
@@ -285,19 +293,9 @@ public static function getTemplatesGrouped(): array
             ],
             'document' => [
                 [
-                    'variable' => 'compilatio_tool',
+                    'variable' => 'video_features',
                     'json_example' => [
-                        'settings' => [
-                            'key' => '',
-                            'soap_url' => '',
-                            'proxy_host' => '',
-                            'proxy_port' => '',
-                            'max_filesize' => '',
-                            'transport_mode' => '',
-                            'wget_uri' => '',
-                            'wget_login' => '',
-                            'wget_password' => '',
-                        ],
+                        'features' => ['speed'],
                     ],
                 ],
                 [
@@ -468,12 +466,6 @@ public static function getTemplatesGrouped(): array
                         ],
                     ],
                 ],
-                [
-                    'variable' => 'my_progress_course_tools_order',
-                    'json_example' => [
-                        'order' => ['quizzes', 'learning_paths', 'skills'],
-                    ],
-                ],
             ],
             'mail' => [
                 [
@@ -585,12 +577,6 @@ public static function getTemplatesGrouped(): array
                         'extra_fields' => ['variable1', 'variable2'],
                     ],
                 ],
-                [
-                    'variable' => 'community_managers_user_list',
-                    'json_example' => [
-                        'users' => [1],
-                    ],
-                ],
                 [
                     'variable' => 'allow_social_map_fields',
                     'json_example' => [
@@ -599,6 +585,13 @@ public static function getTemplatesGrouped(): array
                 ],
             ],
             'registration' => [
+                [
+                    'variable' => 'extldap_config',
+                    'json_example' => [
+                        'host' => '',
+                        'port' => '',
+                    ],
+                ],
                 [
                     'variable' => 'required_extra_fields_in_inscription',
                     'json_example' => [
@@ -658,6 +651,21 @@ public static function getTemplatesGrouped(): array
                 ],
             ],
             'security' => [
+                [
+                    'variable' => 'proxy_settings',
+                    'json_example' => [
+                        'stream_context_create' => [
+                            'http' => [
+                                'proxy' => 'tcp://example.com:8080',
+                                'request_fulluri' => true,
+                            ],
+                        ],
+                        'curl_setopt_array' => [
+                            'CURLOPT_PROXY' => 'http://example.com',
+                            'CURLOPT_PROXYPORT' => '8080',
+                        ],
+                    ],
+                ],
                 [
                     'variable' => 'password_requirements',
                     'json_example' => [
diff --git a/src/CoreBundle/Helpers/ChamiloHelper.php b/src/CoreBundle/Helpers/ChamiloHelper.php
index 6ad69feb17d..af9d0e676f1 100644
--- a/src/CoreBundle/Helpers/ChamiloHelper.php
+++ b/src/CoreBundle/Helpers/ChamiloHelper.php
@@ -489,7 +489,7 @@ public static function addLegalTermsFields(FormValidator $form, bool $userAlread
         }
 
         // Check if T&C should be shown during registration
-        $loadMode = api_get_setting('platform.load_term_conditions_section');
+        $loadMode = api_get_setting('workflows.load_term_conditions_section');
 
         if ('course' === $loadMode) {
             // skip adding terms on registration page
diff --git a/src/CoreBundle/Helpers/CourseHelper.php b/src/CoreBundle/Helpers/CourseHelper.php
index 82736e88d82..c46c1ba6806 100644
--- a/src/CoreBundle/Helpers/CourseHelper.php
+++ b/src/CoreBundle/Helpers/CourseHelper.php
@@ -360,7 +360,7 @@ private function insertCourseSettings(Course $course): void
             'enable_document_auto_launch' => ['default' => 0, 'category' => 'document'],
             'pdf_export_watermark_text' => ['default' => '', 'category' => 'learning_path'],
             'allow_public_certificates' => [
-                'default' => 'true' === $this->settingsManager->getSetting('course.allow_public_certificates') ? 1 : '',
+                'default' => 'true' === $this->settingsManager->getSetting('certificate.allow_public_certificates') ? 1 : '',
                 'category' => 'certificates',
             ],
             'documents_default_visibility' => ['default' => 'visible', 'category' => 'document'],
@@ -840,7 +840,7 @@ private function installCoursePlugins(int $courseId): void
     public function useTemplateAsBasisIfRequired($courseCode, $courseTemplate): void
     {
         $templateSetting = $this->settingsManager->getSetting('course.course_creation_use_template');
-        $teacherCanSelectCourseTemplate = 'true' === $this->settingsManager->getSetting('course.teacher_can_select_course_template');
+        $teacherCanSelectCourseTemplate = 'true' === $this->settingsManager->getSetting('workflows.teacher_can_select_course_template');
         $courseTemplate = isset($courseTemplate) ? (int) $courseTemplate : 0;
 
         $useTemplate = false;
diff --git a/src/CoreBundle/Helpers/IsAllowedToEditHelper.php b/src/CoreBundle/Helpers/IsAllowedToEditHelper.php
index e3e75bac521..33cc9c1ef30 100644
--- a/src/CoreBundle/Helpers/IsAllowedToEditHelper.php
+++ b/src/CoreBundle/Helpers/IsAllowedToEditHelper.php
@@ -120,7 +120,7 @@ public function canCreateCourse(): bool
         }
 
         if ($user->isTeacher()) {
-            return 'true' === $this->settingsManager->getSetting('course.allow_users_to_create_courses');
+            return 'true' === $this->settingsManager->getSetting('workflows.allow_users_to_create_courses');
         }
 
         return $this->requestStack->getSession()->get('is_allowedCreateCourse');
diff --git a/src/CoreBundle/Helpers/MailHelper.php b/src/CoreBundle/Helpers/MailHelper.php
index 2fb24dfbdfe..942682bb773 100644
--- a/src/CoreBundle/Helpers/MailHelper.php
+++ b/src/CoreBundle/Helpers/MailHelper.php
@@ -111,7 +111,7 @@ public function send(
         try {
             $templatedEmail->subject($subject);
 
-            $list = api_get_setting('announcement.send_all_emails_to', true);
+            $list = api_get_setting('workflows.send_all_emails_to', true);
 
             if (!empty($list) && isset($list['emails'])) {
                 foreach ($list['emails'] as $email) {
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20250926174000.php b/src/CoreBundle/Migrations/Schema/V200/Version20250926174000.php
new file mode 100644
index 00000000000..6c39531724e
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20250926174000.php
@@ -0,0 +1,292 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\DataFixtures\SettingsCurrentFixtures;
+use Chamilo\CoreBundle\DataFixtures\SettingsValueTemplateFixtures;
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+use Doctrine\DBAL\Schema\Schema;
+
+use const JSON_UNESCAPED_SLASHES;
+use const JSON_UNESCAPED_UNICODE;
+
+final class Version20250926174000 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Upsert settings (title/comment/category/value) + settings_value_template.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Collect settings (existing + new) from fixtures
+        $rows = [];
+        $this->collectFromFixtures($rows, (array) SettingsCurrentFixtures::getExistingSettings());
+        $this->collectFromFixtures($rows, (array) SettingsCurrentFixtures::getNewConfigurationSettings());
+
+        // Index by variable (last occurrence wins)
+        $byVariable = [];
+        foreach ($rows as $r) {
+            $byVariable[$r['variable']] = $r;
+        }
+
+        // Defaults from SettingsManager schemas
+        $defaults = $this->buildDefaultsFromSchemas();
+
+        foreach ($byVariable as $variable => $row) {
+            if (!$this->isValidIdentifier($variable)) {
+                error_log(sprintf('[SKIP] Invalid variable name: "%s".', $variable));
+                continue;
+            }
+            $category = $row['category'];
+            if (!$this->isValidIdentifier($category)) {
+                error_log(sprintf('[SKIP] Invalid category for "%s": "%s".', $variable, $category));
+                continue;
+            }
+
+            $title   = (string) $row['title'];
+            $comment = (string) $row['comment'];
+
+            try {
+                $exists = (int) $this->connection->fetchOne(
+                    'SELECT COUNT(*) FROM settings WHERE variable = ?',
+                    [$variable]
+                );
+            } catch (\Throwable $e) {
+                error_log(sprintf('[ERROR] Existence check failed for "%s": %s', $variable, $e->getMessage()));
+                continue;
+            }
+
+            if ($exists > 0) {
+                $sql    = 'UPDATE settings SET category = ?, title = ?, comment = ? WHERE variable = ?';
+                $params = [$category, $title, $comment, $variable];
+                $this->addSql($sql, $params);
+            } else {
+                $defaultValue = $defaults[$variable] ?? '';
+                $sql    = 'INSERT INTO settings (variable, category, title, comment, selected_value, access_url_changeable) VALUES (?, ?, ?, ?, ?, 0)';
+                $params = [$variable, $category, $title, $comment, (string) $defaultValue];
+                $this->addSql($sql, $params);
+            }
+        }
+
+        $this->dryRunTemplatesUpsertAndLink();
+    }
+
+    public function down(Schema $schema): void
+    {
+        error_log('[MIGRATION] Down is a no-op (dry-run migration).');
+    }
+
+    /**
+     * Read fixtures and normalize to: [variable, category, title, comment]
+     */
+    private function collectFromFixtures(array &$out, array $byCategory): void
+    {
+        foreach ($byCategory as $categoryKey => $settings) {
+            $category = strtolower((string) $categoryKey);
+
+            foreach ((array) $settings as $setting) {
+                $variable = (string) ($setting['name'] ?? $setting['variable'] ?? '');
+                if ($variable === '') {
+                    error_log(sprintf('[WARN] Missing "name" in fixture entry for category "%s" - skipping.', $category));
+                    continue;
+                }
+
+                $title   = (string) ($setting['title'] ?? $variable);
+                $comment = (string) ($setting['comment'] ?? '');
+
+                $out[] = [
+                    'variable' => $variable,
+                    'category' => $category,
+                    'title'    => $title,
+                    'comment'  => $comment,
+                ];
+            }
+        }
+    }
+
+    /**
+     * Build default values map by scanning SettingsManager schemas.
+     * Returns: [ variable => defaultValueAsString, ... ]
+     */
+    private function buildDefaultsFromSchemas(): array
+    {
+        $map = [];
+
+        $manager = null;
+        try {
+            if ($this->container->has('chamilo.settings_manager')) {
+                $manager = $this->container->get('chamilo.settings_manager');
+            } elseif ($this->container->has('chamilo.core.settings_manager')) {
+                $manager = $this->container->get('chamilo.core.settings_manager');
+            } elseif ($this->container->has(SettingsManager::class)) {
+                $manager = $this->container->get(SettingsManager::class);
+            }
+        } catch (\Throwable $e) {
+            error_log('[WARN] Unable to retrieve SettingsManager from container: ' . $e->getMessage());
+        }
+
+        if (!$manager) {
+            error_log('[WARN] SettingsManager not found; defaults map will be empty.');
+            return $map;
+        }
+
+        try {
+            $schemas = $manager->getSchemas();
+        } catch (\Throwable $e) {
+            error_log('[WARN] getSchemas() failed on SettingsManager: ' . $e->getMessage());
+            return $map;
+        }
+
+        foreach (array_keys($schemas) as $serviceIdOrAlias) {
+            $namespace = str_replace('chamilo_core.settings.', '', (string) $serviceIdOrAlias);
+
+            try {
+                $settingsBag = $manager->load($namespace);
+            } catch (\Throwable $e) {
+                error_log(sprintf('[WARN] load("%s") failed: %s', $namespace, $e->getMessage()));
+                continue;
+            }
+
+            $parameters = [];
+
+            try {
+                if (method_exists($settingsBag, 'getParameters')) {
+                    $parameters = (array) $settingsBag->getParameters();
+                } elseif (method_exists($settingsBag, 'all')) {
+                    $parameters = (array) $settingsBag->all();
+                } elseif (method_exists($settingsBag, 'toArray')) {
+                    $parameters = (array) $settingsBag->toArray();
+                }
+            } catch (\Throwable $e) {
+                error_log(sprintf('[WARN] Could not extract parameters for "%s": %s', $namespace, $e->getMessage()));
+                $parameters = [];
+            }
+
+            if (empty($parameters)) {
+                try {
+                    $keys = [];
+                    if (method_exists($settingsBag, 'keys')) {
+                        $keys = (array) $settingsBag->keys();
+                    } elseif (method_exists($settingsBag, 'getIterator')) {
+                        $keys = array_keys(iterator_to_array($settingsBag->getIterator()));
+                    }
+                    foreach ($keys as $k) {
+                        try {
+                            $parameters[$k] = $settingsBag->get($k);
+                        } catch (\Throwable $e) {
+                            // ignore
+                        }
+                    }
+                } catch (\Throwable $e) {
+                    error_log(sprintf('[WARN] Parameter keys iteration failed for "%s": %s', $namespace, $e->getMessage()));
+                }
+            }
+
+            foreach ($parameters as $var => $val) {
+                $var = (string) $var;
+                if ($var === '') {
+                    continue;
+                }
+                if (!array_key_exists($var, $map)) {
+                    $map[$var] = is_scalar($val) ? (string) $val : (string) json_encode($val);
+                }
+            }
+        }
+
+        return $map;
+    }
+
+    /**
+     * Upsert settings_value_template and preview linking to settings.value_template_id.
+     * For safety, we:
+     *  - validate variable
+     *  - JSON-encode examples with proper flags
+     *  - do existence checks with SELECTs
+     */
+    private function dryRunTemplatesUpsertAndLink(): void
+    {
+        $grouped = [];
+        try {
+            $grouped = (array) SettingsValueTemplateFixtures::getTemplatesGrouped();
+        } catch (\Throwable $e) {
+            error_log('[WARN] Unable to load SettingsValueTemplateFixtures::getTemplatesGrouped(): ' . $e->getMessage());
+            return;
+        }
+
+        foreach ($grouped as $category => $items) {
+            foreach ((array) $items as $setting) {
+                $variable    = (string) ($setting['variable'] ?? $setting['name'] ?? '');
+                $jsonExample = $setting['json_example'] ?? null;
+
+                if ($variable === '' || !$this->isValidIdentifier($variable)) {
+                    error_log(sprintf('[SKIP] Invalid or empty template variable in category "%s".', (string) $category));
+                    continue;
+                }
+
+                // Serialize JSON example safely (string for SQL param preview)
+                try {
+                    $jsonEncoded = json_encode($jsonExample, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+                } catch (\Throwable $e) {
+                    error_log(sprintf('[WARN] JSON encoding failed for variable "%s": %s', $variable, $e->getMessage()));
+                    $jsonEncoded = 'null';
+                }
+
+                // Check if template exists
+                try {
+                    $templateId = $this->connection->fetchOne(
+                        'SELECT id FROM settings_value_template WHERE variable = ?',
+                        [$variable]
+                    );
+                } catch (\Throwable $e) {
+                    error_log(sprintf('[ERROR] Failed to check template existence for "%s": %s', $variable, $e->getMessage()));
+                    continue;
+                }
+
+                if ($templateId) {
+                    // UPDATE PREVIEW on existing template
+                    $sql    = 'UPDATE settings_value_template SET json_example = ?, updated_at = NOW() WHERE id = ?';
+                    $params = [$jsonEncoded, $templateId];
+                    $this->addSql($sql, $params);
+                } else {
+                    // INSERT PREVIEW new template
+                    $sql    = 'INSERT INTO settings_value_template (variable, json_example, created_at, updated_at) VALUES (?, ?, NOW(), NOW())';
+                    $params = [$variable, $jsonEncoded];
+                    $this->addSql($sql, $params);
+
+                    // Try to discover what ID it would be (optional best-effort)
+                    try {
+                        // We DO NOT insert, so we cannot call lastInsertId().
+                        // Instead, try to SELECT id if it exists already after a previous run; otherwise log NULL.
+                        $templateId = $this->connection->fetchOne(
+                            'SELECT id FROM settings_value_template WHERE variable = ?',
+                            [$variable]
+                        );
+                    } catch (\Throwable $e) {
+                        $templateId = false;
+                    }
+                }
+
+                // Link PREVIEW: settings.value_template_id = $templateId
+                if ($templateId) {
+                    $sql    = 'UPDATE settings SET value_template_id = ? WHERE variable = ?';
+                    $params = [$templateId, $variable];
+                    $this->addSql($sql, $params);
+                } else {
+                    error_log(sprintf('[INFO] Skipping link preview for "%s" (no template id available in dry-run).', $variable));
+                }
+            }
+        }
+    }
+
+    /** Allow letters, numbers, underscore, dash and dot. */
+    private function isValidIdentifier(string $s): bool
+    {
+        return (bool) preg_match('/^[A-Za-z0-9_.-]+$/', $s);
+    }
+}
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20250927022200.php b/src/CoreBundle/Migrations/Schema/V200/Version20250927022200.php
new file mode 100644
index 00000000000..19f4041656c
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20250927022200.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20250927022200 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Remove deprecated settings';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Settings to remove everywhere
+        $vars = [
+            'bug_report_link',
+            'enable_webcam_clip',
+            'hide_dltt_markup',
+            'lp_category_accordion',
+            'enable_bootstrap_in_documents_html',
+        ];
+
+        // Remove potential templates (no-op if none exist)
+        $this->addSql(
+            "DELETE FROM settings_value_template WHERE variable IN (?)",
+            [$vars],
+            [Connection::PARAM_STR_ARRAY]
+        );
+
+        // Remove catalog definitions
+        $this->addSql(
+            "DELETE FROM settings WHERE variable IN (?)",
+            [$vars],
+            [Connection::PARAM_STR_ARRAY]
+        );
+    }
+}
diff --git a/src/CoreBundle/Resources/config/settings.yml b/src/CoreBundle/Resources/config/settings.yml
index ebc5f8a92fd..5e1f19ea021 100644
--- a/src/CoreBundle/Resources/config/settings.yml
+++ b/src/CoreBundle/Resources/config/settings.yml
@@ -198,3 +198,13 @@ services:
       class: Chamilo\CoreBundle\Settings\CatalogSettingsSchema
       tags:
         - { name: sylius.settings_schema, alias: chamilo_core.settings.catalog, namespace: catalog }
+
+    chamilo_core.settings.workflows:
+      class: Chamilo\CoreBundle\Settings\WorkflowsSettingsSchema
+      tags:
+        - { name: sylius.settings_schema, alias: chamilo_core.settings.workflows, namespace: workflows }
+
+    chamilo_core.settings.privacy:
+      class: Chamilo\CoreBundle\Settings\PrivacySettingsSchema
+      tags:
+        - { name: sylius.settings_schema, alias: chamilo_core.settings.privacy, namespace: privacy }
diff --git a/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig b/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig
index 641cdd8bb72..8729a7723f0 100644
--- a/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig
+++ b/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig
@@ -57,9 +57,11 @@
                                         method="post"
                                         novalidate
                                 >
+                                    {% set verticalChoiceFields = ['active_tools_on_create', 'course_hide_tools'] %}
+
                                     {% for field in form %}
                                         {% set fieldName = field.vars.name %}
-                                        {% set isHidden = 'hidden' in field.vars.block_prefixes %}
+                                        {% set isHidden  = 'hidden' in field.vars.block_prefixes %}
 
                                         {% if isHidden %}
                                             {{ form_widget(field) }}
@@ -82,17 +84,30 @@
                                                 </div>
 
                                                 <div class="mb-2">
-                                                    {{ form_widget(field, {
-                                                        'attr': {
-                                                            'class': 'w-full rounded border border-gray-25 focus:border-primary focus:ring focus:ring-primary/30 transition'
-                                                        }
-                                                    }) }}
+                                                    {% if fieldName in verticalChoiceFields
+                                                        and field.vars.expanded
+                                                        and field.vars.multiple %}
+
+                                                        <div class="flex flex-col gap-2">
+                                                            {% for child in field %}
+                                                                <label class="inline-flex items-center gap-2">
+                                                                    {{ form_widget(child) }}
+                                                                    <span>{{ child.vars.label }}</span>
+                                                                </label>
+                                                            {% endfor %}
+                                                        </div>
+
+                                                    {% else %}
+                                                        {{ form_widget(field, {
+                                                            attr: {
+                                                                class: 'w-full rounded border border-gray-25 focus:border-primary focus:ring focus:ring-primary/30 transition'
+                                                            }
+                                                        }) }}
+                                                    {% endif %}
                                                 </div>
 
                                                 {% if field.vars.help is not empty %}
-                                                    <p class="text-gray-50 text-body-2 italic pl-3">
-                                                        {{ field.vars.help|raw }}
-                                                    </p>
+                                                    <p class="text-gray-50 text-body-2 italic pl-3">{{ field.vars.help|raw }}</p>
                                                 {% endif %}
 
                                                 {{ form_errors(field) }}
diff --git a/src/CoreBundle/Resources/views/Admin/Settings/menu.html.twig b/src/CoreBundle/Resources/views/Admin/Settings/menu.html.twig
index 26c06f0f106..773731d0fd9 100644
--- a/src/CoreBundle/Resources/views/Admin/Settings/menu.html.twig
+++ b/src/CoreBundle/Resources/views/Admin/Settings/menu.html.twig
@@ -1,55 +1,67 @@
 <div class="list-group">
-{% set current_namespace = app.request.get('namespace') %}
-{% set array = {
-    'admin': 'star',
-    'announcement': 'bullhorn',
-    'agenda': 'calendar-text',
-    'attendance': 'av-timer',
-    'cas': 'cloud-key',
-    'certificate': 'certificate',
-    'chat': 'chat-processing',
-    'course': 'book-open-page-variant',
-    'crons': 'clock-start',
-    'display': 'monitor-screenshot',
-    'document': 'bookshelf',
-    'dropbox': 'dropbox',
-    'editor': 'form-textarea',
-    'exercise': 'order-bool-ascending-variant',
-    'forum': 'comment-quote',
-    'glossary': 'alphabetical',
-    'gradebook': 'numeric-7-box-multiple',
-    'group': 'account-group',
-    'language': 'translate',
-    'lp': 'map-marker-path',
-    'mail': 'mailbox',
-    'message': 'message-reply-text',
-    'platform': 'cog',
-    'profile': 'account-settings',
-    'ppt_to_lp': 'map-marker-plus',
-    'registration': 'account-plus',
-    'search': 'book-search',
-    'security': 'security',
-    'session': 'google-classroom',
-    'skill': 'shield-star',
-    'social': 'linkedin',
-    'survey': 'form-dropdown',
-    'work': 'inbox-full',
-    'ticket': 'ticket-confirmation',
-    'tracking': 'chart-box',
-    'webservice': 'cloud-sync',
-    'stylesheets': 'language-css3',
-    'ai_helpers': 'robot',
-}
-%}
-{% for namespace in schemas|keys %}
-    {% set namespace = namespace | replace({'chamilo_core.settings.' : ''}) %}
-    <a
-        class="list-group-item border-0 {% if (current_namespace ==  namespace)  %} bg-gray-25 rounded-lg {% endif %} "
-        href="{{ path('chamilo_platform_settings', { 'namespace': namespace }) }}"
-    >
-        <i class="mdi mdi-{{ array[namespace] | default('help-circle') }} ch-tool-icon-gradient" style="font-size: 32px; width: 32px; height: 32px; line-height: 32px;" aria-hidden="true" title="{{ namespace | capitalize | trans }}"></i>
+    {% set current_namespace = app.request.get('namespace') %}
+    {% set array = {
+        'admin': 'star',
+        'announcement': 'bullhorn',
+        'agenda': 'calendar-text',
+        'attendance': 'av-timer',
+        'cas': 'cloud-key',
+        'certificate': 'certificate',
+        'chat': 'chat-processing',
+        'course': 'book-open-page-variant',
+        'crons': 'clock-start',
+        'display': 'monitor-screenshot',
+        'document': 'bookshelf',
+        'dropbox': 'dropbox',
+        'editor': 'form-textarea',
+        'exercise': 'order-bool-ascending-variant',
+        'forum': 'comment-quote',
+        'glossary': 'alphabetical',
+        'gradebook': 'numeric-7-box-multiple',
+        'group': 'account-group',
+        'language': 'translate',
+        'lp': 'map-marker-path',
+        'mail': 'mailbox',
+        'message': 'message-reply-text',
+        'platform': 'cog',
+        'privacy': 'incognito',
+        'profile': 'account-settings',
+        'ppt_to_lp': 'map-marker-plus',
+        'registration': 'account-plus',
+        'search': 'book-search',
+        'security': 'security',
+        'session': 'google-classroom',
+        'skill': 'shield-star',
+        'social': 'linkedin',
+        'survey': 'form-dropdown',
+        'ticket': 'ticket-confirmation',
+        'tracking': 'chart-box',
+        'webservice': 'cloud-sync',
+        'work': 'inbox-full',
+        'workflows': 'chart-timeline-variant',
+        'stylesheets': 'language-css3',
+        'ai_helpers': 'robot',
+        'catalog': 'storefront-outline',
+        'catalogue': 'storefront-outline',
+        } %}
+
+    {% set namespaces = ordered_namespaces is defined
+        ? ordered_namespaces
+        : (schemas|keys|map(k => k|replace({'chamilo_core.settings.':''}))) %}
+
+    {% for namespace in namespaces %}
+        {% set label = namespace_labels[namespace] ?? (
+            namespace == 'cas' ? 'CAS' :
+            (namespace == 'lp' ? 'Learning path'|trans : (namespace|capitalize)|trans)
+            ) %}
+
+        <a class="list-group-item border-0 {% if current_namespace == namespace %} bg-gray-25 rounded-lg {% endif %}"
+           href="{{ path('chamilo_platform_settings', { 'namespace': namespace }) }}">
+            <i class="mdi mdi-{{ array[namespace] | default('help-circle') }} ch-tool-icon-gradient"
+               style="font-size:32px;width:32px;height:32px;line-height:32px"
+               aria-hidden="true" title="{{ label }}"></i>
+            {{ label }}
+        </a>
+    {% endfor %}
 
-        {{ namespace | capitalize | trans }}
-    </a>
-{% endfor %}
 </div>
diff --git a/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig b/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig
index d53c6b0dcb9..1d21f866f73 100644
--- a/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig
+++ b/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig
@@ -24,8 +24,13 @@
                         <div class="col-md-12">
 
                             <div class="{% if not loop.first %}mt-12 {% endif %}mb-4 pb-2 border-b border-gray-25">
-                                <h3 class="text-gray-90 text-h6 font-semibold tracking-wide uppercase">
-                                    {{ category|trans }}
+                                {% set label = namespace_labels[category]
+                                    ?? (category == 'cas' ? 'CAS'
+                                    : (category == 'lp' ? 'Learning path'|trans
+                                    : (category|capitalize)|trans)) %}
+
+                                <h3 class="text-gray-90 text-h6 font-semibold tracking-wide">
+                                    {{ category == 'cas' ? label : label|title }}
                                 </h3>
                             </div>
 
diff --git a/src/CoreBundle/Resources/views/LearnPath/list.html.twig b/src/CoreBundle/Resources/views/LearnPath/list.html.twig
index 651b723cb52..f3f69187fd3 100644
--- a/src/CoreBundle/Resources/views/LearnPath/list.html.twig
+++ b/src/CoreBundle/Resources/views/LearnPath/list.html.twig
@@ -55,7 +55,7 @@
             {% endif %}
 
             {% if show_category %}
-                {% if 'false' == chamilo_settings_get('lp.lp_category_accordion') %}
+                {% if 0 %}
                     <!--- old view -->
                     {% if categories|length > 1 and lp_data.category.iid %}
                         <div class="section-header section-header--h6">
diff --git a/src/CoreBundle/Settings/AdminSettingsSchema.php b/src/CoreBundle/Settings/AdminSettingsSchema.php
index c1f5c8d24a7..8c11fc002f1 100644
--- a/src/CoreBundle/Settings/AdminSettingsSchema.php
+++ b/src/CoreBundle/Settings/AdminSettingsSchema.php
@@ -28,13 +28,8 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'show_link_request_hrm_user' => 'false',
                     'max_anonymous_users' => '0',
                     'send_inscription_notification_to_general_admin_only' => 'false',
-                    'plugin_redirection_enabled' => 'false',
                     'chamilo_latest_news' => 'true',
                     'chamilo_support' => 'true',
-                    'usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe' => 'false',
-                    'usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe' => 'false',
-                    'usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe' => 'false',
-                    'drh_allow_access_to_all_students' => 'false',
                     'user_status_option_only_for_admin_enabled' => 'false',
                     'user_status_option_show_only_for_admin' => '',
                 ]
@@ -53,13 +48,8 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('show_link_request_hrm_user', YesNoType::class)
             ->add('max_anonymous_users', TextType::class)
             ->add('send_inscription_notification_to_general_admin_only', YesNoType::class)
-            ->add('plugin_redirection_enabled', YesNoType::class)
             ->add('chamilo_latest_news', YesNoType::class)
             ->add('chamilo_support', YesNoType::class)
-            ->add('usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe', YesNoType::class)
-            ->add('usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe', YesNoType::class)
-            ->add('usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe', YesNoType::class)
-            ->add('drh_allow_access_to_all_students', YesNoType::class)
             ->add('user_status_option_only_for_admin_enabled', YesNoType::class)
             ->add(
                 'user_status_option_show_only_for_admin',
diff --git a/src/CoreBundle/Settings/AnnouncementSettingsSchema.php b/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
index 4b4f96ee79e..60c31987eb7 100644
--- a/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
+++ b/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
@@ -23,7 +23,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'allow_scheduled_announcements' => 'false',
                 'disable_delete_all_announcements' => 'false',
                 'hide_announcement_sent_to_users_info' => 'false',
-                'send_all_emails_to' => '',
                 'allow_careers_in_global_announcements' => 'false',
                 'allow_coach_to_edit_announcements' => 'false',
                 'course_announcement_scheduled_by_date' => 'false',
@@ -45,9 +44,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('allow_scheduled_announcements', YesNoType::class)
             ->add('disable_delete_all_announcements', YesNoType::class)
             ->add('hide_announcement_sent_to_users_info', YesNoType::class)
-            ->add('send_all_emails_to', TextareaType::class, [
-                'attr' => ['rows' => 5, 'style' => 'font-family: monospace;'],
-            ])
             ->add('allow_careers_in_global_announcements', YesNoType::class)
             ->add('allow_coach_to_edit_announcements', YesNoType::class)
             ->add('course_announcement_scheduled_by_date', YesNoType::class)
diff --git a/src/CoreBundle/Settings/CertificateSettingsSchema.php b/src/CoreBundle/Settings/CertificateSettingsSchema.php
index 5b7ce14d65e..3348e95567f 100644
--- a/src/CoreBundle/Settings/CertificateSettingsSchema.php
+++ b/src/CoreBundle/Settings/CertificateSettingsSchema.php
@@ -8,25 +8,34 @@
 
 use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CertificateSettingsSchema extends AbstractSettingsSchema
 {
     public function buildSettings(AbstractSettingsBuilder $builder): void
     {
-        $builder
-            ->setDefaults(
-                [
-                    'hide_my_certificate_link' => 'false',
-                    'add_certificate_pdf_footer' => 'false',
-                    'session_admin_can_download_all_certificates' => 'false',
-                ]
-            )
-        ;
+        $builder->setDefaults([
+            'hide_my_certificate_link' => 'false',
+            'add_certificate_pdf_footer' => 'false',
+            'session_admin_can_download_all_certificates' => 'false',
+            'allow_public_certificates' => 'false',
+
+            'certificate_pdf_orientation' => 'landscape',
+            'allow_general_certificate' => 'false',
+            'hide_certificate_export_link' => 'false',
+            'add_gradebook_certificates_cron_task_enabled' => 'false',
+            'certificate_filter_by_official_code' => 'false',
+            'hide_certificate_export_link_students' => 'false',
+        ]);
 
         $allowedTypes = [
             'hide_my_certificate_link' => ['string'],
+            'add_certificate_pdf_footer' => ['string'],
+            'session_admin_can_download_all_certificates' => ['string'],
+            'certificate_filter_by_official_code' => ['string'],
         ];
+
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
     }
 
@@ -36,7 +45,19 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('hide_my_certificate_link', YesNoType::class)
             ->add('add_certificate_pdf_footer', YesNoType::class)
             ->add('session_admin_can_download_all_certificates', YesNoType::class)
-        ;
+
+            ->add('allow_public_certificates', YesNoType::class)
+            ->add('certificate_pdf_orientation', ChoiceType::class, [
+                'choices' => [
+                    'Portrait' => 'portrait',
+                    'Landscape' => 'landscape',
+                ],
+            ])
+            ->add('allow_general_certificate', YesNoType::class)
+            ->add('hide_certificate_export_link', YesNoType::class)
+            ->add('add_gradebook_certificates_cron_task_enabled', YesNoType::class)
+            ->add('certificate_filter_by_official_code', YesNoType::class)
+            ->add('hide_certificate_export_link_students', YesNoType::class);
 
         $this->updateFormFieldsFromSettingsInfo($builder);
     }
diff --git a/src/CoreBundle/Settings/CourseSettingsSchema.php b/src/CoreBundle/Settings/CourseSettingsSchema.php
index 3e7309c0e29..5fd25d4c49e 100644
--- a/src/CoreBundle/Settings/CourseSettingsSchema.php
+++ b/src/CoreBundle/Settings/CourseSettingsSchema.php
@@ -29,69 +29,80 @@ public function __construct(
         private readonly CourseRepository $courseRepository,
     ) {}
 
-    public function getProcessedToolChain(): array
+    public function setToolChain(ToolChain $tools): void
     {
-        $tools = [];
+        $this->toolChain = $tools;
+    }
+
+    private function getFilteredToolChoices(): array
+    {
+        $choices = [];
+        $excludedSlugs = [
+            'asset',
+            'course_homepage',
+            'course_tool',
+            'course_maintenance',
+            'member',
+            'course_setting',
+            'shortcuts',
+            'tool_intro',
+            'usergroup',
+        ];
 
         /** @var AbstractTool $tool */
         foreach ($this->toolChain->getTools() as $tool) {
-            $name = $tool->getTitle();
-            $tools[$name] = $name;
+            $title = $tool->getTitle();
+            $slug = null;
+            if (method_exists($tool, 'getTitle')) {
+                $slug = strtolower((string) $tool->getTitle());
+            } elseif (method_exists($tool, 'getId')) {
+                $slug = strtolower((string) $tool->getId());
+            }
+
+            if ($slug && \in_array($slug, $excludedSlugs, true)) {
+                continue;
+            }
+
+            $choices[$title] = $slug ?: $title;
         }
 
-        return $tools;
-    }
+        ksort($choices, SORT_NATURAL | SORT_FLAG_CASE);
 
-    public function setToolChain(ToolChain $tools): void
-    {
-        $this->toolChain = $tools;
+        return $choices;
     }
 
+
+
     public function buildSettings(AbstractSettingsBuilder $builder): void
     {
-        $tools = $this->getProcessedToolChain();
+        $toolChoices = $this->getFilteredToolChoices();
 
         $builder
             ->setDefaults(
                 [
-                    'active_tools_on_create' => $tools,
+                    'active_tools_on_create' => array_values($toolChoices),
                     'display_coursecode_in_courselist' => 'false',
                     'display_teacher_in_courselist' => 'true',
                     'student_view_enabled' => 'true',
-                    'go_to_course_after_login' => 'false',
                     'show_navigation_menu' => 'false',
                     'enable_tool_introduction' => 'false',
                     'breadcrumbs_course_homepage' => 'course_title',
                     'example_material_course_creation' => 'true',
                     'allow_course_theme' => 'true',
-                    'allow_users_to_create_courses' => 'true',
                     'send_email_to_admin_when_create_course' => 'false',
-                    'allow_user_course_subscription_by_course_admin' => 'true',
                     'course_validation' => 'false',
                     'course_validation_terms_and_conditions_url' => '',
                     'course_hide_tools' => [],
                     'scorm_cumulative_session_time' => 'true',
                     'courses_default_creation_visibility' => '2',
-                    // COURSE_VISIBILITY_OPEN_PLATFORM
-                    'allow_public_certificates' => 'false',
-                    'allow_lp_return_link' => 'true',
                     'course_creation_use_template' => null,
-                    'hide_scorm_export_link' => 'false',
-                    'hide_scorm_copy_link' => 'false',
-                    'hide_scorm_pdf_link' => 'true',
                     'course_images_in_courses_list' => 'true',
-                    'teacher_can_select_course_template' => 'true',
                     'show_toolshortcuts' => '',
-                    'lp_show_reduced_report' => 'false',
                     'course_creation_splash_screen' => 'true',
                     'block_registered_users_access_to_open_course_contents' => 'false',
-                    'enable_bootstrap_in_documents_html' => 'false',
                     'view_grid_courses' => 'true',
-                    'show_simple_session_info' => 'true',
                     'my_courses_show_courses_in_user_language_only' => 'false',
                     'allow_public_course_with_no_terms_conditions' => 'false',
-                    'show_all_sessions_on_my_course_page' => 'true',
-                    'disabled_edit_session_coaches_course_editing_course' => 'false',
                     'allow_base_course_category' => 'false',
                     'hide_course_sidebar' => 'true',
                     'multiple_access_url_show_shared_course_marker' => 'false',
@@ -99,7 +110,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'enable_unsubscribe_button_on_my_course_page' => 'false',
                     'course_creation_donate_message_show' => 'false',
                     'course_creation_donate_link' => '<some donate button html>',
-                    'courses_list_session_title_link' => '1',
                     'hide_course_rating' => 'false',
                     'course_log_hide_columns' => '',
                     'course_student_info' => '',
@@ -108,15 +118,13 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'course_creation_form_set_course_category_mandatory' => 'false',
                     'course_creation_form_hide_course_code' => 'false',
                     'course_about_teacher_name_hide' => 'false',
-                    'course_visibility_change_only_admin' => 'false',
                     'course_log_default_extra_fields' => '',
                     'course_creation_by_teacher_extra_fields_to_show' => '',
                     'course_creation_form_set_extra_fields_mandatory' => '',
                     'course_configuration_tool_extra_fields_to_show_and_edit' => '',
                     'course_creation_user_course_extra_field_relation_to_prefill' => '',
-                    'allow_edit_tool_visibility_in_session' => 'true',
                     'show_course_duration' => 'false',
-                    'access_url_specific_files' => 'false',
+                    'profiling_filter_adding_users' => 'false',
                 ]
             )
             ->setTransformer(
@@ -146,18 +154,17 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
 
     public function buildForm(FormBuilderInterface $builder): void
     {
-        $tools = $this->getProcessedToolChain();
+        $toolChoices = $this->getFilteredToolChoices();
 
         $builder
             ->add('active_tools_on_create', ChoiceType::class, [
-                'choices' => $tools,
+                'choices'  => $toolChoices,
                 'multiple' => true,
                 'expanded' => true,
             ])
             ->add('display_coursecode_in_courselist', YesNoType::class)
             ->add('display_teacher_in_courselist', YesNoType::class)
             ->add('student_view_enabled', YesNoType::class)
-            ->add('go_to_course_after_login', YesNoType::class)
             ->add('show_navigation_menu', ChoiceType::class, [
                 'choices' => [
                     'No' => 'false',
@@ -177,13 +184,11 @@ public function buildForm(FormBuilderInterface $builder): void
             ])
             ->add('example_material_course_creation', YesNoType::class)
             ->add('allow_course_theme', YesNoType::class)
-            ->add('allow_users_to_create_courses', YesNoType::class)
             ->add('send_email_to_admin_when_create_course', YesNoType::class)
-            ->add('allow_user_course_subscription_by_course_admin', YesNoType::class)
             ->add('course_validation', YesNoType::class)
             ->add('course_validation_terms_and_conditions_url', UrlType::class)
             ->add('course_hide_tools', ChoiceType::class, [
-                'choices' => $tools,
+                'choices'  => $toolChoices,
                 'multiple' => true,
                 'expanded' => true,
             ])
@@ -196,8 +201,6 @@ public function buildForm(FormBuilderInterface $builder): void
                     'Closed' => '0',
                 ],
             ])
-            ->add('allow_public_certificates', YesNoType::class)
-            ->add('allow_lp_return_link', YesNoType::class)
             ->add('course_creation_use_template', EntityType::class, [
                 'class' => Course::class,
                 'placeholder' => 'Choose ...',
@@ -206,22 +209,13 @@ public function buildForm(FormBuilderInterface $builder): void
                 'choice_value' => 'id',
                 'required' => false,
             ])
-            ->add('hide_scorm_export_link', YesNoType::class)
-            ->add('hide_scorm_copy_link', YesNoType::class)
-            ->add('hide_scorm_pdf_link', YesNoType::class)
             ->add('course_images_in_courses_list', YesNoType::class)
-            ->add('teacher_can_select_course_template', YesNoType::class)
             ->add('show_toolshortcuts', YesNoType::class)
-            ->add('lp_show_reduced_report', YesNoType::class)
             ->add('course_creation_splash_screen', YesNoType::class)
             ->add('block_registered_users_access_to_open_course_contents', YesNoType::class)
-            ->add('enable_bootstrap_in_documents_html', YesNoType::class)
             ->add('view_grid_courses', YesNoType::class)
-            ->add('show_simple_session_info', YesNoType::class)
             ->add('my_courses_show_courses_in_user_language_only', YesNoType::class)
             ->add('allow_public_course_with_no_terms_conditions', YesNoType::class)
-            ->add('show_all_sessions_on_my_course_page', YesNoType::class)
-            ->add('disabled_edit_session_coaches_course_editing_course', YesNoType::class)
             ->add('allow_base_course_category', YesNoType::class)
             ->add('hide_course_sidebar', YesNoType::class)
             ->add('multiple_access_url_show_shared_course_marker', YesNoType::class)
@@ -229,14 +223,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('enable_unsubscribe_button_on_my_course_page', YesNoType::class)
             ->add('course_creation_donate_message_show', YesNoType::class)
             ->add('course_creation_donate_link', TextType::class)
-            ->add('courses_list_session_title_link', ChoiceType::class, [
-                'choices' => [
-                    'No link' => '0',
-                    'Default' => '1',
-                    'Link' => '2',
-                    'Session link' => '3',
-                ],
-            ])
             ->add('hide_course_rating', YesNoType::class)
             ->add('course_log_hide_columns', TextareaType::class, [
                 'attr' => ['rows' => 5, 'style' => 'font-family: monospace;'],
@@ -249,7 +235,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('course_creation_form_set_course_category_mandatory', YesNoType::class)
             ->add('course_creation_form_hide_course_code', YesNoType::class)
             ->add('course_about_teacher_name_hide', YesNoType::class)
-            ->add('course_visibility_change_only_admin', YesNoType::class)
             ->add('course_log_default_extra_fields', TextareaType::class, [
                 'attr' => ['rows' => 5, 'style' => 'font-family: monospace;'],
             ])
@@ -265,9 +250,8 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('course_creation_user_course_extra_field_relation_to_prefill', TextareaType::class, [
                 'attr' => ['rows' => 5, 'style' => 'font-family: monospace;'],
             ])
-            ->add('allow_edit_tool_visibility_in_session', YesNoType::class)
             ->add('show_course_duration', YesNoType::class)
-            ->add('access_url_specific_files', YesNoType::class)
+            ->add('profiling_filter_adding_users', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/DisplaySettingsSchema.php b/src/CoreBundle/Settings/DisplaySettingsSchema.php
index fa7c1675fda..7c65f785061 100644
--- a/src/CoreBundle/Settings/DisplaySettingsSchema.php
+++ b/src/CoreBundle/Settings/DisplaySettingsSchema.php
@@ -7,12 +7,30 @@
 namespace Chamilo\CoreBundle\Settings;
 
 use Chamilo\CoreBundle\Form\Type\YesNoType;
+use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class DisplaySettingsSchema extends AbstractSettingsSchema
 {
+    private static array $tabs = [
+        'MenuCampusHomepage' => 'campus_homepage',
+        'MenuMyCourses' => 'my_courses',
+        'MenuReporting' => 'reporting',
+        'MenuPlatformAdministration' => 'platform_administration',
+        'MenuMyAgenda' => 'my_agenda',
+        'MenuSocial' => 'social',
+        'MenuVideoConference' => 'videoconference',
+        'MenuDiagnostics' => 'diagnostics',
+        'MenuCatalogue' => 'catalogue',
+        'MenuSessionAdmin' => 'session_admin',
+        'TopbarCertificate' => 'topbar_certificate',
+        'TopbarSkills' => 'topbar_skills',
+    ];
+
     public function buildSettings(AbstractSettingsBuilder $builder): void
     {
         $builder
@@ -23,7 +41,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'show_tutor_data' => 'true',
                     'show_teacher_data' => 'true',
                     'showonline' => 'world',
-                    'allow_user_headings' => 'false',
                     'time_limit_whosonline' => '30',
                     'show_email_addresses' => 'false',
                     'show_number_of_courses' => 'false',
@@ -31,24 +48,36 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'show_back_link_on_top_of_tree' => 'false',
                     'display_categories_on_homepage' => 'false',
                     'show_closed_courses' => 'false',
-                    'show_link_bug_notification' => 'false',
                     'accessibility_font_resize' => 'false',
                     'show_admin_toolbar' => 'do_not_show',
                     'show_hot_courses' => 'true',
-                    'use_virtual_keyboard' => '',
-                    'disable_copy_paste' => '',
-                    'bug_report_link' => '',
                     'hide_home_top_when_connected' => 'false',
                     'hide_logout_button' => 'false',
-                    'show_link_ticket_notification' => 'false',
                     'icons_mode_svg' => 'false',
                     'hide_social_media_links' => 'false',
+
+                    'gravatar_enabled' => 'false',
+                    'gravatar_type' => 'mm',
+                    'order_user_list_by_official_code' => 'false',
+                    'pdf_logo_header' => '',
+                    'show_tabs' => array_values(array_diff(self::$tabs, ['videoconference', 'diagnostics'])),
+                    'show_tabs_per_role' => '{}',
+                    'hide_main_navigation_menu' => 'false',
+                    'hide_complete_name_in_whoisonline' => 'false',
+                    'table_default_row' => '20',
+                    'table_row_list' => '[10,20,50,100]',
                 ]
             )
+            ->setTransformer(
+                'show_tabs',
+                new ArrayToIdentifierTransformer()
+            )
         ;
 
         $allowedTypes = [
             'time_limit_whosonline' => ['string'],
+            'show_tabs' => ['array', 'null'],
+            'show_tabs_per_role' => ['string', 'null'],
         ];
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
     }
@@ -71,7 +100,6 @@ public function buildForm(FormBuilderInterface $builder): void
                     ],
                 ]
             )
-            ->add('allow_user_headings', YesNoType::class)
             ->add('time_limit_whosonline')
             ->add('show_email_addresses', YesNoType::class)
             ->add('show_number_of_courses', YesNoType::class)
@@ -80,7 +108,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('show_empty_course_categories', YesNoType::class)
             ->add('display_categories_on_homepage', YesNoType::class)
             ->add('show_closed_courses', YesNoType::class)
-            ->add('show_link_bug_notification', YesNoType::class)
             ->add('accessibility_font_resize', YesNoType::class)
             ->add(
                 'show_admin_toolbar',
@@ -95,14 +122,38 @@ public function buildForm(FormBuilderInterface $builder): void
                 ]
             )
             ->add('show_hot_courses', YesNoType::class)
-            ->add('use_virtual_keyboard', YesNoType::class)
-            ->add('disable_copy_paste', YesNoType::class)
-            ->add('bug_report_link', YesNoType::class)
             ->add('hide_home_top_when_connected', YesNoType::class)
             ->add('hide_logout_button', YesNoType::class)
-            ->add('show_link_ticket_notification', YesNoType::class)
             ->add('icons_mode_svg', YesNoType::class)
             ->add('hide_social_media_links', YesNoType::class)
+            ->add('gravatar_enabled', YesNoType::class)
+            ->add(
+                'gravatar_type',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'mistery-man' => 'mm',
+                        'identicon' => 'identicon',
+                        'monsterid' => 'monsterid',
+                        'wavatar' => 'wavatar',
+                    ],
+                ]
+            )
+            ->add('order_user_list_by_official_code', YesNoType::class)
+            ->add('pdf_logo_header')
+            ->add(
+                'show_tabs',
+                ChoiceType::class,
+                [
+                    'multiple' => true,
+                    'choices' => self::$tabs,
+                ],
+            )
+            ->add('show_tabs_per_role', TextareaType::class)
+            ->add('hide_main_navigation_menu', YesNoType::class)
+            ->add('hide_complete_name_in_whoisonline', YesNoType::class)
+            ->add('table_default_row', TextType::class)
+            ->add('table_row_list', TextareaType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/DocumentSettingsSchema.php b/src/CoreBundle/Settings/DocumentSettingsSchema.php
index 5450ea4c4b0..afaa937f533 100644
--- a/src/CoreBundle/Settings/DocumentSettingsSchema.php
+++ b/src/CoreBundle/Settings/DocumentSettingsSchema.php
@@ -39,7 +39,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'show_users_folders' => 'true',
                 'show_default_folders' => 'true',
                 'show_documents_preview' => 'false',
-                'enable_webcam_clip' => 'false',
                 'tool_visible_by_default_at_creation' => [
                     'documents',
                     'learning_path',
@@ -52,15 +51,14 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'documents_default_visibility_defined_in_course' => 'false',
                 'send_notification_when_document_added' => 'false',
                 'thematic_pdf_orientation' => 'landscape',
-                'certificate_pdf_orientation' => 'landscape',
-                'allow_general_certificate' => 'false',
                 'group_document_access' => 'false',
                 'group_category_document_access' => 'false',
-                'allow_compilatio_tool' => 'false',
-                'compilatio_tool' => '',
                 'documents_hide_download_icon' => 'false',
                 'enable_x_sendfile_headers' => 'false',
                 'documents_custom_cloud_link_list' => '',
+
+                'access_url_specific_files' => 'false',
+                'video_features' => '',
             ])
             ->setTransformer(
                 'tool_visible_by_default_at_creation',
@@ -121,7 +119,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('show_users_folders', YesNoType::class)
             ->add('show_default_folders', YesNoType::class)
             ->add('show_documents_preview', YesNoType::class)
-            ->add('enable_webcam_clip', YesNoType::class)
             ->add('tool_visible_by_default_at_creation', ChoiceType::class, [
                 'multiple' => true,
                 'choices' => [
@@ -141,24 +138,18 @@ public function buildForm(FormBuilderInterface $builder): void
                     'Landscape' => 'landscape',
                 ],
             ])
-            ->add('certificate_pdf_orientation', ChoiceType::class, [
-                'choices' => [
-                    'Portrait' => 'portrait',
-                    'Landscape' => 'landscape',
-                ],
-            ])
-            ->add('allow_general_certificate', YesNoType::class)
             ->add('group_document_access', YesNoType::class)
             ->add('group_category_document_access', YesNoType::class)
-            ->add('allow_compilatio_tool', YesNoType::class)
-            ->add('compilatio_tool', TextareaType::class, [
-                'attr' => ['rows' => 8, 'style' => 'font-family: monospace;'],
-            ])
             ->add('documents_hide_download_icon', YesNoType::class)
             ->add('enable_x_sendfile_headers', YesNoType::class)
             ->add('documents_custom_cloud_link_list', TextareaType::class, [
                 'attr' => ['rows' => 3, 'style' => 'font-family: monospace;'],
             ])
+            ->add('access_url_specific_files', YesNoType::class)
+            ->add('video_features', TextareaType::class, [
+                'attr' => ['rows' => 4, 'style' => 'font-family: monospace;'],
+                'help' => "JSON opcional. Ej: {\"speed\": true}",
+            ])
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/ForumSettingsSchema.php b/src/CoreBundle/Settings/ForumSettingsSchema.php
index 75f958333c2..b1aeec92204 100644
--- a/src/CoreBundle/Settings/ForumSettingsSchema.php
+++ b/src/CoreBundle/Settings/ForumSettingsSchema.php
@@ -9,6 +9,7 @@
 use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -27,6 +28,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'forum_fold_categories' => 'false',
                     'allow_forum_category_language_filter' => 'false',
                     'subscribe_users_to_forum_notifications_also_in_base_course' => 'false',
+                    'community_managers_user_list' => '',
                 ]
             )
         ;
@@ -58,6 +60,7 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('forum_fold_categories', YesNoType::class)
             ->add('allow_forum_category_language_filter', YesNoType::class)
             ->add('subscribe_users_to_forum_notifications_also_in_base_course', YesNoType::class)
+            ->add('community_managers_user_list', TextareaType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/GradebookSettingsSchema.php b/src/CoreBundle/Settings/GradebookSettingsSchema.php
index 4d0dc84dfb8..e91b88ea725 100644
--- a/src/CoreBundle/Settings/GradebookSettingsSchema.php
+++ b/src/CoreBundle/Settings/GradebookSettingsSchema.php
@@ -32,11 +32,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'my_display_coloring' => 'false',
             'student_publication_to_take_in_gradebook' => 'first',
             'gradebook_detailed_admin_view' => 'false',
-            'openbadges_backpack' => 'https://backpack.openbadges.org/',
-            'hide_certificate_export_link' => 'false',
-            'add_gradebook_certificates_cron_task_enabled' => 'false',
-            'certificate_filter_by_official_code' => 'false',
-            'hide_certificate_export_link_students' => 'false',
             'gradebook_hide_graph' => 'false',
             'gradebook_hide_pdf_report_button' => 'false',
             'hide_gradebook_percentage_user_result' => 'true',
@@ -65,7 +60,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'gradebook_default_weight' => ['string'],
             'student_publication_to_take_in_gradebook' => ['string'],
             'gradebook_detailed_admin_view' => ['string'],
-            'certificate_filter_by_official_code' => ['string'],
         ];
 
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
@@ -93,11 +87,6 @@ public function buildForm(FormBuilderInterface $builder): void
                 ],
             ])
             ->add('gradebook_detailed_admin_view', YesNoType::class)
-            ->add('openbadges_backpack')
-            ->add('hide_certificate_export_link', YesNoType::class)
-            ->add('add_gradebook_certificates_cron_task_enabled', YesNoType::class)
-            ->add('certificate_filter_by_official_code', YesNoType::class)
-            ->add('hide_certificate_export_link_students', YesNoType::class)
             ->add('gradebook_hide_pdf_report_button', YesNoType::class)
             ->add('hide_gradebook_percentage_user_result', YesNoType::class)
             ->add('gradebook_use_exercise_score_settings_in_categories', YesNoType::class)
diff --git a/src/CoreBundle/Settings/GroupSettingsSchema.php b/src/CoreBundle/Settings/GroupSettingsSchema.php
index a87640af179..5c574ec93d9 100644
--- a/src/CoreBundle/Settings/GroupSettingsSchema.php
+++ b/src/CoreBundle/Settings/GroupSettingsSchema.php
@@ -19,6 +19,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 [
                     'allow_group_categories' => 'false',
                     'hide_course_group_if_no_tools_available' => 'false',
+                    'show_groups_to_users' => 'false',
                 ]
             )
         ;
@@ -33,6 +34,7 @@ public function buildForm(FormBuilderInterface $builder): void
         $builder
             ->add('allow_group_categories', YesNoType::class)
             ->add('hide_course_group_if_no_tools_available', YesNoType::class)
+            ->add('show_groups_to_users', YesNoType::class);
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/LanguageSettingsSchema.php b/src/CoreBundle/Settings/LanguageSettingsSchema.php
index b2137f59df0..c918982bdc6 100644
--- a/src/CoreBundle/Settings/LanguageSettingsSchema.php
+++ b/src/CoreBundle/Settings/LanguageSettingsSchema.php
@@ -27,7 +27,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'language_priority_2' => 'user_profil_lang',
                     'language_priority_3' => 'user_selected_lang',
                     'language_priority_4' => 'platform_lang',
-                    'hide_dltt_markup' => 'false',
                     'show_language_selector_in_menu' => 'true',
                     'language_flags_by_country' => 'false',
                     'allow_course_multiple_languages' => 'false',
@@ -87,7 +86,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('language_priority_4', ChoiceType::class, [
                 'choices' => $choices,
             ])
-            ->add('hide_dltt_markup')
             ->add('show_language_selector_in_menu', YesNoType::class)
             ->add('language_flags_by_country', YesNoType::class)
             ->add('allow_course_multiple_languages', YesNoType::class)
diff --git a/src/CoreBundle/Settings/LearningPathSettingsSchema.php b/src/CoreBundle/Settings/LearningPathSettingsSchema.php
index 43789c59cd7..17e5b05b9a3 100644
--- a/src/CoreBundle/Settings/LearningPathSettingsSchema.php
+++ b/src/CoreBundle/Settings/LearningPathSettingsSchema.php
@@ -22,7 +22,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'add_all_files_in_lp_export' => 'false',
             'show_prerequisite_as_blocked' => 'false',
             'hide_lp_time' => 'false',
-            'lp_category_accordion' => 'false',
             'lp_view_accordion' => 'false',
             'disable_js_in_lp_view' => 'false',
             'allow_teachers_to_access_blocked_lp_by_prerequisite' => 'false',
@@ -62,9 +61,13 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'student_follow_page_add_lp_acquisition_info' => 'false',
             'student_follow_page_add_lp_invisible_checkbox' => 'false',
             'student_follow_page_include_not_subscribed_lp_students' => 'false',
-            'my_progress_course_tools_order' => '',
             'lp_enable_flow' => 'false',
             'lp_item_prerequisite_dates' => 'false',
+            'allow_lp_return_link' => 'true',
+            'hide_scorm_export_link' => 'false',
+            'hide_scorm_copy_link' => 'false',
+            'hide_scorm_pdf_link' => 'true',
+            'lp_show_reduced_report' => 'false',
         ]);
 
         $allowedTypes = [];
@@ -79,7 +82,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('add_all_files_in_lp_export', YesNoType::class)
             ->add('show_prerequisite_as_blocked', YesNoType::class)
             ->add('hide_lp_time', YesNoType::class)
-            ->add('lp_category_accordion', YesNoType::class)
             ->add('lp_view_accordion', YesNoType::class)
             ->add('disable_js_in_lp_view', YesNoType::class)
             ->add('allow_teachers_to_access_blocked_lp_by_prerequisite', YesNoType::class)
@@ -124,9 +126,13 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('student_follow_page_add_lp_acquisition_info', YesNoType::class)
             ->add('student_follow_page_add_lp_invisible_checkbox', YesNoType::class)
             ->add('student_follow_page_include_not_subscribed_lp_students', YesNoType::class)
-            ->add('my_progress_course_tools_order', TextareaType::class)
             ->add('lp_enable_flow', YesNoType::class)
             ->add('lp_item_prerequisite_dates', YesNoType::class)
+            ->add('allow_lp_return_link', YesNoType::class)
+            ->add('hide_scorm_export_link', YesNoType::class)
+            ->add('hide_scorm_copy_link', YesNoType::class)
+            ->add('hide_scorm_pdf_link', YesNoType::class)
+            ->add('lp_show_reduced_report', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/PlatformSettingsSchema.php b/src/CoreBundle/Settings/PlatformSettingsSchema.php
index 7232b4de2f5..5b919dd1903 100644
--- a/src/CoreBundle/Settings/PlatformSettingsSchema.php
+++ b/src/CoreBundle/Settings/PlatformSettingsSchema.php
@@ -43,61 +43,30 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'institution_address' => '',
                     'site_name' => 'Chamilo site',
                     'timezone' => 'Europe/Paris',
-                    'gravatar_enabled' => 'false',
-                    'gravatar_type' => 'mm',
-                    'gamification_mode' => ' ',
-                    'order_user_list_by_official_code' => 'false',
                     'cookie_warning' => 'false',
                     'donotlistcampus' => 'false',
                     'use_custom_pages' => 'false',
-                    'pdf_logo_header' => '',
                     'allow_my_files' => 'true',
                     'registered' => 'false',
-                    'load_term_conditions_section' => 'login',
                     'server_type' => 'prod',
                     'show_tabs' => array_values(array_diff(self::$tabs, ['videoconference', 'diagnostics'])),
                     'chamilo_database_version' => '2.0.0',
                     'unoconv_binaries' => '/usr/bin/unoconv',
-                    'hide_main_navigation_menu' => 'false',
                     'pdf_img_dpi' => '96',
-                    'tracking_skip_generic_data' => 'false',
-                    'hide_complete_name_in_whoisonline' => 'false',
-                    'table_default_row' => '0',
-                    'allow_double_validation_in_registration' => 'false',
-                    'block_my_progress_page' => 'false',
                     'hosting_limit_users_per_course' => '0',
                     'generate_random_login' => 'false',
                     'timepicker_increment' => '5',
-                    'proxy_settings' => '',
-                    'video_features' => '',
-                    'table_row_list' => '',
-                    'webservice_return_user_field' => 'oauth2_id',
-                    'multiple_url_hide_disabled_settings' => 'false',
-                    'login_max_attempt_before_blocking_account' => '0',
-                    'force_renew_password_at_first_login' => 'false',
-                    'hide_breadcrumb_if_not_allowed' => 'false',
-                    'extldap_config' => '',
-                    'update_student_expiration_x_date' => '',
                     'user_status_show_options_enabled' => 'false',
                     'user_status_show_option' => '',
-                    'user_number_of_days_for_default_expiration_date_per_role' => '',
-                    'user_edition_extra_field_to_check' => 'ExtrafieldLabel',
-                    'user_hide_never_expire_option' => 'false',
                     'platform_logo_url' => 'https://chamilo.org',
                     'use_career_external_id_as_identifier_in_diagrams' => 'false',
-                    'disable_webservices' => 'false',
-                    'webservice_enable_adminonly_api' => 'false',
-                    'allow_working_time_edition' => 'false',
-                    'disable_user_conditions_sender_id' => '0',
                     'portfolio_advanced_sharing' => 'false',
-                    'redirect_index_to_url_for_logged_users' => '',
-                    'default_menu_entry_for_course_or_session' => 'my_courses',
                     'notification_event' => 'false',
-                    'show_tabs_per_role' => '{}',
-                    'session_admin_user_subscription_search_extra_field_to_search' => '',
                     'push_notification_settings' => '',
                     'hosting_limit_identical_email' => '0',
                     'session_admin_access_to_all_users_on_all_urls' => 'false',
+                    'use_virtual_keyboard' => 'false',
+                    'disable_copy_paste' => 'false',
                 ]
             )
             ->setTransformer(
@@ -111,11 +80,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'institution_url' => ['string'],
             'site_name' => ['string'],
             'timezone' => ['string'],
-            'gravatar_enabled' => ['string'],
-            'gravatar_type' => ['string'],
             'show_tabs' => ['array', 'null'],
-            'show_tabs_per_role' => ['string', 'null'],
-            'session_admin_user_subscription_search_extra_field_to_search' => ['string', 'null'],
         ];
 
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
@@ -129,38 +94,10 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('institution_address')
             ->add('site_name')
             ->add('timezone', TimezoneType::class)
-            ->add('gravatar_enabled', YesNoType::class)
-            ->add(
-                'gravatar_type',
-                ChoiceType::class,
-                [
-                    'choices' => [
-                        'mistery-man' => 'mm',
-                        'identicon' => 'identicon',
-                        'monsterid' => 'monsterid',
-                        'wavatar' => 'wavatar',
-                    ],
-                ]
-            )
-            ->add('gamification_mode')
-            ->add('order_user_list_by_official_code', YesNoType::class)
             ->add('cookie_warning', YesNoType::class)
             ->add('donotlistcampus', YesNoType::class)
             ->add('use_custom_pages', YesNoType::class)
-            ->add('pdf_logo_header')
             ->add('allow_my_files', YesNoType::class)
-            // old settings with no category
-            ->add('chamilo_database_version')
-            ->add(
-                'load_term_conditions_section',
-                ChoiceType::class,
-                [
-                    'choices' => [
-                        'Login' => 'login',
-                        'Course' => 'course',
-                    ],
-                ]
-            )
             ->add(
                 'server_type',
                 ChoiceType::class,
@@ -181,61 +118,17 @@ public function buildForm(FormBuilderInterface $builder): void
                     'choices' => self::$tabs,
                 ],
             )
-            ->add('show_tabs_per_role', TextareaType::class)
             ->add('unoconv_binaries', TextType::class)
-            ->add('hide_main_navigation_menu', YesNoType::class)
             ->add('pdf_img_dpi', TextType::class)
-            ->add('tracking_skip_generic_data', YesNoType::class)
-            ->add('hide_complete_name_in_whoisonline', YesNoType::class)
-            ->add('table_default_row', TextType::class)
-            ->add('allow_double_validation_in_registration', YesNoType::class)
-            ->add('block_my_progress_page', YesNoType::class)
             ->add('hosting_limit_users_per_course', TextType::class)
             ->add('generate_random_login', YesNoType::class)
             ->add('timepicker_increment', TextType::class)
-            ->add('proxy_settings', TextareaType::class)
-            ->add('video_features', TextareaType::class)
-            ->add('table_row_list', TextareaType::class)
-            ->add('webservice_return_user_field', TextType::class)
-            ->add('multiple_url_hide_disabled_settings', YesNoType::class)
-            ->add('login_max_attempt_before_blocking_account', TextType::class)
-            ->add('force_renew_password_at_first_login', YesNoType::class)
-            ->add('hide_breadcrumb_if_not_allowed', YesNoType::class)
-            ->add('extldap_config', TextareaType::class)
-            ->add('update_student_expiration_x_date', TextareaType::class)
             ->add('user_status_show_options_enabled', YesNoType::class)
             ->add('user_status_show_option', TextareaType::class)
-            ->add('user_number_of_days_for_default_expiration_date_per_role', TextareaType::class)
-            ->add('user_edition_extra_field_to_check', TextType::class)
-            ->add('user_hide_never_expire_option', YesNoType::class)
             ->add('platform_logo_url', TextType::class)
             ->add('use_career_external_id_as_identifier_in_diagrams', YesNoType::class)
-            ->add('disable_webservices', YesNoType::class)
-            ->add('webservice_enable_adminonly_api', YesNoType::class)
-            ->add('allow_working_time_edition', YesNoType::class)
-            ->add('disable_user_conditions_sender_id', TextType::class)
             ->add('portfolio_advanced_sharing', TextType::class)
-            ->add('redirect_index_to_url_for_logged_users', TextType::class)
-            ->add(
-                'default_menu_entry_for_course_or_session',
-                ChoiceType::class,
-                [
-                    'choices' => [
-                        'My courses' => 'my_courses',
-                        'My sessions' => 'my_sessions',
-                    ],
-                ]
-            )
             ->add('notification_event', YesNoType::class)
-            ->add(
-                'session_admin_user_subscription_search_extra_field_to_search',
-                TextType::class,
-                [
-                    'required' => false,
-                    'empty_data' => '',
-                    'help' => 'User extra field key to use when searching and naming sessions from /admin-dashboard/register.',
-                ]
-            )
             ->add('push_notification_settings', TextareaType::class)
             ->add(
                 'hosting_limit_identical_email',
@@ -246,6 +139,8 @@ public function buildForm(FormBuilderInterface $builder): void
                 ]
             )
             ->add('session_admin_access_to_all_users_on_all_urls', YesNoType::class)
+            ->add('use_virtual_keyboard', YesNoType::class)
+            ->add('disable_copy_paste', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
@@ -255,6 +150,7 @@ public function getHiddenSettings(): array
     {
         return [
             'registered',
+            'chamilo_database_version',
         ];
     }
 }
diff --git a/src/CoreBundle/Settings/PrivacySettingsSchema.php b/src/CoreBundle/Settings/PrivacySettingsSchema.php
new file mode 100644
index 00000000000..78f066bbebd
--- /dev/null
+++ b/src/CoreBundle/Settings/PrivacySettingsSchema.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Settings;
+
+use Chamilo\CoreBundle\Form\Type\YesNoType;
+use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class PrivacySettingsSchema extends AbstractSettingsSchema
+{
+    public function buildSettings(AbstractSettingsBuilder $builder): void
+    {
+        $builder->setDefaults([
+            'disable_change_user_visibility_for_public_courses' => 'true',
+            'disable_gdpr' => 'true',
+            'data_protection_officer_name' => '',
+            'data_protection_officer_role' => '',
+            'data_protection_officer_email' => '',
+            'hide_user_field_from_list' => '',
+        ]);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('disable_change_user_visibility_for_public_courses', YesNoType::class)
+            ->add('disable_gdpr', YesNoType::class)
+            ->add('data_protection_officer_name', TextType::class)
+            ->add('data_protection_officer_role', TextType::class)
+            ->add('data_protection_officer_email', TextType::class)
+            ->add('hide_user_field_from_list', TextareaType::class)
+        ;
+
+        $this->updateFormFieldsFromSettingsInfo($builder);
+    }
+}
+
diff --git a/src/CoreBundle/Settings/ProfileSettingsSchema.php b/src/CoreBundle/Settings/ProfileSettingsSchema.php
index 03cecbfd040..cd9111d07f4 100644
--- a/src/CoreBundle/Settings/ProfileSettingsSchema.php
+++ b/src/CoreBundle/Settings/ProfileSettingsSchema.php
@@ -28,37 +28,26 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'use_users_timezone' => 'true',
                 'allow_users_to_change_email_with_no_password' => 'false',
                 'login_is_email' => 'false',
-                'profiling_filter_adding_users' => '',
                 'enable_profile_user_address_geolocalization' => '',
                 'allow_show_skype_account' => '',
                 'allow_show_linkedin_url' => '',
                 'hide_username_with_complete_name' => 'false',
                 'hide_username_in_course_chat' => 'false',
                 'show_official_code_whoisonline' => 'false',
-                'allow_career_diagram' => 'false',
-                'disable_change_user_visibility_for_public_courses' => 'true',
                 'my_space_users_items_per_page' => '10',
                 'add_user_course_information_in_mailto' => 'false',
                 'pass_reminder_custom_link' => '',
                 'registration_add_helptext_for_2_names' => 'false',
-                'disable_gdpr' => 'true',
-                'data_protection_officer_name' => '',
-                'data_protection_officer_role' => '',
-                'data_protection_officer_email' => '',
-                'hide_user_field_from_list' => '',
                 'send_notification_when_user_added' => '',
                 'show_conditions_to_user' => '',
                 'allow_teachers_to_classes' => 'false',
                 'profile_fields_visibility' => '',
                 'user_import_settings' => '',
                 'user_search_on_extra_fields' => '',
-                'allow_career_users' => 'false',
-                'community_managers_user_list' => '',
                 'allow_social_map_fields' => '',
-                'career_diagram_legend' => 'false',
-                'career_diagram_disclaimer' => 'false',
                 'linkedin_organization_id' => 'false',
                 'visible_options' => ['name', 'officialcode', 'email', 'picture', 'login', 'password', 'language', 'phone', 'theme'],
+                'show_terms_if_profile_completed' => 'false',
             ])
             ->setTransformer('changeable_options', new ArrayToIdentifierTransformer())
             ->setTransformer('visible_options', new ArrayToIdentifierTransformer())
@@ -68,6 +57,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'changeable_options' => ['array'],
             'visible_options' => ['array'],
             'account_valid_duration' => ['string'],
+            'show_terms_if_profile_completed' => ['string'],
         ];
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
     }
@@ -112,36 +102,25 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('login_is_email', YesNoType::class, [
                 'label' => 'LoginIsEmailTitle',
             ])
-            ->add('profiling_filter_adding_users', YesNoType::class)
             ->add('enable_profile_user_address_geolocalization', YesNoType::class)
             ->add('allow_show_skype_account', YesNoType::class)
             ->add('allow_show_linkedin_url', YesNoType::class)
             ->add('hide_username_with_complete_name', YesNoType::class)
             ->add('hide_username_in_course_chat', YesNoType::class)
             ->add('show_official_code_whoisonline', YesNoType::class)
-            ->add('allow_career_diagram', YesNoType::class)
-            ->add('disable_change_user_visibility_for_public_courses', YesNoType::class)
             ->add('my_space_users_items_per_page', TextType::class)
             ->add('add_user_course_information_in_mailto', YesNoType::class)
             ->add('pass_reminder_custom_link', TextType::class)
             ->add('registration_add_helptext_for_2_names', YesNoType::class)
-            ->add('disable_gdpr', YesNoType::class)
-            ->add('data_protection_officer_name', TextType::class)
-            ->add('data_protection_officer_role', TextType::class)
-            ->add('data_protection_officer_email', TextType::class)
-            ->add('hide_user_field_from_list', TextareaType::class)
             ->add('send_notification_when_user_added', TextareaType::class)
             ->add('show_conditions_to_user', TextareaType::class)
             ->add('allow_teachers_to_classes', YesNoType::class)
             ->add('profile_fields_visibility', TextareaType::class)
             ->add('user_import_settings', TextareaType::class)
             ->add('user_search_on_extra_fields', TextareaType::class)
-            ->add('allow_career_users', YesNoType::class)
-            ->add('community_managers_user_list', TextareaType::class)
             ->add('allow_social_map_fields', TextareaType::class)
-            ->add('career_diagram_legend', YesNoType::class)
-            ->add('career_diagram_disclaimer', YesNoType::class)
             ->add('linkedin_organization_id', YesNoType::class)
+            ->add('show_terms_if_profile_completed', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/RegistrationSettingsSchema.php b/src/CoreBundle/Settings/RegistrationSettingsSchema.php
index c02c1d81087..ad4c3cdca22 100644
--- a/src/CoreBundle/Settings/RegistrationSettingsSchema.php
+++ b/src/CoreBundle/Settings/RegistrationSettingsSchema.php
@@ -36,6 +36,9 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'send_inscription_msg_to_inbox' => 'false',
                 'redirect_after_login' => '',
                 'hide_legal_accept_checkbox' => 'false',
+                'allow_double_validation_in_registration' => 'false',
+                'extldap_config' => '',
+                'user_hide_never_expire_option' => 'false',
             ])
             ->setTransformer('required_profile_fields', new ArrayToIdentifierTransformer())
             ->setTransformer('extendedprofile_registration', new ArrayToIdentifierTransformer())
@@ -103,6 +106,9 @@ public function buildForm(FormBuilderInterface $builder): void
                 'required' => false,
             ])
             ->add('hide_legal_accept_checkbox', YesNoType::class)
+            ->add('allow_double_validation_in_registration', YesNoType::class)
+            ->add('extldap_config', TextareaType::class)
+            ->add('user_hide_never_expire_option', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/SecuritySettingsSchema.php b/src/CoreBundle/Settings/SecuritySettingsSchema.php
index 21fa6274e71..e28740e4c60 100644
--- a/src/CoreBundle/Settings/SecuritySettingsSchema.php
+++ b/src/CoreBundle/Settings/SecuritySettingsSchema.php
@@ -44,6 +44,10 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'access_to_personal_file_for_all' => 'false',
             'password_rotation_days' => '0',
             '2fa_enable' => 'false',
+            'proxy_settings' => '',
+            'login_max_attempt_before_blocking_account' => '0',
+            'force_renew_password_at_first_login' => 'false',
+            'hide_breadcrumb_if_not_allowed' => 'false',
         ]);
 
         $allowedTypes = [
@@ -82,6 +86,10 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('access_to_personal_file_for_all', YesNoType::class)
             ->add('password_rotation_days', TextType::class)
             ->add('2fa_enable', YesNoType::class)
+            ->add('proxy_settings', TextareaType::class)
+            ->add('login_max_attempt_before_blocking_account', TextType::class)
+            ->add('force_renew_password_at_first_login', YesNoType::class)
+            ->add('hide_breadcrumb_if_not_allowed', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/SessionSettingsSchema.php b/src/CoreBundle/Settings/SessionSettingsSchema.php
index 0d541f44247..89bb81b131c 100644
--- a/src/CoreBundle/Settings/SessionSettingsSchema.php
+++ b/src/CoreBundle/Settings/SessionSettingsSchema.php
@@ -25,7 +25,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'show_session_coach' => 'false',
                     'show_session_data' => 'false',
                     'allow_coach_to_edit_course_session' => 'true',
-                    'show_groups_to_users' => 'false',
                     'hide_courses_in_sessions' => 'false',
                     'allow_session_admins_to_manage_all_sessions' => 'false',
                     'allow_teachers_to_create_sessions' => 'false',
@@ -81,6 +80,14 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'enable_session_replication' => 'false',
                     'session_list_view_remaining_days' => 'false',
                     'user_session_display_mode' => 'card',
+                    'show_simple_session_info' => 'true',
+                    'show_all_sessions_on_my_course_page' => 'true',
+                    'courses_list_session_title_link' => '1',
+                    'allow_edit_tool_visibility_in_session' => 'true',
+                    'allow_career_diagram' => 'false',
+                    'allow_career_users' => 'false',
+                    'career_diagram_legend' => 'false',
+                    'career_diagram_disclaimer' => 'false',
                 ]
             )
         ;
@@ -99,7 +106,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('show_session_coach', YesNoType::class)
             ->add('show_session_data', YesNoType::class)
             ->add('allow_coach_to_edit_course_session', YesNoType::class)
-            ->add('show_groups_to_users', YesNoType::class)
             ->add('hide_courses_in_sessions', YesNoType::class)
             ->add('allow_session_admins_to_manage_all_sessions', YesNoType::class)
             ->add('allow_teachers_to_create_sessions', YesNoType::class)
@@ -164,6 +170,22 @@ public function buildForm(FormBuilderInterface $builder): void
                     'List (classic)' => 'list',
                 ],
             ])
+
+            ->add('show_simple_session_info', YesNoType::class)
+            ->add('show_all_sessions_on_my_course_page', YesNoType::class)
+            ->add('courses_list_session_title_link', ChoiceType::class, [
+                'choices' => [
+                    'No link' => '0',
+                    'Default' => '1',
+                    'Link' => '2',
+                    'Session link' => '3',
+                ],
+            ])
+            ->add('allow_edit_tool_visibility_in_session', YesNoType::class)
+            ->add('allow_career_diagram', YesNoType::class)
+            ->add('allow_career_users', YesNoType::class)
+            ->add('career_diagram_legend', YesNoType::class)
+            ->add('career_diagram_disclaimer', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/SettingsManager.php b/src/CoreBundle/Settings/SettingsManager.php
index 63937435c2f..7bcacac551e 100644
--- a/src/CoreBundle/Settings/SettingsManager.php
+++ b/src/CoreBundle/Settings/SettingsManager.php
@@ -603,7 +603,6 @@ private function getVariablesAndCategories(): array
             'show_back_link_on_top_of_tree' => 'Platform',
             'show_different_course_language' => 'Platform',
             'split_users_upload_directory' => 'Tuning',
-            'hide_dltt_markup' => 'Languages',
             'display_categories_on_homepage' => 'Platform',
             'permissions_for_new_directories' => 'Security',
             'permissions_for_new_files' => 'Security',
@@ -679,7 +678,7 @@ private function getVariablesAndCategories(): array
             'show_default_folders' => 'Tools',
             'show_chat_folder' => 'Tools',
             'course_hide_tools' => 'Course',
-            'show_groups_to_users' => 'Session',
+            'show_groups_to_users' => 'Group',
             'accessibility_font_resize' => 'Platform',
             'hide_courses_in_sessions' => 'Session',
             'enable_quiz_scenario' => 'Course',
@@ -754,7 +753,7 @@ private function getVariablesAndCategories(): array
             'ticket_warn_admin_no_user_in_category' => 'Ticket',
             'ticket_allow_category_edition' => 'Ticket',
             'load_term_conditions_section' => 'Platform',
-            'show_terms_if_profile_completed' => 'Ticket',
+            'show_terms_if_profile_completed' => 'Profile',
             'hide_home_top_when_connected' => 'Platform',
             'hide_global_announcements_when_not_connected' => 'Platform',
             'course_creation_use_template' => 'Course',
@@ -820,11 +819,10 @@ private function getVariablesAndCategories(): array
             'exercise_invisible_in_session' => 'exercise',
             'configure_exercise_visibility_in_course' => 'exercise',
             'allow_download_documents_by_api_key' => 'Webservices',
-            'profiling_filter_adding_users' => 'profile',
+            'profiling_filter_adding_users' => 'course',
             'donotlistcampus' => 'platform',
             'course_creation_splash_screen' => 'Course',
             'translate_html' => 'Editor',
-            'enable_bootstrap_in_documents_html' => 'Course',
         ];
     }
 
@@ -994,8 +992,7 @@ private function fixCategory($variable, $defaultCategory)
             'messaging_gdc_project_number' => 'webservice',
             'messaging_gdc_api_key' => 'webservice',
             'allow_download_documents_by_api_key' => 'webservice',
-            'profiling_filter_adding_users' => 'profile',
-            'hide_dltt_markup' => 'language',
+            'profiling_filter_adding_users' => 'course',
             'active_tools_on_create' => 'course',
         ];
 
diff --git a/src/CoreBundle/Settings/SkillSettingsSchema.php b/src/CoreBundle/Settings/SkillSettingsSchema.php
index 990d0da9749..681bd64bef9 100644
--- a/src/CoreBundle/Settings/SkillSettingsSchema.php
+++ b/src/CoreBundle/Settings/SkillSettingsSchema.php
@@ -28,6 +28,7 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'skill_levels_names' => '',
             'allow_skill_rel_items' => 'false',
             'manual_assignment_subskill_autoload' => 'false',
+            'openbadges_backpack' => 'https://www.badgecraft.eu/',
         ]);
 
         $allowedTypes = [
@@ -51,6 +52,7 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('skill_levels_names', TextareaType::class)
             ->add('allow_skill_rel_items', YesNoType::class)
             ->add('manual_assignment_subskill_autoload', YesNoType::class)
+            ->add('openbadges_backpack')
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/TicketSettingsSchema.php b/src/CoreBundle/Settings/TicketSettingsSchema.php
index 186613484e1..8a87933f040 100644
--- a/src/CoreBundle/Settings/TicketSettingsSchema.php
+++ b/src/CoreBundle/Settings/TicketSettingsSchema.php
@@ -16,29 +16,29 @@ class TicketSettingsSchema extends AbstractSettingsSchema
     public function buildSettings(AbstractSettingsBuilder $builder): void
     {
         $builder->setDefaults([
-            'show_terms_if_profile_completed' => 'false',
             'ticket_allow_category_edition' => 'false',
             'ticket_allow_student_add' => 'false',
             'ticket_send_warning_to_all_admins' => 'false',
             'ticket_warn_admin_no_user_in_category' => 'false',
             'ticket_project_user_roles' => '',
+            'show_link_ticket_notification' => 'false',
+            'show_link_bug_notification' => 'false',
         ]);
 
-        $allowedTypes = [
-            'show_terms_if_profile_completed' => ['string'],
-        ];
+        $allowedTypes = [];
         $this->setMultipleAllowedTypes($allowedTypes, $builder);
     }
 
     public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
-            ->add('show_terms_if_profile_completed', YesNoType::class)
             ->add('ticket_allow_category_edition', YesNoType::class)
             ->add('ticket_allow_student_add', YesNoType::class)
             ->add('ticket_send_warning_to_all_admins', YesNoType::class)
             ->add('ticket_warn_admin_no_user_in_category', YesNoType::class)
             ->add('ticket_project_user_roles', TextareaType::class)
+            ->add('show_link_ticket_notification', YesNoType::class)
+            ->add('show_link_bug_notification', YesNoType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/TrackingSettingsSchema.php b/src/CoreBundle/Settings/TrackingSettingsSchema.php
index 2506cc3d453..c4acb62ffcc 100644
--- a/src/CoreBundle/Settings/TrackingSettingsSchema.php
+++ b/src/CoreBundle/Settings/TrackingSettingsSchema.php
@@ -6,6 +6,7 @@
 
 namespace Chamilo\CoreBundle\Settings;
 
+use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -24,6 +25,9 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'meta_image_path' => '',
                     'meta_twitter_site' => '',
                     'meta_twitter_creator' => '',
+                    'tracking_skip_generic_data' => 'false',
+                    'block_my_progress_page' => 'false',
+                    'my_progress_course_tools_order' => '',
                 ]
             )
         ;
@@ -39,6 +43,9 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('meta_image_path')
             ->add('meta_twitter_site')
             ->add('meta_twitter_creator')
+            ->add('tracking_skip_generic_data', YesNoType::class)
+            ->add('block_my_progress_page', YesNoType::class)
+            ->add('my_progress_course_tools_order', TextareaType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/WebServiceSettingsSchema.php b/src/CoreBundle/Settings/WebServiceSettingsSchema.php
index f3c8e8138da..912278ae453 100644
--- a/src/CoreBundle/Settings/WebServiceSettingsSchema.php
+++ b/src/CoreBundle/Settings/WebServiceSettingsSchema.php
@@ -8,6 +8,7 @@
 
 use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class WebServiceSettingsSchema extends AbstractSettingsSchema
@@ -21,6 +22,9 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'messaging_gdc_project_number' => '',
                     'messaging_gdc_api_key' => '',
                     'allow_download_documents_by_api_key' => 'false',
+                    'disable_webservices' => 'false',
+                    'webservice_enable_adminonly_api' => 'false',
+                    'webservice_return_user_field' => 'oauth2_id',
                 ]
             )
         ;
@@ -35,6 +39,9 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('messaging_gdc_project_number')
             ->add('messaging_gdc_api_key')
             ->add('allow_download_documents_by_api_key', YesNoType::class)
+            ->add('disable_webservices', YesNoType::class)
+            ->add('webservice_enable_adminonly_api', YesNoType::class)
+            ->add('webservice_return_user_field', TextType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/WorkSettingsSchema.php b/src/CoreBundle/Settings/WorkSettingsSchema.php
index 5ddd722bf7a..ee2b4929cd9 100644
--- a/src/CoreBundle/Settings/WorkSettingsSchema.php
+++ b/src/CoreBundle/Settings/WorkSettingsSchema.php
@@ -8,6 +8,7 @@
 
 use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -28,6 +29,8 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                     'force_download_doc_before_upload_work' => 'true',
                     'allow_redirect_to_main_page_after_work_upload' => 'false',
                     'my_courses_show_pending_work' => 'false',
+                    'allow_compilatio_tool' => 'false',
+                    'compilatio_tool' => '',
                 ]
             )
         ;
@@ -47,6 +50,8 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('force_download_doc_before_upload_work', YesNoType::class)
             ->add('allow_redirect_to_main_page_after_work_upload', YesNoType::class)
             ->add('my_courses_show_pending_work', YesNoType::class)
+            ->add('allow_compilatio_tool', YesNoType::class)
+            ->add('compilatio_tool', TextareaType::class)
         ;
 
         $this->updateFormFieldsFromSettingsInfo($builder);
diff --git a/src/CoreBundle/Settings/WorkflowsSettingsSchema.php b/src/CoreBundle/Settings/WorkflowsSettingsSchema.php
new file mode 100644
index 00000000000..a48f43f5885
--- /dev/null
+++ b/src/CoreBundle/Settings/WorkflowsSettingsSchema.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Settings;
+
+use Chamilo\CoreBundle\Form\Type\YesNoType;
+use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class WorkflowsSettingsSchema extends AbstractSettingsSchema
+{
+    public function buildSettings(AbstractSettingsBuilder $builder): void
+    {
+        $builder->setDefaults([
+            'plugin_redirection_enabled' => 'false',
+            'usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe' => 'false',
+            'usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe' => 'false',
+            'usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe' => 'false',
+            'drh_allow_access_to_all_students' => 'false',
+            'send_all_emails_to' => '',
+            'go_to_course_after_login' => 'false',
+            'allow_users_to_create_courses' => 'false',
+            'allow_user_course_subscription_by_course_admin' => 'true',
+            'teacher_can_select_course_template' => 'true',
+            'disabled_edit_session_coaches_course_editing_course' => 'false',
+            'course_visibility_change_only_admin' => 'false',
+            'multiple_url_hide_disabled_settings' => 'false',
+            'gamification_mode' => '',
+            'load_term_conditions_section' => 'login',
+            'update_student_expiration_x_date' => '',
+            'user_number_of_days_for_default_expiration_date_per_role' => '',
+            'user_edition_extra_field_to_check' => 'ExtrafieldLabel',
+            'allow_working_time_edition' => 'false',
+            'disable_user_conditions_sender_id' => '0',
+            'redirect_index_to_url_for_logged_users' => '',
+            'default_menu_entry_for_course_or_session' => 'my_courses',
+            'session_admin_user_subscription_search_extra_field_to_search' => '',
+        ]);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // admin → workflows
+        $builder
+            ->add('plugin_redirection_enabled', YesNoType::class)
+            ->add('usergroup_do_not_unsubscribe_users_from_course_nor_session_on_user_unsubscribe', YesNoType::class)
+            ->add('usergroup_do_not_unsubscribe_users_from_course_on_course_unsubscribe', YesNoType::class)
+            ->add('usergroup_do_not_unsubscribe_users_from_session_on_session_unsubscribe', YesNoType::class)
+            ->add('drh_allow_access_to_all_students', YesNoType::class)
+            ->add('send_all_emails_to', TextareaType::class, [
+                'attr' => ['rows' => 5, 'style' => 'font-family: monospace;'],
+            ])
+            ->add('go_to_course_after_login', YesNoType::class)
+            ->add('allow_users_to_create_courses', YesNoType::class)
+            ->add('allow_user_course_subscription_by_course_admin', YesNoType::class)
+            ->add('teacher_can_select_course_template', YesNoType::class)
+            ->add('disabled_edit_session_coaches_course_editing_course', YesNoType::class)
+            ->add('course_visibility_change_only_admin', YesNoType::class)
+            ->add('multiple_url_hide_disabled_settings', YesNoType::class)
+            ->add('gamification_mode', TextType::class)
+            ->add(
+                'load_term_conditions_section',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Login' => 'login',
+                        'Course' => 'course',
+                    ],
+                ]
+            )
+            ->add('update_student_expiration_x_date', TextareaType::class)
+            ->add('user_number_of_days_for_default_expiration_date_per_role', TextareaType::class)
+            ->add('user_edition_extra_field_to_check', TextType::class)
+            ->add('allow_working_time_edition', YesNoType::class)
+            ->add('disable_user_conditions_sender_id', TextType::class)
+            ->add('redirect_index_to_url_for_logged_users', TextType::class)
+            ->add(
+                'default_menu_entry_for_course_or_session',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'My courses' => 'my_courses',
+                        'My sessions' => 'my_sessions',
+                    ],
+                ]
+            )
+            ->add(
+                'session_admin_user_subscription_search_extra_field_to_search',
+                TextType::class,
+                [
+                    'required' => false,
+                    'empty_data' => '',
+                    'help' => 'User extra field key to use when searching and naming sessions from /admin-dashboard/register.',
+                ]
+            )
+        ;
+
+        $this->updateFormFieldsFromSettingsInfo($builder);
+    }
+}
diff --git a/src/CoreBundle/State/CToolStateProvider.php b/src/CoreBundle/State/CToolStateProvider.php
index c38b289cb27..cbf02aad46b 100644
--- a/src/CoreBundle/State/CToolStateProvider.php
+++ b/src/CoreBundle/State/CToolStateProvider.php
@@ -68,7 +68,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
                 || $user->hasRole('ROLE_CURRENT_COURSE_SESSION_TEACHER')
         );
 
-        $allowVisibilityInSession = $this->settingsManager->getSetting('course.allow_edit_tool_visibility_in_session');
+        $allowVisibilityInSession = $this->settingsManager->getSetting('session.allow_edit_tool_visibility_in_session');
         $session = $this->getSession();
         $course = $this->getCourse();