diff --git a/public/certificates/index.php b/public/certificates/index.php
index ef44c54d51..ee57c6ef64 100644
--- a/public/certificates/index.php
+++ b/public/certificates/index.php
@@ -35,7 +35,7 @@ switch ($action) {
                 'left' => 0,
             ];
 
-            $orientation = api_get_configuration_value('certificate_pdf_orientation');
+            $orientation = api_get_setting('document.certificate_pdf_orientation');
             $pdfParams['orientation'] = 'landscape';
             if (!empty($orientation)) {
                 $pdfParams['orientation'] = $orientation;
diff --git a/public/main/admin/career_dashboard.php b/public/main/admin/career_dashboard.php
index 1e6cbc0125..7ca0c97193 100644
--- a/public/main/admin/career_dashboard.php
+++ b/public/main/admin/career_dashboard.php
@@ -8,7 +8,7 @@
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
-$allowCareer = api_get_configuration_value('allow_session_admin_read_careers');
+$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers'));
 
 api_protect_admin_script($allowCareer);
 
diff --git a/public/main/admin/career_diagram.php b/public/main/admin/career_diagram.php
index 91a2db6f67..b5fd2953a9 100644
--- a/public/main/admin/career_diagram.php
+++ b/public/main/admin/career_diagram.php
@@ -14,7 +14,7 @@ ALTER TABLE extra_field_values modify column value longtext null;
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (false === api_get_configuration_value('allow_career_diagram')) {
+if ('false' === api_get_setting('profile.allow_career_diagram')) {
     api_not_allowed(true);
 }
 
@@ -33,7 +33,7 @@ if (!(api_is_platform_admin() || api_is_drh())) {
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$allowCareer = api_get_configuration_value('allow_session_admin_read_careers');
+$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers'));
 api_protect_admin_script($allowCareer);
 
 $htmlHeadXtra[] = api_get_js('jsplumb2.js');
diff --git a/public/main/admin/careers.php b/public/main/admin/careers.php
index ce083f914f..e502b3fe79 100644
--- a/public/main/admin/careers.php
+++ b/public/main/admin/careers.php
@@ -7,7 +7,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-$allowCareer = api_get_configuration_value('allow_session_admin_read_careers');
+$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers'));
 api_protect_admin_script($allowCareer);
 
 // Add the JS needed to use the jqgrid
@@ -74,7 +74,7 @@ $extra_params['autowidth'] = 'true';
 $extra_params['height'] = 'auto';
 
 $diagramLink = '';
-$allow = api_get_configuration_value('allow_career_diagram');
+$allow = ('true' === api_get_setting('profile.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_category.php b/public/main/admin/course_category.php
index 8db8771036..9b49246fa6 100644
--- a/public/main/admin/course_category.php
+++ b/public/main/admin/course_category.php
@@ -134,7 +134,7 @@ if ('add' === $action || 'edit' === $action) {
     $form->addHidden('formSent', 1);
     $form->addElement('text', 'code', get_lang('Category code'));
 
-    if (api_get_configuration_value('save_titles_as_html')) {
+    if ('true' === api_get_setting('editor.save_titles_as_html')) {
         $form->addHtmlEditor(
             'name',
             get_lang('Category name'),
diff --git a/public/main/admin/course_edit.php b/public/main/admin/course_edit.php
index 86be493acc..5c0410339a 100644
--- a/public/main/admin/course_edit.php
+++ b/public/main/admin/course_edit.php
@@ -139,11 +139,11 @@ $form->addText(
 
 $form->applyFilter('visual_code', 'strtoupper');
 $form->applyFilter('visual_code', 'html_filter');
-
+$allowBaseCourseCategory = ('true' === api_get_setting('course.allow_base_course_category'));
 $categories = $courseCategoriesRepo->getCategoriesByCourseIdAndAccessUrlId(
     $urlId,
     $courseId,
-    api_get_configuration_value('allow_base_course_category')
+    $allowBaseCourseCategory
 );
 
 $courseCategoryNames = [];
@@ -186,7 +186,7 @@ if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) {
     );
 }
 
-$allowEditSessionCoaches = false === api_get_configuration_value('disabled_edit_session_coaches_course_editing_course');
+$allowEditSessionCoaches = ('false' === api_get_setting('course.disabled_edit_session_coaches_course_editing_course'));
 $coursesInSession = SessionManager::get_session_by_course($courseInfo['real_id']);
 if (!empty($coursesInSession) && $allowEditSessionCoaches) {
     foreach ($coursesInSession as $session) {
@@ -265,7 +265,7 @@ $extra = $extraField->addElements(
     true
 );
 
-if (api_get_configuration_value('multiple_access_url_show_shared_course_marker')) {
+if ('true' === api_get_setting('course.multiple_access_url_show_shared_course_marker')) {
     $urls = UrlManager::get_access_url_from_course($courseId);
     $urlToString = '';
     foreach ($urls as $url) {
diff --git a/public/main/admin/index.php b/public/main/admin/index.php
index 6167483f7a..9d6785269e 100644
--- a/public/main/admin/index.php
+++ b/public/main/admin/index.php
@@ -85,10 +85,10 @@ if (api_is_platform_admin()) {
     }
     $items[] = ['url' => 'extra_fields.php?type=user', 'label' => get_lang('Profiling')];
     $items[] = ['url' => 'usergroups.php', 'label' => get_lang('Classes')];
-    if (!api_get_configuration_value('disable_gdpr')) {
+    if ('true' !== api_get_setting('profile.disable_gdpr')) {
         $items[] = ['url' => 'user_list_consent.php', 'label' => get_lang('Users in consents list')];
     }
-    if (api_get_configuration_value('show_link_request_hrm_user')) {
+    if ('true' === api_get_setting('admin.show_link_request_hrm_user')) {
         $items[] = ['url' => 'user_linking_requests.php', 'label' => get_lang('Student linking requests')];
     }
 } else {
@@ -108,7 +108,7 @@ if (api_is_platform_admin()) {
             });
         }
 
-        if (true === api_get_configuration_value('limit_session_admin_list_users')) {
+        if ('true' === api_get_setting('session.limit_session_admin_list_users')) {
             $items = array_filter($items, function (array $item) {
                 $urls = ['user_list.php'];
 
@@ -241,7 +241,7 @@ if (api_is_platform_admin()) {
         ];
     }
 
-    $allowCareer = api_get_configuration_value('allow_session_admin_read_careers');
+    $allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers'));
 
     if (api_is_platform_admin() || ($allowCareer && api_is_session_admin())) {
         // option only visible in development mode. Enable through code if required
diff --git a/public/main/admin/update_schema.php b/public/main/admin/update_schema.php
index 6c2a6f1680..feabecb45a 100644
--- a/public/main/admin/update_schema.php
+++ b/public/main/admin/update_schema.php
@@ -8,7 +8,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 // Access restrictions
 api_protect_admin_script(true);
 
-if (true != api_get_configuration_value('sync_db_with_schema')) {
+if ('false' === api_get_setting('platform.sync_db_with_schema')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/admin/user_import.php b/public/main/admin/user_import.php
index 296aff5b6b..4b18fc5f1c 100644
--- a/public/main/admin/user_import.php
+++ b/public/main/admin/user_import.php
@@ -339,7 +339,7 @@ function save_data($users, $sendMail = false)
 function parse_csv_data($users, $fileName, $sendEmail = 0, $checkUniqueEmail = true, $resumeImport = false)
 {
     $usersFromOrigin = $users;
-    $allowRandom = api_get_configuration_value('generate_random_login');
+    $allowRandom = ('true' === api_get_setting('platform.generate_random_login'));
     if ($allowRandom) {
         $factory = new RandomLib\Factory();
         $generator = $factory->getLowStrengthGenerator();
@@ -749,7 +749,7 @@ if ($count_fields > 0) {
     }
 }
 
-if (api_get_configuration_value('plugin_redirection_enabled')) {
+if ('true' === api_get_setting('admin.plugin_redirection_enabled')) {
     $list[] = 'Redirection';
     $list_reponse[] = api_get_path(WEB_PATH);
 }
diff --git a/public/main/admin/user_list.php b/public/main/admin/user_list.php
index e88ca1f33e..cf4c2d3097 100644
--- a/public/main/admin/user_list.php
+++ b/public/main/admin/user_list.php
@@ -547,7 +547,7 @@ function modify_filter($user_id, $url_params, $row)
     $loginAsStatusForSessionAdmins = [$statusname[STUDENT]];
 
     // Except when session.allow_session_admin_login_as_teacher is enabled, then can login_as teachers also
-    if (api_get_configuration_value('session.allow_session_admin_login_as_teacher')) {
+    if ('true' === api_get_setting('session.allow_session_admin_login_as_teacher')) {
         $loginAsStatusForSessionAdmins[] = $statusname[COURSEMANAGER];
     }
 
@@ -730,7 +730,7 @@ function modify_filter($user_id, $url_params, $row)
         }
     }
 
-    $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+    $allowDelete = ('true' === api_get_setting('session.allow_delete_user_for_session_admin'));
 
     if (api_is_session_admin() && $allowDelete) {
         if ($user_id != $currentUserId &&
diff --git a/public/main/announcements/announcements.php b/public/main/announcements/announcements.php
index 15165ed1bb..876a822508 100644
--- a/public/main/announcements/announcements.php
+++ b/public/main/announcements/announcements.php
@@ -89,7 +89,7 @@ $logInfo = [
 ];
 Event::registerLog($logInfo);
 
-$announcementAttachmentIsDisabled = api_get_configuration_value('disable_announcement_attachment');
+$announcementAttachmentIsDisabled = ('true' === api_get_setting('announcement.disable_announcement_attachment'));
 $thisAnnouncementId = null;
 
 switch ($action) {
@@ -329,7 +329,7 @@ switch ($action) {
         break;
     case 'delete_all':
         if (api_is_allowed_to_edit()) {
-            $allow = api_get_configuration_value('disable_delete_all_announcements');
+            $allow = ('true' === api_get_setting('announcement.disable_delete_all_announcements'));
             if (false === $allow) {
                 AnnouncementManager::delete_all_announcements($_course);
                 Display::addFlash(Display::return_message(get_lang('Announcement has been deletedAll')));
@@ -821,7 +821,7 @@ if (($allowToEdit || $allowStudentInGroupToSend) && (empty($_GET['origin']) || '
 
 /*
 if ($allowToEdit && 0 == api_get_group_id()) {
-    $allow = api_get_configuration_value('disable_delete_all_announcements');
+    $allow = ('true' === api_get_setting('announcement.disable_delete_all_announcements'));
     if (false === $allow && api_is_allowed_to_edit()) {
         if (!isset($_GET['action']) ||
             isset($_GET['action']) && 'list' == $_GET['action']
diff --git a/public/main/auth/courses.php b/public/main/auth/courses.php
index 9cf3252228..6646b0621a 100644
--- a/public/main/auth/courses.php
+++ b/public/main/auth/courses.php
@@ -22,7 +22,7 @@ if ('true' !== api_get_setting('course_catalog_published')) {
     api_block_anonymous_users();
 }
 
-$allowExtraFields = api_get_configuration_value('allow_course_extra_field_in_catalog');
+$allowExtraFields = ('true' === api_get_setting('course.allow_course_extra_field_in_catalog'));
 
 // For students
 $userCanViewPage = true;
@@ -116,7 +116,7 @@ switch ($action) {
             CourseManager::autoSubscribeToCourse($courseCodeToSubscribe);
             if ('course_home' === $redirectAfterSubscription) {
                 $redirectionTarget = $courseInfo['course_public_url'];
-                if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
+                if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) {
                     $user = api_get_user_entity(api_get_user_id());
                     if ($user) {
                         foreach ($user->getCurrentlyAccessibleSessions() as $session) {
@@ -164,7 +164,7 @@ switch ($action) {
 
                 if ('course_home' === $redirectAfterSubscription) {
                     $redirectionTarget = $courseInfo['course_public_url'];
-                    if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
+                    if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) {
                         $user = api_get_user_entity(api_get_user_id());
                         if ($user) {
                             foreach ($user->getCurrentlyAccessibleSessions() as $session) {
@@ -413,7 +413,7 @@ switch ($action) {
             }
 
             $courseUrl = api_get_path(WEB_COURSE_PATH);
-            $hideRating = api_get_configuration_value('hide_course_rating');
+            $hideRating = ('true' === api_get_setting('course.hide_course_rating'));
 
             if (!empty($courses)) {
                 foreach ($courses as &$course) {
diff --git a/public/main/auth/inscription.php b/public/main/auth/inscription.php
index 715354a4d2..9d5660f392 100644
--- a/public/main/auth/inscription.php
+++ b/public/main/auth/inscription.php
@@ -105,9 +105,9 @@ $extraFieldsLoaded = false;
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#pass1');
 // User is not allowed if Terms and Conditions are disabled and
 // registration is disabled too.
-$isNotAllowedHere = 'false' === api_get_setting('allow_terms_conditions') &&
-    'false' === api_get_setting('allow_registration');
-
+//$isNotAllowedHere = 'false' === api_get_setting('allow_terms_conditions') &&
+  //  'false' === api_get_setting('allow_registration');
+$isNotAllowedHere = false;
 if ($isNotAllowedHere) {
     api_not_allowed(true, get_lang('Sorry, you are trying to access the registration page for this portal, but registration is currently disabled. Please contact the administrator (see contact information in the footer). If you already have an account on this site.'));
 }
@@ -153,7 +153,7 @@ $sessionId = Session::read('sessionId');
 $sessionRedirect = isset($_REQUEST['s']) && !empty($_REQUEST['s']) ? $_REQUEST['s'] : null;
 $onlyOneCourseSessionRedirect = isset($_REQUEST['cr']) && !empty($_REQUEST['cr']) ? $_REQUEST['cr'] : null;
 
-if (api_get_configuration_value('allow_redirect_to_session_after_inscription_about')) {
+if ('true' === api_get_setting('session.allow_redirect_to_session_after_inscription_about')) {
     if (!empty($sessionRedirect)) {
         Session::write('session_redirect', $sessionRedirect);
         Session::write('only_one_course_session_redirect', $onlyOneCourseSessionRedirect);
@@ -199,7 +199,7 @@ if (false === $userAlreadyRegisteredShowTerms &&
     }
 
     $LastnameLabel = get_lang('LastName');
-    if (true == api_get_configuration_value('registration_add_helptext_for_2_names')) {
+    if ('true' === api_get_setting('profile.registration_add_helptext_for_2_names')) {
         $LastnameLabel = [$LastnameLabel, get_lang('InsertTwoNames')];
     }
     if (api_is_western_name_order()) {
@@ -753,7 +753,7 @@ if ($blockButton) {
         );
     }
 } else {
-    $allow = api_get_configuration_value('allow_double_validation_in_registration');
+    $allow = ('true' === api_get_setting('platform.allow_double_validation_in_registration'));
 
     if (false === $allow && $termActivated) {
         $htmlHeadXtra[] = '<script>
diff --git a/public/main/auth/my_progress.php b/public/main/auth/my_progress.php
index 523774a943..090963048d 100644
--- a/public/main/auth/my_progress.php
+++ b/public/main/auth/my_progress.php
@@ -9,7 +9,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 
 api_block_anonymous_users();
 
-if (api_get_configuration_value('block_my_progress_page')) {
+if (('true' === api_get_setting('platform.block_my_progress_page'))) {
     api_not_allowed(true);
 }
 
@@ -101,8 +101,8 @@ if (!empty($dates)) {
 }
 */
 
-if (api_get_configuration_value('private_messages_about_user_visible_to_user')) {
-    $allowMessages = api_get_configuration_value('private_messages_about_user');
+if ('true' === api_get_setting('message.private_messages_about_user_visible_to_user')) {
+    $allowMessages = ('true' === api_get_setting('message.private_messages_about_user'));
     if ($allowMessages) {
         // Messages
         $content .= Display::page_subheader2(get_lang('Messages'));
diff --git a/public/main/chat/chat.php b/public/main/chat/chat.php
index 661bb22cba..703e852672 100644
--- a/public/main/chat/chat.php
+++ b/public/main/chat/chat.php
@@ -48,7 +48,7 @@ $view = new Template(get_lang('Chat'), false, false, false, true, false);
 $view->assign('icons', $iconList);
 $view->assign('emoji_strategy', CourseChatUtils::getEmojiStrategy());
 //$view->assign('emoji_smile', \Emojione\Emojione::toImage(':smile:'));
-$view->assign('restrict_to_coach', api_get_configuration_value('course_chat_restrict_to_coach'));
+$view->assign('restrict_to_coach', ('true' === api_get_setting('chat.course_chat_restrict_to_coach')));
 $view->assign('user', api_get_user_info());
 $template = $view->get_template('chat/chat.tpl');
 $content = $view->fetch($template);
diff --git a/public/main/course_description/course_description_controller.php b/public/main/course_description/course_description_controller.php
index d3886983f9..a02911e054 100644
--- a/public/main/course_description/course_description_controller.php
+++ b/public/main/course_description/course_description_controller.php
@@ -261,7 +261,7 @@ class CourseDescriptionController
             $form->addElement('hidden', 'description_type', $description_type);
             //$form->addElement('hidden', 'sec_token', $token);
 
-            if (api_get_configuration_value('save_titles_as_html')) {
+            if ('true' === api_get_setting('editor.save_titles_as_html')) {
                 $form->addHtmlEditor(
                     'title',
                     get_lang('Title'),
@@ -351,7 +351,7 @@ class CourseDescriptionController
                 'index.php?action=add&'.api_get_cidreq()
             );
             $form->addElement('hidden', 'description_type', ADD_BLOCK);
-            if (api_get_configuration_value('save_titles_as_html')) {
+            if ('true' === api_get_setting('editor.save_titles_as_html')) {
                 $form->addHtmlEditor(
                     'title',
                     get_lang('Title'),
diff --git a/public/main/course_info/infocours.php b/public/main/course_info/infocours.php
index d5007d3c28..3cdb18ae8f 100644
--- a/public/main/course_info/infocours.php
+++ b/public/main/course_info/infocours.php
@@ -691,7 +691,7 @@ $form->addPanelOption(
     'accordionSettings'
 );
 
-if (api_get_configuration_value('allow_exercise_auto_launch')) {
+if ('true' === api_get_setting('exercise.allow_exercise_auto_launch')) {
     $globalGroup = [];
 
     // Auto launch exercise
diff --git a/public/main/course_progress/index.php b/public/main/course_progress/index.php
index c2dfc6f6c7..7476f91da4 100644
--- a/public/main/course_progress/index.php
+++ b/public/main/course_progress/index.php
@@ -232,7 +232,7 @@ switch ($action) {
                 $form->addHidden('thematic_id', $thematicId);
             }
 
-            if (api_get_configuration_value('save_titles_as_html')) {
+            if ('true' === api_get_setting('editor.save_titles_as_html')) {
                 $form->addHtmlEditor(
                     'title',
                     get_lang('Title'),
@@ -416,7 +416,7 @@ switch ($action) {
         break;
     case 'export_documents':
     case 'thematic_export_pdf':
-        $pdfOrientation = api_get_configuration_value('thematic_pdf_orientation');
+        $pdfOrientation = api_get_setting('document.thematic_pdf_orientation');
         $view = new Template('', false, false, false, true, false, false);
         $list = $thematicManager->getThematicList($course, $session);
         $view->assign('data', $list);
@@ -461,7 +461,7 @@ switch ($action) {
         $view->assign('thematic', $thematicEntity);
         $template = $view->get_template('course_progress/pdf_single_thematic.tpl');
 
-        $pdfOrientation = api_get_configuration_value('thematic_pdf_orientation');
+        $pdfOrientation = api_get_setting('document.thematic_pdf_orientation');
         $format = 'portrait' !== $pdfOrientation ? 'A4-L' : 'A4-P';
         $orientation = 'portrait' !== $pdfOrientation ? 'L' : 'P';
         $title = get_lang('Thematic').'-'.$thematicEntity->getTitle();
diff --git a/public/main/create_course/add_course.php b/public/main/create_course/add_course.php
index dc93be70a6..f37f7265a6 100644
--- a/public/main/create_course/add_course.php
+++ b/public/main/create_course/add_course.php
@@ -103,10 +103,10 @@ $form->addRule(
     'filetype',
     $allowed_picture_types
 );
-
+$allowBaseCourseCategory = ('true' === api_get_setting('course.allow_base_course_category'));
 $countCategories = $courseCategoriesRepo->countAllInAccessUrl(
     $accessUrlId,
-    api_get_configuration_value('allow_base_course_category')
+    $allowBaseCourseCategory
 );
 
 if ($countCategories >= 100) {
@@ -120,14 +120,15 @@ if ($countCategories >= 100) {
         ['url' => $url]
     );
 } else {
+    $allowBaseCourseCategory = ('true' === api_get_setting('course.allow_base_course_category'));
     $categories = $courseCategoriesRepo->findAllInAccessUrl(
         $accessUrlId,
-        api_get_configuration_value('allow_base_course_category')
+        $allowBaseCourseCategory
     );
     $categoriesOptions = [null => get_lang('None')];
     $categoryToAvoid = '';
     if (!api_is_platform_admin()) {
-        $categoryToAvoid = api_get_configuration_value('course_category_code_to_use_as_model');
+        $categoryToAvoid = api_get_setting('course.course_category_code_to_use_as_model');
     }
 
     /** @var CourseCategory $category */
@@ -437,8 +438,8 @@ if ($form->validate()) {
     if (!$course_validation_feature) {
         $message = Display::return_message(get_lang('Once you click on "Create a course", a course is created with a section for Tests, Project based learning, Assessments, Courses, Dropbox, Agenda and much more. Logging in as teacher provides you with editing privileges for this course.'));
         // If the donation feature is enabled, show a message with a donate button
-        if (true == api_get_configuration_value('course_creation_donate_message_show')) {
-            $button = api_get_configuration_value('course_creation_donate_link');
+        if ('true' === api_get_setting('course.course_creation_donate_message_show')) {
+            $button = api_get_setting('course.course_creation_donate_link');
             if (!empty($button)) {
                 $message .= Display::return_message(get_lang('DonateToTheProject').'<br /><br /><div style="display:block; margin-left:42%;">'.$button.'</div>', 'warning', false);
             }
diff --git a/public/main/cron/hosting_total_size_limit.php b/public/main/cron/hosting_total_size_limit.php
index 50afd69e41..a504b9456a 100644
--- a/public/main/cron/hosting_total_size_limit.php
+++ b/public/main/cron/hosting_total_size_limit.php
@@ -12,7 +12,7 @@ require_once __DIR__.'/../inc/global.inc.php';
  */
 function isTotalPortalSizeBiggerThanLimit($debug = true)
 {
-    $sizeLimit = api_get_configuration_value('hosting_total_size_limit');
+    $sizeLimit = (int) api_get_setting('mail.hosting_total_size_limit');
     if (empty($sizeLimit)) {
         return true;
     }
diff --git a/public/main/cron/import_csv.php b/public/main/cron/import_csv.php
index 6d0e50b294..d3dc455208 100644
--- a/public/main/cron/import_csv.php
+++ b/public/main/cron/import_csv.php
@@ -3256,7 +3256,8 @@ if (isset($_configuration['import_csv_disable_dump']) &&
     $import->setDumpValues($dump);
 }
 
-$import->setUpdateEmailToDummy(api_get_configuration_value('update_users_email_to_dummy_except_admins'));
+$settingEmailDummy = ('true' === api_get_setting('mail.update_users_email_to_dummy_except_admins'));
+$import->setUpdateEmailToDummy($settingEmailDummy);
 
 // Do not moves the files to treated
 if (isset($_configuration['import_csv_test'])) {
diff --git a/public/main/exercise/ReadingComprehension.php b/public/main/exercise/ReadingComprehension.php
index b32a436e34..2ff6bff7f7 100644
--- a/public/main/exercise/ReadingComprehension.php
+++ b/public/main/exercise/ReadingComprehension.php
@@ -131,7 +131,7 @@ class ReadingComprehension extends UniqueAnswer
         $form->addElement('hidden', 'answerType', READING_COMPREHENSION);
         $form->addTextarea('questionDescription', get_lang('Text'), ['rows' => 20]);
         // question name
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $editorConfig = ['ToolbarSet' => 'TitleAsHtml'];
             $form->addHtmlEditor(
                 'questionName',
diff --git a/public/main/exercise/admin.php b/public/main/exercise/admin.php
index 81d72b8dc3..f9f22f11a2 100644
--- a/public/main/exercise/admin.php
+++ b/public/main/exercise/admin.php
@@ -54,7 +54,7 @@ api_protect_course_script(true);
 $is_allowedToEdit = api_is_allowed_to_edit(null, true, false, false);
 $sessionId = api_get_session_id();
 $studentViewActive = api_is_student_view_active();
-$showPagination = api_get_configuration_value('show_question_pagination');
+$showPagination = api_get_setting('exercise.show_question_pagination');
 
 if (!$is_allowedToEdit) {
     api_not_allowed(true);
diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index bbebfe9e1d..56230d1340 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -148,7 +148,7 @@ class Exercise
         $this->sessionId = api_get_session_id();
 
         // ALTER TABLE c_quiz_question ADD COLUMN feedback text;
-        $this->questionFeedbackEnabled = api_get_configuration_value('allow_quiz_question_feedback');
+        $this->questionFeedbackEnabled = ('true' === api_get_setting('exercise.allow_quiz_question_feedback'));
         $this->showPreviousButton = true;
     }
 
@@ -1615,12 +1615,12 @@ class Exercise
 
         $exercise->setPreventBackwards($this->getPreventBackwards());
 
-        $allow = api_get_configuration_value('allow_quiz_show_previous_button_setting');
+        $allow = ('true' === api_get_setting('exercise.allow_quiz_show_previous_button_setting'));
         if (true === $allow) {
             $exercise->setShowPreviousButton($this->showPreviousButton());
         }
 
-        $allow = api_get_configuration_value('allow_notification_setting_per_exercise');
+        $allow = ('true' === api_get_setting('exercise.allow_notification_setting_per_exercise'));
         if (true === $allow) {
             $notifications = $this->getNotifications();
             if (!empty($notifications)) {
@@ -1765,7 +1765,7 @@ class Exercise
      */
     public function delete()
     {
-        $limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+        $limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
 
         if ($limitTeacherAccess && !api_is_platform_admin()) {
             return false;
@@ -1838,7 +1838,7 @@ class Exercise
         $form->addHeader($form_title);
 
         // Title.
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $form->addHtmlEditor(
                 'exerciseTitle',
                 get_lang('Test name'),
@@ -2143,7 +2143,7 @@ class Exercise
             ];
             $form->addGroup($group, null, get_lang('Hide question title'));
 
-            $allow = api_get_configuration_value('allow_quiz_show_previous_button_setting');
+            $allow = ('true' === api_get_setting('exercise.allow_quiz_show_previous_button_setting'))
 
             if (true === $allow) {
                 // Hide question title.
@@ -2282,7 +2282,7 @@ class Exercise
                 $editor_config
             );
 
-            $allow = api_get_configuration_value('allow_notification_setting_per_exercise');
+            $allow = ('true' === api_get_setting('exercise.allow_notification_setting_per_exercise'));
             if (true === $allow) {
                 $settings = ExerciseLib::getNotificationSettings();
                 $group = [];
@@ -6199,7 +6199,7 @@ class Exercise
 
         if (!empty($sessionId)) {
             $addGeneralCoach = true;
-            $setting = api_get_configuration_value('block_quiz_mail_notification_general_coach');
+            $setting = ('true' === api_get_setting('exercise.block_quiz_mail_notification_general_coach'));
             if (true === $setting) {
                 $addGeneralCoach = false;
             }
@@ -6239,9 +6239,9 @@ class Exercise
 
         $scoreLabel = '';
         if ($sendEnd &&
-            true == api_get_configuration_value('send_score_in_exam_notification_mail_to_manager')
+            ('true' === api_get_setting('exercise.send_score_in_exam_notification_mail_to_manager'))
         ) {
-            $notificationPercentage = api_get_configuration_value('send_notification_score_in_percentage');
+            $notificationPercentage = ('true' === api_get_setting('mail.send_notification_score_in_percentage'));
             $scoreLabel = ExerciseLib::show_score($score, $weight, $notificationPercentage, true);
             $scoreLabel = '<tr>
                             <td>'.get_lang('Score')."</td>
@@ -6329,7 +6329,7 @@ class Exercise
         $allowSignature = false,
         $allowExportPdf = false
     ) {
-        if (api_get_configuration_value('hide_user_info_in_quiz_result')) {
+        if ('true' === api_get_setting('exercise.hide_user_info_in_quiz_result')) {
             return '';
         }
 
@@ -6372,7 +6372,7 @@ class Exercise
         $data['duration'] = $duration;
         $data['ip'] = $ip;
 
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html'))) {
             $data['title'] = $this->get_formated_title().get_lang('Result');
         } else {
             $data['title'] = PHP_EOL.$this->exercise.' : '.get_lang('Result');
@@ -7931,7 +7931,7 @@ class Exercise
      */
     public function get_formated_title()
     {
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
         }
 
         return api_html_entity_decode($this->selectTitle());
@@ -8242,7 +8242,7 @@ class Exercise
      */
     public function showPreviousButton()
     {
-        $allow = api_get_configuration_value('allow_quiz_show_previous_button_setting');
+        $allow = ('true' === api_get_setting('exercise.allow_quiz_show_previous_button_setting'))
         if (false === $allow) {
             return true;
         }
@@ -8385,7 +8385,7 @@ class Exercise
      */
     public function showExpectedChoice()
     {
-        return api_get_configuration_value('show_exercise_expected_choice');
+        return ('true' === api_get_setting('exercise.show_exercise_expected_choice'));
     }
 
     /**
@@ -8434,7 +8434,7 @@ class Exercise
         $ribbonClassModifier = '';
 
         if ($this->showExpectedChoice()) {
-            $hideLabel = api_get_configuration_value('exercise_hide_label');
+            $hideLabel = ('true' === api_get_setting('exercise.exercise_hide_label'));
             if (true === $hideLabel) {
                 $ribbonClassModifier = 'question-answer-result__header-ribbon--no-ribbon';
                 $html = '';
@@ -8748,7 +8748,7 @@ class Exercise
         $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? (int) $_REQUEST['learnpath_item_id'] : null;
         $autoLaunchAvailable = false;
         if (1 == api_get_course_setting('enable_exercise_auto_launch') &&
-            api_get_configuration_value('allow_exercise_auto_launch')
+            ('true' === api_get_setting('exercise.allow_exercise_auto_launch'))
         ) {
             $autoLaunchAvailable = true;
         }
@@ -8759,7 +8759,7 @@ class Exercise
         $charset = 'utf-8';
         $token = Security::get_token();
         $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh($userId, ['real_id' => $courseId]);
-        $limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+        $limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
         $content = '';
         $column = 0;
         if ($is_allowedToEdit) {
@@ -8818,7 +8818,7 @@ class Exercise
 
         $webPath = api_get_path(WEB_CODE_PATH);
         if (!empty($exerciseList)) {
-            $visibilitySetting = api_get_configuration_value('show_hidden_exercise_added_to_lp');
+            $visibilitySetting = ('true' === api_get_setting('lp.show_hidden_exercise_added_to_lp'));
             //avoid sending empty parameters
             $mylpid = empty($learnpath_id) ? '' : '&learnpath_id='.$learnpath_id;
             $mylpitemid = empty($learnpath_item_id) ? '' : '&learnpath_item_id='.$learnpath_item_id;
@@ -9892,8 +9892,8 @@ class Exercise
             return true;
         }
 
-        $limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
-        $disableClean = api_get_configuration_value('disable_clean_exercise_results_for_teachers');
+        $limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
+        $disableClean = ('true' === api_get_setting('exercise.disable_clean_exercise_results_for_teachers'));
 
         switch ($action) {
             case 'delete':
diff --git a/public/main/exercise/exercise.php b/public/main/exercise/exercise.php
index 4f16a34e0b..4336a6d851 100644
--- a/public/main/exercise/exercise.php
+++ b/public/main/exercise/exercise.php
@@ -22,7 +22,7 @@ $this_section = SECTION_COURSES;
 
 api_protect_course_script(true);
 
-$limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+$limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
 
 $allowDelete = Exercise::allowAction('delete');
 $allowClean = Exercise::allowAction('clean_results');
diff --git a/public/main/exercise/exercise_question_reminder.php b/public/main/exercise/exercise_question_reminder.php
index 39241577ed..8ffb158a75 100644
--- a/public/main/exercise/exercise_question_reminder.php
+++ b/public/main/exercise/exercise_question_reminder.php
@@ -7,7 +7,7 @@ use ChamiloSession as Session;
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_QUIZ;
 
-if (false === api_get_configuration_value('block_category_questions')) {
+if ('false' === api_get_setting('exercise.block_category_questions')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/exercise/exercise_reminder.php b/public/main/exercise/exercise_reminder.php
index bd07ddd142..c30d4e03b8 100644
--- a/public/main/exercise/exercise_reminder.php
+++ b/public/main/exercise/exercise_reminder.php
@@ -107,7 +107,7 @@ if ($time_control) {
 }
 
 $selectionType = $objExercise->getQuestionSelectionType();
-if (api_get_configuration_value('block_category_questions') &&
+if (('true' === api_get_setting('exercise.block_category_questions')) &&
     ONE_PER_PAGE == $objExercise->type &&
     EX_Q_SELECTION_CATEGORIES_ORDERED_QUESTIONS_RANDOM == $selectionType
 ) {
diff --git a/public/main/exercise/exercise_report.php b/public/main/exercise/exercise_report.php
index d1309656e4..37480c2bc1 100644
--- a/public/main/exercise/exercise_report.php
+++ b/public/main/exercise/exercise_report.php
@@ -33,7 +33,7 @@ if (api_is_student_boss() && !empty($filter_user)) {
     api_protect_course_script(true, false, true);
 }
 
-$limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+$limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
 $allowClean = Exercise::allowAction('clean_results');
 
 if ($limitTeacherAccess && !api_is_platform_admin()) {
@@ -318,7 +318,7 @@ if (isset($_REQUEST['comments']) &&
             false,
             false,
             false,
-            api_get_configuration_value('quiz_results_answers_report'),
+            ('true' === api_get_setting('exercise.quiz_results_answers_report')),
             false
         );
         $objExerciseTmp->results_disabled = $oldResultDisabled;
@@ -334,7 +334,7 @@ if (isset($_REQUEST['comments']) &&
             false,
             false,
             false,
-            api_get_configuration_value('quiz_results_answers_report'),
+            ('true' === api_get_setting('exercise.quiz_results_answers_report')),
             false
         );
         ob_end_clean();
@@ -685,7 +685,7 @@ if ($is_allowedToEdit || $is_tutor) {
             'width' => '40',
             'align' => 'left',
             'search' => 'true',
-            'hidden' => api_get_configuration_value('exercise_attempts_report_show_username') ? 'false' : 'true',
+            'hidden' => ('true' === api_get_setting('exercise.exercise_attempts_report_show_username')) ? 'false' : 'true',
         ],
         [
             'name' => 'group_name',
diff --git a/public/main/exercise/exercise_result.php b/public/main/exercise/exercise_result.php
index a6ddd0dbcd..d89f28e7dd 100644
--- a/public/main/exercise/exercise_result.php
+++ b/public/main/exercise/exercise_result.php
@@ -63,7 +63,7 @@ $interbreadcrumb[] = [
 
 $htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
-if (api_get_configuration_value('quiz_prevent_copy_paste')) {
+if ('true' === api_get_setting('exercise.quiz_prevent_copy_paste')) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'jquery.nocopypaste.js"></script>';
 }
 
@@ -208,7 +208,7 @@ $stats = ExerciseLib::displayQuestionListByAttempt(
     $saveResults,
     $remainingMessage,
     $allowSignature,
-    api_get_configuration_value('quiz_results_answers_report'),
+    ('true' === api_get_setting('exercise.quiz_results_answers_report')),
     false
 );
 $pageContent .= ob_get_contents();
@@ -226,7 +226,7 @@ $statsTeacher = ExerciseLib::displayQuestionListByAttempt(
     false,
     $remainingMessage,
     $allowSignature,
-    api_get_configuration_value('quiz_results_answers_report'),
+    ('true' === api_get_setting('exercise.quiz_results_answers_report')),
     false
 );
 ob_end_clean();
diff --git a/public/main/exercise/exercise_show.php b/public/main/exercise/exercise_show.php
index ff6131e937..9473184962 100644
--- a/public/main/exercise/exercise_show.php
+++ b/public/main/exercise/exercise_show.php
@@ -136,7 +136,7 @@ if (!$is_allowedToEdit) {
 }
 
 $allowRecordAudio = 'true' === api_get_setting('enable_record_audio');
-$allowTeacherCommentAudio = true === api_get_configuration_value('allow_teacher_comment_audio');
+$allowTeacherCommentAudio = ('true' === api_get_setting('exercise.allow_teacher_comment_audio'));
 
 //$js = '<script>'.api_get_language_translate_html().'</script>';
 //$htmlHeadXtra[] = $js;
@@ -325,7 +325,7 @@ if ($show_results || $show_only_total_score || $showTotalScoreAndUserChoicesInLa
         $track_exercise_info,
         false,
         false,
-        api_get_configuration_value('quiz_results_answers_report')
+        ('true' === api_get_setting('exercise.quiz_results_answers_report'))
     );
 }
 
@@ -689,7 +689,7 @@ foreach ($questionList as $questionId) {
 
                 echo '<div id="'.$marksname.'" class="hidden">';
 
-                $allowDecimalScore = api_get_configuration_value('quiz_open_question_decimal_score');
+                $allowDecimalScore = ('true' === api_get_setting('exercise.quiz_open_question_decimal_score'));
                 $formMark = new FormValidator('marksform_'.$questionId, 'post');
                 $formMark->addHeader(get_lang('Assign a grade'));
                 $model = ExerciseLib::getCourseScoreModel();
diff --git a/public/main/exercise/exercise_submit.php b/public/main/exercise/exercise_submit.php
index b8553aee54..f0fae22109 100644
--- a/public/main/exercise/exercise_submit.php
+++ b/public/main/exercise/exercise_submit.php
@@ -71,7 +71,7 @@ if ($showGlossary) {
 $htmlHeadXtra[] = api_get_build_js('exercise.js');
 $htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
 //$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
-if (api_get_configuration_value('quiz_prevent_copy_paste')) {
+if ('true' === api_get_setting('exercise.quiz_prevent_copy_paste')) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'jquery.nocopypaste.js"></script>';
 }
 
@@ -380,7 +380,7 @@ $questionListUncompressed = $objExercise->getQuestionListWithMediasUncompressed(
 Session::write('question_list_uncompressed', $questionListUncompressed);
 $clock_expired_time = null;
 if (empty($exercise_stat_info)) {
-    $disable = api_get_configuration_value('exercises_disable_new_attempts');
+    $disable = ('true' === api_get_setting('exercise.exercises_disable_new_attempts'));
     if ($disable) {
         api_not_allowed(true);
     }
@@ -481,7 +481,7 @@ $questionListInSession = Session::read('questionList');
 $selectionType = $objExercise->getQuestionSelectionType();
 
 $allowBlockCategory = false;
-if (api_get_configuration_value('block_category_questions')) {
+if ('true' === api_get_setting('exercise.block_category_questions')) {
     $extraFieldValue = new ExtraFieldValue('exercise');
     $extraFieldData = $extraFieldValue->get_values_by_handler_and_field_variable($objExercise->iId, 'block_category');
     if ($extraFieldData && isset($extraFieldData['value']) && 1 === (int) $extraFieldData['value']) {
diff --git a/public/main/exercise/overview.php b/public/main/exercise/overview.php
index fa600eba12..d211d45cd1 100644
--- a/public/main/exercise/overview.php
+++ b/public/main/exercise/overview.php
@@ -113,7 +113,7 @@ if ($is_allowed_to_edit) {
 $iconExercise = Display::return_icon('test-quiz.png', null, [], ICON_SIZE_MEDIUM);
 
 // Exercise name.
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $html .= Display::div(
         $objExercise->get_formated_title().PHP_EOL.$editLink
     );
@@ -160,7 +160,7 @@ $exercise_url_button = Display::url(
 );
 
 $btnCheck = '';
-$quizCheckButtonEnabled = api_get_configuration_value('quiz_check_button_enable');
+$quizCheckButtonEnabled = ('true' === api_get_setting('exercise.quiz_check_button_enable'));
 if ($quizCheckButtonEnabled) {
     $btnCheck = Display::button(
             'quiz_check_request_button',
@@ -434,7 +434,7 @@ if ($time_control) {
 
 $html .= $message;
 
-$disable = api_get_configuration_value('exercises_disable_new_attempts');
+$disable = ('true' === api_get_setting('exercise.exercises_disable_new_attempts'));
 if ($disable && empty($exercise_stat_info)) {
     $exercise_url_button = Display::return_message(get_lang('The portal do not allowed to start new test for the moment, please come back later.'));
 }
diff --git a/public/main/exercise/question.class.php b/public/main/exercise/question.class.php
index 901b19ebbf..4032eddade 100644
--- a/public/main/exercise/question.class.php
+++ b/public/main/exercise/question.class.php
@@ -228,7 +228,7 @@ abstract class Question
      */
     public function selectTitle()
     {
-        if (!api_get_configuration_value('save_titles_as_html')) {
+        if (!('true' === api_get_setting('editor.save_titles_as_html'))) {
             return $this->question;
         }
 
@@ -237,9 +237,9 @@ abstract class Question
 
     public function getTitleToDisplay(Exercise $exercise, int $itemNumber): string
     {
-        $showQuestionTitleHtml = api_get_configuration_value('save_titles_as_html');
+        $showQuestionTitleHtml = ('true' === api_get_setting('editor.save_titles_as_html'));
         $title = '';
-        if (api_get_configuration_value('show_question_id')) {
+        if ('true' === api_get_setting('exercise.show_question_id')) {
             $title .= '<h4>#'.$this->course['code'].'-'.$this->iid.'</h4>';
         }
 
@@ -1205,7 +1205,7 @@ abstract class Question
         }
 
         // question name
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $editorConfig = ['ToolbarSet' => 'TitleAsHtml'];
             $form->addHtmlEditor(
                 'questionName',
@@ -1651,7 +1651,7 @@ abstract class Question
                         $score['result'] = ' ? ';
                     }
 
-                    $hide = api_get_configuration_value('hide_free_question_score');
+                    $hide = ('true' === api_get_setting('exercise.hide_free_question_score'));
                     if (true === $hide) {
                         $score['result'] = '-';
                     }
@@ -1695,7 +1695,7 @@ abstract class Question
         // dont display score for certainty degree questions
         if (MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY == $this->type) {
             $showRibbon = false;
-            $ribbonResult = api_get_configuration_value('show_exercise_question_certainty_ribbon_result');
+            $ribbonResult = ('true' === api_get_setting('exercise.show_exercise_question_certainty_ribbon_result'));
             if (true === $ribbonResult) {
                 $showRibbon = true;
             }
diff --git a/public/main/exercise/question_admin.inc.php b/public/main/exercise/question_admin.inc.php
index c8d8ada8a3..01845bda3b 100644
--- a/public/main/exercise/question_admin.inc.php
+++ b/public/main/exercise/question_admin.inc.php
@@ -75,7 +75,7 @@ if (is_object($objQuestion)) {
             } else {
                 // New question
                 $page = 1;
-                $length = api_get_configuration_value('question_pagination_length');
+                $length = api_get_setting('exercise.question_pagination_length');
                 if (!empty($length)) {
                     $page = round($objExercise->getQuestionCount() / $length);
                 }
diff --git a/public/main/exercise/question_list_admin.inc.php b/public/main/exercise/question_list_admin.inc.php
index 29aa16492c..960bdb08fb 100644
--- a/public/main/exercise/question_list_admin.inc.php
+++ b/public/main/exercise/question_list_admin.inc.php
@@ -11,7 +11,7 @@ use ChamiloSession as Session;
  *    This script allows to manage the question list
  *    It is included from the script admin.php
  */
-$limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+$limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
 
 // deletes a question from the exercise (not from the data base)
 if ($deleteQuestion) {
@@ -132,9 +132,9 @@ if (!$inATest) {
         // In building mode show all questions not render by teacher order.
         $objExercise->questionSelectionType = EX_Q_SELECTION_ORDERED;
         $allowQuestionOrdering = true;
-        $showPagination = api_get_configuration_value('show_question_pagination');
+        $showPagination = api_get_setting('exercise.show_question_pagination');
         if (!empty($showPagination) && $nbrQuestions > $showPagination) {
-            $length = api_get_configuration_value('question_pagination_length');
+            $length = api_get_setting('exercise.question_pagination_length');
             $url = api_get_self().'?'.api_get_cidreq();
             // Use pagination for exercise with more than 200 questions.
             $allowQuestionOrdering = false;
diff --git a/public/main/exercise/question_pool.php b/public/main/exercise/question_pool.php
index 02c2e833f8..4fcab9dbc1 100644
--- a/public/main/exercise/question_pool.php
+++ b/public/main/exercise/question_pool.php
@@ -98,7 +98,7 @@ if ($is_allowedToEdit) {
 
     // Deletes a question from the database and all exercises
     if ($delete) {
-        $limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+        $limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
         if ($limitTeacherAccess && !api_is_platform_admin()) {
             api_not_allowed(true);
         }
@@ -376,7 +376,7 @@ if (1 == $exercise_id_changed) {
 $my_exercise_list = [];
 $my_exercise_list['0'] = get_lang('AllTests');
 $my_exercise_list['-1'] = get_lang('Orphan questions');
-$titleSavedAsHtml = api_get_configuration_value('save_titles_as_html');
+$titleSavedAsHtml = ('true' === api_get_setting('editor.save_titles_as_html'));
 if (is_array($exercise_list)) {
     foreach ($exercise_list as $row) {
         $my_exercise_list[$row['iid']] = '';
@@ -851,7 +851,7 @@ $nbrQuestions = getQuestions(
     $formValues
 );
 
-$length = api_get_configuration_value('question_pagination_length');
+$length = api_get_setting('exercise.question_pagination_length');
 if (empty($length)) {
     $length = 20;
 }
@@ -1227,7 +1227,7 @@ function get_action_icon_for_question(
     $in_exercise_id,
     Exercise $myObjEx
 ) {
-    $limitTeacherAccess = api_get_configuration_value('limit_exercise_teacher_access');
+    $limitTeacherAccess = ('true' === api_get_setting('exercise.limit_exercise_teacher_access'));
     $getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
     $res = '';
     switch ($in_action) {
diff --git a/public/main/exercise/result.php b/public/main/exercise/result.php
index ff207b7c13..d20b7bac60 100644
--- a/public/main/exercise/result.php
+++ b/public/main/exercise/result.php
@@ -92,7 +92,7 @@ if ($show_headers) {
 $message = Session::read('attempt_remaining');
 Session::erase('attempt_remaining');
 
-$allowExportPdf = api_get_configuration_value('quiz_results_answers_report');
+$allowExportPdf = ('true' === api_get_setting('exercise.quiz_results_answers_report'));
 ob_start();
 $stats = ExerciseLib::displayQuestionListByAttempt(
     $objExercise,
diff --git a/public/main/forum/forumfunction.inc.php b/public/main/forum/forumfunction.inc.php
index 6639105293..1c0acf6185 100644
--- a/public/main/forum/forumfunction.inc.php
+++ b/public/main/forum/forumfunction.inc.php
@@ -2066,7 +2066,7 @@ function show_add_post_form(CForum $forum, CForumThread $thread, CForumPost $pos
     }
 
     if ($giveRevision) {
-        $hide = api_get_configuration_value('hide_forum_post_revision_language');
+        $hide = ('true' === api_get_setting('forum.hide_forum_post_revision_language'));
         $form->addHidden('give_revision', 1);
         if (false === $hide) {
             $extraField = new ExtraField('forum_post');
@@ -2355,7 +2355,7 @@ function newThread(CForum $forum, $form_values = '', $showPreview = true)
     $form->addFile('user_upload', get_lang('Attachment'));
 
     if ($giveRevision) {
-        $hide = api_get_configuration_value('hide_forum_post_revision_language');
+        $hide = ('true' === api_get_setting('forum.hide_forum_post_revision_language'));
         $form->addHidden('give_revision', 1);
         if (false === $hide) {
             $extraField = new ExtraField('forum_post');
@@ -3431,7 +3431,7 @@ function send_mail($userInfo, CForum $forum, CForumThread $thread, CForumPost $p
     $email_body .= get_lang('New Post in the forum').
         ': '.$forum->getForumTitle().' - '.$thread->getThreadTitle()." <br />\n";
 
-    $courseId = api_get_configuration_value('global_forums_course_id');
+    $courseId = (int) api_get_setting('forum.global_forums_course_id');
     $subject = get_lang('New Post in the forum').' - '.
         $_course['official_code'].': '.$forum->getForumTitle().' - '.$thread->getThreadTitle()." <br />\n";
 
@@ -5346,7 +5346,7 @@ function postNeedsRevision(CForumPost $post): bool
  */
 function getAskRevisionButton(CForumPost $post, CForumThread $threadInfo): string
 {
-    if (false === api_get_configuration_value('allow_forum_post_revisions')) {
+    if ('false' === api_get_setting('forum.allow_forum_post_revisions')) {
         return '';
     }
 
diff --git a/public/main/forum/viewthread.php b/public/main/forum/viewthread.php
index 13057154b1..c19637cee5 100644
--- a/public/main/forum/viewthread.php
+++ b/public/main/forum/viewthread.php
@@ -220,7 +220,7 @@ switch ($my_action) {
 
         break;
     case 'ask_revision':
-        if (api_get_configuration_value('allow_forum_post_revisions')) {
+        if ('true' === api_get_setting('forum.allow_forum_post_revisions')) {
             $result = savePostRevision($postEntity);
             Display::addFlash(Display::return_message(get_lang('Saved.')));
         }
diff --git a/public/main/glossary/index.php b/public/main/glossary/index.php
index 75a5938d7b..9220140929 100644
--- a/public/main/glossary/index.php
+++ b/public/main/glossary/index.php
@@ -87,7 +87,7 @@ switch ($action) {
         );
         // Setting the form elements
         $form->addElement('header', get_lang('Add new glossary term'));
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $form->addHtmlEditor(
                 'name',
                 get_lang('Term'),
@@ -152,7 +152,7 @@ switch ($action) {
             // Setting the form elements
             $form->addElement('header', get_lang('Edit term'));
             $form->addElement('hidden', 'glossary_id');
-            if (api_get_configuration_value('save_titles_as_html')) {
+            if ('true' === api_get_setting('editor.save_titles_as_html')) {
                 $form->addHtmlEditor(
                     'name',
                     get_lang('Term'),
@@ -447,7 +447,7 @@ switch ($action) {
             Session::write('glossary_view', $_GET['view']);
         } else {
             $view = Session::read('glossary_view');
-            $defaultView = api_get_configuration_value('default_glossary_view');
+            $defaultView = api_get_setting('glossary.default_glossary_view');
             if (empty($defaultView)) {
                 $defaultView = 'table';
             }
diff --git a/public/main/gradebook/gradebook_display_summary.php b/public/main/gradebook/gradebook_display_summary.php
index a89f91bf13..273eec1c99 100644
--- a/public/main/gradebook/gradebook_display_summary.php
+++ b/public/main/gradebook/gradebook_display_summary.php
@@ -30,13 +30,13 @@ $loadStats = [];
 if ('true' === api_get_setting('gradebook_detailed_admin_view')) {
     $loadStats = [1, 2, 3];
 } else {
-    if (false !== api_get_configuration_value('gradebook_enable_best_score')) {
+    if ('true' === api_get_setting('gradebook.gradebook_enable_best_score')) {
         $loadStats = [2];
     }
 }
 
 /*Session::write('use_gradebook_cache', false);
-$useCache = api_get_configuration_value('gradebook_use_apcu_cache');
+$useCache = ('true' === api_get_setting('gradebook.gradebook_use_apcu_cache'));
 $cacheAvailable = api_get_configuration_value('apc') && $useCache;
 
 if ($cacheAvailable) {
diff --git a/public/main/gradebook/index.php b/public/main/gradebook/index.php
index 81c6abdbf2..bbb974a1f7 100644
--- a/public/main/gradebook/index.php
+++ b/public/main/gradebook/index.php
@@ -69,7 +69,7 @@ switch ($action) {
         }
         break;
     case 'export_table':
-        $hidePdfReport = api_get_configuration_value('gradebook_hide_pdf_report_button');
+        $hidePdfReport = ('true' === api_get_setting('gradebook.gradebook_hide_pdf_report_button'));
         if ($hidePdfReport) {
             api_not_allowed(true);
         }
@@ -831,7 +831,7 @@ if (!empty($selectCat)) {
 }
 
 if (!api_is_allowed_to_edit(null, true)) {
-    $allowButton = false === api_get_configuration_value('gradebook_hide_pdf_report_button');
+    $allowButton = ('false' === api_get_setting('gradebook.gradebook_hide_pdf_report_button'));
     if ($allowButton) {
         $actionsLeft .= Display::url(
             Display::getMdiIcon('file-pdf-box').get_lang('Download report in PDF'),
@@ -933,7 +933,7 @@ if (isset($first_time) && 1 == $first_time && api_is_allowed_to_edit(null, true)
         $i = 0;
         $allcat = [];
         $model = ExerciseLib::getCourseScoreModel();
-        $allowGraph = false === api_get_configuration_value('gradebook_hide_graph');
+        $allowGraph = ('false' === api_get_setting('gradebook.gradebook_hide_graph'));
         $isAllow = api_is_allowed_to_edit(null, true);
 
         $settings = api_get_configuration_value('gradebook_pdf_export_settings');
@@ -983,7 +983,7 @@ if (isset($first_time) && 1 == $first_time && api_is_allowed_to_edit(null, true)
                     if ('true' === api_get_setting('gradebook_detailed_admin_view')) {
                         $loadStats = [1, 2, 3];
                     } else {
-                        if (false !== api_get_configuration_value('gradebook_enable_best_score')) {
+                        if ('true' === api_get_setting('gradebook.gradebook_enable_best_score')) {
                             $loadStats = [2];
                         }
                     }
diff --git a/public/main/gradebook/lib/GradebookUtils.php b/public/main/gradebook/lib/GradebookUtils.php
index e1b0f7f721..fbfcc91a2c 100644
--- a/public/main/gradebook/lib/GradebookUtils.php
+++ b/public/main/gradebook/lib/GradebookUtils.php
@@ -1574,7 +1574,7 @@ class GradebookUtils
         if ('true' === api_get_setting('gradebook_detailed_admin_view')) {
             $loadStats = [1, 2, 3];
         } else {
-            if (false !== api_get_configuration_value('gradebook_enable_best_score')) {
+            if ('true' === api_get_setting('gradebook.gradebook_enable_best_score')) {
                 $loadStats = [2];
             }
         }
diff --git a/public/main/gradebook/lib/be/category.class.php b/public/main/gradebook/lib/be/category.class.php
index 0e08c944fc..b773fe3c85 100644
--- a/public/main/gradebook/lib/be/category.class.php
+++ b/public/main/gradebook/lib/be/category.class.php
@@ -844,7 +844,7 @@ class Category implements GradebookItem
         $session_id = null
     ) {
         $key = 'category:'.$this->id.'student:'.(int) $studentId.'type:'.$type.'course:'.$course_code.'session:'.(int) $session_id;
-        $useCache = api_get_configuration_value('gradebook_use_apcu_cache');
+        $useCache = ('true' === api_get_setting('gradebook.gradebook_use_apcu_cache'));
         $cacheAvailable = api_get_configuration_value('apc') && $useCache;
 
         if ($cacheAvailable) {
@@ -2183,7 +2183,7 @@ class Category implements GradebookItem
      */
     public static function exportAllCertificates($catId, $userList = [])
     {
-        $orientation = api_get_configuration_value('certificate_pdf_orientation');
+        $orientation = api_get_setting('document.certificate_pdf_orientation');
 
         $params['orientation'] = 'landscape';
         if (!empty($orientation)) {
diff --git a/public/main/gradebook/lib/be/exerciselink.class.php b/public/main/gradebook/lib/be/exerciselink.class.php
index 7852874089..982533e66b 100644
--- a/public/main/gradebook/lib/be/exerciselink.class.php
+++ b/public/main/gradebook/lib/be/exerciselink.class.php
@@ -194,7 +194,7 @@ class ExerciseLink extends AbstractLink
             $this->get_id().
             'exerciseId:'.$exerciseId.'student:'.$studentId.'session:'.$sessionId.'courseId:'.$courseId.'type:'.$type;
 
-        $useCache = api_get_configuration_value('gradebook_use_apcu_cache');
+        $useCache = ('true' === api_get_setting('gradebook.gradebook_use_apcu_cache'));
         $cacheAvailable = api_get_configuration_value('apc') && $useCache;
         $cacheDriver = null;
         if ($cacheAvailable) {
diff --git a/public/main/gradebook/lib/be/surveylink.class.php b/public/main/gradebook/lib/be/surveylink.class.php
index 96db51b24a..b361b47292 100644
--- a/public/main/gradebook/lib/be/surveylink.class.php
+++ b/public/main/gradebook/lib/be/surveylink.class.php
@@ -233,7 +233,7 @@ class SurveyLink extends AbstractLink
 
     public function get_link()
     {
-        if (api_get_configuration_value('hide_survey_reporting_button')) {
+        if ('true' === api_get_setting('survey.hide_survey_reporting_button')) {
             return null;
         }
 
diff --git a/public/main/gradebook/lib/fe/catform.class.php b/public/main/gradebook/lib/fe/catform.class.php
index 8350630a6c..d81c403b2c 100644
--- a/public/main/gradebook/lib/fe/catform.class.php
+++ b/public/main/gradebook/lib/fe/catform.class.php
@@ -245,7 +245,7 @@ class CatForm extends FormValidator
         $skillsDefaults = [];
 
         $allowSkillEdit = api_is_platform_admin() || api_is_drh();
-        if (api_get_configuration_value('skills_teachers_can_assign_skills')) {
+        if ('true' === api_get_setting('skill.skills_teachers_can_assign_skills')) {
             $allowSkillEdit = $allowSkillEdit || api_is_allowed_to_edit();
         }
 
diff --git a/public/main/gradebook/lib/fe/gradebooktable.class.php b/public/main/gradebook/lib/fe/gradebooktable.class.php
index 3329d6478c..a7536bab6e 100644
--- a/public/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/public/main/gradebook/lib/fe/gradebooktable.class.php
@@ -81,7 +81,7 @@ class GradebookTable extends SortableTable
         $this->datagen = new GradebookDataGenerator($cats, $evals, $links);
         $this->datagen->exportToPdf = $this->exportToPdf;
         $this->datagen->preLoadDataKey = $this->getPreloadDataKey();
-        $this->datagen->hidePercentage = api_get_configuration_value('hide_gradebook_percentage_user_result');
+        $this->datagen->hidePercentage = ('true' === api_get_setting('gradebook.hide_gradebook_percentage_user_result'));
 
         if (!empty($userId)) {
             $this->datagen->userId = $userId;
@@ -388,10 +388,8 @@ class GradebookTable extends SortableTable
         }
 
         $model = ExerciseLib::getCourseScoreModel();
-        $userExerciseScoreInCategory = api_get_configuration_value(
-            'gradebook_use_exercise_score_settings_in_categories'
-        );
-        $useExerciseScoreInTotal = api_get_configuration_value('gradebook_use_exercise_score_settings_in_total');
+        $userExerciseScoreInCategory = ('true' === api_get_setting('gradebook.gradebook_use_exercise_score_settings_in_categories'));
+        $useExerciseScoreInTotal = ('true' === api_get_setting('gradebook.gradebook_use_exercise_score_settings_in_total'));
         $course_code = api_get_course_id();
         $session_id = api_get_session_id();
         $defaultData = Session::read($this->getPreloadDataKey());
diff --git a/public/main/gradebook/lib/flatview_data_generator.class.php b/public/main/gradebook/lib/flatview_data_generator.class.php
index 9285a1ad95..53b6579d95 100644
--- a/public/main/gradebook/lib/flatview_data_generator.class.php
+++ b/public/main/gradebook/lib/flatview_data_generator.class.php
@@ -226,7 +226,7 @@ class FlatViewDataGenerator
 
         $headers[] = '<span class="text-center">'.api_strtoupper(get_lang('GradebookQualificationTotal')).'</span>';
 
-        if (api_get_configuration_value('gradebook_score_display_custom_standalone')
+        if ('true' === api_get_setting('gradebook.gradebook_score_display_custom_standalone')
             && ScoreDisplay::instance()->is_custom()
         ) {
             $headers[] = get_lang('GradebookScoreDisplayCustomValues');
@@ -445,7 +445,7 @@ class FlatViewDataGenerator
 
             $evaluationsAdded = [];
             $detailAdminView = api_get_setting('gradebook_detailed_admin_view');
-            $style = api_get_configuration_value('gradebook_report_score_style');
+            $style = api_get_setting('gradebook.gradebook_report_score_style');
             $defaultStyle = SCORE_DIV_SIMPLE_WITH_CUSTOM;
             if (!empty($style)) {
                 $defaultStyle = (int) $style;
@@ -575,8 +575,8 @@ class FlatViewDataGenerator
             $item_total += $result['item_total'];
             $item_value_total += $result['item_value_total'];
             $total_score = [$item_value_total, $item_total];
-            $style = api_get_configuration_value('gradebook_report_score_style');
-            $customDisplayIsStandalone = api_get_configuration_value('gradebook_score_display_custom_standalone')
+            $style = api_get_setting('gradebook.gradebook_report_score_style')
+            $customDisplayIsStandalone = ('true' === api_get_setting('gradebook.gradebook_score_display_custom_standalone'))
                 && $scoreDisplay->is_custom();
 
             if (!$show_all) {
@@ -646,7 +646,7 @@ class FlatViewDataGenerator
         $item_value_total = 0;
         $evaluationsAdded = [];
         $model = ExerciseLib::getCourseScoreModel();
-        $style = api_get_configuration_value('gradebook_report_score_style');
+        $style = api_get_setting('gradebook.gradebook_report_score_style');
 
         $defaultStyle = SCORE_DIV_SIMPLE_WITH_CUSTOM;
         if (!empty($style)) {
diff --git a/public/main/gradebook/lib/gradebook_data_generator.class.php b/public/main/gradebook/lib/gradebook_data_generator.class.php
index a4daa8306f..46b9ec3ee3 100644
--- a/public/main/gradebook/lib/gradebook_data_generator.class.php
+++ b/public/main/gradebook/lib/gradebook_data_generator.class.php
@@ -65,7 +65,7 @@ class GradebookDataGenerator
         $this->items = array_merge($allcats, $allevals, $tabLinkToDisplay);
         $this->evals_links = array_merge($allevals, $tabLinkToDisplay);
         $this->userId = api_get_user_id();
-        $this->hidePercentage = api_get_configuration_value('hide_gradebook_percentage_user_result');
+        $this->hidePercentage = ('true' === api_get_setting('gradebook.hide_gradebook_percentage_user_result'));
     }
 
     /**
@@ -118,7 +118,7 @@ class GradebookDataGenerator
         $scoreDisplay = ScoreDisplay::instance();
         $defaultData = Session::read($this->preLoadDataKey);
         $model = ExerciseLib::getCourseScoreModel();
-        $useExerciseScoreInTotal = api_get_configuration_value('gradebook_use_exercise_score_settings_in_total');
+        $useExerciseScoreInTotal = ('true' === api_get_setting('gradebook.gradebook_use_exercise_score_settings_in_total'));
 
         /** @var GradebookItem $item */
         foreach ($visibleItems as $item) {
diff --git a/public/main/inc/ajax/admin.ajax.php b/public/main/inc/ajax/admin.ajax.php
index e0b912a8e6..392ae45217 100644
--- a/public/main/inc/ajax/admin.ajax.php
+++ b/public/main/inc/ajax/admin.ajax.php
@@ -67,7 +67,7 @@ switch ($action) {
 
         break;
     case 'get_latest_news':
-        if (true === api_get_configuration_value('admin_chamilo_announcements_disable')) {
+        if ('true' === api_get_setting('announcement.admin_chamilo_announcements_disable')) {
             break;
         }
 
@@ -178,7 +178,7 @@ function check_system_version()
 
         // The number of sessions
         $number_of_sessions = SessionManager::count_sessions(api_get_current_access_url_id());
-        $packager = api_get_configuration_value('packager');
+        $packager = api_get_setting('platform.packager');
         if (empty($packager)) {
             $packager = 'chamilo';
         }
diff --git a/public/main/inc/ajax/chat.ajax.php b/public/main/inc/ajax/chat.ajax.php
index a64f22d1ec..505e97cc34 100644
--- a/public/main/inc/ajax/chat.ajax.php
+++ b/public/main/inc/ajax/chat.ajax.php
@@ -64,7 +64,7 @@ switch ($action) {
         exit;
         break;
     case 'create_room':
-        if (api_get_configuration_value('hide_chat_video')) {
+        if ('true' === api_get_setting('chat.hide_chat_video')) {
             api_not_allowed();
         }
         /*$room = VideoChat::getChatRoomByUsers(api_get_user_id(), $toUserId);
diff --git a/public/main/inc/ajax/course.ajax.php b/public/main/inc/ajax/course.ajax.php
index b43f876d61..a75f2d22f0 100644
--- a/public/main/inc/ajax/course.ajax.php
+++ b/public/main/inc/ajax/course.ajax.php
@@ -106,7 +106,7 @@ switch ($action) {
 
             $categoryToAvoid = '';
             if (!api_is_platform_admin()) {
-                $categoryToAvoid = api_get_configuration_value('course_category_code_to_use_as_model');
+                $categoryToAvoid = api_get_setting('course.course_category_code_to_use_as_model');
             }
             $list = [];
             foreach ($categories as $item) {
@@ -147,7 +147,7 @@ switch ($action) {
                     );
                 } elseif (api_is_teacher()) {
                     $courseList = CourseManager::get_course_list_of_user_as_course_admin(api_get_user_id(), $_GET['q']);
-                    $category = api_get_configuration_value('course_category_code_to_use_as_model');
+                    $category = api_get_setting('course.course_category_code_to_use_as_model');
                     if (!empty($category)) {
                         $alreadyAdded = [];
                         if (!empty($courseList)) {
diff --git a/public/main/inc/ajax/exercise.ajax.php b/public/main/inc/ajax/exercise.ajax.php
index dbefe46181..761ff03aaa 100644
--- a/public/main/inc/ajax/exercise.ajax.php
+++ b/public/main/inc/ajax/exercise.ajax.php
@@ -919,7 +919,7 @@ switch ($action) {
         $objExercise->read($exerciseId);
         $objQuestion = Question::read($questionId);
         $id = '';
-        if (api_get_configuration_value('show_question_id')) {
+        if ('true' === api_get_setting('exercise.show_question_id')) {
             $id = '<h4>#'.$objQuestion->course['code'].'-'.$objQuestion->iid.'</h4>';
         }
         echo $id;
@@ -982,7 +982,7 @@ switch ($action) {
         echo json_encode($result);
         break;
     case 'browser_test':
-        $quizCheckButtonEnabled = api_get_configuration_value('quiz_check_button_enable');
+        $quizCheckButtonEnabled = ('true' === api_get_setting('exercise.quiz_check_button_enable'));
 
         if ($quizCheckButtonEnabled) {
             if (isset($_POST['sleep'])) {
diff --git a/public/main/inc/ajax/model.ajax.php b/public/main/inc/ajax/model.ajax.php
index d85853ee41..64d1217f78 100644
--- a/public/main/inc/ajax/model.ajax.php
+++ b/public/main/inc/ajax/model.ajax.php
@@ -1688,7 +1688,7 @@ switch ($action) {
         ];
         $extraFieldsToAdd = [];
         $extraFields = api_get_configuration_value('exercise_category_report_user_extra_fields');
-        $roundValues = api_get_configuration_value('exercise_category_round_score_in_export');
+        $roundValues = ('true' === api_get_setting('exercise.exercise_category_round_score_in_export'));
 
         if (!empty($extraFields) && isset($extraFields['fields'])) {
             $extraField = new ExtraField('user');
diff --git a/public/main/inc/ajax/user_manager.ajax.php b/public/main/inc/ajax/user_manager.ajax.php
index adcfd05f13..298d933dfe 100644
--- a/public/main/inc/ajax/user_manager.ajax.php
+++ b/public/main/inc/ajax/user_manager.ajax.php
@@ -174,7 +174,7 @@ switch ($action) {
         }
         break;
     case 'active_user':
-        $allow = api_get_configuration_value('allow_disable_user_for_session_admin');
+        $allow = ('true' === api_get_setting('session.allow_disable_user_for_session_admin'));
         if ((api_is_platform_admin() && api_global_admin_can_edit_admin($_GET['user_id'])) ||
             (
                 $allow &&
diff --git a/public/main/inc/ajax/work.ajax.php b/public/main/inc/ajax/work.ajax.php
index 478e9e78cf..a1266ff5eb 100644
--- a/public/main/inc/ajax/work.ajax.php
+++ b/public/main/inc/ajax/work.ajax.php
@@ -70,7 +70,7 @@ switch ($action) {
         $userId = api_get_user_id();
         $groupId = api_get_group_id();
 
-        $onlyOnePublication = api_get_configuration_value('allow_only_one_student_publication_per_user');
+        $onlyOnePublication = ('true' === api_get_setting('work.allow_only_one_student_publication_per_user'));
         if ($onlyOnePublication) {
             $count = get_work_count_by_student($userId, $workId);
             if ($count >= 1) {
@@ -108,7 +108,7 @@ switch ($action) {
                     $groupId,
                     $userId,
                     $file,
-                    api_get_configuration_value('assignment_prevent_duplicate_upload'),
+                    ('true' === api_get_setting('work.assignment_prevent_duplicate_upload')),
                     false
                 );
 
diff --git a/public/main/inc/email_editor_external.php b/public/main/inc/email_editor_external.php
index bbe97999dd..62f9f44c9b 100644
--- a/public/main/inc/email_editor_external.php
+++ b/public/main/inc/email_editor_external.php
@@ -9,7 +9,7 @@ use ChamiloSession as Session;
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (false === api_get_configuration_value('allow_email_editor_for_anonymous')) {
+if ('false' === api_get_setting('mail.allow_email_editor_for_anonymous')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/inc/lib/AnnouncementManager.php b/public/main/inc/lib/AnnouncementManager.php
index a62d6a8d12..b37acc309d 100644
--- a/public/main/inc/lib/AnnouncementManager.php
+++ b/public/main/inc/lib/AnnouncementManager.php
@@ -539,7 +539,7 @@ class AnnouncementManager
         $html .= Display::dateToStringAgoAndLongDate($lastEdit);
         $html .= "</td></tr>";
 
-        $allow = !api_get_configuration_value('hide_announcement_sent_to_users_info');
+        $allow = !('true' === api_get_setting('announcement.hide_announcement_sent_to_users_info'));
         if ($allow && api_is_allowed_to_edit(false, true)) {
             $sentTo = $announcement->getUsersAndGroupSubscribedToResource();
             $sentToForm = self::sent_to_form($sentTo);
diff --git a/public/main/inc/lib/CourseChatUtils.php b/public/main/inc/lib/CourseChatUtils.php
index 7dd288cac9..bb8ff23d68 100644
--- a/public/main/inc/lib/CourseChatUtils.php
+++ b/public/main/inc/lib/CourseChatUtils.php
@@ -658,7 +658,7 @@ class CourseChatUtils
             $criteria = Criteria::create()->where(Criteria::expr()->eq('course', $course));
             $userIsCoach = api_is_course_session_coach($this->userId, $course->getId(), $session->getId());
 
-            if (api_get_configuration_value('course_chat_restrict_to_coach')) {
+            if ('true' === api_get_setting('chat.course_chat_restrict_to_coach')) {
                 if ($userIsCoach) {
                     $criteria->andWhere(
                         Criteria::expr()->eq('status', Session::STUDENT)
diff --git a/public/main/inc/lib/CoursesAndSessionsCatalog.class.php b/public/main/inc/lib/CoursesAndSessionsCatalog.class.php
index d2b0f27726..c47ec5cfe4 100644
--- a/public/main/inc/lib/CoursesAndSessionsCatalog.class.php
+++ b/public/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -179,7 +179,7 @@ class CoursesAndSessionsCatalog
         $allCategories = CourseCategory::getAllCategories();
         $categoryToAvoid = '';
         if (api_is_student()) {
-            $categoryToAvoid = api_get_configuration_value('course_category_code_to_use_as_model');
+            $categoryToAvoid = api_get_setting('course.course_category_code_to_use_as_model');
         }
         foreach ($allCategories as $category) {
             $categoryCode = $category['code'];
@@ -262,7 +262,7 @@ class CoursesAndSessionsCatalog
                 $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 
                 $urlCondition = ' access_url_id = '.$urlId.' ';
-                $allowBaseCategories = api_get_configuration_value('allow_base_course_category');
+                $allowBaseCategories = ('true' === api_get_setting('course.allow_base_course_category'));
                 if ($allowBaseCategories) {
                     $urlCondition = ' (access_url_id = '.$urlId.' OR access_url_id = 1)  ';
                 }
@@ -479,7 +479,7 @@ class CoursesAndSessionsCatalog
             if (-1 != $urlId) {
                 $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
                 $urlCondition = ' access_url_id = '.$urlId.' AND';
-                $allowBaseCategories = api_get_configuration_value('allow_base_course_category');
+                $allowBaseCategories = ('true' === api_get_setting('course.allow_base_course_category'));
                 if ($allowBaseCategories) {
                     $urlCondition = ' (access_url_id = '.$urlId.' OR access_url_id = 1) AND ';
                 }
diff --git a/public/main/inc/lib/ScheduledAnnouncement.php b/public/main/inc/lib/ScheduledAnnouncement.php
index 985597f665..09b0cbc007 100644
--- a/public/main/inc/lib/ScheduledAnnouncement.php
+++ b/public/main/inc/lib/ScheduledAnnouncement.php
@@ -455,7 +455,7 @@ class ScheduledAnnouncement extends Model
      */
     public function allowed()
     {
-        return api_get_configuration_value('allow_scheduled_announcements');
+        return ('true' === api_get_setting('announcement.allow_scheduled_announcements'));
     }
 
     private function setTagsInForm(FormValidator $form)
diff --git a/public/main/inc/lib/SkillModel.php b/public/main/inc/lib/SkillModel.php
index c1e827c0ca..efe9bdd742 100644
--- a/public/main/inc/lib/SkillModel.php
+++ b/public/main/inc/lib/SkillModel.php
@@ -192,7 +192,7 @@ class SkillModel extends Model
                 break;
         }
 
-        $isHierarchicalTable = api_get_configuration_value('table_of_hierarchical_skill_presentation');
+        $isHierarchicalTable = ('true' === api_get_setting('skill.table_of_hierarchical_skill_presentation'));
         $skillRepo = Container::getSkillRepository();
         $html = '';
         foreach ($skills as $skill) {
@@ -711,7 +711,7 @@ class SkillModel extends Model
      */
     public function processVertex(Vertex $vertex, $skills = [], $level = 0)
     {
-        $isHierarchicalTable = api_get_configuration_value('table_of_hierarchical_skill_presentation');
+        $isHierarchicalTable = ('true' === api_get_setting('skill.table_of_hierarchical_skill_presentation'));
         $subTable = '';
         if ($vertex->getVerticesEdgeTo()->count() > 0) {
             if ($isHierarchicalTable) {
@@ -818,7 +818,7 @@ class SkillModel extends Model
             $tableRows[] = $tableRow;
         }
 
-        $isHierarchicalTable = api_get_configuration_value('table_of_hierarchical_skill_presentation');
+        $isHierarchicalTable = ('true' === api_get_setting('skill.table_of_hierarchical_skill_presentation'));
         $allowLevels = api_get_configuration_value('skill_levels_names');
 
         $tableResult = '<div id="skillList">';
@@ -1651,7 +1651,7 @@ class SkillModel extends Model
                 }
             }
 
-            $allow = api_get_configuration_value('allow_private_skills');
+            $allow = ('true' === api_get_setting('skill.allow_private_skills'));
             if (true === $allow) {
                 if (api_is_teacher()) {
                     return UserManager::isTeacherOfStudent(
@@ -2341,7 +2341,7 @@ class SkillModel extends Model
         string $argumentation,
         int $authorId
     ): ?SkillRelUser {
-        $showLevels = false === api_get_configuration_value('hide_skill_levels');
+        $showLevels = ('false' === api_get_setting('skill.hide_skill_levels'));
 
         $entityManager = Database::getManager();
 
diff --git a/public/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php
index 43f0e04b6e..a6bf4bf358 100644
--- a/public/main/inc/lib/agenda.lib.php
+++ b/public/main/inc/lib/agenda.lib.php
@@ -105,7 +105,7 @@ class Agenda
                 }
 
                 if (!empty($sessionId)) {
-                    $allowDhrToEdit = api_get_configuration_value('allow_agenda_edit_for_hrm');
+                    $allowDhrToEdit = ('true' === api_get_setting('agenda.allow_agenda_edit_for_hrm'));
                     if ($allowDhrToEdit) {
                         $isHrm = SessionManager::isUserSubscribedAsHRM($sessionId, api_get_user_id());
                         if ($isHrm) {
@@ -1003,7 +1003,7 @@ class Agenda
                     $this->getPlatformEvents($start, $end);
                 }
 
-                $ignoreVisibility = api_get_configuration_value('personal_agenda_show_all_session_events');
+                $ignoreVisibility = ('true' === api_get_setting('agenda.personal_agenda_show_all_session_events'));
 
                 // Getting course events
                 $my_course_list = [];
@@ -1459,7 +1459,7 @@ class Agenda
 
         $isAllowToEditByHrm = false;
         if (!empty($sessionId)) {
-            $allowDhrToEdit = api_get_configuration_value('allow_agenda_edit_for_hrm');
+            $allowDhrToEdit = ('true' === api_get_setting('agenda.allow_agenda_edit_for_hrm'));
             if ($allowDhrToEdit) {
                 $isHrm = SessionManager::isUserSubscribedAsHRM($sessionId, $userId);
                 if ($isHrm) {
diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
index 5b85544faa..7ad04d55ce 100644
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -889,7 +889,7 @@ function api_protect_course_script($print_headers = false, $allow_session_admins
     }
 
     // Session admin has access to course
-    $sessionAccess = api_get_configuration_value('session_admins_access_all_content');
+    $sessionAccess = ('true' === api_get_setting('session.session_admins_access_all_content'));
     if ($sessionAccess) {
         $allow_session_admins = true;
     }
@@ -1051,7 +1051,7 @@ function api_protect_admin_script($allow_sessions_admins = false, $allow_drh = f
 function api_block_inactive_user()
 {
     $data = true;
-    if (1 != api_get_configuration_value('security_block_inactive_users_immediately')) {
+    if ('true' !== api_get_setting('security.security_block_inactive_users_immediately')) {
         return $data;
     }
 
@@ -1903,7 +1903,7 @@ function api_get_anonymous_id()
     $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
     $tableU = Database::get_main_table(TABLE_MAIN_USER);
     $ip = Database::escape_string(api_get_real_ip());
-    $max = (int) api_get_configuration_value('max_anonymous_users');
+    $max = (int) api_get_setting('admin.max_anonymous_users');
     if ($max >= 2) {
         $sql = "SELECT * FROM $table as TEL
                 JOIN $tableU as U
@@ -3449,7 +3449,7 @@ function api_not_allowed(
  */
 function languageToCountryIsoCode($languageIsoCode)
 {
-    $allow = api_get_configuration_value('language_flags_by_country');
+    $allow = ('true' === api_get_setting('language.language_flags_by_country'));
 
     // @todo save in DB
     switch ($languageIsoCode) {
@@ -6615,7 +6615,7 @@ function api_can_login_as($loginAsUserId, $userId = null)
 
     $loginAsStatusForSessionAdmins = [STUDENT];
 
-    if (api_get_setting('session.allow_session_admin_login_as_teacher')) {
+    if ('true' === api_get_setting('session.allow_session_admin_login_as_teacher')) {
         $loginAsStatusForSessionAdmins[] = COURSEMANAGER;
     }
 
@@ -7050,8 +7050,8 @@ function api_mail_html(
         }
 
         $params = [
-            'mail_header_style' => api_get_configuration_value('mail_header_style'),
-            'mail_content_style' => api_get_configuration_value('mail_content_style'),
+            'mail_header_style' => api_get_setting('mail.mail_header_style'),
+            'mail_content_style' => api_get_setting('mail.mail_content_style'),
             'link' => $additionalParameters['link'] ?? '',
             'automatic_email_text' => $automaticEmailText,
             'content' => $body,
@@ -7202,7 +7202,7 @@ function api_protect_limit_for_session_admin()
  */
 function api_protect_session_admin_list_users()
 {
-    $limitAdmin = api_get_configuration_value('limit_session_admin_list_users');
+    $limitAdmin = ('true' === api_get_setting('session.limit_session_admin_list_users'));
 
     if (api_is_session_admin() && true === $limitAdmin) {
         api_not_allowed(true);
diff --git a/public/main/inc/lib/certificate.lib.php b/public/main/inc/lib/certificate.lib.php
index bffa954ad0..d7f5c667af 100644
--- a/public/main/inc/lib/certificate.lib.php
+++ b/public/main/inc/lib/certificate.lib.php
@@ -88,7 +88,7 @@ class Certificate extends Model
             $this->html_file = $this->certification_user_path.basename($this->certificate_data['path_certificate']);
             $this->qr_file = $this->certification_user_path.$pathinfo['filename'].'_qr.png';
         } else {
-            if (api_get_configuration_value('allow_general_certificate')) {
+            if ('true' === api_get_setting('document.allow_general_certificate')) {
                 // General certificate
                 $name = md5($this->user_id).'.html';
                 $my_path_certificate = $this->certification_user_path.$name;
@@ -813,7 +813,7 @@ class Certificate extends Model
      */
     public function generatePdfFromCustomCertificate()
     {
-        $orientation = api_get_configuration_value('certificate_pdf_orientation');
+        $orientation = api_get_setting('document.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 550f0bc713..5ce994342a 100644
--- a/public/main/inc/lib/course.lib.php
+++ b/public/main/inc/lib/course.lib.php
@@ -519,7 +519,7 @@ class CourseManager
                 );
             }
         }
-        if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
+        if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) {
             // Also unlink the course from the users' currently accessible sessions
             /** @var Course $course */
             $course = Container::getCourseRepository()->findOneBy([
@@ -604,7 +604,7 @@ class CourseManager
 
         $userId = api_get_user_id();
 
-        if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
+        if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) {
             $user = api_get_user_entity($userId);
             $sessions = $user->getCurrentlyAccessibleSessions();
             if (empty($sessions)) {
@@ -621,7 +621,7 @@ class CourseManager
                     return false;
                 }
                 // user has no session at all, create one starting now
-                $numberOfDays = api_get_configuration_value('user_s_session_duration') ?: 3 * 365;
+                $numberOfDays = (int) api_get_setting('session.user_s_session_duration');
                 try {
                     $duration = new DateInterval(sprintf('P%dD', $numberOfDays));
                 } catch (Exception $exception) {
@@ -644,7 +644,7 @@ class CourseManager
                 $session->setCoachAccessEndDate($endDate);
                 $session->setDisplayEndDate($endDate);
                 $session->setSendSubscriptionNotification(false);
-                $adminId = api_get_configuration_value('session_automatic_creation_user_id') ?: 1;
+                $adminId = (int) api_get_setting('session.session_automatic_creation_user_id');
                 $session->addSessionAdmin(api_get_user_entity($adminId));
                 $session->addUserInSession(0, $user);
                 Database::getManager()->persist($session);
@@ -1125,7 +1125,7 @@ class CourseManager
         $userId = (int) $userId;
         $session_id = (int) $session_id;
 
-        if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
+        if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) {
             // with this option activated, only check whether the course is in one of the users' sessions
             $course = Container::getCourseRepository()->findOneBy([
                 'code' => $course_code,
@@ -2826,7 +2826,7 @@ class CourseManager
         $tblCourseCategory = Database::get_main_table(TABLE_MAIN_CATEGORY);
 
         $languageCondition = '';
-        $onlyInUserLanguage = api_get_configuration_value('my_courses_show_courses_in_user_language_only');
+        $onlyInUserLanguage = ('true' === api_get_setting('course.my_courses_show_courses_in_user_language_only'));
         if ($useUserLanguageFilterIfAvailable && $onlyInUserLanguage) {
             $userInfo = api_get_user_info(api_get_user_id());
             if (!empty($userInfo['language'])) {
@@ -3475,7 +3475,7 @@ class CourseManager
 
         // Filter by language
         $languageCondition = '';
-        $onlyInUserLanguage = api_get_configuration_value('my_courses_show_courses_in_user_language_only');
+        $onlyInUserLanguage = ('true' === api_get_setting('course.my_courses_show_courses_in_user_language_only'));
         if ($useUserLanguageFilterIfAvailable && $onlyInUserLanguage) {
             $userInfo = api_get_user_info(api_get_user_id());
             if (!empty($userInfo['language'])) {
@@ -3618,7 +3618,7 @@ class CourseManager
         }
 
         $languageCondition = '';
-        $onlyInUserLanguage = api_get_configuration_value('my_courses_show_courses_in_user_language_only');
+        $onlyInUserLanguage = ('true' === api_get_setting('course.my_courses_show_courses_in_user_language_only'));
         if ($useUserLanguageFilterIfAvailable && $onlyInUserLanguage) {
             $userInfo = api_get_user_info(api_get_user_id());
             if (!empty($userInfo['language'])) {
@@ -3767,7 +3767,7 @@ class CourseManager
             $params['extrafields'] = CourseManager::getExtraFieldsToBePresented($course_info['real_id']);
             $params['real_id'] = $course_info['real_id'];
 
-            if (api_get_configuration_value('enable_unsubscribe_button_on_my_course_page')
+            if ('true' === api_get_setting('course.enable_unsubscribe_button_on_my_course_page')
                 && '1' === $course_info['unsubscribe']
             ) {
                 $params['unregister_button'] = CoursesAndSessionsCatalog::return_unregister_button(
@@ -3847,7 +3847,7 @@ class CourseManager
         $user_id = api_get_user_id();
         $course_info = api_get_course_info_by_id($course['real_id']);
         $course_visibility = (int) $course_info['visibility'];
-        $allowUnsubscribe = api_get_configuration_value('enable_unsubscribe_button_on_my_course_page');
+        $allowUnsubscribe = ('true' === api_get_setting('course.enable_unsubscribe_button_on_my_course_page'));
 
         if (Course::HIDDEN === $course_visibility) {
             return '';
@@ -4858,7 +4858,7 @@ class CourseManager
             $my_course['teachers'] = self::getTeachersFromCourse($course_info['real_id'], true);
             $point_info = self::get_course_ranking($course_info['real_id'], 0);
             $my_course['rating_html'] = '';
-            if (false === api_get_configuration_value('hide_course_rating')) {
+            if (('false' === api_get_setting('course.hide_course_rating'))) {
                 $my_course['rating_html'] = Display::return_rating_system(
                     'star_'.$course_info['real_id'],
                     $ajax_url.'&course_id='.$course_info['real_id'],
diff --git a/public/main/inc/lib/course_category.lib.php b/public/main/inc/lib/course_category.lib.php
index 338aba5c56..0417d8ed81 100644
--- a/public/main/inc/lib/course_category.lib.php
+++ b/public/main/inc/lib/course_category.lib.php
@@ -90,7 +90,7 @@ class CourseCategory
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
         $conditions = " INNER JOIN $table a ON (t1.id = a.course_category_id)";
         $whereCondition = " AND a.access_url_id = ".api_get_current_access_url_id();
-        $allowBaseCategories = api_get_configuration_value('allow_base_course_category');
+        $allowBaseCategories = ('true' === api_get_setting('course.allow_base_course_category'));
         if ($allowBaseCategories) {
             $whereCondition = " AND (a.access_url_id = ".api_get_current_access_url_id()." OR a.access_url_id = 1) ";
         }
@@ -474,10 +474,11 @@ class CourseCategory
     {
         $repo = Container::getCourseCategoryRepository();
         $category = (int) $category;
+        $allowBaseCourseCategory = ('true' === api_get_setting('course.allow_base_course_category'));
 
         return $repo->findAllInAccessUrl(
             api_get_current_access_url_id(),
-            api_get_configuration_value('allow_base_course_category'),
+            $allowBaseCourseCategory,
             $category
         );
     }
@@ -517,7 +518,7 @@ class CourseCategory
 
         $categoryToAvoid = '';
         if (!api_is_platform_admin()) {
-            $categoryToAvoid = api_get_configuration_value('course_category_code_to_use_as_model');
+            $categoryToAvoid = api_get_setting('course.course_category_code_to_use_as_model');
         }
         $categories[''] = '-';
         while ($cat = Database::fetch_array($res)) {
@@ -612,7 +613,7 @@ class CourseCategory
         $conditions = " INNER JOIN $table a ON (c.id = a.course_category_id)";
         $whereCondition = " AND a.access_url_id = ".api_get_current_access_url_id();
 
-        $allowBaseCategories = api_get_configuration_value('allow_base_course_category');
+        $allowBaseCategories = ('true' === api_get_setting('course.allow_base_course_category'));
         if ($allowBaseCategories) {
             $whereCondition = " AND (a.access_url_id = ".api_get_current_access_url_id()." OR a.access_url_id = 1) ";
         }
diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
index c7abc62e66..a1f1990409 100644
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -524,7 +524,7 @@ class Display
             $hmail .= '&#'.ord($email[$i]).';';
         }
 
-        $value = api_get_configuration_value('add_user_course_information_in_mailto');
+        $value = ('true' === api_get_setting('profile.add_user_course_information_in_mailto'));
 
         if ($value) {
             if ('false' === api_get_setting('allow_email_editor')) {
@@ -1204,7 +1204,7 @@ class Display
             $extra_params['rowList'] = $rowList;
         }
 
-        $defaultRow = api_get_configuration_value('table_default_row');
+        $defaultRow = api_get_setting('platform.table_default_row');
         if (!empty($defaultRow)) {
             $obj->rowNum = (int) $defaultRow;
         }
diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php
index a6c0e8966a..0e173de901 100644
--- a/public/main/inc/lib/document.lib.php
+++ b/public/main/inc/lib/document.lib.php
@@ -3451,7 +3451,7 @@ This folder contains all sessions that have been opened in the chat. Although th
         }
 
         if ($document) {
-            $allowNotification = api_get_configuration_value('send_notification_when_document_added');
+            $allowNotification = ('true' === api_get_setting('document.send_notification_when_document_added'));
             if ($sendNotification && $allowNotification) {
                 $courseTitle = $courseEntity->getTitle();
                 if (!empty($sessionId)) {
diff --git a/public/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php
index 87af79fecd..c4112349e2 100644
--- a/public/main/inc/lib/events.lib.php
+++ b/public/main/inc/lib/events.lib.php
@@ -1131,7 +1131,7 @@ class Event
             Database::query($sql);
         }
 
-        if (api_get_configuration_value('lp_minimum_time')) {
+        if ('true' === api_get_setting('lp.lp_minimum_time')) {
             $sql = "DELETE FROM track_e_access_complete
                     WHERE
                         tool = 'learnpath' AND
diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
index 628f50bf99..f250cde246 100644
--- a/public/main/inc/lib/exercise.lib.php
+++ b/public/main/inc/lib/exercise.lib.php
@@ -2728,7 +2728,7 @@ HOTSPOT;
 
         // Ignore other formats and use the configuration['exercise_score_format'] value
         // But also keep the round values settings.
-        $format = api_get_configuration_value('exercise_score_format');
+        $format = (int) api_get_setting('exercise.exercise_score_format');
         if (!empty($format)) {
             $html = ScoreDisplay::instance()->display_score([$score, $weight], $format);
         }
@@ -4655,7 +4655,7 @@ EOT;
         echo $certificateBlock;
 
         // Ofaj change BT#11784
-        if (api_get_configuration_value('quiz_show_description_on_results_page') &&
+        if (('true' === api_get_setting('exercise.quiz_show_description_on_results_page')) &&
             !empty($objExercise->description)
         ) {
             echo Display::div($objExercise->description, ['class' => 'exercise_description']);
@@ -5304,7 +5304,7 @@ EOT;
         $courseId,
         $sessionId = 0
     ) {
-        if (!api_get_configuration_value('quiz_generate_certificate_ending') ||
+        if (!('true' === api_get_setting('exercise.quiz_generate_certificate_ending')) ||
             !self::isSuccessExerciseResult($totalScore, $totalWeight, $objExercise->selectPassPercentage())
         ) {
             return '';
diff --git a/public/main/inc/lib/export.lib.inc.php b/public/main/inc/lib/export.lib.inc.php
index dd52a19631..6fcc408925 100644
--- a/public/main/inc/lib/export.lib.inc.php
+++ b/public/main/inc/lib/export.lib.inc.php
@@ -229,7 +229,7 @@ class Export
      */
     public static function htmlToOdt($html, $name, $format = 'odt')
     {
-        $unoconv = api_get_configuration_value('unoconv.binaries');
+        $unoconv = api_get_setting('platform.unoconv_binaries');
 
         if (empty($unoconv)) {
             return false;
diff --git a/public/main/inc/lib/extra_field.lib.php b/public/main/inc/lib/extra_field.lib.php
index 0c415fc7c5..4d77e93103 100644
--- a/public/main/inc/lib/extra_field.lib.php
+++ b/public/main/inc/lib/extra_field.lib.php
@@ -178,7 +178,7 @@ class ExtraField extends Model
             'lp_view',
         ];
 
-        if (api_get_configuration_value('allow_scheduled_announcements')) {
+        if ('true' === api_get_setting('announcement.allow_scheduled_announcements')) {
             $result[] = 'scheduled_announcement';
         }
         if (api_get_configuration_value('allow_portfolio_tool')) {
diff --git a/public/main/inc/lib/formvalidator/Element/DateRangePicker.php b/public/main/inc/lib/formvalidator/Element/DateRangePicker.php
index 731a6bea66..7b432d176d 100644
--- a/public/main/inc/lib/formvalidator/Element/DateRangePicker.php
+++ b/public/main/inc/lib/formvalidator/Element/DateRangePicker.php
@@ -179,14 +179,14 @@ class DateRangePicker extends HTML_QuickForm_text
         }
 
         $timeIncrement = 30;
-        if (api_get_configuration_value('timepicker_increment')) {
-            $timeIncrement = api_get_configuration_value('timepicker_increment');
+        if (api_get_setting('platform.timepicker_increment')) {
+            $timeIncrement = api_get_setting('platform.timepicker_increment');
         }
 
         // timeFormat: 'hh:mm'
         $js .= "<script>
             $(function() {
-                $('#$id').daterangepicker({                    
+                $('#$id').daterangepicker({
                     timePicker: $timePicker,
                     timePickerIncrement: $timeIncrement,
                     timePicker12Hour: false,
@@ -195,14 +195,14 @@ class DateRangePicker extends HTML_QuickForm_text
                     $minDate
                     ranges: {
                          '".addslashes(get_lang('Today'))."': [moment(), moment()],
-                         '".addslashes(get_lang('Yesterday'))."': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],                                                  
+                         '".addslashes(get_lang('Yesterday'))."': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
                          '".addslashes(get_lang('This month'))."': [moment().startOf('month'), moment().endOf('month')],
-                         '".addslashes(get_lang('Last month'))."': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],                      
+                         '".addslashes(get_lang('Last month'))."': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
                          '".addslashes(get_lang('This week'))."': [moment().weekday(1), moment().weekday(5)],
                          '".addslashes(get_lang('Next Week'))."': [moment().weekday(8), moment().weekday(12)]
                     },
                     //showDropdowns : true,
-                    
+
                     locale: {
                         separator: ' / ',
                         format: '$format',
@@ -213,12 +213,12 @@ class DateRangePicker extends HTML_QuickForm_text
                         customRangeLabel: '".addslashes(get_lang('Custom range'))."',
                     }
                 });
-                
+
                 $('#$id').on('change', function() {
                     var myPickedDates = $('#$id').val().split('/');
                     var {$id}_start = myPickedDates[0].trim();
                     var {$id}_end = myPickedDates[1].trim();
-                    
+
                     $('input[name={$id}_start]').val({$id}_start);
                     $('input[name={$id}_end]').val({$id}_end);
                 });
diff --git a/public/main/inc/lib/glossary.lib.php b/public/main/inc/lib/glossary.lib.php
index 09900c59b1..00b3c56048 100644
--- a/public/main/inc/lib/glossary.lib.php
+++ b/public/main/inc/lib/glossary.lib.php
@@ -128,7 +128,7 @@ class GlossaryManager
         $glossaryName = trim($glossaryName);
         $parsed = $glossaryName;
 
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $parsed = api_htmlentities($parsed);
             $parsed = "%$parsed%";
         }
@@ -444,7 +444,7 @@ class GlossaryManager
     {
         $view = Session::read('glossary_view', '');
         if (empty($view)) {
-            $defaultView = api_get_configuration_value('default_glossary_view');
+            $defaultView = api_get_setting('glossary.default_glossary_view');
             if (empty($defaultView)) {
                 $defaultView = 'table';
             }
@@ -1029,7 +1029,7 @@ class GlossaryManager
         //usort($data, 'sorter');
         $list = [];
         $list[] = ['term', 'definition'];
-        $allowStrip = api_get_configuration_value('allow_remove_tags_in_glossary_export');
+        $allowStrip = ('true' === api_get_setting('glossary.allow_remove_tags_in_glossary_export'));
         foreach ($data as $line) {
             $definition = $line[1];
             if ($allowStrip) {
diff --git a/public/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php
index 7f5f466631..8fe4fddbda 100644
--- a/public/main/inc/lib/message.lib.php
+++ b/public/main/inc/lib/message.lib.php
@@ -1426,7 +1426,7 @@ class MessageManager
 
         $emailsubject = '['.get_lang('ApprovalForNewAccount').'] '.$user->getUsername();
 
-        if (api_get_configuration_value('send_inscription_notification_to_general_admin_only')) {
+        if ('true' === api_get_setting('admin.send_inscription_notification_to_general_admin_only')) {
             $email = api_get_setting('emailAdministrator');
             $firstname = api_get_setting('administratorSurname');
             $lastname = api_get_setting('administratorName');
diff --git a/public/main/inc/lib/notification.lib.php b/public/main/inc/lib/notification.lib.php
index b3da2934bd..7dfae59a47 100644
--- a/public/main/inc/lib/notification.lib.php
+++ b/public/main/inc/lib/notification.lib.php
@@ -349,7 +349,7 @@ class Notification extends Model
     public function formatContent($messageId, $content, $senderInfo)
     {
         $newMessageText = $linkToNewMessage = '';
-        $showEmail = api_get_configuration_value('show_user_email_in_notification');
+        $showEmail = ('true' === api_get_setting('mail.show_user_email_in_notification'));
         $senderInfoName = '';
         if (!empty($senderInfo) && isset($senderInfo['complete_name'])) {
             $senderInfoName = $senderInfo['complete_name'];
@@ -367,7 +367,7 @@ class Notification extends Model
                 );
                 break;
             case self::NOTIFICATION_TYPE_MESSAGE:
-                $allow = api_get_configuration_value('messages_hide_mail_content');
+                $allow = ('true' === api_get_setting('mail.messages_hide_mail_content'));
                 if ($allow) {
                     $content = '';
                 }
diff --git a/public/main/inc/lib/pdf.lib.php b/public/main/inc/lib/pdf.lib.php
index 918315598a..4210d5cc58 100644
--- a/public/main/inc/lib/pdf.lib.php
+++ b/public/main/inc/lib/pdf.lib.php
@@ -75,7 +75,7 @@ class PDF
         ];
 
         // Default value is 96 set in the mpdf library file config.php
-        $value = api_get_configuration_value('pdf_img_dpi');
+        $value = api_get_setting('platform.pdf_img_dpi');
         if (!empty($value)) {
             $params['img_dpi'] = (int) $value;
         }
diff --git a/public/main/inc/lib/redirect.class.php b/public/main/inc/lib/redirect.class.php
index 7f23c4f48f..a8672bba2a 100644
--- a/public/main/inc/lib/redirect.class.php
+++ b/public/main/inc/lib/redirect.class.php
@@ -77,12 +77,9 @@ class Redirect
         ) {
             if (isset($userInfo) && !empty($userInfo)) {
                 $userId = $userInfo['user_id'];
-                $allow = api_get_configuration_value('plugin_redirection_enabled');
+                $allow = ('true' === api_get_setting('admin.plugin_redirection_enabled'));
                 if ($allow) {
-                    $allow = api_get_configuration_value('plugin_redirection_enabled');
-                    if ($allow) {
-                        RedirectionPlugin::redirectUser($userId);
-                    }
+                    RedirectionPlugin::redirectUser($userId);
                 }
 
                 // Make sure we use the appropriate role redirection in case one has been defined
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
index e1ca33aad8..aaf4902056 100644
--- a/public/main/inc/lib/sessionmanager.lib.php
+++ b/public/main/inc/lib/sessionmanager.lib.php
@@ -8236,7 +8236,7 @@ class SessionManager
         $extraFields = [],
         $addExtraFields = true
     ) {
-        $showCount = api_get_configuration_value('session_list_show_count_users');
+        $showCount = ('true' === api_get_setting('session.session_list_show_count_users'));
         // Column config
         $operators = ['cn', 'nc'];
         $date_operators = ['gt', 'ge', 'lt', 'le'];
@@ -9592,7 +9592,7 @@ class SessionManager
     public static function getDefaultSessionTab()
     {
         $default = 'all';
-        $view = api_get_configuration_value('default_session_list_view');
+        $view = api_get_setting('session.default_session_list_view');
 
         if (!empty($view)) {
             $default = $view;
diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php
index d7054d4ca3..e5e92e38a5 100644
--- a/public/main/inc/lib/social.lib.php
+++ b/public/main/inc/lib/social.lib.php
@@ -101,7 +101,7 @@ class SocialManager extends UserManager
 
             return (int) $row['id'];
         } else {
-            if (api_get_configuration_value('social_make_teachers_friend_all')) {
+            if ('true' === api_get_setting('social.social_make_teachers_friend_all')) {
                 $adminsList = UserManager::get_all_administrators();
                 foreach ($adminsList as $admin) {
                     if (api_get_user_id() == $admin['user_id']) {
@@ -587,7 +587,7 @@ class SocialManager extends UserManager
             $course_url = '&amp;cidReq='.Security::remove_XSS($_GET['cidReq']);
         }
 
-        $hide = api_get_configuration_value('hide_complete_name_in_whoisonline');
+        $hide = ('true' === api_get_setting('platform.hide_complete_name_in_whoisonline'));
         foreach ($user_list as $uid) {
             $user_info = api_get_user_info($uid, true);
             $lastname = $user_info['lastname'];
@@ -1087,7 +1087,7 @@ class SocialManager extends UserManager
         }
 
         $extraFieldBlock = self::getExtraFieldBlock($userId, true);
-        $showLanguageFlag = api_get_configuration_value('social_show_language_flag_in_profile');
+        $showLanguageFlag = ('true' === api_get_setting('social.social_show_language_flag_in_profile'));
 
         $template->assign('user', $userInfo);
         $template->assign('show_language_flag', $showLanguageFlag);
@@ -1729,7 +1729,7 @@ class SocialManager extends UserManager
     public static function getThreadList($userId)
     {
         return [];
-        $forumCourseId = api_get_configuration_value('global_forums_course_id');
+        $forumCourseId = (int) api_get_setting('forum.global_forums_course_id');
 
         $threads = [];
         if (!empty($forumCourseId)) {
@@ -1782,7 +1782,7 @@ class SocialManager extends UserManager
         $threadList = self::getThreadList($userId);
         $userGroup = new UserGroupModel();
 
-        $forumCourseId = api_get_configuration_value('global_forums_course_id');
+        $forumCourseId = (int) api_get_setting('forum.global_forums_course_id');
         $courseInfo = null;
         if (!empty($forumCourseId)) {
             $courseInfo = api_get_course_info_by_id($forumCourseId);
diff --git a/public/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php
index 2120561ff2..2baf4d8c88 100644
--- a/public/main/inc/lib/sortable_table.class.php
+++ b/public/main/inc/lib/sortable_table.class.php
@@ -158,7 +158,7 @@ class SortableTable extends HTML_Table
         $this->defaultItemsPerPage = $default_items_per_page;
         $this->hideItemSelector = false;
 
-        $defaultRow = api_get_configuration_value('table_default_row');
+        $defaultRow = api_get_setting('platform.table_default_row');
         if (!empty($defaultRow)) {
             $this->defaultItemsPerPage = $default_items_per_page = $defaultRow;
         }
diff --git a/public/main/inc/lib/template.lib.php b/public/main/inc/lib/template.lib.php
index 1c17b969f5..e51c48a115 100644
--- a/public/main/inc/lib/template.lib.php
+++ b/public/main/inc/lib/template.lib.php
@@ -786,7 +786,7 @@ class Template
      */
     public static function getThemeFallback()
     {
-        $theme = api_get_configuration_value('theme_fallback');
+        $theme = api_get_setting('platform.theme_fallback');
         if (empty($theme)) {
             $theme = 'chamilo';
         }
@@ -1077,45 +1077,45 @@ class Template
         // by https://securityheaders.io/
         // Enable these settings in configuration.php to use them on your site
         // Strict-Transport-Security
-        $setting = api_get_configuration_value('security_strict_transport');
+        $setting = api_get_setting('security.security_strict_transport');
         if (!empty($setting)) {
             header('Strict-Transport-Security: '.$setting);
         }
         // Content-Security-Policy
-        $setting = api_get_configuration_value('security_content_policy');
+        $setting = api_get_setting('security.security_content_policy');
         if (!empty($setting)) {
             header('Content-Security-Policy: '.$setting);
         }
-        $setting = api_get_configuration_value('security_content_policy_report_only');
+        $setting = api_get_setting('security.security_content_policy_report_only');
         if (!empty($setting)) {
             header('Content-Security-Policy-Report-Only: '.$setting);
         }
         // Public-Key-Pins
-        $setting = api_get_configuration_value('security_public_key_pins');
+        $setting = api_get_setting('security.security_public_key_pins');
         if (!empty($setting)) {
             header('Public-Key-Pins: '.$setting);
         }
-        $setting = api_get_configuration_value('security_public_key_pins_report_only');
+        $setting = api_get_setting('security.security_public_key_pins_report_only');
         if (!empty($setting)) {
             header('Public-Key-Pins-Report-Only: '.$setting);
         }
         // X-Frame-Options
-        $setting = api_get_configuration_value('security_x_frame_options');
+        $setting = api_get_setting('security.security_x_frame_options');
         if (!empty($setting)) {
             header('X-Frame-Options: '.$setting);
         }
         // X-XSS-Protection
-        $setting = api_get_configuration_value('security_xss_protection');
+        $setting = api_get_setting('security.security_xss_protection');
         if (!empty($setting)) {
             header('X-XSS-Protection: '.$setting);
         }
         // X-Content-Type-Options
-        $setting = api_get_configuration_value('security_x_content_type_options');
+        $setting = api_get_setting('security.security_x_content_type_options');
         if (!empty($setting)) {
             header('X-Content-Type-Options: '.$setting);
         }
         // Referrer-Policy
-        $setting = api_get_configuration_value('security_referrer_policy');
+        $setting = api_get_setting('security.security_referrer_policy');
         if (!empty($setting)) {
             header('Referrer-Policy: '.$setting);
         }
diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php
index a4913da16f..26a996bd61 100644
--- a/public/main/inc/lib/tracking.lib.php
+++ b/public/main/inc/lib/tracking.lib.php
@@ -157,7 +157,7 @@ class Tracking
             return '';
         }
 
-        $hideTime = api_get_configuration_value('hide_lp_time');
+        $hideTime = ('true' === api_get_setting('lp.hide_lp_time'));
         $lp_id = (int) $lp_id;
 
         $lp_item_id = (int) $lp_item_id;
@@ -1782,7 +1782,7 @@ class Tracking
      */
     public static function minimumTimeAvailable($sessionId, $courseId)
     {
-        if (!api_get_configuration_value('lp_minimum_time')) {
+        if (!('true' === api_get_setting('lp.lp_minimum_time'))) {
             return false;
         }
 
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index 055feb2bcd..ddb7a321b7 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -364,7 +364,7 @@ class UserManager
                 'false'
             );
 
-            if (!empty($redirectToURLAfterLogin) && api_get_configuration_value('plugin_redirection_enabled')) {
+            if (!empty($redirectToURLAfterLogin) && ('true' === api_get_setting('admin.plugin_redirection_enabled'))) {
                 RedirectionPlugin::insert($userId, $redirectToURLAfterLogin);
             }
 
@@ -434,7 +434,7 @@ class UserManager
                     }
                 }
 
-                $twoEmail = api_get_configuration_value('send_two_inscription_confirmation_mail');
+                $twoEmail = ('true' === api_get_setting('mail.send_two_inscription_confirmation_mail'));
                 if (true === $twoEmail) {
                     $emailBody = $tpl->render(
                         '@ChamiloCore/Mailer/Legacy/new_user_first_email_confirmation.html.twig'
@@ -487,7 +487,7 @@ class UserManager
                     if (!empty($emailBodyTemplate)) {
                         $emailBody = $emailBodyTemplate;
                     }
-                    $sendToInbox = api_get_configuration_value('send_inscription_msg_to_inbox');
+                    $sendToInbox = ('true' === api_get_setting('mail.send_inscription_msg_to_inbox'));
                     if ($sendToInbox) {
                         $adminList = self::get_all_administrators();
                         $senderId = 1;
@@ -720,7 +720,7 @@ class UserManager
                 WHERE user_id = '".$user_id."'";
         Database::query($sql);
 
-        if (api_get_configuration_value('plugin_redirection_enabled')) {
+        if ('true' === api_get_setting('admin.plugin_redirection_enabled')) {
             RedirectionPlugin::deleteUserRedirection($user_id);
         }
 
@@ -2560,13 +2560,13 @@ class UserManager
         $order = 'ORDER BY sc.name, s.name';
 
         // Order by date if showing all sessions
-        $showAllSessions = true === api_get_configuration_value('show_all_sessions_on_my_course_page');
+        $showAllSessions = ('true' === api_get_setting('course.show_all_sessions_on_my_course_page'));
         if ($showAllSessions) {
             $order = 'ORDER BY s.accessStartDate';
         }
 
         // Order by position
-        if (api_get_configuration_value('session_list_order')) {
+        if ('true' === api_get_setting('session.session_list_order')) {
             $order = 'ORDER BY s.position';
         }
 
@@ -2633,7 +2633,7 @@ class UserManager
             }
         }
 
-        $collapsable = api_get_configuration_value('allow_user_session_collapsable');
+        $collapsable = ('true' === api_get_setting('session.allow_user_session_collapsable'));
         $extraField = new ExtraFieldValue('session');
         $collapsableLink = api_get_path(WEB_PATH).'user_portal.php?action=collapse_session';
 
@@ -5636,7 +5636,7 @@ SQL;
      */
     public static function anonymizeUserWithVerification($userId)
     {
-        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+        $allowDelete = ('true' === api_get_setting('session.allow_delete_user_for_session_admin'));
 
         $message = '';
         if (api_is_platform_admin() ||
@@ -5681,7 +5681,7 @@ SQL;
      */
     public static function deleteUserWithVerification($userId)
     {
-        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+        $allowDelete = ('true' === api_get_setting('session.allow_delete_user_for_session_admin'));
         $message = Display::return_message(get_lang('You cannot delete this user'), 'error');
         $userToUpdateInfo = api_get_user_info($userId);
 
diff --git a/public/main/inc/lib/userportal.lib.php b/public/main/inc/lib/userportal.lib.php
index 26a8bf1068..42bcb4ee78 100644
--- a/public/main/inc/lib/userportal.lib.php
+++ b/public/main/inc/lib/userportal.lib.php
@@ -232,7 +232,7 @@ class IndexManager
             return [];
         }
 
-        $allow = api_get_configuration_value('allow_my_student_publication_page');
+        $allow = ('true' === api_get_setting('work.allow_my_student_publication_page'));
         $items = [];
 
         if ($allow) {
@@ -745,7 +745,7 @@ class IndexManager
             unset($this->tpl->menu_navigation['myprofile']);
         }
 
-        $hideMenu = api_get_configuration_value('hide_main_navigation_menu');
+        $hideMenu = ('true' === api_get_setting('platform.hide_main_navigation_menu'));
         if (true === $hideMenu) {
             return '';
         }
@@ -770,7 +770,7 @@ class IndexManager
      */
     public function return_course_block()
     {
-        if (api_get_configuration_value('hide_course_sidebar')) {
+        if ('true' === api_get_setting('course.hide_course_sidebar')) {
             return '';
         }
         $isHrm = api_is_drh();
@@ -885,11 +885,11 @@ class IndexManager
         $loadHistory = false
     ) {
         $gameModeIsActive = api_get_setting('gamification_mode');
-        $viewGridCourses = api_get_configuration_value('view_grid_courses');
-        $showSimpleSessionInfo = api_get_configuration_value('show_simple_session_info');
+        $viewGridCourses = ('true' === api_get_setting('course.view_grid_courses'));
+        $showSimpleSessionInfo = ('true' === api_get_setting('course.show_simple_session_info'));
         $coursesWithoutCategoryTemplate = '/user_portal/classic_courses_without_category.tpl';
         $coursesWithCategoryTemplate = '/user_portal/classic_courses_with_category.tpl';
-        $showAllSessions = true === api_get_configuration_value('show_all_sessions_on_my_course_page');
+        $showAllSessions = ('true' === api_get_setting('course.show_all_sessions_on_my_course_page'));
 
         if ($loadHistory) {
             // Load sessions in category in *history*
@@ -1151,7 +1151,7 @@ class IndexManager
 
         $sessions_with_category = '';
         $sessions_with_no_category = '';
-        $collapsable = api_get_configuration_value('allow_user_session_collapsable');
+        $collapsable = ('true' === api_get_setting('session.allow_user_session_collapsable'));
         $collapsableLink = '';
         if ($collapsable) {
             $collapsableLink = api_get_path(WEB_PATH).'user_portal.php?action=collapse_session';
@@ -1159,7 +1159,7 @@ class IndexManager
 
         $extraFieldValue = new ExtraFieldValue('session');
         if ($showSessions) {
-            $coursesListSessionStyle = api_get_configuration_value('courses_list_session_title_link');
+            $coursesListSessionStyle = api_get_setting('course.courses_list_session_title_link');
             $coursesListSessionStyle = false === $coursesListSessionStyle ? 1 : $coursesListSessionStyle;
             if (api_is_drh()) {
                 $coursesListSessionStyle = 1;
diff --git a/public/main/lp/LearnPathItemForm.php b/public/main/lp/LearnPathItemForm.php
index 0d99019246..03c78f5950 100644
--- a/public/main/lp/LearnPathItemForm.php
+++ b/public/main/lp/LearnPathItemForm.php
@@ -161,7 +161,7 @@ class LearnPathItemForm
 
     public static function setItemTitle(FormValidator $form)
     {
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $form->addHtmlEditor(
                 'title',
                 get_lang('Title'),
diff --git a/public/main/lp/ScormApi.php b/public/main/lp/ScormApi.php
index 2c9c98422c..856c817790 100644
--- a/public/main/lp/ScormApi.php
+++ b/public/main/lp/ScormApi.php
@@ -474,7 +474,7 @@ class ScormApi
             }
         }
         $progressBarSpecial = false;
-        $scoreAsProgressSetting = api_get_configuration_value('lp_score_as_progress_enable');
+        $scoreAsProgressSetting = ('true' === api_get_setting('lp.lp_score_as_progress_enable'));
         if (true === $scoreAsProgressSetting) {
             $scoreAsProgress = $myLP->getUseScoreAsProgress();
             if ($scoreAsProgress) {
diff --git a/public/main/lp/ScormExport.php b/public/main/lp/ScormExport.php
index e1ce982bf5..bfc761a127 100644
--- a/public/main/lp/ScormExport.php
+++ b/public/main/lp/ScormExport.php
@@ -776,7 +776,7 @@ class ScormExport
         $root->appendChild($resources);
         $xmldoc->appendChild($root);
 
-        $copyAll = api_get_configuration_value('add_all_files_in_lp_export');
+        $copyAll = ('true' === api_get_setting('lp.add_all_files_in_lp_export'));
 
         // then add the file to the zip, then destroy the file (this is done automatically).
         // http://www.reload.ac.uk/scormplayer.html - once done, don't forget to close FS#138
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index b7b29d4696..81c3cbfe75 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -1682,7 +1682,7 @@ class learnpath
     ) {
         $courseId = $course->getId();
 
-        $allow = api_get_configuration_value('allow_teachers_to_access_blocked_lp_by_prerequisite');
+        $allow = ('true' === api_get_setting('lp.allow_teachers_to_access_blocked_lp_by_prerequisite'));
         if ($allow) {
             if (api_is_allowed_to_edit() ||
                 api_is_platform_admin(true) ||
@@ -1975,7 +1975,7 @@ class learnpath
         // If the option to use the score as progress is set for this learning
         // path, then the rules are completely different: we assume only one
         // item exists and the progress of the LP depends on the score
-        $scoreAsProgressSetting = api_get_configuration_value('lp_score_as_progress_enable');
+        $scoreAsProgressSetting = ('true' === api_get_setting('lp.lp_score_as_progress_enable'));
         if (true === $scoreAsProgressSetting) {
             $scoreAsProgress = $this->getUseScoreAsProgress();
             if ($scoreAsProgress) {
@@ -3114,7 +3114,7 @@ class learnpath
      */
     public function prerequisites_match($itemId = null)
     {
-        $allow = api_get_configuration_value('allow_teachers_to_access_blocked_lp_by_prerequisite');
+        $allow = ('true' === api_get_setting('lp.allow_teachers_to_access_blocked_lp_by_prerequisite'));
         if ($allow) {
             if (api_is_allowed_to_edit() ||
                 api_is_platform_admin(true) ||
@@ -3590,7 +3590,7 @@ class learnpath
         if (!api_is_invitee()) {
             // Save progress.
             [$progress] = $this->get_progress_bar_text('%');
-            $scoreAsProgressSetting = api_get_configuration_value('lp_score_as_progress_enable');
+            $scoreAsProgressSetting = ('true' === api_get_setting('lp.lp_score_as_progress_enable'));
             $scoreAsProgress = $this->getUseScoreAsProgress();
             if ($scoreAsProgress && $scoreAsProgressSetting && (null === $score || empty($score) || -1 == $score)) {
                 if ($debug) {
@@ -8386,7 +8386,7 @@ class learnpath
 
     public function setItemTitle(FormValidator $form)
     {
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $form->addHtmlEditor(
                 'title',
                 get_lang('Title'),
@@ -8482,13 +8482,14 @@ class learnpath
      */
     public static function getUserIdentifierForExternalServices()
     {
-        if (api_get_configuration_value('scorm_api_username_as_student_id')) {
+        $scormApiExtraFieldUseStudentId = api_get_setting('lp.scorm_api_extrafield_to_use_as_student_id');
+        if ('true' === api_get_setting('lp.scorm_api_username_as_student_id')) {
             return api_get_user_info(api_get_user_id())['username'];
-        } elseif (null != api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id')) {
+        } elseif (!empty($scormApiExtraFieldUseStudentId)) {
             $extraFieldValue = new ExtraFieldValue('user');
             $extrafield = $extraFieldValue->get_values_by_handler_and_field_variable(
                 api_get_user_id(),
-                api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id')
+                $scormApiExtraFieldUseStudentId
             );
 
             return $extrafield['value'];
diff --git a/public/main/lp/learnpathItem.class.php b/public/main/lp/learnpathItem.class.php
index 7bd5149b40..f9c70b2816 100644
--- a/public/main/lp/learnpathItem.class.php
+++ b/public/main/lp/learnpathItem.class.php
@@ -2432,7 +2432,7 @@ class learnpathItem
 
                                         if (false === $returnstatus) {
                                             // Check results from another sessions.
-                                            $checkOtherSessions = api_get_configuration_value('validate_lp_prerequisite_from_other_session');
+                                            $checkOtherSessions = ('true' === api_get_setting('lp.validate_lp_prerequisite_from_other_session'));
                                             if ($checkOtherSessions) {
                                                 $returnstatus = $this->getStatusFromOtherSessions(
                                                     $user_id,
@@ -2462,7 +2462,7 @@ class learnpathItem
                                         $returnstatus = $status == $this->possible_status[2] || $status == $this->possible_status[3];
 
                                         // Check results from another sessions.
-                                        $checkOtherSessions = api_get_configuration_value('validate_lp_prerequisite_from_other_session');
+                                        $checkOtherSessions = ('true' === api_get_setting('lp.validate_lp_prerequisite_from_other_session'));
                                         if ($checkOtherSessions && !$returnstatus) {
                                             $returnstatus = $this->getStatusFromOtherSessions(
                                                 $user_id,
@@ -4221,7 +4221,7 @@ class learnpathItem
         $user_id = (int) $user_id;
 
         // Check results from another sessions:
-        $checkOtherSessions = api_get_configuration_value('validate_lp_prerequisite_from_other_session');
+        $checkOtherSessions = ('true' === api_get_setting('lp.validate_lp_prerequisite_from_other_session'));
         if ($checkOtherSessions) {
             // Check items
             $sql = "SELECT iid FROM $lp_view
diff --git a/public/main/lp/learnpathList.class.php b/public/main/lp/learnpathList.class.php
index b543be5406..e1d7226f4c 100644
--- a/public/main/lp/learnpathList.class.php
+++ b/public/main/lp/learnpathList.class.php
@@ -94,7 +94,7 @@ class LearnpathList
                     $order
                 ";*/
         //$learningPaths = Database::getManager()->createQuery($dql)->getResult();
-        $showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked');
+        $showBlockedPrerequisite = ('true' === api_get_setting('lp.show_prerequisite_as_blocked'));
         $names = [];
         $isAllowToEdit = api_is_allowed_to_edit();
         $learningPaths = $qb->getQuery()->getResult();
diff --git a/public/main/lp/lp_add.php b/public/main/lp/lp_add.php
index 21cabe8420..529330107e 100644
--- a/public/main/lp/lp_add.php
+++ b/public/main/lp/lp_add.php
@@ -68,7 +68,7 @@ $form = new FormValidator(
 $form->addHeader(get_lang('To start, give a title to your course'));
 
 // Title
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor(
         'lp_name',
         get_lang('Learning path name'),
diff --git a/public/main/lp/lp_add_category.php b/public/main/lp/lp_add_category.php
index 1ca8dd067a..1b3c5e66be 100644
--- a/public/main/lp/lp_add_category.php
+++ b/public/main/lp/lp_add_category.php
@@ -32,7 +32,7 @@ $form = new FormValidator(
 $form->addElement('header', null, get_lang('Add learning path category'));
 
 // Title
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor(
         'name',
         get_lang('Name'),
diff --git a/public/main/lp/lp_ajax_switch_item_toc.php b/public/main/lp/lp_ajax_switch_item_toc.php
index 0ffa199fe8..536357e04f 100644
--- a/public/main/lp/lp_ajax_switch_item_toc.php
+++ b/public/main/lp/lp_ajax_switch_item_toc.php
@@ -152,7 +152,7 @@ function switch_item_toc($lpId, $userId, $viewId, $currentItem, $nextItem)
         "update_toc('$lessonStatus','".$newItemId."');";
 
     $progressBarSpecial = false;
-    $scoreAsProgressSetting = api_get_configuration_value('lp_score_as_progress_enable');
+    $scoreAsProgressSetting = ('true' === api_get_setting('lp.lp_score_as_progress_enable'));
     if (true === $scoreAsProgressSetting) {
         $scoreAsProgress = $myLP->getUseScoreAsProgress();
         if ($scoreAsProgress) {
diff --git a/public/main/lp/lp_controller.php b/public/main/lp/lp_controller.php
index 101f80c4de..938d8bc4a6 100644
--- a/public/main/lp/lp_controller.php
+++ b/public/main/lp/lp_controller.php
@@ -194,7 +194,7 @@ if (isset($_POST['title'])) {
         !empty($_POST['title'])
     ) {
         $post_title = Exercise::format_title_variable($_POST['title']);
-        if (api_get_configuration_value('save_titles_as_html')) {
+        if ('true' === api_get_setting('editor.save_titles_as_html')) {
             $post_title = $_POST['title'];
         }
     }
@@ -701,7 +701,7 @@ switch ($action) {
         }
         break;
     case 'export_to_course_build':
-        $allowExport = api_get_configuration_value('allow_lp_chamilo_export');
+        $allowExport = ('true' === api_get_setting('lp.allow_lp_chamilo_export'));
         if (api_is_allowed_to_edit() && $allowExport) {
             if (!$lp_found) {
                 require 'lp_list.php';
diff --git a/public/main/lp/lp_edit.php b/public/main/lp/lp_edit.php
index e74839cfc1..5787e5ba72 100644
--- a/public/main/lp/lp_edit.php
+++ b/public/main/lp/lp_edit.php
@@ -74,7 +74,7 @@ $form = new FormValidator(
 $form->addHeader(get_lang('Edit'));
 
 // Title
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor(
         'lp_name',
         get_lang('Learning path name'),
@@ -252,7 +252,7 @@ $form->addElement(
     get_lang('Accumulate SCORM session time')
 );
 
-$scoreAsProgressSetting = api_get_configuration_value('lp_score_as_progress_enable');
+$scoreAsProgressSetting = ('true' === api_get_setting('lp.lp_score_as_progress_enable'));
 $countItems = $learnPath->get_total_items_count();
 $lpType = $learnPath->get_type();
 // This option is only usable for SCORM, if there is only 1 item, otherwise
diff --git a/public/main/lp/lp_list.php b/public/main/lp/lp_list.php
index 73dfcb8381..8f31feb5c2 100644
--- a/public/main/lp/lp_list.php
+++ b/public/main/lp/lp_list.php
@@ -135,8 +135,8 @@ if ($filteredCategoryId) {
 }
 
 $test_mode = api_get_setting('server_type');
-$showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked');
-$allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export');
+$showBlockedPrerequisite = ('true' === api_get_setting('lp.show_prerequisite_as_blocked'));
+$allowLpChamiloExport = ('true' === api_get_setting('lp.allow_lp_chamilo_export'));
 $allowMinTime = Tracking::minimumTimeAvailable($sessionId, $courseId);
 $accumulateWorkTimeTotal = 0;
 if ($allowMinTime) {
diff --git a/public/main/lp/lp_upload.php b/public/main/lp/lp_upload.php
index d6740c0459..3557d91185 100644
--- a/public/main/lp/lp_upload.php
+++ b/public/main/lp/lp_upload.php
@@ -20,7 +20,7 @@ if (empty($_POST['current_dir'])) {
 $uncompress = 1;
 
 $allowHtaccess = false;
-if (api_get_configuration_value('allow_htaccess_import_from_scorm') && isset($_POST['allow_htaccess'])) {
+if (('true' === api_get_setting('lp.allow_htaccess_import_from_scorm')) && isset($_POST['allow_htaccess'])) {
     $allowHtaccess = true;
 }
 
diff --git a/public/main/lp/lp_view.php b/public/main/lp/lp_view.php
index 2e8a7a41ec..978d35f94e 100644
--- a/public/main/lp/lp_view.php
+++ b/public/main/lp/lp_view.php
@@ -120,7 +120,7 @@ if (isset($zoomOptions['options']) && !in_array($origin, ['embeddable', 'noheade
     </script>';
 }
 
-$allowLpItemTip = false === api_get_configuration_value('hide_accessibility_label_on_lp_item');
+$allowLpItemTip = ('false' === api_get_setting('lp.hide_accessibility_label_on_lp_item'));
 
 if ($allowLpItemTip) {
     $htmlHeadXtra[] = '<script>
@@ -539,7 +539,7 @@ $template->assign('lp_title_scorm', $lp->getName());
 $template->assign('lp_item_parents', $oLP->getCurrentItemParentNames($oLP->get_current_item_id()));
 
 // @todo Fix lp_view_accordion
-/*if (true === api_get_configuration_value('lp_view_accordion') && 1 == $lpType) {
+/*if ('true' === api_get_setting('lp.lp_view_accordion') && 1 == $lpType) {
     $template->assign('data_panel', $oLP->getTOCTree());
     $template->assign('data_list', null);
 } else {*/
@@ -554,11 +554,11 @@ $template->assign('lp_id', $lp->getIid());
 $template->assign('lp_current_item_id', $oLP->get_current_item_id());
 
 $menuLocation = 'left';
-if (!empty(api_get_configuration_value('lp_menu_location'))) {
-    $menuLocation = api_get_configuration_value('lp_menu_location');
+if (!empty(api_get_setting('lp.lp_menu_location'))) {
+    $menuLocation = api_get_setting('lp.lp_menu_location');
 }
 $template->assign('menu_location', $menuLocation);
-$template->assign('disable_js_in_lp_view', (int) api_get_configuration_value('disable_js_in_lp_view'));
+$template->assign('disable_js_in_lp_view', (int) ('true' === api_get_setting('lp.disable_js_in_lp_view')));
 $template->assign('lp_preview_image', '<img src="'.$lpPreviewImagePath.'" alt="'.$oLP->getNameNoTags().'" />');
 
 //$frameReady = Display::getFrameReadyBlock('#content_id, #content_id_blank');
diff --git a/public/main/lp/my_list.php b/public/main/lp/my_list.php
index 478952bbcb..249005b4b9 100644
--- a/public/main/lp/my_list.php
+++ b/public/main/lp/my_list.php
@@ -8,7 +8,7 @@ $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (api_get_configuration_value('disable_my_lps_page')) {
+if ('true' === api_get_setting('lp.disable_my_lps_page')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/lp/scorm_api.php b/public/main/lp/scorm_api.php
index de93217491..94e345e754 100644
--- a/public/main/lp/scorm_api.php
+++ b/public/main/lp/scorm_api.php
@@ -1129,7 +1129,7 @@ function addListeners(){
     if (olms.lms_item_type=='sco') {
         //window.addEventListener('beforeunload', lastCall);
         window.addEventListener('beforeunload', function (e) {
-            var preventsBeforeUnload = <?php echo (int) api_get_configuration_value('lp_prevents_beforeunload'); ?>;
+            var preventsBeforeUnload = <?php echo (int) ('true' === api_get_setting('lp.lp_prevents_beforeunload')); ?>;
 
             if (preventsBeforeUnload) {
                 e.preventDefault();
diff --git a/public/main/my_space/index.php b/public/main/my_space/index.php
index 2eb3a115ee..e2d0d94ccf 100644
--- a/public/main/my_space/index.php
+++ b/public/main/my_space/index.php
@@ -27,7 +27,7 @@ $is_coach = api_is_coach($session_id);
 $is_platform_admin = api_is_platform_admin();
 $is_drh = api_is_drh();
 $is_session_admin = api_is_session_admin();
-$skipData = api_get_configuration_value('tracking_skip_generic_data');
+$skipData = ('true' === api_get_setting('platform.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 bf0eaed9fc..04ffbed957 100644
--- a/public/main/my_space/myStudents.php
+++ b/public/main/my_space/myStudents.php
@@ -35,8 +35,8 @@ $coachId = isset($_GET['id_coach']) ? (int) $_GET['id_coach'] : 0;
 $details = isset($_GET['details']) ? Security::remove_XSS($_GET['details']) : '';
 $currentUrl = api_get_self().'?student='.$studentId.'&course='.$courseCode.'&sid='.$sessionId
     .'&origin='.$origin.'&details='.$details.'&cid='.$courseId;
-$allowMessages = api_get_configuration_value('private_messages_about_user');
-$workingTime = api_get_configuration_value('considered_working_time');
+$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');
 
 $allowToQualify = api_is_allowed_to_edit(null, true) ||
@@ -1185,7 +1185,7 @@ $content = $tpl->fetch($templateName);
 
 echo $content;
 
-$allowAll = api_get_configuration_value('allow_teacher_access_student_skills');
+$allowAll = ('true' === api_get_setting('skill.allow_teacher_access_student_skills'));
 if ($allowAll) {
     // Show all skills
     echo Tracking::displayUserSkills(
@@ -2276,7 +2276,7 @@ if ($allowMessages) {
     $form->display();
 }
 
-$allow = api_get_configuration_value('allow_user_message_tracking');
+$allow = ('true' === api_get_setting('mail.allow_user_message_tracking'));
 if ($allow && (api_is_drh() || api_is_platform_admin())) {
     $users = MessageManager::getUsersThatHadConversationWithUser($studentId);
     echo Display::page_subheader2(get_lang('MessageReporting'));
diff --git a/public/main/my_space/my_career.php b/public/main/my_space/my_career.php
index e00601f852..9e89bba4f8 100644
--- a/public/main/my_space/my_career.php
+++ b/public/main/my_space/my_career.php
@@ -5,7 +5,7 @@ use Fhaculty\Graph\Graph;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (false == api_get_configuration_value('allow_career_diagram')) {
+if ('false' === api_get_setting('profile.allow_career_diagram')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/my_space/student.php b/public/main/my_space/student.php
index 133921e1b1..b01d5cdf4c 100644
--- a/public/main/my_space/student.php
+++ b/public/main/my_space/student.php
@@ -303,7 +303,7 @@ $actionsRight .= Display::url(
 $toolbar = Display::toolbarAction('toolbar-student', [$actionsLeft, $actionsRight]);
 
 $itemPerPage = 10;
-$perPage = api_get_configuration_value('my_space_users_items_per_page');
+$perPage = api_get_setting('profile.my_space_users_items_per_page');
 if ($perPage) {
     $itemPerPage = (int) $perPage;
 }
diff --git a/public/main/my_space/users.php b/public/main/my_space/users.php
index cc11e8be51..8e4773251d 100644
--- a/public/main/my_space/users.php
+++ b/public/main/my_space/users.php
@@ -278,7 +278,7 @@ $actionsRight .= Display::url(
 $toolbar = Display::toolbarAction('toolbar-user', [$actionsLeft, $actionsRight]);
 
 $itemPerPage = 10;
-$perPage = api_get_configuration_value('my_space_users_items_per_page');
+$perPage = api_get_setting('profile.my_space_users_items_per_page');
 if ($perPage) {
     $itemPerPage = (int) $perPage;
 }
diff --git a/public/main/my_space/work_stats.php b/public/main/my_space/work_stats.php
index 18a6693fa6..4216919fa9 100644
--- a/public/main/my_space/work_stats.php
+++ b/public/main/my_space/work_stats.php
@@ -11,7 +11,7 @@ $allowToTrack = api_is_platform_admin() || api_is_allowed_to_edit();
 if (!$allowToTrack) {
     api_not_allowed(true);
 }
-$consideredWorkingTime = api_get_configuration_value('considered_working_time');
+$consideredWorkingTime = api_get_setting('work.considered_working_time');
 
 if (false === $consideredWorkingTime) {
     api_not_allowed(true);
@@ -46,7 +46,7 @@ function get_count_users()
 
 function get_users($from, $number_of_items, $column, $direction)
 {
-    $consideredWorkingTime = api_get_configuration_value('considered_working_time');
+    $consideredWorkingTime = api_get_setting('work.considered_working_time');
 
     $courseId = api_get_course_int_id();
     $courseCode = api_get_course_id();
@@ -168,7 +168,7 @@ $actionsLeft = '';
 $toolbar = Display::toolbarAction('toolbar-student', [$actionsLeft]);
 
 $itemPerPage = 10;
-$perPage = api_get_configuration_value('my_space_users_items_per_page');
+$perPage = api_get_setting('profile.my_space_users_items_per_page');
 if ($perPage) {
     $itemPerPage = (int) $perPage;
 }
diff --git a/public/main/portfolio/add_category.php b/public/main/portfolio/add_category.php
index 68d06140bb..c9dbdffa8d 100644
--- a/public/main/portfolio/add_category.php
+++ b/public/main/portfolio/add_category.php
@@ -4,7 +4,7 @@
 use Chamilo\CoreBundle\Entity\PortfolioCategory;
 
 $form = new FormValidator('add_category', 'post', "$baseUrl&action=add_category");
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'TitleAsHtml']);
 } else {
     $form->addText('title', get_lang('Title'));
diff --git a/public/main/portfolio/add_item.php b/public/main/portfolio/add_item.php
index 3f5b11caaf..799c29e03c 100644
--- a/public/main/portfolio/add_item.php
+++ b/public/main/portfolio/add_item.php
@@ -10,7 +10,7 @@ $categories = $em
     ]);
 
 $form = new FormValidator('add_portfolio', 'post', $baseUrl.'action=add_item');
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'TitleAsHtml']);
 } else {
     $form->addText('title', get_lang('Title'));
diff --git a/public/main/portfolio/edit_category.php b/public/main/portfolio/edit_category.php
index 8df69e5411..39e1d239fa 100644
--- a/public/main/portfolio/edit_category.php
+++ b/public/main/portfolio/edit_category.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 $form = new FormValidator('edit_category', 'post', $baseUrl."action=edit_category&id={$category->getId()}");
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'TitleAsHtml']);
 } else {
     $form->addText('title', get_lang('Title'));
diff --git a/public/main/portfolio/edit_item.php b/public/main/portfolio/edit_item.php
index e0e6ce294d..991e0f442a 100644
--- a/public/main/portfolio/edit_item.php
+++ b/public/main/portfolio/edit_item.php
@@ -8,7 +8,7 @@ $categories = $em
     ]);
 
 $form = new FormValidator('edit_portfolio', 'post', $baseUrl."action=edit_item&id={$item->getId()}");
-if (api_get_configuration_value('save_titles_as_html')) {
+if ('true' === api_get_setting('editor.save_titles_as_html')) {
     $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'TitleAsHtml']);
 } else {
     $form->addText('title', get_lang('Title'));
diff --git a/public/main/session/add_edit_users_to_session.php b/public/main/session/add_edit_users_to_session.php
index 8601572775..fba2ea8b08 100644
--- a/public/main/session/add_edit_users_to_session.php
+++ b/public/main/session/add_edit_users_to_session.php
@@ -329,7 +329,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     }
 
     if (1 == $form_sent) {
-        $notEmptyList = api_get_configuration_value('session_multiple_subscription_students_list_avoid_emptying');
+        $notEmptyList = ('true' === api_get_setting('session.session_multiple_subscription_students_list_avoid_emptying'));
 
         // Added a parameter to send emails when registering a user
         SessionManager::subscribeUsersToSession(
diff --git a/public/main/session/index.php b/public/main/session/index.php
index 9bbb3226b4..a578ab688d 100644
--- a/public/main/session/index.php
+++ b/public/main/session/index.php
@@ -187,7 +187,7 @@ if (false == api_is_coach_of_course_in_session($session_id)) {
 }
 
 $entityManager = Database::getManager();
-$sessionTitleLink = api_get_configuration_value('courses_list_session_title_link');
+$sessionTitleLink = api_get_setting('course.courses_list_session_title_link');
 
 if (2 == $sessionTitleLink && 1 === $session->getNbrCourses()) {
     $sessionCourses = $session->getCourses();
diff --git a/public/main/session/session_list.php b/public/main/session/session_list.php
index dbd4df4007..c6581e66c9 100644
--- a/public/main/session/session_list.php
+++ b/public/main/session/session_list.php
@@ -148,7 +148,7 @@ if (!isset($_GET['keyword'])) {
     ];
 }
 
-$hideSearch = api_get_configuration_value('hide_search_form_in_session_list');
+$hideSearch = ('true' === api_get_setting('session.hide_search_form_in_session_list'));
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
diff --git a/public/main/session/session_list_custom.php b/public/main/session/session_list_custom.php
index c057cfa180..019b6a329f 100644
--- a/public/main/session/session_list_custom.php
+++ b/public/main/session/session_list_custom.php
@@ -113,7 +113,7 @@ if (!isset($_GET['keyword'])) {
     ];
 }
 
-$hideSearch = api_get_configuration_value('hide_search_form_in_session_list');
+$hideSearch = ('true' === api_get_setting('session.hide_search_form_in_session_list'));
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
diff --git a/public/main/skills/assign.php b/public/main/skills/assign.php
index 56ac1cfce3..6ac698e95a 100644
--- a/public/main/skills/assign.php
+++ b/public/main/skills/assign.php
@@ -227,7 +227,7 @@ $form->addHidden('user', $user->getId());
 $form->addHidden('id', $skillId);
 $form->addRule('skill', get_lang('Required field'), 'required');
 
-$showLevels = false; // === api_get_configuration_value('hide_skill_levels');
+$showLevels = ('false' === api_get_setting('skill.hide_skill_levels'));
 
 if ($showLevels) {
     $form->addSelect('acquired_level', get_lang('Level acquired'), $acquiredLevel);
diff --git a/public/main/skills/issued.php b/public/main/skills/issued.php
index 87816a2d1b..242ae4d833 100644
--- a/public/main/skills/issued.php
+++ b/public/main/skills/issued.php
@@ -58,7 +58,7 @@ if (!SkillModel::isToolAvailable()) {
     api_not_allowed(true);
 }
 
-$showLevels = false === api_get_configuration_value('hide_skill_levels');
+$showLevels = ('false' === api_get_setting('skill.hide_skill_levels'));
 
 $skillInfo = [
     'id' => $skill->getId(),
diff --git a/public/main/skills/issued_all.php b/public/main/skills/issued_all.php
index 9715bc0842..4321e37fb2 100644
--- a/public/main/skills/issued_all.php
+++ b/public/main/skills/issued_all.php
@@ -222,7 +222,7 @@ foreach ($userSkills as $index => $skillRelUser) {
 
 $template = new Template(get_lang('Issued badge information'));
 $template->assign('user_badges', $allUserBadges);
-$template->assign('show_level', false === api_get_configuration_value('hide_skill_levels'));
+$template->assign('show_level', ('false' === api_get_setting('skill.hide_skill_levels')));
 
 $content = $template->fetch($template->get_template('skill/issued_all.html.twig'));
 $template->assign('header', get_lang('Issued badge information'));
diff --git a/public/main/social/personal_data.php b/public/main/social/personal_data.php
index a496b98462..496a10cd63 100644
--- a/public/main/social/personal_data.php
+++ b/public/main/social/personal_data.php
@@ -12,7 +12,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_set_more_memory_and_time_limits();
 api_block_anonymous_users();
 
-if (api_get_configuration_value('disable_gdpr')) {
+if ('true' === api_get_setting('profile.disable_gdpr')) {
     api_not_allowed(true);
 }
 
@@ -415,9 +415,9 @@ $treatmentTypes = LegalManager::getTreatmentTypeList();
     $personalData['treatment'][$item]['content'] = $legalTermContent;
 }*/
 
-$officerName = api_get_configuration_value('data_protection_officer_name');
-$officerRole = api_get_configuration_value('data_protection_officer_role');
-$officerEmail = api_get_configuration_value('data_protection_officer_email');
+$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');
 if (!empty($officerName)) {
     $personalData['officer_name'] = $officerName;
     $personalData['officer_role'] = $officerRole;
diff --git a/public/main/social/require_user_linking.php b/public/main/social/require_user_linking.php
index eb6e573de4..8a16216926 100644
--- a/public/main/social/require_user_linking.php
+++ b/public/main/social/require_user_linking.php
@@ -5,7 +5,7 @@ $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$isAllowed = api_get_configuration_value('show_link_request_hrm_user') && api_is_drh();
+$isAllowed = ('true' === api_get_setting('admin.show_link_request_hrm_user') && api_is_drh());
 
 if (!$isAllowed) {
     api_not_allowed(true);
diff --git a/public/main/survey/create_new_survey.php b/public/main/survey/create_new_survey.php
index 2ede9dc034..3a462e16ae 100644
--- a/public/main/survey/create_new_survey.php
+++ b/public/main/survey/create_new_survey.php
@@ -164,7 +164,7 @@ $visibleResults = [
     SURVEY_VISIBLE_PUBLIC => get_lang('Everyone'),
 ];
 
-if (api_get_configuration_value('hide_survey_reporting_button')) {
+if ('true' === api_get_setting('survey.hide_survey_reporting_button')) {
     $form->addLabel(get_lang('Results visibility'), get_lang('Feature disabled by administrator'));
 } else {
     $form->addSelect('visible_results', get_lang('Results visibility'), $visibleResults);
diff --git a/public/main/survey/edit_meeting.php b/public/main/survey/edit_meeting.php
index 5acd511115..bf0af3bb15 100644
--- a/public/main/survey/edit_meeting.php
+++ b/public/main/survey/edit_meeting.php
@@ -56,7 +56,7 @@ $form->addHidden('visible_results', '0');
 $form->addHidden('survey_type', 3);
 $text = $form->addText('survey_title', get_lang('Title'));
 
-$allowSurveyAvailabilityDatetime = api_get_configuration_value('allow_survey_availability_datetime');
+$allowSurveyAvailabilityDatetime = ('true' === api_get_setting('survey.allow_survey_availability_datetime'));
 
 if ($allowSurveyAvailabilityDatetime) {
     $form->addDateTimePicker('start_date', get_lang('Start Date'));
diff --git a/public/main/survey/fillsurvey.php b/public/main/survey/fillsurvey.php
index 5bbecd2e55..98c2c2eb8e 100644
--- a/public/main/survey/fillsurvey.php
+++ b/public/main/survey/fillsurvey.php
@@ -38,7 +38,7 @@ $table_survey_question_option = Database::get_course_table(TABLE_SURVEY_QUESTION
 $table_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-$allowRequiredSurveyQuestions = api_get_configuration_value('allow_required_survey_questions');
+$allowRequiredSurveyQuestions = ('true' === api_get_setting('survey.allow_required_survey_questions'));
 
 // Check if user is anonymous or not
 $isAnonymous = false;
@@ -670,7 +670,7 @@ if ((isset($_GET['show']) && '' != $_GET['show']) ||
     $paged_questions = [];
     // If non-conditional survey
     $select = '';
-    if (true === api_get_configuration_value('survey_question_dependency')) {
+    if ('true' === api_get_setting('survey.survey_question_dependency')) {
         $select = ' survey_question.parent_id, survey_question.parent_option_id, ';
     }
 
@@ -1325,7 +1325,7 @@ if ('0' == $survey->getSurveyType()) {
                 );
             } else {
                 if (
-                api_get_configuration_value('survey_backwards_enable')
+                'true' === api_get_setting('survey.survey_backwards_enable')
                 ) {
                     if ($lastQuestion >= 0) {
                         $form->addHtml(
diff --git a/public/main/survey/preview.php b/public/main/survey/preview.php
index 815653c321..8c4b62f53d 100644
--- a/public/main/survey/preview.php
+++ b/public/main/survey/preview.php
@@ -36,7 +36,7 @@ $table_survey_question_option = Database::get_course_table(TABLE_SURVEY_QUESTION
 
 $course_id = api_get_course_int_id();
 $courseInfo = api_get_course_info();
-$allowRequiredSurveyQuestions = api_get_configuration_value('allow_required_survey_questions');
+$allowRequiredSurveyQuestions = ('true' === api_get_setting('survey.allow_required_survey_questions'));
 
 // Breadcrumbs
 $interbreadcrumb[] = [
@@ -116,7 +116,7 @@ if (isset($_GET['show'])) {
 
     if (array_key_exists($_GET['show'], $paged_questions)) {
         $select = '';
-        if (true === api_get_configuration_value('survey_question_dependency')) {
+        if ('true' === api_get_setting('survey.survey_question_dependency')) {
             $select = ' survey_question.parent_id, survey_question.parent_option_id, ';
         }
         $sql = "SELECT
diff --git a/public/main/survey/survey.lib.php b/public/main/survey/survey.lib.php
index 2580a9d150..a82a08a351 100644
--- a/public/main/survey/survey.lib.php
+++ b/public/main/survey/survey.lib.php
@@ -642,7 +642,7 @@ class SurveyManager
                 'survey_group_sec2' => $row['survey_group_sec2'],
             ];
 
-            if (api_get_configuration_value('allow_required_survey_questions')) {
+            if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                 if (isset($row['is_required'])) {
                     $params['is_required'] = $row['is_required'];
                 }
@@ -856,7 +856,7 @@ class SurveyManager
         $return['horizontalvertical'] = $row['display'];
         $return['shared_question_id'] = $row['shared_question_id'];
         $return['maximum_score'] = $row['max_value'];
-        $return['is_required'] = api_get_configuration_value('allow_required_survey_questions')
+        $return['is_required'] = ('true' === api_get_setting('survey.allow_required_survey_questions'))
             ? $row['is_required']
             : false;
 
@@ -1016,11 +1016,11 @@ class SurveyManager
                         ->setSharedQuestionId((int) $form_content['shared_question_id'])
                     ;
 
-                    if (api_get_configuration_value('allow_required_survey_questions')) {
+                    if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                         $question->setIsMandatory(isset($form_content['is_required']));
                     }
 
-                    if (api_get_configuration_value('survey_question_dependency')) {
+                    if ('true' === api_get_setting('survey.survey_question_dependency')) {
                         $params['parent_id'] = 0;
                         $params['parent_option_id'] = 0;
                         if (isset($form_content['parent_id']) &&
@@ -1071,11 +1071,11 @@ class SurveyManager
                         ->setMaxValue($maxScore)
                     ;
 
-                    if (api_get_configuration_value('allow_required_survey_questions')) {
+                    if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                         $question->isMandatory(isset($form_content['is_required']));
                     }
 
-                    if (api_get_configuration_value('survey_question_dependency')) {
+                    if ('true' === api_get_setting('survey.survey_question_dependency')) {
                         $params['parent_id'] = 0;
                         $params['parent_option_id'] = 0;
                         if (isset($form_content['parent_id']) &&
@@ -1440,7 +1440,7 @@ class SurveyManager
             $sql = "SELECT DISTINCT user FROM $table_survey_answer
 			        WHERE survey_id= '".$survey_id."'  ";
 
-            if (api_get_configuration_value('survey_anonymous_show_answered')) {
+            if ('true' === api_get_setting('survey.survey_anonymous_show_answered')) {
                 $tblInvitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
                 $tblSurvey = Database::get_course_table(TABLE_SURVEY);
 
@@ -1733,7 +1733,7 @@ class SurveyManager
                     'survey_group_sec2' => $row['survey_group_sec2'],
                 ];
 
-                if (api_get_configuration_value('allow_required_survey_questions')) {
+                if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                     if (isset($row['is_required'])) {
                         $params['is_required'] = $row['is_required'];
                     }
@@ -1815,7 +1815,7 @@ class SurveyManager
             'survey_group_sec1' => $row['survey_group_sec1'],
             'survey_group_sec2' => $row['survey_group_sec2'],
         ];
-        if (api_get_configuration_value('allow_required_survey_questions')) {
+        if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
             if (isset($row['is_required'])) {
                 $params['is_required'] = $row['is_required'];
             }
@@ -1956,7 +1956,7 @@ class SurveyManager
         }
         ksort($newQuestionList);
 
-        $order = api_get_configuration_value('survey_duplicate_order_by_name');
+        $order = ('true' === api_get_setting('survey.survey_duplicate_order_by_name'));
         foreach ($itemList as $class) {
             $className = $class['name'];
             $users = $class['users'];
@@ -2044,7 +2044,7 @@ class SurveyManager
 
     public static function hasDependency(CSurvey $survey)
     {
-        if (false === api_get_configuration_value('survey_question_dependency')) {
+        if ('false' === api_get_setting('survey.survey_question_dependency')) {
             return false;
         }
 
diff --git a/public/main/survey/survey.php b/public/main/survey/survey.php
index 9129e37273..ad31dfc22d 100644
--- a/public/main/survey/survey.php
+++ b/public/main/survey/survey.php
@@ -161,7 +161,7 @@ $survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite
     Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_MEDIUM).'</a>';
 
 if (3 != $survey_data['survey_type']) {
-    if (!api_get_configuration_value('hide_survey_reporting_button')) {
+    if (!('true' === api_get_setting('survey.hide_survey_reporting_button'))) {
         $survey_actions .= Display::url(
             Display::return_icon('statistics.png', get_lang('Reporting'), [], ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&survey_id='.$survey_id
diff --git a/public/main/survey/surveyUtil.class.php b/public/main/survey/surveyUtil.class.php
index 34e32e82b9..0f338c759e 100644
--- a/public/main/survey/surveyUtil.class.php
+++ b/public/main/survey/surveyUtil.class.php
@@ -2981,7 +2981,7 @@ class SurveyUtil
 
         $survey_id = $survey->getIid();
         $actions = [];
-        $hideReportingButton = api_get_configuration_value('hide_survey_reporting_button');
+        $hideReportingButton = ('true' === api_get_setting('survey.hide_survey_reporting_button'));
         $codePath = api_get_path(WEB_CODE_PATH);
         $params = [];
         parse_str(api_get_cidreq(), $params);
@@ -3277,7 +3277,7 @@ class SurveyUtil
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
         $table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
         $mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
-        $allowSurveyAvailabilityDatetime = api_get_configuration_value('allow_survey_availability_datetime');
+        $allowSurveyAvailabilityDatetime = ('true' === api_get_setting('survey.allow_survey_availability_datetime'));
 
         // Searching
         $search_restriction = self::survey_search_restriction();
@@ -3427,7 +3427,7 @@ class SurveyUtil
     public static function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
     {
         $mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
-        $allowSurveyAvailabilityDatetime = api_get_configuration_value('allow_survey_availability_datetime');
+        $allowSurveyAvailabilityDatetime = ('true' === api_get_setting('survey.allow_survey_availability_datetime'));
         $repo = Container::getSurveyRepository();
         $qb = $repo->findAllByCourse(
             api_get_course_entity(),
@@ -3529,7 +3529,7 @@ class SurveyUtil
         $user_id = (int) $user_id;
         $sessionId = api_get_session_id();
         $mandatoryAllowed = api_get_configuration_value('allow_mandatory_survey');
-        $allowSurveyAvailabilityDatetime = api_get_configuration_value('allow_survey_availability_datetime');
+        $allowSurveyAvailabilityDatetime = ('true' === api_get_setting('survey.allow_survey_availability_datetime'));
 
         // Database table definitions
         $table_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
diff --git a/public/main/survey/survey_invitation.php b/public/main/survey/survey_invitation.php
index e0cd6d21a5..67e92433b5 100644
--- a/public/main/survey/survey_invitation.php
+++ b/public/main/survey/survey_invitation.php
@@ -58,7 +58,7 @@ $invitationsCount = count($sentInvitations);
 $answeredCount = count($answered_data);
 $unAnsweredCount = count($sentInvitations) - count($answered_data);
 
-if (1 == $survey->getAnonymous() && !api_get_configuration_value('survey_anonymous_show_answered')) {
+if (1 == $survey->getAnonymous() && !('true' === api_get_setting('survey.survey_anonymous_show_answered'))) {
     echo Display::return_message(
         get_lang('This survey is anonymous. You can\'t see who answered.').' '.$answeredCount.' '.get_lang(
             'people answered'
@@ -118,8 +118,8 @@ switch ($view) {
         break;
 }
 echo '</tr>';
-$surveyAnonymousShowAnswered = api_get_configuration_value('survey_anonymous_show_answered');
-$hideSurveyReportingButton = api_get_configuration_value('hide_survey_reporting_button');
+$surveyAnonymousShowAnswered = ('true' === api_get_setting('survey.survey_anonymous_show_answered'));
+$hideSurveyReportingButton = ('true' === api_get_setting('survey.hide_survey_reporting_button'));
 
 foreach ($sentInvitations as $row) {
     $id = $row['iid'];
diff --git a/public/main/survey/survey_invite.php b/public/main/survey/survey_invite.php
index 52c10d335b..0705b80006 100644
--- a/public/main/survey/survey_invite.php
+++ b/public/main/survey/survey_invite.php
@@ -128,7 +128,7 @@ $form->addHtmlEditor(
 );
 $form->addElement('html', '</div>');
 // You cab send a reminder to unanswered people if the survey is not anonymous
-if (1 != $survey->getAnonymous() || api_get_configuration_value('survey_anonymous_show_answered')) {
+if (1 != $survey->getAnonymous() || ('true' === api_get_setting('survey.survey_anonymous_show_answered'))) {
     $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('Remind only users who didn\'t answer'));
 }
 // Allow resending to all selected users
diff --git a/public/main/survey/survey_question.php b/public/main/survey/survey_question.php
index 73e3b64721..ed23f59a2e 100644
--- a/public/main/survey/survey_question.php
+++ b/public/main/survey/survey_question.php
@@ -199,7 +199,7 @@ class survey_question
                 break;
         }
 
-        if (false === api_get_configuration_value('survey_question_dependency')) {
+        if ('false' === api_get_setting('survey.survey_question_dependency')) {
             $allowParent = false;
         }
 
@@ -237,7 +237,7 @@ class survey_question
             $config
         );
 
-        if (api_get_configuration_value('allow_required_survey_questions') &&
+        if (('true' === api_get_setting('survey.allow_required_survey_questions')) &&
             in_array($_GET['type'], ['yesno', 'multiplechoice'])) {
             $form->addCheckBox('is_required', get_lang('Mandatory?'), get_lang('Yes'));
         }
@@ -314,7 +314,7 @@ class survey_question
              */
             $surveyId = isset($_GET['survey_id']) ? (int) $_GET['survey_id'] : 0;
             $answersChecker = SurveyUtil::checkIfSurveyHasAnswers($surveyId);
-            $allowQuestionEdit = true == api_get_configuration_value('survey_allow_answered_question_edit');
+            $allowQuestionEdit = ('true' === api_get_setting('survey.survey_allow_answered_question_edit'));
             if ($allowQuestionEdit || !$answersChecker) {
                 $this->buttonList[] = $this->getForm()->addButtonUpdate(get_lang('Edit question'), 'save', true);
             } else {
@@ -482,7 +482,7 @@ class survey_question
         $formData['answers'] = isset($formData['answers']) ? $formData['answers'] : [];
         Session::write('answer_list', $formData['answers']);
 
-        if (!isset($formData['is_required']) && api_get_configuration_value('survey_mark_question_as_required')) {
+        if (!isset($formData['is_required']) && ('true' === api_get_setting('survey.survey_mark_question_as_required'))) {
             $formData['is_required'] = true;
         }
 
@@ -572,7 +572,7 @@ class survey_question
      */
     public static function getParents($questionId, $list = [])
     {
-        if (true !== api_get_configuration_value('survey_question_dependency')) {
+        if ('false' === api_get_setting('survey.survey_question_dependency')) {
             return $list;
         }
         $courseId = api_get_course_int_id();
@@ -687,7 +687,7 @@ class survey_question
      */
     public static function getDependency($question)
     {
-        if (true !== api_get_configuration_value('survey_question_dependency')) {
+        if ('false' === api_get_setting('survey.survey_question_dependency')) {
             return [];
         }
         $table = Database::get_course_table(TABLE_SURVEY_QUESTION);
diff --git a/public/main/template/default/admin/index.html.twig b/public/main/template/default/admin/index.html.twig
index 50ade33b9a..c93d3629bb 100644
--- a/public/main/template/default/admin/index.html.twig
+++ b/public/main/template/default/admin/index.html.twig
@@ -1,4 +1,4 @@
-{% set admin_chamilo_announcements_disable = 'admin_chamilo_announcements_disable'|api_get_configuration_value %}
+{% set admin_chamilo_announcements_disable = 'announcement.admin_chamilo_announcements_disable'|api_get_setting == 'true' %}
 
 {% block content %}
     {% autoescape false %}
diff --git a/public/main/template/default/exercise/partials/result_exercise.html.twig b/public/main/template/default/exercise/partials/result_exercise.html.twig
index 95c4f313fb..985ba71359 100644
--- a/public/main/template/default/exercise/partials/result_exercise.html.twig
+++ b/public/main/template/default/exercise/partials/result_exercise.html.twig
@@ -4,7 +4,7 @@
     <div class="question-result">
         <div class="panel panel-default">
             <div class="panel-body">
-                {% if 'save_titles_as_html'|api_get_configuration_value %}
+                {% if 'editor.save_titles_as_html'|api_get_setting == 'true' %}
                     {{ data.title }}
                 {% else %}
                     <h3>{{ data.title }}</h3>
diff --git a/public/main/template/default/forum/list.html.twig b/public/main/template/default/forum/list.html.twig
index d549ee8937..32ebfa2690 100644
--- a/public/main/template/default/forum/list.html.twig
+++ b/public/main/template/default/forum/list.html.twig
@@ -33,7 +33,7 @@
     {{ form_content }}
     {{ search_filter }}
 
-    {% set fold_forum_categories = 'forum_fold_categories'|api_get_configuration_value %}
+    {% set fold_forum_categories = chamilo_settings_get('forum.forum_fold_categories') %}
 
     {% if categories is not empty %}
         {% for item in categories %}
diff --git a/public/main/template/default/user_portal/grid_session.html.twig b/public/main/template/default/user_portal/grid_session.html.twig
index e9aa6f092a..27a8c6900e 100644
--- a/public/main/template/default/user_portal/grid_session.html.twig
+++ b/public/main/template/default/user_portal/grid_session.html.twig
@@ -1,4 +1,4 @@
-{% set group_courses = 'view_grid_courses_grouped_categories_in_sessions'| api_get_configuration_value %}
+{% set group_courses = chamilo_settings_get('course.view_grid_courses') == 'true' %}
 
 {% macro course_block(course, show_category) %}
     <div class="col-xs-12 col-sm-6 col-md-4">
diff --git a/public/main/tracking/courseLog.php b/public/main/tracking/courseLog.php
index 3f7dc5d466..68be087e49 100644
--- a/public/main/tracking/courseLog.php
+++ b/public/main/tracking/courseLog.php
@@ -290,7 +290,7 @@ if (!empty($coaches)) {
     $html .= $coaches;
 }
 
-$showReporting = false === api_get_configuration_value('hide_reporting_session_list');
+$showReporting = ('false' === api_get_setting('session.hide_reporting_session_list'));
 if ($showReporting) {
     $sessionList = SessionManager::get_session_by_course($courseId);
     if (!empty($sessionList)) {
diff --git a/public/main/tracking/messages.php b/public/main/tracking/messages.php
index 2a764082f9..caa5b2fc46 100644
--- a/public/main/tracking/messages.php
+++ b/public/main/tracking/messages.php
@@ -3,7 +3,7 @@
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-$allow = api_get_configuration_value('allow_user_message_tracking');
+$allow = ('true' === api_get_setting('mail.allow_user_message_tracking'));
 
 if (!$allow) {
     api_not_allowed(true);
diff --git a/public/main/upload/index.php b/public/main/upload/index.php
index babefc160a..9a59527e0c 100644
--- a/public/main/upload/index.php
+++ b/public/main/upload/index.php
@@ -152,7 +152,7 @@ if (api_is_platform_admin()) {
     $form->addElement('checkbox', 'use_max_score', null, get_lang('Use default maximum score of 100'));
 }
 
-if (api_get_configuration_value('allow_htaccess_import_from_scorm')) {
+if ('true' === api_get_setting('lp.allow_htaccess_import_from_scorm')) {
     $form->addElement('checkbox', 'allow_htaccess', null, get_lang('Allow htaccess in the SCORM import'));
 }
 
diff --git a/public/main/user/career_diagram.php b/public/main/user/career_diagram.php
index 0d84d37c16..8f8c0d68df 100644
--- a/public/main/user/career_diagram.php
+++ b/public/main/user/career_diagram.php
@@ -13,7 +13,7 @@ ALTER TABLE extra_field_values modify column value longtext null;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (false === api_get_configuration_value('allow_career_diagram')) {
+if ('false' === api_get_setting('profile.allow_career_diagram')) {
     api_not_allowed(true);
 }
 api_block_anonymous_users();
diff --git a/public/main/user/user.php b/public/main/user/user.php
index 127ba76c03..d7ac566571 100644
--- a/public/main/user/user.php
+++ b/public/main/user/user.php
@@ -49,7 +49,7 @@ if (!empty($sessionId)) {
 }
 
 $disableUsers = 3 === (int) $course_info['visibility'] &&
-    api_get_configuration_value('disable_change_user_visibility_for_public_courses');
+    ('true' === api_get_setting('profile.disable_change_user_visibility_for_public_courses'));
 
 if (false === $canEdit && $disableUsers) {
     api_not_allowed(true);
diff --git a/public/main/work/add_document.php b/public/main/work/add_document.php
index 18b6b12a9b..969d7fe5b4 100644
--- a/public/main/work/add_document.php
+++ b/public/main/work/add_document.php
@@ -17,7 +17,7 @@ if (empty($workId)) {
     api_not_allowed(true);
 }
 
-$blockAddDocuments = api_get_configuration_value('block_student_publication_add_documents');
+$blockAddDocuments = ('true' === api_get_setting('work.block_student_publication_add_documents'));
 if ($blockAddDocuments) {
     api_not_allowed(true);
 }
diff --git a/public/main/work/edit.php b/public/main/work/edit.php
index 6556c9018f..e2cb76f944 100644
--- a/public/main/work/edit.php
+++ b/public/main/work/edit.php
@@ -10,7 +10,7 @@ $current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 
-$blockEdition = api_get_configuration_value('block_student_publication_edition');
+$blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
 
 if ($blockEdition && !api_is_platform_admin()) {
     api_not_allowed(true);
diff --git a/public/main/work/edit_work.php b/public/main/work/edit_work.php
index f8e1d5a55e..f8793217a3 100644
--- a/public/main/work/edit_work.php
+++ b/public/main/work/edit_work.php
@@ -15,7 +15,7 @@ if (!api_is_allowed_to_edit()) {
     api_not_allowed(true);
 }
 
-$blockEdition = api_get_configuration_value('block_student_publication_edition');
+$blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
 
 if ($blockEdition && !api_is_platform_admin()) {
     api_not_allowed(true);
diff --git a/public/main/work/publications.php b/public/main/work/publications.php
index ff3da1c819..926b54582f 100644
--- a/public/main/work/publications.php
+++ b/public/main/work/publications.php
@@ -6,7 +6,7 @@ $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
-if (false === api_get_configuration_value('allow_my_student_publication_page')) {
+if ('false' === api_get_setting('work.allow_my_student_publication_page')) {
     api_not_allowed(true);
 }
 
diff --git a/public/main/work/upload.php b/public/main/work/upload.php
index 1c4bcc536e..a09c1b1bdd 100644
--- a/public/main/work/upload.php
+++ b/public/main/work/upload.php
@@ -41,7 +41,7 @@ $token = Security::get_token();
 
 $student_can_edit_in_session = api_is_allowed_to_session_edit(false, true);
 
-$onlyOnePublication = api_get_configuration_value('allow_only_one_student_publication_per_user');
+$onlyOnePublication = ('true' === api_get_setting('work.allow_only_one_student_publication_per_user'));
 
 if ($onlyOnePublication) {
     $count = get_work_count_by_student($user_id, $work_id);
@@ -76,7 +76,7 @@ setWorkUploadForm($form, $workInfo['allow_text_assignment']);
 $form->addHidden('id', $work_id);
 $form->addHidden('sec_token', $token);
 
-$allowRedirect = api_get_configuration_value('allow_redirect_to_main_page_after_work_upload');
+$allowRedirect = ('true' === api_get_setting('work.allow_redirect_to_main_page_after_work_upload'));
 $urlToRedirect = '';
 if ($allowRedirect) {
     $urlToRedirect = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq();
@@ -95,7 +95,7 @@ if ($form->validate()) {
             $group_id,
             $user_id,
             $_FILES['file'],
-            api_get_configuration_value('assignment_prevent_duplicate_upload')
+            ('true' === api_get_setting('work.assignment_prevent_duplicate_upload'))
         );
 
         if ($allowRedirect) {
diff --git a/public/main/work/upload_from_template.php b/public/main/work/upload_from_template.php
index 420dd92e84..b729c8b13b 100644
--- a/public/main/work/upload_from_template.php
+++ b/public/main/work/upload_from_template.php
@@ -100,7 +100,7 @@ if ($form->validate()) {
             $group_id,
             $user_id,
             [],
-            api_get_configuration_value('assignment_prevent_duplicate_upload')
+            ('true' === api_get_setting('work.assignment_prevent_duplicate_upload'))
         );
         $script = 'work_list.php';
         if ($is_allowed_to_edit) {
diff --git a/public/main/work/view.php b/public/main/work/view.php
index 83d48a8940..5506a3b18b 100644
--- a/public/main/work/view.php
+++ b/public/main/work/view.php
@@ -44,7 +44,7 @@ $allowEdition = false;
 if ($isCourseManager) {
     $allowEdition = true;
     if (!empty($work->getQualification()) &&
-        api_get_configuration_value('block_student_publication_score_edition')
+        ('true' === api_get_setting('work.block_student_publication_score_edition'))
     ) {
         $allowEdition = false;
     }
@@ -94,7 +94,7 @@ if (($isDrhOfCourse || $allowEdition || $isDrhOfSession || user_is_author($id))
         } else {
             $url = api_get_path(WEB_CODE_PATH).'work/view.php?id='.$workId.'&'.api_get_cidreq();
 
-            $allowRedirect = api_get_configuration_value('allow_redirect_to_main_page_after_work_upload');
+            $allowRedirect = ('true' === api_get_setting('work.allow_redirect_to_main_page_after_work_upload'));
             $urlToRedirect = '';
             if ($allowRedirect) {
                 $url = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq();
diff --git a/public/main/work/work.lib.php b/public/main/work/work.lib.php
index 3076314c31..e3b5627bd8 100644
--- a/public/main/work/work.lib.php
+++ b/public/main/work/work.lib.php
@@ -786,7 +786,7 @@ function deleteDirWork($id)
     $check = true;
 
     if ($check) {
-        $consideredWorkingTime = api_get_configuration_value('considered_working_time');
+        $consideredWorkingTime = api_get_setting('work.considered_working_time');
         if (!empty($consideredWorkingTime)) {
             $fieldValue = new ExtraFieldValue('work');
             $resultExtra = $fieldValue->getAllValuesForAnItem(
@@ -1625,7 +1625,7 @@ function getWorkListTeacher(
         $studentPublications = $qb->getQuery()->getResult();
 
         $url = api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq();
-        $blockEdition = api_get_configuration_value('block_student_publication_edition');
+        $blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
 
         //while ($work = Database::fetch_array($result, 'ASSOC')) {
         $icon = Display::return_icon('work.png');
@@ -2132,7 +2132,7 @@ function get_work_user_list(
         }*/
 
         $url = api_get_path(WEB_CODE_PATH).'work/';
-        $unoconv = api_get_configuration_value('unoconv.binaries');
+        $unoconv = api_get_setting('platform.unoconv_binaries');
         $loadingText = addslashes(get_lang('Loading'));
         $uploadedText = addslashes(get_lang('Uploaded.'));
         $failsUploadText = addslashes(get_lang('No file was uploaded..'));
@@ -2170,8 +2170,8 @@ function get_work_user_list(
             ICON_SIZE_SMALL
         );
 
-        $blockEdition = api_get_configuration_value('block_student_publication_edition');
-        $blockScoreEdition = api_get_configuration_value('block_student_publication_score_edition');
+        $blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
+        $blockScoreEdition = ('true' === api_get_setting('work.block_student_publication_score_edition'));
         $loading = Display::getMdiIcon('loading', 'animate-spin');
         $router = Container::getRouter();
         $studentDeleteOwnPublication = api_get_course_setting('student_delete_own_publication');
@@ -2663,7 +2663,7 @@ function getAllWork(
     }
 
     $url = api_get_path(WEB_CODE_PATH).'work/';
-    $unoconv = api_get_configuration_value('unoconv.binaries');
+    $unoconv = api_get_setting('platform.unoconv_binaries');
     $loadingText = addslashes(get_lang('Loading'));
     $uploadedText = addslashes(get_lang('Uploaded'));
     $failsUploadText = addslashes(get_lang('UplNoFileUploaded'));
@@ -2701,8 +2701,8 @@ function getAllWork(
         ICON_SIZE_SMALL
     );
     $parentList = [];
-    $blockEdition = api_get_configuration_value('block_student_publication_edition');
-    $blockScoreEdition = api_get_configuration_value('block_student_publication_score_edition');
+    $blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
+    $blockScoreEdition = ('true' === api_get_setting('work.block_student_publication_score_edition'));
     $loading = Display::getMdiIcon('loading', 'animate-spin');
     $qualification_exists = true;
     $repo = Container::getStudentPublicationRepository();
@@ -4264,7 +4264,7 @@ function getWorkCommentForm(CStudentPublication $work, $workParent)
     if ($isCourseManager) {
         $allowEdition = true;
         if (!empty($work->getQualification()) &&
-            api_get_configuration_value('block_student_publication_score_edition')
+            ('true' === api_get_setting('work.block_student_publication_score_edition'))
         ) {
             $allowEdition = false;
         }
@@ -4819,7 +4819,7 @@ function processWorkForm(
             // handing it in Chamilo, adding this time to the student total
             // course use time, as a register of time spent *before* his
             // connection to the platform to hand the work in.
-            $consideredWorkingTime = api_get_configuration_value('considered_working_time');
+            $consideredWorkingTime = api_get_setting('work.considered_working_time');
 
             if (!empty($consideredWorkingTime)) {
                 // Get the "considered work time" defined for this work
@@ -5329,7 +5329,7 @@ function deleteWorkItem($item_id, Course $course)
         if ($count > 0) {
             // If the "considered_working_time" option is enabled, check
             // whether some time should be removed from track_e_course_access
-            $consideredWorkingTime = api_get_configuration_value('considered_working_time');
+            $consideredWorkingTime = api_get_setting('work.considered_working_time');
             if ($consideredWorkingTime) {
                 $userWorks = get_work_user_list(
                     0,
diff --git a/public/main/work/work_list.php b/public/main/work/work_list.php
index 28bc480dd9..59da5a05a6 100644
--- a/public/main/work/work_list.php
+++ b/public/main/work/work_list.php
@@ -67,7 +67,7 @@ $actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_
     Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
 
 $actionsRight = '';
-$onlyOnePublication = api_get_configuration_value('allow_only_one_student_publication_per_user');
+$onlyOnePublication = ('true' === api_get_setting('work.allow_only_one_student_publication_per_user'));
 if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_invitee()) {
     $url = api_get_path(WEB_CODE_PATH).'work/upload.php?'.api_get_cidreq().'&id='.$workId;
     $actionsRight = Display::url(
@@ -106,7 +106,7 @@ if (!empty($my_folder_data['description'])) {
 $extraFieldWorkData = workGetExtraFieldData($workId);
 
 if (!empty($extraFieldWorkData)) {
-    $forceDownload = api_get_configuration_value('force_download_doc_before_upload_work');
+    $forceDownload = ('true' === api_get_setting('work.force_download_doc_before_upload_work'));
     if ($forceDownload) {
         // Force to download documents first.
         $downloadDocumentsFirst = addslashes(get_lang('DownloadDocumentsFirst'));
diff --git a/public/main/work/work_list_all.php b/public/main/work/work_list_all.php
index be9489719e..ce05042fe6 100644
--- a/public/main/work/work_list_all.php
+++ b/public/main/work/work_list_all.php
@@ -175,7 +175,7 @@ $actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_
     Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
 
 if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfCourse) {
-    $blockAddDocuments = api_get_configuration_value('block_student_publication_add_documents');
+    $blockAddDocuments = ('true' === api_get_setting('work.block_student_publication_add_documents'));
     if (!$blockAddDocuments) {
         $actionsLeft .= '<a
             href="'.api_get_path(WEB_CODE_PATH).'work/add_document.php?'.api_get_cidreq().'&id='.$workId.'">';
@@ -197,7 +197,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
     $editLink = '<a href="'.api_get_path(WEB_CODE_PATH).'work/edit_work.php?'.api_get_cidreq().'&id='.$workId.'">';
     $editLink .= Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    $blockEdition = api_get_configuration_value('block_student_publication_edition');
+    $blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
     if ($blockEdition && !api_is_platform_admin()) {
         $editLink = '';
     }
diff --git a/public/plugin/azure_active_directory/layout/login_form.tpl b/public/plugin/azure_active_directory/layout/login_form.tpl
index a8506afe5b..afd333e5db 100644
--- a/public/plugin/azure_active_directory/layout/login_form.tpl
+++ b/public/plugin/azure_active_directory/layout/login_form.tpl
@@ -24,7 +24,7 @@
                             {% endif %}
 
                             {% if "allow_lostpassword"|api_get_setting == 'true' %}
-                                {% set pass_reminder_link = 'pass_reminder_custom_link'|api_get_configuration_value %}
+                                {% set pass_reminder_link = chamilo_settings_get('profile.pass_reminder_custom_link') %}
                                 {% set lost_password_link = _p.web_main ~ 'auth/lostPassword.php' %}
 
                                 {% if not pass_reminder_link is empty %}
diff --git a/public/plugin/azure_active_directory/view/login.tpl b/public/plugin/azure_active_directory/view/login.tpl
index 89810414a6..b2d0baf059 100644
--- a/public/plugin/azure_active_directory/view/login.tpl
+++ b/public/plugin/azure_active_directory/view/login.tpl
@@ -11,7 +11,7 @@
                 {% endif %}
 
                 {% if "allow_lostpassword" | api_get_setting == 'true' %}
-                    {% set pass_reminder_link = 'pass_reminder_custom_link'|api_get_configuration_value %}
+                    {% set pass_reminder_link = chamilo_settings_get('profile.pass_reminder_custom_link') %}
                     {% set lost_password_link = _p.web_main ~ 'auth/lostPassword.php' %}
 
                     {% if not pass_reminder_link is empty %}
diff --git a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
index 94baddb784..40b48cd83a 100644
--- a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@@ -133,7 +133,7 @@ class Basic extends Toolbar
             $plugins[] = 'ckeditor_vimeo_embed';
         }
 
-        if (api_get_configuration_value('ck_editor_block_image_copy_paste')) {
+        if ('true' === api_get_setting('editor.ck_editor_block_image_copy_paste')) {
             $plugins[] = 'blockimagepaste';
         }
         $this->defaultPlugins = array_unique(array_merge($this->defaultPlugins, $plugins));
diff --git a/src/CoreBundle/Component/Editor/Toolbar.php b/src/CoreBundle/Component/Editor/Toolbar.php
index 88426da5cd..378502d52f 100644
--- a/src/CoreBundle/Component/Editor/Toolbar.php
+++ b/src/CoreBundle/Component/Editor/Toolbar.php
@@ -38,7 +38,7 @@ class Toolbar
                 $toolbarObj = new $class($urlGenerator, $toolbar, $config);
                 $config = $toolbarObj->getConfig();
 
-                if (api_get_configuration_value('full_ckeditor_toolbar_set')) {
+                if ('true' === api_get_setting('editor.full_ckeditor_toolbar_set')) {
                     $basicClass = __NAMESPACE__.'\\'.$prefix.'\\Toolbar\\Basic';
                     $basicObj = new $basicClass($urlGenerator, $toolbar, $config);
                     $basicConfig = $basicObj->getConfig();
diff --git a/src/CoreBundle/Controller/ChatController.php b/src/CoreBundle/Controller/ChatController.php
index 9f973250d6..a38e7740e5 100644
--- a/src/CoreBundle/Controller/ChatController.php
+++ b/src/CoreBundle/Controller/ChatController.php
@@ -42,7 +42,7 @@ class ChatController extends AbstractResourceController implements CourseControl
         return $this->render(
             '@ChamiloCore/Chat/chat.html.twig',
             [
-                'restrict_to_coach' => api_get_configuration_value('course_chat_restrict_to_coach'),
+                'restrict_to_coach' => ('true' === api_get_setting('chat.course_chat_restrict_to_coach')),
                 'user' => api_get_user_info(),
             ]
         );
diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php
index fe20d8842b..dbb3bda34e 100644
--- a/src/CoreBundle/Controller/CourseController.php
+++ b/src/CoreBundle/Controller/CourseController.php
@@ -109,7 +109,7 @@ class CourseController extends ToolBaseController
             }
 
             $redirect = true;
-            $allow = api_get_configuration_value('allow_public_course_with_no_terms_conditions');
+            $allow = ('true' === Container::getSettingsManager()->getSetting('course.allow_public_course_with_no_terms_conditions'));
             if (true === $allow &&
                 null !== $course->getVisibility() &&
                 COURSE_VISIBILITY_OPEN_WORLD === $course->getVisibility()
@@ -659,7 +659,7 @@ class CourseController extends ToolBaseController
             }
         }
 
-        if (api_get_configuration_value('allow_exercise_auto_launch')) {
+        if (('true' === api_get_setting('exercise.allow_exercise_auto_launch'))) {
             $exerciseAutoLaunch = (int) api_get_course_setting('enable_exercise_auto_launch');
             if (2 === $exerciseAutoLaunch) {
                 if ($allowAutoLaunchForCourseAdmins) {
diff --git a/src/CoreBundle/Controller/SessionController.php b/src/CoreBundle/Controller/SessionController.php
index 626f4a21ea..9597de47a6 100644
--- a/src/CoreBundle/Controller/SessionController.php
+++ b/src/CoreBundle/Controller/SessionController.php
@@ -205,7 +205,7 @@ class SessionController extends AbstractController
             }
         }
 
-        $redirectToSession = api_get_configuration_value('allow_redirect_to_session_after_inscription_about');
+        $redirectToSession = ('true' === Container::getSettingsManager()->getSetting('session.allow_redirect_to_session_after_inscription_about'));
         $redirectToSession = $redirectToSession ? '?s='.$sessionId : false;
 
         $coursesInThisSession = SessionManager::get_course_list_by_session_id($sessionId);
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20230216122900.php b/src/CoreBundle/Migrations/Schema/V200/Version20230216122900.php
new file mode 100644
index 0000000000..1bd05d5949
--- /dev/null
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20230216122900.php
@@ -0,0 +1,550 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+class Version20230216122900 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Migrate configuration values to settings_current';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $connection = $this->getEntityManager()->getConnection();
+        $configurationValues = [
+            'Session' => [
+                'allow_redirect_to_session_after_inscription_about',
+                'remove_session_url',
+                'session_list_show_count_users',
+                'session_admins_access_all_content',
+                'session_admins_edit_courses_content',
+                'limit_session_admin_list_users',
+                'hide_search_form_in_session_list',
+                'allow_delete_user_for_session_admin',
+                'allow_disable_user_for_session_admin',
+                'session_multiple_subscription_students_list_avoid_emptying',
+                'hide_reporting_session_list',
+                'allow_session_admin_read_careers',
+                'session_list_order',
+                'allow_user_session_collapsable',
+                'allow_session_admin_login_as_teacher',
+                'catalog_course_subscription_in_user_s_session',
+                'default_session_list_view',
+                'session_automatic_creation_user_id',
+                'user_s_session_duration',
+            ],
+            'Security' => [
+                'security_strict_transport',
+                'security_content_policy',
+                'security_content_policy_report_only',
+                'security_public_key_pins',
+                'security_public_key_pins_report_only',
+                'security_x_frame_options',
+                'security_xss_protection',
+                'security_x_content_type_options',
+                'security_referrer_policy',
+                'security_block_inactive_users_immediately',
+            ],
+            'Course' => [
+                'view_grid_courses',
+                'show_simple_session_info',
+                'my_courses_show_courses_in_user_language_only',
+                'allow_public_course_with_no_terms_conditions',
+                'show_all_sessions_on_my_course_page',
+                'disabled_edit_session_coaches_course_editing_course',
+                'allow_base_course_category',
+                'hide_course_sidebar',
+                'allow_course_extra_field_in_catalog',
+                'multiple_access_url_show_shared_course_marker',
+                'course_category_code_to_use_as_model',
+                'enable_unsubscribe_button_on_my_course_page',
+                'course_creation_donate_message_show',
+                'course_creation_donate_link',
+                'courses_list_session_title_link',
+                'hide_course_rating',
+            ],
+            'Language' => [
+                'show_language_selector_in_menu',
+                'language_flags_by_country',
+            ],
+            'Platform' => [
+                'theme_fallback',
+                'unoconv_binaries',
+                'packager',
+                'sync_db_with_schema',
+                'hide_main_navigation_menu',
+                'pdf_img_dpi',
+                'tracking_skip_generic_data',
+                'hide_complete_name_in_whoisonline',
+                'table_default_row',
+                'allow_double_validation_in_registration',
+                'block_my_progress_page',
+                'generate_random_login',
+                'timepicker_increment',
+            ],
+            'Profile' => [
+                'allow_career_diagram',
+                'hide_username_with_complete_name',
+                'disable_change_user_visibility_for_public_courses',
+                'my_space_users_items_per_page',
+                'add_user_course_information_in_mailto',
+                'pass_reminder_custom_link',
+                'registration_add_helptext_for_2_names',
+                'disable_gdpr',
+                'data_protection_officer_name',
+                'data_protection_officer_role',
+                'data_protection_officer_email',
+            ],
+            'Admin' => [
+                'show_link_request_hrm_user',
+                'max_anonymous_users',
+                'send_inscription_notification_to_general_admin_only',
+                'plugin_redirection_enabled',
+            ],
+            'Agenda' => [
+                'personal_agenda_show_all_session_events',
+                'allow_agenda_edit_for_hrm',
+            ],
+            'Lp' => [
+                'add_all_files_in_lp_export',
+                'show_prerequisite_as_blocked',
+                'hide_lp_time',
+                'lp_category_accordion',
+                'lp_view_accordion',
+                'disable_js_in_lp_view',
+                'allow_teachers_to_access_blocked_lp_by_prerequisite',
+                'allow_lp_chamilo_export',
+                'hide_accessibility_label_on_lp_item',
+                'lp_minimum_time',
+                'validate_lp_prerequisite_from_other_session',
+                'show_hidden_exercise_added_to_lp',
+                'lp_menu_location',
+                'lp_score_as_progress_enable',
+                'lp_prevents_beforeunload',
+                'disable_my_lps_page',
+                'scorm_api_username_as_student_id',
+                'scorm_api_extrafield_to_use_as_student_id',
+                'allow_import_scorm_package_in_course_builder',
+                'allow_htaccess_import_from_scorm',
+            ],
+            'Gradebook' => [
+                'gradebook_enable_best_score',
+                'gradebook_hide_graph',
+                'gradebook_hide_pdf_report_button',
+                'hide_gradebook_percentage_user_result',
+                'gradebook_use_exercise_score_settings_in_categories',
+                'gradebook_use_apcu_cache',
+                'gradebook_report_score_style',
+                'gradebook_score_display_custom_standalone',
+                'gradebook_use_exercise_score_settings_in_total',
+            ],
+            'Exercise' => [
+                'block_quiz_mail_notification_general_coach',
+                'allow_quiz_question_feedback',
+                'allow_quiz_show_previous_button_setting',
+                'allow_teacher_comment_audio',
+                'quiz_prevent_copy_paste',
+                'quiz_show_description_on_results_page',
+                'quiz_generate_certificate_ending',
+                'quiz_open_question_decimal_score',
+                'quiz_check_button_enable',
+                'allow_notification_setting_per_exercise',
+                'hide_free_question_score',
+                'hide_user_info_in_quiz_result',
+                'exercise_attempts_report_show_username',
+                'allow_exercise_auto_launch',
+                'disable_clean_exercise_results_for_teachers',
+                'show_exercise_question_certainty_ribbon_result',
+                'quiz_results_answers_report',
+                'send_score_in_exam_notification_mail_to_manager',
+                'show_exercise_expected_choice',
+                'exercise_hide_label',
+                'exercise_category_round_score_in_export',
+                'exercises_disable_new_attempts',
+                'show_question_id',
+                'show_question_pagination',
+                'question_pagination_length',
+                'limit_exercise_teacher_access',
+                'block_category_questions',
+                'exercise_score_format',
+            ],
+            'Glossary' => [
+                'default_glossary_view',
+                'allow_remove_tags_in_glossary_export',
+            ],
+            'Forum' => [
+                'global_forums_course_id',
+                'hide_forum_post_revision_language',
+                'allow_forum_post_revisions',
+                'forum_fold_categories',
+            ],
+            'Message' => [
+                'private_messages_about_user',
+                'private_messages_about_user_visible_to_user',
+            ],
+            'Display' => [
+                'hide_social_media_links',
+            ],
+            'Social' => [
+                'social_show_language_flag_in_profile',
+                'social_make_teachers_friend_all',
+            ],
+            'Editor' => [
+                'save_titles_as_html',
+                'full_ckeditor_toolbar_set',
+                'ck_editor_block_image_copy_paste',
+                'translate_html',
+            ],
+            'Chat' => [
+                'hide_username_in_course_chat',
+                'hide_chat_video',
+                'course_chat_restrict_to_coach',
+            ],
+            'Survey' => [
+                'allow_required_survey_questions',
+                'hide_survey_reporting_button',
+                'allow_survey_availability_datetime',
+                'survey_mark_question_as_required',
+                'survey_anonymous_show_answered',
+                'survey_question_dependency',
+                'survey_allow_answered_question_edit',
+                'survey_duplicate_order_by_name',
+                'survey_backwards_enable',
+            ],
+            'Document' => [
+                'send_notification_when_document_added',
+                'thematic_pdf_orientation',
+                'certificate_pdf_orientation',
+                'allow_general_certificate',
+            ],
+            'Announcement' => [
+                'disable_announcement_attachment',
+                'admin_chamilo_announcements_disable',
+                'allow_scheduled_announcements',
+                'disable_delete_all_announcements',
+                'hide_announcement_sent_to_users_info',
+            ],
+            'Skill' => [
+                'allow_private_skills',
+                'allow_teacher_access_student_skills',
+                'skills_teachers_can_assign_skills',
+                'hide_skill_levels',
+                'table_of_hierarchical_skill_presentation',
+            ],
+            'Mail' => [
+                'update_users_email_to_dummy_except_admins',
+                'hosting_total_size_limit',
+                'mail_header_style',
+                'mail_content_style',
+                'allow_email_editor_for_anonymous',
+                'messages_hide_mail_content',
+                'send_inscription_msg_to_inbox',
+                'allow_user_message_tracking',
+                'send_two_inscription_confirmation_mail',
+                'show_user_email_in_notification',
+                'send_notification_score_in_percentage',
+            ],
+            'Work' => [
+                'block_student_publication_edition',
+                'block_student_publication_add_documents',
+                'block_student_publication_score_edition',
+                'allow_only_one_student_publication_per_user',
+                'allow_my_student_publication_page',
+                'assignment_prevent_duplicate_upload',
+                'considered_working_time',
+                'force_download_doc_before_upload_work',
+                'allow_redirect_to_main_page_after_work_upload',
+            ],
+        ];
+        foreach ($configurationValues as $category => $variables) {
+            foreach ($variables as $variable) {
+                $result = $connection
+                    ->executeQuery(
+                        "SELECT COUNT(1) FROM settings_current WHERE variable = '$variable' AND category = '{$category}'"
+                    )
+                ;
+                $count = $result->fetchNumeric()[0];
+                if (empty($count)) {
+                    $selectedValue = $this->getConfigurationValue($variable);
+                    $this->addSql(
+                        "INSERT INTO settings_current (access_url, variable, category, selected_value, title, access_url_changeable, access_url_locked) VALUES (1, '{$variable}', '{$category}', '{$selectedValue}', '{$variable}', 1, 1)"
+                    );
+                }
+            }
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        $connection = $this->getEntityManager()->getConnection();
+        $configurationValues = [
+            'Work' => [
+                'allow_redirect_to_main_page_after_work_upload',
+                'force_download_doc_before_upload_work',
+                'considered_working_time',
+                'assignment_prevent_duplicate_upload',
+                'allow_my_student_publication_page',
+                'allow_only_one_student_publication_per_user',
+                'block_student_publication_score_edition',
+                'block_student_publication_add_documents',
+                'block_student_publication_edition',
+            ],
+            'Mail' => [
+                'send_notification_score_in_percentage',
+                'show_user_email_in_notification',
+                'send_two_inscription_confirmation_mail',
+                'allow_user_message_tracking',
+                'send_inscription_msg_to_inbox',
+                'messages_hide_mail_content',
+                'allow_email_editor_for_anonymous',
+                'mail_content_style',
+                'mail_header_style',
+                'hosting_total_size_limit',
+                'update_users_email_to_dummy_except_admins',
+            ],
+            'Skill' => [
+                'table_of_hierarchical_skill_presentation',
+                'hide_skill_levels',
+                'skills_teachers_can_assign_skills',
+                'allow_teacher_access_student_skills',
+                'allow_private_skills',
+            ],
+            'Announcement' => [
+                'hide_announcement_sent_to_users_info',
+                'allow_scheduled_announcements',
+                'admin_chamilo_announcements_disable',
+                'disable_announcement_attachment',
+                'disable_delete_all_announcements'
+            ],
+            'Document' => [
+                'allow_general_certificate',
+                'certificate_pdf_orientation',
+                'thematic_pdf_orientation',
+                'send_notification_when_document_added',
+            ],
+            'Survey' => [
+                'survey_backwards_enable',
+                'survey_duplicate_order_by_name',
+                'survey_allow_answered_question_edit',
+                'survey_question_dependency',
+                'survey_anonymous_show_answered',
+                'survey_mark_question_as_required',
+                'allow_survey_availability_datetime',
+                'hide_survey_reporting_button',
+                'allow_required_survey_questions',
+            ],
+            'Chat' => [
+                'course_chat_restrict_to_coach',
+                'hide_chat_video',
+                'hide_username_in_course_chat',
+            ],
+            'Editor' => [
+                'translate_html',
+                'ck_editor_block_image_copy_paste',
+                'full_ckeditor_toolbar_set',
+                'save_titles_as_html',
+            ],
+            'Social' => [
+                'social_make_teachers_friend_all',
+                'social_show_language_flag_in_profile',
+            ],
+            'Display' => [
+                'hide_social_media_links',
+            ],
+            'Message' => [
+                'private_messages_about_user_visible_to_user',
+                'private_messages_about_user',
+            ],
+            'Forum' => [
+                'forum_fold_categories',
+                'allow_forum_post_revisions',
+                'hide_forum_post_revision_language',
+                'global_forums_course_id',
+            ],
+            'Glossary' => [
+                'allow_remove_tags_in_glossary_export',
+                'default_glossary_view',
+            ],
+            'Exercise' => [
+                'exercise_score_format',
+                'block_category_questions',
+                'limit_exercise_teacher_access',
+                'question_pagination_length',
+                'show_question_pagination',
+                'show_question_id',
+                'exercises_disable_new_attempts',
+                'exercise_category_round_score_in_export',
+                'exercise_hide_label',
+                'show_exercise_expected_choice',
+                'send_score_in_exam_notification_mail_to_manager',
+                'quiz_results_answers_report',
+                'show_exercise_question_certainty_ribbon_result',
+                'disable_clean_exercise_results_for_teachers',
+                'allow_exercise_auto_launch',
+                'exercise_attempts_report_show_username',
+                'hide_user_info_in_quiz_result',
+                'hide_free_question_score',
+                'allow_notification_setting_per_exercise',
+                'quiz_check_button_enable',
+                'quiz_open_question_decimal_score',
+                'quiz_generate_certificate_ending',
+                'quiz_show_description_on_results_page',
+                'quiz_prevent_copy_paste',
+                'allow_teacher_comment_audio',
+                'allow_quiz_show_previous_button_setting',
+                'allow_quiz_question_feedback',
+                'block_quiz_mail_notification_general_coach',
+            ],
+            'Gradebook' => [
+                'gradebook_use_exercise_score_settings_in_total',
+                'gradebook_score_display_custom_standalone',
+                'gradebook_report_score_style',
+                'gradebook_use_apcu_cache',
+                'gradebook_use_exercise_score_settings_in_categories',
+                'hide_gradebook_percentage_user_result',
+                'gradebook_hide_pdf_report_button',
+                'gradebook_hide_graph',
+                'gradebook_enable_best_score',
+            ],
+            'Lp' => [
+                'allow_htaccess_import_from_scorm',
+                'allow_import_scorm_package_in_course_builder',
+                'scorm_api_extrafield_to_use_as_student_id',
+                'scorm_api_username_as_student_id',
+                'disable_my_lps_page',
+                'lp_prevents_beforeunload',
+                'lp_score_as_progress_enable',
+                'lp_menu_location',
+                'show_hidden_exercise_added_to_lp',
+                'validate_lp_prerequisite_from_other_session',
+                'lp_minimum_time',
+                'hide_accessibility_label_on_lp_item',
+                'allow_lp_chamilo_export',
+                'allow_teachers_to_access_blocked_lp_by_prerequisite',
+                'disable_js_in_lp_view',
+                'lp_view_accordion',
+                'lp_category_accordion',
+                'hide_lp_time',
+                'show_prerequisite_as_blocked',
+                'add_all_files_in_lp_export',
+            ],
+            'Agenda' => [
+                'allow_agenda_edit_for_hrm',
+                'personal_agenda_show_all_session_events',
+            ],
+            'Admin' => [
+                'plugin_redirection_enabled',
+                'send_inscription_notification_to_general_admin_only',
+                'max_anonymous_users',
+                'show_link_request_hrm_user',
+            ],
+            'Profile' => [
+                'data_protection_officer_email',
+                'data_protection_officer_role',
+                'data_protection_officer_name',
+                'disable_gdpr',
+                'registration_add_helptext_for_2_names',
+                'pass_reminder_custom_link',
+                'add_user_course_information_in_mailto',
+                'my_space_users_items_per_page',
+                'disable_change_user_visibility_for_public_courses',
+                'hide_username_with_complete_name',
+                'allow_career_diagram',
+            ],
+            'Platform' => [
+                'timepicker_increment',
+                'generate_random_login',
+                'block_my_progress_page',
+                'allow_double_validation_in_registration',
+                'table_default_row',
+                'hide_complete_name_in_whoisonline',
+                'tracking_skip_generic_data',
+                'pdf_img_dpi',
+                'hide_main_navigation_menu',
+                'sync_db_with_schema',
+                'packager',
+                'unoconv_binaries',
+                'theme_fallback',
+            ],
+            'Language' => [
+                'language_flags_by_country',
+                'show_language_selector_in_menu',
+            ],
+            'Course' => [
+                'hide_course_rating',
+                'courses_list_session_title_link',
+                'course_creation_donate_link',
+                'course_creation_donate_message_show',
+                'enable_unsubscribe_button_on_my_course_page',
+                'course_category_code_to_use_as_model',
+                'multiple_access_url_show_shared_course_marker',
+                'allow_course_extra_field_in_catalog',
+                'hide_course_sidebar',
+                'allow_base_course_category',
+                'disabled_edit_session_coaches_course_editing_course',
+                'show_all_sessions_on_my_course_page',
+                'allow_public_course_with_no_terms_conditions',
+                'my_courses_show_courses_in_user_language_only',
+                'show_simple_session_info',
+                'view_grid_courses',
+            ],
+            'Security' => [
+                'security_block_inactive_users_immediately',
+                'security_referrer_policy',
+                'security_x_content_type_options',
+                'security_xss_protection',
+                'security_x_frame_options',
+                'security_public_key_pins_report_only',
+                'security_public_key_pins',
+                'security_content_policy_report_only',
+                'security_content_policy',
+                'security_strict_transport',
+            ],
+            'Session' => [
+                'user_s_session_duration',
+                'session_automatic_creation_user_id',
+                'default_session_list_view',
+                'catalog_course_subscription_in_user_s_session',
+                'allow_session_admin_login_as_teacher',
+                'allow_user_session_collapsable',
+                'session_list_order',
+                'allow_session_admin_read_careers',
+                'hide_reporting_session_list',
+                'session_multiple_subscription_students_list_avoid_emptying',
+                'allow_disable_user_for_session_admin',
+                'allow_delete_user_for_session_admin',
+                'hide_search_form_in_session_list',
+                'limit_session_admin_list_users',
+                'session_admins_edit_courses_content',
+                'session_admins_access_all_content',
+                'session_list_show_count_users',
+                'remove_session_url',
+                'allow_redirect_to_session_after_inscription_about',
+            ]
+        ];
+        foreach ($configurationValues as $category => $variables) {
+            foreach ($variables as $variable) {
+                $result = $connection
+                    ->executeQuery(
+                        "SELECT COUNT(1) FROM settings_current WHERE variable = '$variable' AND category = '$category'"
+                    )
+                ;
+                $count = $result->fetchNumeric()[0];
+                if (!empty($count)) {
+                    $this->addSql(
+                        "DELETE FROM settings_current WHERE variable = '{$variable}' AND category = '$category'"
+                    );
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/CoreBundle/Resources/config/settings.yml b/src/CoreBundle/Resources/config/settings.yml
index 6d9c15ff91..703efdde6f 100644
--- a/src/CoreBundle/Resources/config/settings.yml
+++ b/src/CoreBundle/Resources/config/settings.yml
@@ -166,6 +166,11 @@ services:
         tags:
             - {name: sylius.settings_schema, alias: chamilo_core.settings.survey, namespace: survey}
 
+    chamilo_core.settings.work:
+        class: Chamilo\CoreBundle\Settings\WorkSettingsSchema
+        tags:
+            - { name: sylius.settings_schema, alias: chamilo_core.settings.work, namespace: work }
+
     chamilo_core.settings.ticket:
         class: Chamilo\CoreBundle\Settings\TicketSettingsSchema
         tags:
diff --git a/src/CoreBundle/Resources/views/LearnPath/list.html.twig b/src/CoreBundle/Resources/views/LearnPath/list.html.twig
index ab7f300e05..bd1b60f544 100644
--- a/src/CoreBundle/Resources/views/LearnPath/list.html.twig
+++ b/src/CoreBundle/Resources/views/LearnPath/list.html.twig
@@ -10,7 +10,7 @@
             }
         }
     </script>
-    {% set configuration = 'lp_category_accordion'|api_get_configuration_value %}
+    {% set configuration = chamilo_settings_get('lp.lp_category_accordion') %}
     <div class="lp-accordion panel-group my-8" id="lp-accordion" role="tablist" aria-multiselectable="true">
         {% for lp_data in data %}
             {% set show_category = true %}
diff --git a/src/CoreBundle/Resources/views/Session/about.html.twig b/src/CoreBundle/Resources/views/Session/about.html.twig
index 36f49304f1..7cf5d631e6 100644
--- a/src/CoreBundle/Resources/views/Session/about.html.twig
+++ b/src/CoreBundle/Resources/views/Session/about.html.twig
@@ -31,7 +31,7 @@
                             </div>
                         {% endif %}
 
-                        {% if not 'hide_social_media_links'|api_get_configuration_value %}
+                        {% if not "display.hide_social_media_links" | api_get_setting == 'true' %}
                             <div class="share-social-media">
                                 <ul class="sharing-buttons">
                                     <li>
diff --git a/src/CoreBundle/Settings/AdminSettingsSchema.php b/src/CoreBundle/Settings/AdminSettingsSchema.php
index cbc4e82dc8..380b775f95 100644
--- a/src/CoreBundle/Settings/AdminSettingsSchema.php
+++ b/src/CoreBundle/Settings/AdminSettingsSchema.php
@@ -9,6 +9,7 @@ namespace Chamilo\CoreBundle\Settings;
 use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -24,6 +25,10 @@ class AdminSettingsSchema extends AbstractSettingsSchema
                     'administrator_surname' => '',
                     'administrator_phone' => '',
                     'redirect_admin_to_courses_list' => 'false',
+                    'show_link_request_hrm_user' => 'false',
+                    'max_anonymous_users' => '0',
+                    'send_inscription_notification_to_general_admin_only' => 'false',
+                    'plugin_redirection_enabled' => 'false',
                 ]
             )
         ;
@@ -51,6 +56,10 @@ class AdminSettingsSchema extends AbstractSettingsSchema
             ->add('administrator_email', EmailType::class)
             ->add('administrator_phone')
             ->add('redirect_admin_to_courses_list', YesNoType::class)
+            ->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)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/AgendaSettingsSchema.php b/src/CoreBundle/Settings/AgendaSettingsSchema.php
index 89d11a9227..050528c18e 100644
--- a/src/CoreBundle/Settings/AgendaSettingsSchema.php
+++ b/src/CoreBundle/Settings/AgendaSettingsSchema.php
@@ -25,6 +25,8 @@ class AgendaSettingsSchema extends AbstractSettingsSchema
                     //'number_of_upcoming_events' => '0',
                     'default_calendar_view' => 'month',
                     'personal_calendar_show_sessions_occupation' => 'false',
+                    'personal_agenda_show_all_session_events' => 'false',
+                    'allow_agenda_edit_for_hrm' => 'false',
                 ]
             )
         ;
@@ -57,6 +59,8 @@ class AgendaSettingsSchema extends AbstractSettingsSchema
                 ]
             )
             ->add('personal_calendar_show_sessions_occupation', YesNoType::class)
+            ->add('personal_agenda_show_all_session_events', YesNoType::class)
+            ->add('allow_agenda_edit_for_hrm', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/AnnouncementSettingsSchema.php b/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
index 8f715e442a..ff8bf9e74f 100644
--- a/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
+++ b/src/CoreBundle/Settings/AnnouncementSettingsSchema.php
@@ -19,6 +19,11 @@ class AnnouncementSettingsSchema extends AbstractSettingsSchema
                 [
                     'hide_global_announcements_when_not_connected' => 'false',
                     'hide_send_to_hrm_users' => 'true',
+                    'disable_announcement_attachment' => 'false',
+                    'admin_chamilo_announcements_disable' => 'false',
+                    'allow_scheduled_announcements' => 'false',
+                    'disable_delete_all_announcements' => 'false',
+                    'hide_announcement_sent_to_users_info' => 'false',
                 ]
             )
         ;
@@ -34,6 +39,11 @@ class AnnouncementSettingsSchema extends AbstractSettingsSchema
         $builder
             ->add('hide_global_announcements_when_not_connected', YesNoType::class)
             ->add('hide_send_to_hrm_users', YesNoType::class)
+            ->add('disable_announcement_attachment', YesNoType::class)
+            ->add('admin_chamilo_announcements_disable', YesNoType::class)
+            ->add('allow_scheduled_announcements', YesNoType::class)
+            ->add('disable_delete_all_announcements', YesNoType::class)
+            ->add('hide_announcement_sent_to_users_info', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/ChatSettingsSchema.php b/src/CoreBundle/Settings/ChatSettingsSchema.php
index a67fd22248..8f3162afca 100644
--- a/src/CoreBundle/Settings/ChatSettingsSchema.php
+++ b/src/CoreBundle/Settings/ChatSettingsSchema.php
@@ -19,6 +19,8 @@ class ChatSettingsSchema extends AbstractSettingsSchema
                 [
                     'show_chat_folder' => 'true',
                     'allow_global_chat' => 'true',
+                    'hide_chat_video' => 'false',
+                    'course_chat_restrict_to_coach' => 'false',
                 ]
             )
         ;
@@ -33,6 +35,8 @@ class ChatSettingsSchema extends AbstractSettingsSchema
         $builder
             ->add('allow_global_chat', YesNoType::class)
             ->add('show_chat_folder', YesNoType::class)
+            ->add('hide_chat_video', YesNoType::class)
+            ->add('course_chat_restrict_to_coach', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/CourseSettingsSchema.php b/src/CoreBundle/Settings/CourseSettingsSchema.php
index 3f2ad9888b..c0af8d8258 100644
--- a/src/CoreBundle/Settings/CourseSettingsSchema.php
+++ b/src/CoreBundle/Settings/CourseSettingsSchema.php
@@ -15,6 +15,7 @@ use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -84,6 +85,22 @@ class CourseSettingsSchema extends AbstractSettingsSchema
                     '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',
+                    'allow_course_extra_field_in_catalog' => 'false',
+                    'multiple_access_url_show_shared_course_marker' => 'false',
+                    'course_category_code_to_use_as_model' => 'MY_CATEGORY',
+                    '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',
                     // @todo
                 ]
             )
@@ -224,6 +241,47 @@ class CourseSettingsSchema extends AbstractSettingsSchema
             ->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('allow_course_extra_field_in_catalog', YesNoType::class)
+            ->add('multiple_access_url_show_shared_course_marker', YesNoType::class)
+            ->add(
+                'course_category_code_to_use_as_model',
+                TextType::class,
+                [
+                    'label' => 'CourseCategoryCodeToUseAsModelTitle',
+                    'help' => 'CourseCategoryCodeToUseAsModelComment',
+                ]
+            )
+            ->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,
+                [
+                    'label' => 'CourseCreationDonateLinkTitle',
+                    'help' => 'CourseCreationDonateLinkComment',
+                ]
+            )
+            ->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)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/DocumentSettingsSchema.php b/src/CoreBundle/Settings/DocumentSettingsSchema.php
index 0dc02ea098..29a1baa169 100644
--- a/src/CoreBundle/Settings/DocumentSettingsSchema.php
+++ b/src/CoreBundle/Settings/DocumentSettingsSchema.php
@@ -58,6 +58,10 @@ class DocumentSettingsSchema extends AbstractSettingsSchema
                     'allow_personal_user_files' => '',
                     // ?
                     'if_file_exists_option' => 'rename',
+                    'send_notification_when_document_added' => 'false',
+                    'thematic_pdf_orientation' => 'landscape',
+                    'certificate_pdf_orientation' => 'landscape',
+                    'allow_general_certificate' => 'false',
                 ]
             )
             ->setTransformer(
@@ -147,6 +151,28 @@ class DocumentSettingsSchema extends AbstractSettingsSchema
                     ],
                 ]
             )
+            ->add('send_notification_when_document_added', YesNoType::class)
+            ->add(
+                'thematic_pdf_orientation',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Portrait' => 'portrait',
+                        'Landscape' => 'landscape',
+                    ],
+                ]
+            )
+            ->add(
+                'certificate_pdf_orientation',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Portrait' => 'portrait',
+                        'Landscape' => 'landscape',
+                    ],
+                ]
+            )
+            ->add('allow_general_certificate', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/EditorSettingsSchema.php b/src/CoreBundle/Settings/EditorSettingsSchema.php
index 21c1c3374c..88b539e1b4 100644
--- a/src/CoreBundle/Settings/EditorSettingsSchema.php
+++ b/src/CoreBundle/Settings/EditorSettingsSchema.php
@@ -37,6 +37,9 @@ class EditorSettingsSchema extends AbstractSettingsSchema
                     'enable_iframe_inclusion' => '',
                     'enabled_mathjax' => '',
                     'translate_html' => 'false',
+                    'save_titles_as_html' => 'false',
+                    'full_ckeditor_toolbar_set' => 'false',
+                    'ck_editor_block_image_copy_paste' => 'false',
                 ]
             )
             /*->setAllowedTypes(
@@ -69,6 +72,9 @@ class EditorSettingsSchema extends AbstractSettingsSchema
             ->add('enable_iframe_inclusion', YesNoType::class)
             ->add('enabled_mathjax', YesNoType::class)
             ->add('translate_html', YesNoType::class)
+            ->add('save_titles_as_html', YesNoType::class)
+            ->add('full_ckeditor_toolbar_set', YesNoType::class)
+            ->add('ck_editor_block_image_copy_paste', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/ExerciseSettingsSchema.php b/src/CoreBundle/Settings/ExerciseSettingsSchema.php
index fbe94105eb..acc9374711 100644
--- a/src/CoreBundle/Settings/ExerciseSettingsSchema.php
+++ b/src/CoreBundle/Settings/ExerciseSettingsSchema.php
@@ -8,6 +8,9 @@ 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\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ExerciseSettingsSchema extends AbstractSettingsSchema
@@ -28,6 +31,33 @@ class ExerciseSettingsSchema extends AbstractSettingsSchema
                     'exercise_invisible_in_session' => 'false',
                     'allow_edit_exercise_in_lp' => 'false',
                     'exercise_hide_label' => 'false',
+                    'block_quiz_mail_notification_general_coach' => 'false',
+                    'allow_quiz_question_feedback' => 'false',
+                    'allow_quiz_show_previous_button_setting' => 'false',
+                    'allow_teacher_comment_audio' => 'true',
+                    'quiz_prevent_copy_paste' => 'false',
+                    'quiz_show_description_on_results_page' => 'false',
+                    'quiz_generate_certificate_ending' => 'false',
+                    'quiz_open_question_decimal_score' => 'false',
+                    'quiz_check_button_enable' => 'false',
+                    'allow_notification_setting_per_exercise' => 'false',
+                    'hide_free_question_score' => 'false',
+                    'hide_user_info_in_quiz_result' => 'false',
+                    'exercise_attempts_report_show_username' => 'false',
+                    'allow_exercise_auto_launch' => 'false',
+                    'disable_clean_exercise_results_for_teachers' => 'true',
+                    'show_exercise_question_certainty_ribbon_result' => 'false',
+                    'quiz_results_answers_report' => 'false',
+                    'send_score_in_exam_notification_mail_to_manager' => 'false',
+                    'show_exercise_expected_choice' => 'false',
+                    'exercise_category_round_score_in_export' => 'false',
+                    'exercises_disable_new_attempts' => 'false',
+                    'show_question_id' => 'false',
+                    'show_question_pagination' => '100',
+                    'question_pagination_length' => '20',
+                    'limit_exercise_teacher_access' => 'false',
+                    'block_category_questions' => 'false',
+                    'exercise_score_format' => '0',
                 ]
             )
         ;
@@ -52,6 +82,44 @@ class ExerciseSettingsSchema extends AbstractSettingsSchema
             ->add('configure_exercise_visibility_in_course', YesNoType::class)
             ->add('exercise_invisible_in_session', YesNoType::class)
             ->add('exercise_hide_label', YesNoType::class)
+            ->add('block_quiz_mail_notification_general_coach', YesNoType::class)
+            ->add('allow_quiz_question_feedback', YesNoType::class)
+            ->add('allow_quiz_show_previous_button_setting', YesNoType::class)
+            ->add('allow_teacher_comment_audio', YesNoType::class)
+            ->add('quiz_prevent_copy_paste', YesNoType::class)
+            ->add('quiz_show_description_on_results_page', YesNoType::class)
+            ->add('quiz_generate_certificate_ending', YesNoType::class)
+            ->add('quiz_open_question_decimal_score', YesNoType::class)
+            ->add('quiz_check_button_enable', YesNoType::class)
+            ->add('allow_notification_setting_per_exercise', YesNoType::class)
+            ->add('hide_free_question_score', YesNoType::class)
+            ->add('hide_user_info_in_quiz_result', YesNoType::class)
+            ->add('exercise_attempts_report_show_username', YesNoType::class)
+            ->add('allow_exercise_auto_launch', YesNoType::class)
+            ->add('disable_clean_exercise_results_for_teachers', YesNoType::class)
+            ->add('show_exercise_question_certainty_ribbon_result', YesNoType::class)
+            ->add('quiz_results_answers_report', YesNoType::class)
+            ->add('send_score_in_exam_notification_mail_to_manager', YesNoType::class)
+            ->add('show_exercise_expected_choice', YesNoType::class)
+            ->add('exercise_category_round_score_in_export', YesNoType::class)
+            ->add('exercises_disable_new_attempts', YesNoType::class)
+            ->add('show_question_id', YesNoType::class)
+            ->add('show_question_pagination', TextType::class)
+            ->add('question_pagination_length', TextType::class)
+            ->add('limit_exercise_teacher_access', YesNoType::class)
+            ->add('block_category_questions', YesNoType::class)
+            ->add(
+                'exercise_score_format',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'none' => '0',
+                        'SCORE_AVERAGE' => '1',
+                        'SCORE_PERCENT' => '2',
+                        'SCORE_DIV_PERCENT' => '3',
+                    ],
+                ],
+            )
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/ForumSettingsSchema.php b/src/CoreBundle/Settings/ForumSettingsSchema.php
index 7392c66d4c..76532f0844 100644
--- a/src/CoreBundle/Settings/ForumSettingsSchema.php
+++ b/src/CoreBundle/Settings/ForumSettingsSchema.php
@@ -9,6 +9,7 @@ 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\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ForumSettingsSchema extends AbstractSettingsSchema
@@ -20,6 +21,10 @@ class ForumSettingsSchema extends AbstractSettingsSchema
                 [
                     'default_forum_view' => 'flat',
                     'display_groups_forum_in_general_tool' => 'true',
+                    'global_forums_course_id' => '0',
+                    'hide_forum_post_revision_language' => 'false',
+                    'allow_forum_post_revisions' => 'false',
+                    'forum_fold_categories' => 'false',
                 ]
             )
         ;
@@ -45,6 +50,10 @@ class ForumSettingsSchema extends AbstractSettingsSchema
                 ]
             )
             ->add('display_groups_forum_in_general_tool', YesNoType::class)
+            ->add('global_forums_course_id', TextType::class)
+            ->add('hide_forum_post_revision_language', YesNoType::class)
+            ->add('allow_forum_post_revisions', YesNoType::class)
+            ->add('forum_fold_categories', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/GlossarySettingsSchema.php b/src/CoreBundle/Settings/GlossarySettingsSchema.php
index 75aeb66707..c889bf7d3c 100644
--- a/src/CoreBundle/Settings/GlossarySettingsSchema.php
+++ b/src/CoreBundle/Settings/GlossarySettingsSchema.php
@@ -6,6 +6,7 @@ declare(strict_types=1);
 
 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\FormBuilderInterface;
@@ -18,6 +19,8 @@ class GlossarySettingsSchema extends AbstractSettingsSchema
             ->setDefaults(
                 [
                     'show_glossary_in_extra_tools' => '',
+                    'default_glossary_view' => 'table',
+                    'allow_remove_tags_in_glossary_export' => 'false',
                 ]
             )
         ;
@@ -43,6 +46,17 @@ class GlossarySettingsSchema extends AbstractSettingsSchema
                     ],
                 ]
             )
+            ->add(
+                'default_glossary_view',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Table' => 'table',
+                        'List' => 'list',
+                    ],
+                ]
+            )
+            ->add('allow_remove_tags_in_glossary_export', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/GradebookSettingsSchema.php b/src/CoreBundle/Settings/GradebookSettingsSchema.php
index 0bedaebc57..f60fcd7c5b 100644
--- a/src/CoreBundle/Settings/GradebookSettingsSchema.php
+++ b/src/CoreBundle/Settings/GradebookSettingsSchema.php
@@ -9,6 +9,8 @@ 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\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class GradebookSettingsSchema extends AbstractSettingsSchema
@@ -38,6 +40,15 @@ class GradebookSettingsSchema extends AbstractSettingsSchema
                     'add_gradebook_certificates_cron_task_enabled' => 'false',
                     'certificate_filter_by_official_code' => 'false',
                     'hide_certificate_export_link_students' => 'false',
+                    'gradebook_enable_best_score' => 'false',
+                    'gradebook_hide_graph' => 'false',
+                    'gradebook_hide_pdf_report_button' => 'false',
+                    'hide_gradebook_percentage_user_result' => 'true',
+                    'gradebook_use_exercise_score_settings_in_categories' => 'true',
+                    'gradebook_use_apcu_cache' => 'true',
+                    'gradebook_report_score_style' => '1',
+                    'gradebook_score_display_custom_standalone' => 'false',
+                    'gradebook_use_exercise_score_settings_in_total' => 'false',
                 ]
             )
         ;
@@ -84,6 +95,22 @@ class GradebookSettingsSchema extends AbstractSettingsSchema
             ->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_enable_best_score', YesNoType::class)
+            ->add('gradebook_hide_graph', 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)
+            ->add('gradebook_use_apcu_cache', YesNoType::class)
+            ->add(
+                'gradebook_report_score_style',
+                TextType::class,
+                [
+                    'label' => 'GradebookReportScoreStyleTitle',
+                    'help' => 'GradebookReportScoreStyleComment',
+                ]
+            )
+            ->add('gradebook_score_display_custom_standalone', YesNoType::class)
+            ->add('gradebook_use_exercise_score_settings_in_total', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/LanguageSettingsSchema.php b/src/CoreBundle/Settings/LanguageSettingsSchema.php
index dfc0138b3b..5598975e6b 100644
--- a/src/CoreBundle/Settings/LanguageSettingsSchema.php
+++ b/src/CoreBundle/Settings/LanguageSettingsSchema.php
@@ -31,6 +31,7 @@ class LanguageSettingsSchema extends AbstractSettingsSchema
                     'show_language_selector_in_menu' => 'true',
                     'user_name_order' => '',
                     'user_name_sort' => '',
+                    'language_flags_by_country' => 'false',
                 ]
             )
         ;
@@ -90,6 +91,7 @@ class LanguageSettingsSchema extends AbstractSettingsSchema
             ])
             ->add('hide_dltt_markup')
             ->add('show_language_selector_in_menu', YesNoType::class)
+            ->add('language_flags_by_country', YesNoType::class)
         ;
 
         $choices = [
diff --git a/src/CoreBundle/Settings/LearningPathSettingsSchema.php b/src/CoreBundle/Settings/LearningPathSettingsSchema.php
index fe293b4430..720f130bc2 100644
--- a/src/CoreBundle/Settings/LearningPathSettingsSchema.php
+++ b/src/CoreBundle/Settings/LearningPathSettingsSchema.php
@@ -8,6 +8,8 @@ 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\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class LearningPathSettingsSchema extends AbstractSettingsSchema
@@ -19,6 +21,26 @@ class LearningPathSettingsSchema extends AbstractSettingsSchema
                 [
                     'fixed_encoding' => 'false',
                     'show_invisible_exercise_in_lp_toc' => 'false',
+                    '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' => 'true',
+                    'allow_teachers_to_access_blocked_lp_by_prerequisite' => 'false',
+                    'allow_lp_chamilo_export' => 'false',
+                    'hide_accessibility_label_on_lp_item' => 'true',
+                    'lp_minimum_time' => 'false',
+                    'validate_lp_prerequisite_from_other_session' => 'false',
+                    'show_hidden_exercise_added_to_lp' => 'true',
+                    'lp_menu_location' => 'left',
+                    'lp_score_as_progress_enable' => 'false',
+                    'lp_prevents_beforeunload' => 'false',
+                    'disable_my_lps_page' => 'false',
+                    'scorm_api_username_as_student_id' => 'false',
+                    'scorm_api_extrafield_to_use_as_student_id' => '',
+                    'allow_import_scorm_package_in_course_builder' => 'false',
+                    'allow_htaccess_import_from_scorm' => 'false',
                 ]
             )
         ;
@@ -34,6 +56,40 @@ class LearningPathSettingsSchema extends AbstractSettingsSchema
         $builder
             ->add('fixed_encoding', YesNoType::class)
             ->add('show_invisible_exercise_in_lp_toc', YesNoType::class)
+            ->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)
+            ->add('allow_lp_chamilo_export', YesNoType::class)
+            ->add('hide_accessibility_label_on_lp_item', YesNoType::class)
+            ->add('lp_minimum_time', YesNoType::class)
+            ->add('validate_lp_prerequisite_from_other_session', YesNoType::class)
+            ->add('show_hidden_exercise_added_to_lp', YesNoType::class)
+            ->add(
+                'lp_menu_location',
+                ChoiceType::class,
+                [
+                    'Left' => 'left',
+                    'Right' => 'right',
+                ]
+            )
+            ->add('lp_score_as_progress_enable', YesNoType::class)
+            ->add('lp_prevents_beforeunload', YesNoType::class)
+            ->add('disable_my_lps_page', YesNoType::class)
+            ->add('scorm_api_username_as_student_id', YesNoType::class)
+            ->add(
+                'scorm_api_extrafield_to_use_as_student_id',
+                TextType::class,
+                [
+                    'label' => 'ScormApiExtrafieldToUseAsStudentIdTitle',
+                    'help' => 'ScormApiExtrafieldToUseAsStudentIdComment',
+                ]
+            )
+            ->add('allow_import_scorm_package_in_course_builder', YesNoType::class)
+            ->add('allow_htaccess_import_from_scorm', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/MailSettingsSchema.php b/src/CoreBundle/Settings/MailSettingsSchema.php
index d2947f2db9..3874d13fca 100644
--- a/src/CoreBundle/Settings/MailSettingsSchema.php
+++ b/src/CoreBundle/Settings/MailSettingsSchema.php
@@ -6,8 +6,10 @@ declare(strict_types=1);
 
 namespace Chamilo\CoreBundle\Settings;
 
+use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class MailSettingsSchema extends AbstractSettingsSchema
@@ -18,6 +20,17 @@ class MailSettingsSchema extends AbstractSettingsSchema
             ->setDefaults(
                 [
                     'noreply_email_address' => 'no_reply@example.com',
+                    'update_users_email_to_dummy_except_admins' => 'false',
+                    'hosting_total_size_limit' => '0',
+                    'mail_header_style' => '',
+                    'mail_content_style' => '',
+                    'allow_email_editor_for_anonymous' => 'true',
+                    'messages_hide_mail_content' => 'false',
+                    'send_inscription_msg_to_inbox' => 'false',
+                    'allow_user_message_tracking' => 'false',
+                    'send_two_inscription_confirmation_mail' => 'false',
+                    'show_user_email_in_notification' => 'false',
+                    'send_notification_score_in_percentage' => 'false',
                 ]
             )
         ;
@@ -28,6 +41,17 @@ class MailSettingsSchema extends AbstractSettingsSchema
     {
         $builder
             ->add('noreply_email_address', EmailType::class)
+            ->add('update_users_email_to_dummy_except_admins', YesNoType::class)
+            ->add('hosting_total_size_limit', TextType::class)
+            ->add('mail_header_style', TextType::class)
+            ->add('mail_content_style', TextType::class)
+            ->add('allow_email_editor_for_anonymous', YesNoType::class)
+            ->add('messages_hide_mail_content', YesNoType::class)
+            ->add('send_inscription_msg_to_inbox', YesNoType::class)
+            ->add('allow_user_message_tracking', YesNoType::class)
+            ->add('send_two_inscription_confirmation_mail', YesNoType::class)
+            ->add('show_user_email_in_notification', YesNoType::class)
+            ->add('send_notification_score_in_percentage', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/MessageSettingsSchema.php b/src/CoreBundle/Settings/MessageSettingsSchema.php
index 57a01e5cdb..0263df69a1 100644
--- a/src/CoreBundle/Settings/MessageSettingsSchema.php
+++ b/src/CoreBundle/Settings/MessageSettingsSchema.php
@@ -20,6 +20,8 @@ class MessageSettingsSchema extends AbstractSettingsSchema
                     'allow_message_tool' => 'true',
                     'allow_send_message_to_all_platform_users' => 'false',
                     'message_max_upload_filesize' => '20971520',
+                    'private_messages_about_user' => 'false',
+                    'private_messages_about_user_visible_to_user' => 'false',
                 ]
             )
         ;
@@ -36,6 +38,8 @@ class MessageSettingsSchema extends AbstractSettingsSchema
             ->add('allow_message_tool', YesNoType::class)
             ->add('allow_send_message_to_all_platform_users', YesNoType::class)
             ->add('message_max_upload_filesize')
+            ->add('private_messages_about_user', YesNoType::class)
+            ->add('private_messages_about_user_visible_to_user', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/PlatformSettingsSchema.php b/src/CoreBundle/Settings/PlatformSettingsSchema.php
index c06173f35c..ded0b55dee 100644
--- a/src/CoreBundle/Settings/PlatformSettingsSchema.php
+++ b/src/CoreBundle/Settings/PlatformSettingsSchema.php
@@ -10,8 +10,10 @@ 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\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class PlatformSettingsSchema extends AbstractSettingsSchema
@@ -53,6 +55,19 @@ class PlatformSettingsSchema extends AbstractSettingsSchema
                     //('catalog_show_courses_sessions', '0', 'CatalogueShowOnlyCourses'),
                     //('catalog_show_courses_sessions', '1', 'CatalogueShowOnlySessions'),
                     //('catalog_show_courses_sessions', '2', 'CatalogueShowCoursesAndSessions'),
+                    'theme_fallback' => 'chamilo',
+                    'unoconv_binaries' => '/usr/bin/unoconv',
+                    'packager' => 'chamilo',
+                    'sync_db_with_schema' => 'false',
+                    'hide_main_navigation_menu' => 'false',
+                    'pdf_img_dpi' => '96',
+                    'tracking_skip_generic_data' => 'false',
+                    'hide_complete_name_in_whoisonline' => 'false',
+                    'table_default_row' => '50',
+                    'allow_double_validation_in_registration' => 'false',
+                    'block_my_progress_page' => 'false',
+                    'generate_random_login' => 'false',
+                    'timepicker_increment' => '5',
                 ]
             )
             ->setTransformer(
@@ -71,7 +86,7 @@ class PlatformSettingsSchema extends AbstractSettingsSchema
             'timezone' => ['string'],
             'gravatar_enabled' => ['string'],
             'gravatar_type' => ['string'],
-            'show_tabs' => ['array'],
+            'show_tabs' => ['array', 'null'],
             //'gamification_mode' => array('string'),
         ];
 
@@ -157,8 +172,49 @@ class PlatformSettingsSchema extends AbstractSettingsSchema
                     'choices' => $tabs,
                     'label' => 'ShowTabsTitle',
                     'help' => 'ShowTabsComment',
+                ],
+            )
+            ->add(
+                'theme_fallback',
+                TextType::class,
+                [
+                    'label' => 'ThemeFallbackTitle',
+                    'help' => 'ThemeFallbackComment',
+                ]
+            )
+            ->add(
+                'unoconv_binaries',
+                TextType::class,
+                [
+                    'label' => 'UnoconvBinariesTitle',
+                    'help' => 'UnoconvBinariesComment',
+                ]
+            )
+            ->add(
+                'packager',
+                TextType::class,
+                [
+                    'label' => 'PackagerTitle',
+                    'help' => 'PackagerComment',
+                ]
+            )
+            ->add('sync_db_with_schema', YesNoType::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,
+                [
+                    'label' => 'TableDefaultRowTitle',
+                    'help' => 'TableDefaultRowComment',
                 ]
             )
+            ->add('allow_double_validation_in_registration', YesNoType::class)
+            ->add('block_my_progress_page', YesNoType::class)
+            ->add('generate_random_login', YesNoType::class)
+            ->add('timepicker_increment', TextType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/ProfileSettingsSchema.php b/src/CoreBundle/Settings/ProfileSettingsSchema.php
index 2ecd588c5b..282faab575 100644
--- a/src/CoreBundle/Settings/ProfileSettingsSchema.php
+++ b/src/CoreBundle/Settings/ProfileSettingsSchema.php
@@ -10,6 +10,8 @@ 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\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ProfileSettingsSchema extends AbstractSettingsSchema
@@ -35,6 +37,16 @@ class ProfileSettingsSchema extends AbstractSettingsSchema
                     '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' => '',
                 ]
             )
             ->setTransformer(
@@ -96,6 +108,23 @@ class ProfileSettingsSchema extends AbstractSettingsSchema
             ->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,
+                [
+                    'label' => 'PassReminderCustomLinkTitle',
+                    'help' => 'PassReminderCustomLinkComment',
+                ]
+            )
+            ->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)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/SecuritySettingsSchema.php b/src/CoreBundle/Settings/SecuritySettingsSchema.php
index b3e18d06a9..87c89c07c0 100644
--- a/src/CoreBundle/Settings/SecuritySettingsSchema.php
+++ b/src/CoreBundle/Settings/SecuritySettingsSchema.php
@@ -9,6 +9,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\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SecuritySettingsSchema extends AbstractSettingsSchema
@@ -20,7 +21,6 @@ class SecuritySettingsSchema extends AbstractSettingsSchema
                 'filter_terms' => '',
                 'allow_browser_sniffer' => 'false',
                 'admins_can_set_users_pass' => '',
-                // ?
                 'allow_strength_pass_checker' => 'true',
                 'allow_captcha' => 'false',
                 'user_reset_password' => 'false',
@@ -29,6 +29,16 @@ class SecuritySettingsSchema extends AbstractSettingsSchema
                 'captcha_time_to_block' => '',
                 'prevent_multiple_simultaneous_login' => 'false',
                 'check_password' => 'false',
+                'security_strict_transport' => 'strict-transport-security: max-age=31536000; includeSubDomains',
+                'security_content_policy' => "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; child-src 'self' *.youtube.com yt.be *.vimeo.com *.slideshare.com;",
+                'security_content_policy_report_only' => "default-src 'self'; script-src *://*.google.com:*",
+                'security_public_key_pins' => '',
+                'security_public_key_pins_report_only' => '',
+                'security_x_frame_options' => 'SAMEORIGIN',
+                'security_xss_protection' => '1; mode=block',
+                'security_x_content_type_options' => 'nosniff',
+                'security_referrer_policy' => 'origin-when-cross-origin',
+                'security_block_inactive_users_immediately' => 'false',
             ]
         );
         $allowedTypes = [
@@ -53,7 +63,79 @@ class SecuritySettingsSchema extends AbstractSettingsSchema
             ->add('captcha_time_to_block')
             ->add('prevent_multiple_simultaneous_login', YesNoType::class)
             ->add('check_password', YesNoType::class)
-
+            ->add(
+                'security_strict_transport',
+                TextType::class,
+                [
+                    'label' => 'SecurityStrictTransportTitle',
+                    'help' => 'SecurityStrictTransportComment',
+                ]
+            )
+            ->add(
+                'security_content_policy',
+                TextType::class,
+                [
+                    'label' => 'SecurityContentPolicyTitle',
+                    'help' => 'SecurityContentPolicyComment',
+                ]
+            )
+            ->add(
+                'security_content_policy_report_only',
+                TextType::class,
+                [
+                    'label' => 'SecurityContentPolicyReportOnlyTitle',
+                    'help' => 'SecurityContentPolicyReportOnlyComment',
+                ]
+            )
+            ->add(
+                'security_public_key_pins',
+                TextType::class,
+                [
+                    'label' => 'SecurityPublicKeyPinsTitle',
+                    'help' => 'SecurityPublicKeyPinsComment',
+                ]
+            )
+            ->add(
+                'security_public_key_pins_report_only',
+                TextType::class,
+                [
+                    'label' => 'SecurityPublicKeyPinsReportOnlyTitle',
+                    'help' => 'SecurityPublicKeyPinsReportOnlyComment',
+                ]
+            )
+            ->add(
+                'security_x_frame_options',
+                TextType::class,
+                [
+                    'label' => 'SecurityXFrameOptionsTitle',
+                    'help' => 'SecurityXFrameOptionsComment',
+                ]
+            )
+            ->add(
+                'security_xss_protection',
+                TextType::class,
+                [
+                    'label' => 'SecurityXssProtectionTitle',
+                    'help' => 'SecurityXssProtectionComment',
+                ]
+            )
+            ->add(
+                'security_x_content_type_options',
+                TextType::class,
+                [
+                    'label' => 'SecurityXContentTypeOptionsTitle',
+                    'help' => 'SecurityXContentTypeOptionsComment',
+                ]
+            )
+            ->add(
+                'security_referrer_policy',
+                TextType::class,
+                [
+                    'label' => 'SecurityReferrerPolicyTitle',
+                    'help' => 'SecurityReferrerPolicyComment',
+                ]
+            )
+            ->add('security_block_inactive_users_immediately', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/SessionSettingsSchema.php b/src/CoreBundle/Settings/SessionSettingsSchema.php
index 66f7425509..4cb92add28 100644
--- a/src/CoreBundle/Settings/SessionSettingsSchema.php
+++ b/src/CoreBundle/Settings/SessionSettingsSchema.php
@@ -8,6 +8,8 @@ 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\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -45,6 +47,22 @@ class SessionSettingsSchema extends AbstractSettingsSchema
                     'session_admins_edit_courses_content' => 'false',
                     'allow_session_admin_login_as_teacher' => 'false',
                     'allow_search_diagnostic' => 'false',
+                    'allow_redirect_to_session_after_inscription_about' => 'false',
+                    'session_list_show_count_users' => 'false',
+                    'session_admins_access_all_content' => 'false',
+                    'limit_session_admin_list_users' => 'false',
+                    'hide_search_form_in_session_list' => 'false',
+                    'allow_delete_user_for_session_admin' => 'false',
+                    'allow_disable_user_for_session_admin' => 'false',
+                    'session_multiple_subscription_students_list_avoid_emptying' => 'false',
+                    'hide_reporting_session_list' => 'false',
+                    'allow_session_admin_read_careers' => 'false',
+                    'session_list_order' => 'false',
+                    'allow_user_session_collapsable' => 'false',
+                    'catalog_course_subscription_in_user_s_session' => 'false',
+                    'default_session_list_view' => 'all',
+                    'session_automatic_creation_user_id' => '1',
+                    'user_s_session_duration' => '1095',
                 ]
             )
         ;
@@ -99,6 +117,33 @@ class SessionSettingsSchema extends AbstractSettingsSchema
             ->add('session_admins_edit_courses_content', YesNoType::class)
             ->add('allow_session_admin_login_as_teacher', YesNoType::class)
             ->add('allow_search_diagnostic', YesNoType::class)
+            ->add('allow_redirect_to_session_after_inscription_about', YesNoType::class)
+            ->add('session_list_show_count_users', YesNoType::class)
+            ->add('session_admins_access_all_content', YesNoType::class)
+            ->add('limit_session_admin_list_users', YesNoType::class)
+            ->add('hide_search_form_in_session_list', YesNoType::class)
+            ->add('allow_delete_user_for_session_admin', YesNoType::class)
+            ->add('allow_disable_user_for_session_admin', YesNoType::class)
+            ->add('session_multiple_subscription_students_list_avoid_emptying', YesNoType::class)
+            ->add('hide_reporting_session_list', YesNoType::class)
+            ->add('allow_session_admin_read_careers', YesNoType::class)
+            ->add('session_list_order', YesNoType::class)
+            ->add('allow_user_session_collapsable', YesNoType::class)
+            ->add('catalog_course_subscription_in_user_s_session', YesNoType::class)
+            ->add(
+                    'default_session_list_view',
+                    ChoiceType::class,
+                    [
+                        'choices' => [
+                            'All' => 'all',
+                            'Close' => 'close',
+                            'Active' => 'active',
+                            'Custom' => 'custom',
+                        ],
+                    ]
+            )
+            ->add('session_automatic_creation_user_id', TextType::class)
+            ->add('user_s_session_duration', TextType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/SkillSettingsSchema.php b/src/CoreBundle/Settings/SkillSettingsSchema.php
index 7f90ddecee..ee9a7f5055 100644
--- a/src/CoreBundle/Settings/SkillSettingsSchema.php
+++ b/src/CoreBundle/Settings/SkillSettingsSchema.php
@@ -21,6 +21,11 @@ class SkillSettingsSchema extends AbstractSettingsSchema
                     'allow_hr_skills_management' => 'true',
                     'show_full_skill_name_on_skill_wheel' => 'false',
                     'badge_assignation_notification' => 'false',
+                    'allow_private_skills' => 'false',
+                    'allow_teacher_access_student_skills' => 'false',
+                    'skills_teachers_can_assign_skills' => 'false',
+                    'hide_skill_levels' => 'false',
+                    'table_of_hierarchical_skill_presentation' => 'false',
                 ]
             )
         ;
@@ -37,6 +42,11 @@ class SkillSettingsSchema extends AbstractSettingsSchema
             ->add('allow_hr_skills_management', YesNoType::class)
             ->add('show_full_skill_name_on_skill_wheel', YesNoType::class)
             ->add('badge_assignation_notification', YesNoType::class)
+            ->add('allow_private_skills', YesNoType::class)
+            ->add('allow_teacher_access_student_skills', YesNoType::class)
+            ->add('skills_teachers_can_assign_skills', YesNoType::class)
+            ->add('hide_skill_levels', YesNoType::class)
+            ->add('table_of_hierarchical_skill_presentation', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/SocialSettingsSchema.php b/src/CoreBundle/Settings/SocialSettingsSchema.php
index bb099f82b1..3ceaa241d4 100644
--- a/src/CoreBundle/Settings/SocialSettingsSchema.php
+++ b/src/CoreBundle/Settings/SocialSettingsSchema.php
@@ -21,6 +21,8 @@ class SocialSettingsSchema extends AbstractSettingsSchema
                     'allow_students_to_create_groups_in_social' => 'false',
                     'social_enable_messages_feedback' => 'false',
                     'disable_dislike_option' => 'false',
+                    'social_show_language_flag_in_profile' => 'false',
+                    'social_make_teachers_friend_all' => 'false',
                 ]
             )
         ;
@@ -40,6 +42,8 @@ class SocialSettingsSchema extends AbstractSettingsSchema
             ->add('allow_students_to_create_groups_in_social', YesNoType::class)
             ->add('social_enable_messages_feedback', YesNoType::class)
             ->add('disable_dislike_option', YesNoType::class)
+            ->add('social_show_language_flag_in_profile', YesNoType::class)
+            ->add('social_make_teachers_friend_all', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/SurveySettingsSchema.php b/src/CoreBundle/Settings/SurveySettingsSchema.php
index bbf618c8d4..be5ddb139a 100644
--- a/src/CoreBundle/Settings/SurveySettingsSchema.php
+++ b/src/CoreBundle/Settings/SurveySettingsSchema.php
@@ -20,6 +20,15 @@ class SurveySettingsSchema extends AbstractSettingsSchema
                 [
                     'survey_email_sender_noreply' => 'coach',
                     'extend_rights_for_coach_on_survey' => 'true',
+                    'allow_required_survey_questions' => 'false',
+                    'hide_survey_reporting_button' => 'false',
+                    'allow_survey_availability_datetime' => 'false',
+                    'survey_mark_question_as_required' => 'false',
+                    'survey_anonymous_show_answered' => 'false',
+                    'survey_question_dependency' => 'true',
+                    'survey_allow_answered_question_edit' => 'false',
+                    'survey_duplicate_order_by_name' => 'true',
+                    'survey_backwards_enable' => 'false',
                 ]
             )
         ;
@@ -44,6 +53,15 @@ class SurveySettingsSchema extends AbstractSettingsSchema
                 ]
             )
             ->add('extend_rights_for_coach_on_survey', YesNoType::class)
+            ->add('allow_required_survey_questions', YesNoType::class)
+            ->add('hide_survey_reporting_button', YesNoType::class)
+            ->add('allow_survey_availability_datetime', YesNoType::class)
+            ->add('survey_mark_question_as_required', YesNoType::class)
+            ->add('survey_anonymous_show_answered', YesNoType::class)
+            ->add('survey_question_dependency', YesNoType::class)
+            ->add('survey_allow_answered_question_edit', YesNoType::class)
+            ->add('survey_duplicate_order_by_name', YesNoType::class)
+            ->add('survey_backwards_enable', YesNoType::class)
         ;
     }
 }
diff --git a/src/CoreBundle/Settings/WorkSettingsSchema.php b/src/CoreBundle/Settings/WorkSettingsSchema.php
new file mode 100644
index 0000000000..d8ac2c7f5b
--- /dev/null
+++ b/src/CoreBundle/Settings/WorkSettingsSchema.php
@@ -0,0 +1,51 @@
+<?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\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class WorkSettingsSchema extends AbstractSettingsSchema
+{
+    public function buildSettings(AbstractSettingsBuilder $builder): void
+    {
+        $builder
+            ->setDefaults(
+                [
+                    'block_student_publication_edition' => 'false',
+                    'block_student_publication_add_documents' => 'false',
+                    'block_student_publication_score_edition' => 'false',
+                    'allow_only_one_student_publication_per_user' => 'false',
+                    'allow_my_student_publication_page' => 'false',
+                    'assignment_prevent_duplicate_upload' => 'false',
+                    'considered_working_time' => 'work_time',
+                    'force_download_doc_before_upload_work' => 'true',
+                    'allow_redirect_to_main_page_after_work_upload' => 'false',
+                ]
+            )
+        ;
+        //$this->setMultipleAllowedTypes($allowedTypes, $builder);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('block_student_publication_edition', YesNoType::class)
+            ->add('block_student_publication_add_documents', YesNoType::class)
+            ->add('block_student_publication_score_edition', YesNoType::class)
+            ->add('allow_only_one_student_publication_per_user', YesNoType::class)
+            ->add('allow_my_student_publication_page', YesNoType::class)
+            ->add('assignment_prevent_duplicate_upload', YesNoType::class)
+            ->add('considered_working_time', TextType::class)
+            ->add('force_download_doc_before_upload_work', YesNoType::class)
+            ->add('allow_redirect_to_main_page_after_work_upload', YesNoType::class)
+        ;
+    }
+}
diff --git a/src/CourseBundle/Component/CourseCopy/CourseBuilder.php b/src/CourseBundle/Component/CourseCopy/CourseBuilder.php
index 41b02ed3e1..ab0c6ae4b4 100644
--- a/src/CourseBundle/Component/CourseCopy/CourseBuilder.php
+++ b/src/CourseBundle/Component/CourseCopy/CourseBuilder.php
@@ -1183,7 +1183,7 @@ class CourseBuilder
         $db_result = Database::query($sql);
         $is_required = 0;
         while ($obj = Database::fetch_object($db_result)) {
-            if (api_get_configuration_value('allow_required_survey_questions')) {
+            if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                 if (isset($obj->is_required)) {
                     $is_required = $obj->is_required;
                 }
diff --git a/src/CourseBundle/Component/CourseCopy/CourseRestorer.php b/src/CourseBundle/Component/CourseCopy/CourseRestorer.php
index 5d802bbdd7..c34d752489 100644
--- a/src/CourseBundle/Component/CourseCopy/CourseRestorer.php
+++ b/src/CourseBundle/Component/CourseCopy/CourseRestorer.php
@@ -98,7 +98,7 @@ class CourseRestorer
         $this->set_tools_invisible_by_default = false;
         $this->skip_content = [];
 
-        $forceImport = api_get_configuration_value('allow_import_scorm_package_in_course_builder');
+        $forceImport = ('true' === api_get_setting('lp.allow_import_scorm_package_in_course_builder'));
         if ($forceImport) {
             $this->tools_to_restore[] = 'scorm_documents';
         }
@@ -1894,7 +1894,7 @@ class CourseRestorer
                         'hide_question_title' => isset($quiz->hide_question_title) ? $quiz->hide_question_title : 0,
                     ];
 
-                    $allow = api_get_configuration_value('allow_notification_setting_per_exercise');
+                    $allow = ('true' === api_get_setting('exercise.allow_notification_setting_per_exercise'));
                     if ($allow) {
                         $params['notifications'] = isset($quiz->notifications) ? $quiz->notifications : '';
                     }
@@ -2590,7 +2590,7 @@ class CourseRestorer
                 'shared_question_id' => self::DBUTF8($question->shared_question_id),
                 'max_value' => self::DBUTF8($question->max_value),
             ];
-            if (api_get_configuration_value('allow_required_survey_questions')) {
+            if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
                 if (isset($question->is_required)) {
                     $params['is_required'] = $question->is_required;
                 }
diff --git a/src/CourseBundle/Component/CourseCopy/Resources/SurveyQuestion.php b/src/CourseBundle/Component/CourseCopy/Resources/SurveyQuestion.php
index 34f499cdb1..aaab9c8b4e 100644
--- a/src/CourseBundle/Component/CourseCopy/Resources/SurveyQuestion.php
+++ b/src/CourseBundle/Component/CourseCopy/Resources/SurveyQuestion.php
@@ -87,7 +87,7 @@ class SurveyQuestion extends Resource
         $this->shared_question_id = $shared_question_id;
         $this->max_value = $max_value;
         $this->answers = [];
-        if (api_get_configuration_value('allow_required_survey_questions')) {
+        if ('true' === api_get_setting('survey.allow_required_survey_questions')) {
             $this->is_required = $is_required;
         }
     }