diff --git a/ChangeLog.md b/ChangeLog.md
index bfac147..dd9494e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,18 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [3.1.0] - Compatibility 14.0.x - 21.0.x (2024/12/30)
-
-### Fixed
-- CSS
+### [3.1.0] - Compatibility 18.0.x - 23.0.x (2025/11/08)
 
 ### Added
 - Option to change the Dolibarr font family
+- In admin, new tab "Icons". If you want to use other FontAwesome Pack Free Or Pro, you can select easily your new pack to apply
+- In admin, add possibility to disable thumb production (MRP) on the dashboard (v23+)
+- Compatibility v21 / v22 / v23
+
+### Fixed
+- CSS
+- Menu (Remove categories/tags in v22 -> move to tools)
 
 ### Changed
 - Move ChangeLog to format 1.1.0 of "Keep a changelog" 
 - Separate the option to change the text color of line titles and the main title
 - Remove Cashdesk CSS
+- Move to version v18 minimum
 
 ### [3.0.6] - Compatibility 14.0.x - 20.0.x (2024/09/30)
 - Fix CSS badges
diff --git a/admin/colors.php b/admin/colors.php
index a92f1e1..f3508f7 100644
--- a/admin/colors.php
+++ b/admin/colors.php
@@ -479,13 +479,13 @@
 
 // View *****************************************
 $page_name	= $langs->trans('OblyonColorsTitle');
-llxHeader('', $page_name, '', '', 0, 0, array('/oblyon/js/jscolor.js', '/oblyon/js/jquery.ui.touch-punch.min.js'), '');
+llxHeader('', $page_name, '', '', 0, 0, array('/oblyon/js/jscolor.js', '/oblyon/js/jquery.ui.touch-punch.min.js'), '', 'mod-oblyon page-admin-colors');
 $linkback	= '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
-print load_fiche_titre($page_name, $linkback);
+print load_fiche_titre($page_name, $linkback, 'object_inovea.png@oblyon');
 
 // Configuration header *************************
 $head		= oblyon_admin_prepare_head();
-print dol_get_fiche_head($head, 'colors', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
+print dol_get_fiche_head($head, 'colors', $page_name, -1);
 
 // setup page goes here *************************
 print '	<script type = "text/javascript">
diff --git a/admin/customcss.php b/admin/customcss.php
index 8f52940..64ffd4f 100644
--- a/admin/customcss.php
+++ b/admin/customcss.php
@@ -77,9 +77,9 @@
         '/includes/ace/src/ace.js',
         '/includes/ace/src/ext-statusbar.js',
         '/includes/ace/src/ext-language_tools.js',
-    ), array());
+    ), array(), 'mod-oblyon page-admin-customcss');
 $linkback					= '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
-print load_fiche_titre($page_name, $linkback);
+print load_fiche_titre($page_name, $linkback, 'object_inovea.png@oblyon');
 
 // Configuration header *************************
 $head						= oblyon_admin_prepare_head();
diff --git a/admin/dashboard.php b/admin/dashboard.php
index ff2411b..7d479e6 100644
--- a/admin/dashboard.php
+++ b/admin/dashboard.php
@@ -65,6 +65,7 @@
 										'OBLYON_INFOXBOX_EXPENSEREPORT_COLOR',		// #79633F EXPENSES
 										'OBLYON_INFOXBOX_HOLIDAY_COLOR',			// #755114 HOLIDAYS
 										'OBLYON_INFOXBOX_TICKET_COLOR',				// #755114 TICKETS
+										'OBLYON_INFOXBOX_MRP_COLOR',				// #212529 MRP
 										);
 
 // Actions **************************************
@@ -160,6 +161,7 @@
 		oblyon_print_input('MAIN_DISABLE_BLOCK_EXPENSEREPORT',	'on_off', $langs->trans('DashboardDisableBlockExpenseReport'),	'', $metas, 2, 1);	// expenses block
 		oblyon_print_input('MAIN_DISABLE_BLOCK_HOLIDAY',		'on_off', $langs->trans('DashboardDisableBlockHoliday'),		'', $metas, 2, 1);	// holidays block
 		oblyon_print_input('MAIN_DISABLE_BLOCK_TICKET',			'on_off', $langs->trans('DashboardDisableBlockTicket'),			'', $metas, 2, 1);	// tickets block
+		if ((float) DOL_VERSION >= 23.0) oblyon_print_input('MAIN_DISABLE_BLOCK_MRP',			'on_off', $langs->trans('DashboardDisableBlockMrp'),			'', $metas, 2, 1);	// mrp block
 		oblyon_print_input('OBLYON_INFOXBOX_SINGLE_WIDTH',		'on_off', $langs->trans('OblyonInfoboxSingleWidth'),			'OblyonInfoboxSingleWidthHelp', $metas, 2, 1);	// Single width for all info boxes
 	}
 }
diff --git a/admin/icons.php b/admin/icons.php
index 63aa87b..c05fc52 100644
--- a/admin/icons.php
+++ b/admin/icons.php
@@ -1,99 +1,205 @@
 <?php
-	/************************************************
-	* Copyright (C) 2015-2023  Alexandre Spangaro   <alexandre@inovea-conseil.com>
-	* Copyright (C) 2022-2025  Sylvain Legrand      <contact@infras.fr>
-	*
-	* This program is free software: you can redistribute it and/or modify
-	* it under the terms of the GNU General Public License as published by
-	* the Free Software Foundation, either version 3 of the License, or
-	* (at your option) any later version.
-	*
-	* This program is distributed in the hope that it will be useful,
-	* but WITHOUT ANY WARRANTY; without even the implied warranty of
-	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	* GNU General Public License for more details.
-	*
-	* You should have received a copy of the GNU General Public License
-	* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-	************************************************/
-
-	/************************************************
-	* 	\file		../oblyon/admin/icons.php
-	* 	\ingroup	oblyon
-	* 	\brief		Options Page < Oblyon Theme Configurator >
-	************************************************/
-
-	// Dolibarr environment *************************
-	require '../config.php';
-
-	// Libraries ************************************
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once '../lib/oblyon.lib.php';
-
-	// Translations *********************************
-	$langs->loadLangs(array('admin', 'oblyon@oblyon', 'inovea@oblyon'));
-
-	// Access control *******************************
-	if (! $user->admin)				accessforbidden();
-
-	// init variables *******************************
-	$list							= array ('fas'	=> '900', 'far'	=> '400', 'fal'	=> '300', 'fat'	=> '100', 'fad'	=> '900');
-
-	// Actions **************************************
-	$action							= GETPOST('action','alpha');
-	$result							= '';
-	// Sauvegarde / Restauration
-	if ($action == 'bkupParams')	$result	= oblyon_bkup_module ('oblyon');
-	if ($action == 'restoreParams')	$result	= oblyon_restore_module ('oblyon');
-	// links management
-	if (preg_match('/set_(.*)/', $action, $reg)) {
-		$confkey	= $reg[1];
-		$result		= dolibarr_set_const($db, 'MAIN_FONTAWESOME_ICON_STYLE', $confkey, 'chaine', 0, 'Oblyon module', $conf->entity);
-		$result		= dolibarr_set_const($db, 'MAIN_FONTAWESOME_WEIGHT', $list[$confkey], 'chaine', 0, 'Oblyon module', $conf->entity);
-	}
-	// Retour => message Ok ou Ko
-	if ($result == 1)						setEventMessages($langs->trans('IconApplied').' : '.$langs->trans('Icon'.$confkey), null, 'mesgs');
-	if ($result == -1)						setEventMessages($langs->trans('Error'), null, 'errors');
-	$_SESSION['dol_resetcache']				= dol_print_date(dol_now(), 'dayhourlog');	// Reset cache
-
-	// View *****************************************
-	$page_name								= $langs->trans('OblyonIconsTitle');
-	llxHeader('', $page_name);
-	$linkback								= '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
-	print load_fiche_titre($page_name, $linkback);
-
-	// Configuration header *************************
-	$head									= oblyon_admin_prepare_head();
-	print dol_get_fiche_head($head, 'icons', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
-
-	// setup page goes here *************************
-	print '	<form action = "'.$_SERVER['PHP_SELF'].'" method = "POST">
-				<input type = "hidden" name = "token" value = "'.newToken().'" />';
-	// Sauvegarde / Restauration
-	oblyon_print_backup_restore();
-	clearstatcache();
-	print '		<div class = "div-table-responsive-no-min">
-					<table summary = "edit" class = "noborder centpercent editmode tableforfield">';
-	$larg									= !empty($list) && count($list) > 0 ? 100 / count($list) : 100;
-	$metas									= array();
-	for ($i = 0; $i < count($list); $i++)	$metas[]	= $larg.'%';
-	oblyon_print_colgroup($metas);
-	$metas									= array(array(count($list)), 'IconsStyle');
-	oblyon_print_liste_titre($metas);
-	print '				<tr>';
-	foreach ($list as $name => $weight)
-		print '				<td class = "center">
-								<a title = "'.$langs->trans('Icon'.$name).'" href = "'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=set_'.$name.'">'.img_picto($langs->trans('Icon'.$name), 'icon'.$name.'.png@oblyon', 'width = "50%"').'
-									<br/>'.$langs->trans('Icon'.$name).'
-								</a>
-							</td>';
-	print '				</tr>
-					</table>
-				</div>';
-	print dol_get_fiche_end();
-	print '	</form>
-			<br/>';
-	// End of page
-	llxFooter();
-	$db->close();
+/************************************************
+* Copyright (C) 2015-2025  Alexandre Spangaro   <alexandre@inovea-conseil.com>
+* Copyright (C) 2022-2025  Sylvain Legrand      <contact@infras.fr>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <https://www.gnu.org/licenses/>.
+************************************************/
+
+/**
+ * 	\file		../oblyon/admin/icons.php
+ * 	\ingroup	oblyon
+ * 	\brief		Options Page < Oblyon Theme Configurator >
+ */
+
+require '../config.php';
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once '../lib/oblyon.lib.php';
+
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @var Translate $langs
+ * @var User $user
+ */
+
+// Translations
+$langs->loadLangs(array('admin', 'oblyon@oblyon', 'inovea@oblyon'));
+
+// Access control *******************************
+if (! $user->admin)				accessforbidden();
+
+// init variables
+$style_weights = array(
+    'fas' => '900',
+    'far' => '400',
+    'fal' => '300',
+    'fat' => '100',
+    'fad' => '900'
+);
+
+// Actions
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action','alpha');
+$result	= '';
+
+// Sauvegarde / Restauration
+if ($action == 'bkupParams') {
+    $result	= oblyon_bkup_module ('oblyon');
+}
+if ($action == 'restoreParams') {
+    $result	= oblyon_restore_module ('oblyon');
+}
+
+if (!empty($_POST['select_fa'])) {
+    $selected_dir = GETPOST('selected_version', 'alpha');
+    $selected_family = GETPOST('selected_family_' . $selected_dir, 'alpha');
+    $selected_style = GETPOST('selected_style_' . $selected_dir, 'alpha');
+
+    if ($selected_dir && $selected_family && $selected_style) {
+        $full_dir_path = '/theme/common/' . $selected_dir;
+        $weight = $style_weights[$selected_style] ?? '900';
+
+        dolibarr_set_const($db, 'MAIN_FONTAWESOME_DIRECTORY', $full_dir_path, 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, 'MAIN_FONTAWESOME_FAMILY', $selected_family, 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, 'MAIN_FONTAWESOME_ICON_STYLE', $selected_style, 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, 'MAIN_FONTAWESOME_WEIGHT', $weight, 'chaine', 0, '', $conf->entity);
+
+        setEventMessages($langs->trans("FontAwesomeSuccessMessage", $selected_family, $selected_style, $weight, $full_dir_path), null, 'mesgs');
+        $_SESSION['dol_resetcache']	= dol_print_date(dol_now(), 'dayhourlog');	// Reset cache
+    }
+}
+
+/*
+ * View
+ */
+$help_url = '';
+$title = $langs->trans("OblyonSetupIcons");
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', 'mod-oblyon page-admin-icons');
+
+// Lecture des dossiers
+$theme_dir = DOL_DOCUMENT_ROOT.'/theme/common/';
+$fa_dirs = [];
+
+if (is_dir($theme_dir)) {
+    foreach (scandir($theme_dir) as $entry) {
+        if (preg_match('/^fontawesome-(.+)$/', $entry) && is_dir($theme_dir . $entry)) {
+            $version = 'Unknown';
+            $family = 'Font Awesome 5 Free'; // par défaut
+            $css_path = $theme_dir . $entry . '/css/all.css';
+            if (file_exists($css_path)) {
+                $css = file_get_contents($css_path);
+                if (preg_match('/Font Awesome (Free|Pro) ([\d\.]+)/', $css, $ver_match)) {
+                    $family = 'Font Awesome ' . intval($ver_match[2]) . ' ' . $ver_match[1];
+                    $version = $ver_match[2];
+                }
+            }
+
+            $fa_dirs[] = array(
+                'dir' => $entry,
+                'version' => $version,
+                'family' => $family
+            );
+        }
+    }
+}
+
+$current_dir = $conf->global->MAIN_FONTAWESOME_DIRECTORY ?? '/theme/common/fontawesome-5';
+$current_style = $conf->global->MAIN_FONTAWESOME_ICON_STYLE ?? 'fas';
+$current_family = $conf->global->MAIN_FONTAWESOME_FAMILY ?? 'Font Awesome 5 Free';
+
+// Subheader
+$linkback = '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
+print load_fiche_titre($title, $linkback, 'object_inovea.png@oblyon');
+
+$head = oblyon_admin_prepare_head();
+print dol_get_fiche_head($head, 'icons', $title, -1);
+
+print '<form action = "'.$_SERVER['PHP_SELF'].'" method = "POST">';
+print '<input type="hidden" name="token" value="'.newToken().'" />';
+print '<input type="hidden" name="select_fa" value="1">';
+print '<input type="hidden" name="page_y" value="">';
+
+// Sauvegarde / Restauration
+oblyon_print_backup_restore();
+clearstatcache();
+
+print '</br>';
+print $langs->trans("FontAwesomeSelectPack");
+print '</br></br>';
+
+print '<div class = "div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<th>' . $langs->trans("FontAwesomeAction") . '</th>';
+print '<th>' . $langs->trans("FontAwesomeFolder") . '</th>';
+print '<th>' . $langs->trans("FontAwesomeVersion") . '</th>';
+print '<th>' . $langs->trans("FontAwesomeLicence") . '</th>';
+print '<th>' . $langs->trans("FontAwesomeAvailableStyles") . '</th>';
+print '</tr>';
+
+foreach ($fa_dirs as $fa) {
+    $dir = $fa['dir'];
+    $full_path = '/theme/common/' . $dir;
+    $selected = ($full_path === $current_dir) ? 'checked' : '';
+    $is_pro = (strpos($fa['family'], 'Pro') !== false);
+    $styles = $is_pro ? ['fas', 'far', 'fal', 'fat', 'fad'] : ['fas'];
+
+    print '<tr>';
+    print '<td><input type="radio" name="selected_version" value="' . dol_escape_htmltag($dir) . '" ' . $selected . '></td>';
+    print '<td>' . dol_escape_htmltag($dir) . '</td>';
+    print '<td>' . dol_escape_htmltag($fa['version']) . '</td>';
+    print '<td>';
+    print '<input type="hidden" name="selected_family_' . $dir . '" value="' . dol_escape_htmltag($fa['family']) . '">';
+    print dol_escape_htmltag($fa['family']);
+    print '</td>';
+    print '<td>';
+    print '<select name="selected_style_' . $dir . '">';
+    $style_labels = array(
+        'fas' => 'Solid',
+        'far' => 'Regular',
+        'fal' => 'Light',
+        'fat' => 'Thin',
+        'fad' => 'Duotone'
+    );
+
+    foreach ($styles as $style) {
+        $sel = ($style === $current_style && $selected) ? 'selected' : '';
+        $label = $style_labels[$style] ?? $style;
+        print '<option value="' . $style . '" ' . $sel . '>' . $label . '</option>';
+    }
+    print '</select>';
+    print '</td>';
+    print '</tr>';
+}
+
+print '</table>';
+print '</div>';
+print '</br>';
+print '<div class="center"><input type="submit" class="button" value="' . $langs->trans("FontAwesomeSaveButton") . '"></div>';
+print '</form>';
+
+print '<br><br><div>'.$langs->trans("FontAwesomeDirectoryDownload").'</div><br>';
+
+print '<img src="../img/example_FAdownload.png">';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/admin/options.php b/admin/options.php
index c94a85b..0606a2f 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -60,8 +60,7 @@
 }
 	// Update buttons management
 if (preg_match('/update_(.*)/', $action, $reg)) {
-	$list									= array('Gen'   => array('OBLYON_FONT_SIZE', 'OBLYON_IMAGE_HEIGHT_TABLE', 'OBLYON_FONT', 'OBLYON_FONT_FAMILY'),
-                                                    'Card'  => array('MAIN_MAXTABS_IN_CARD'));
+	$list									= array('Card'  => array('OBLYON_FONT_SIZE', 'OBLYON_IMAGE_HEIGHT_TABLE', 'OBLYON_FONT', 'OBLYON_FONT_FAMILY', 'MAIN_MAXTABS_IN_CARD'));
 	$confkey								= $reg[1];
 	$error									= 0;
 	foreach ($list[$confkey] as $constname)	$result	= dolibarr_set_const($db, $constname, GETPOST($constname, 'alpha'), 'chaine', 0, 'Oblyon module', $conf->entity);
@@ -104,14 +103,18 @@
 $currentFont				= getDolGlobalString('OBLYON_FONT_FAMILY', 'Arial');
 
 // View *****************************************
-$page_name = $langs->trans('OblyonOptionsTitle');
-llxHeader('', $page_name);
+$help_url = '';
+$title = $langs->trans('OblyonOptionsTitle');
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', 'mod-oblyon page-admin-options');
+
 $linkback = '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
-print load_fiche_titre($page_name, $linkback);
+print load_fiche_titre($title, $linkback, 'object_inovea.png@oblyon');
 
 // Configuration header *************************
 $head = oblyon_admin_prepare_head();
-print dol_get_fiche_head($head, 'options', $langs->trans('Module432573Name'), 0, 'inovea@oblyon');
+
+print dol_get_fiche_head($head, 'options', $title, -1);
 
 // setup page goes here *************************
 $easyaVersion = getDolGlobalFloat('EASYA_VERSION', 0);
@@ -234,9 +237,6 @@
 print '</table>';
 print '<br>';
 
-oblyon_print_btn_action('Gen');
-
-print '<br>';
 print '<table class="noborder centpercent">';
 print '<tbody>';
 print '<tr class="liste_titre">';
@@ -249,19 +249,20 @@
 $countl = 1;
 
 if ($easyaVersion >= "2024.0.0" || (float) DOL_VERSION >= 18.0) {
+    // Select Column on left - MAIN_CHECKBOX_LEFT_COLUMN
     $metas	= array(array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'options');
-    oblyon_print_input('MAIN_CHECKBOX_LEFT_COLUMN', 'on_off', 'L' . $countl . ' - ' . $langs->trans('SwitchColunmOnLeft'), '', $metas, 2, 1);    // Sticky table headers columns
+    oblyon_print_input('MAIN_CHECKBOX_LEFT_COLUMN', 'on_off', 'L' . $countl . ' - ' . $langs->trans('SwitchColunmOnLeft'), '', $metas, 2, 1);
     $countleftcheckbox = $countl;
     $countl++;
 }
 if ($easyaVersion >= "2024.0.0" || (float) DOL_VERSION >= 18.0) {
     // Sticky title, pagination and "Add" element in list - FIX_TITLE_IN_LIST
     $metas	= array(array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'options');
-    oblyon_print_input('FIX_TITLE_IN_LIST', 'on_off', 'L' . $countl . ' - ' . $langs->trans('FixTitleInList'), '', $metas, 2, 1);    // Sticky table headers columns
-    $countleftcheckbox = $countl;
+    oblyon_print_input('FIX_TITLE_IN_LIST', 'on_off', 'L' . $countl . ' - ' . $langs->trans('FixTitleInList') . $labs_picto, '', $metas, 2, 1);
     $countl++;
 }
 if ($easyaVersion >= "2024.0.0" || (float) DOL_VERSION >= 19.0) {
+    // Remove Kanban view in list - DISABLE_KANBAN_VIEW_IN_LIST
     // Old Compatibility
     if (getDolGlobalString('OBLYON_DISABLE_KANBAN_VIEW_IN_LIST')) {
         getDolGlobalString('DISABLE_KANBAN_VIEW_IN_LIST') == 1;
@@ -394,7 +395,7 @@
 $countk++;
 
 $metas	= array(array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'options');
-oblyon_print_input('MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML', 'on_off', 'K' . $countk . ' - ' . $langs->trans('MainSecurityAllowUnsecuredLabelsWithHtml'), '', $metas, 2, 1);    // Allow HTML tags into products label
+oblyon_print_input('MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML', 'on_off', 'K' . $countk . ' - ' . $langs->trans('MainSecurityAllowUnsecuredLabelsWithHtml').  ' (<i>'. $langs->trans("NotRecommended") . '</i>)', '', $metas, 2, 1);    // Allow HTML tags into products label
 $countk++;
 
 print '</tbody>';
diff --git a/config.php b/config.php
index 3af78dc..45b5981 100644
--- a/config.php
+++ b/config.php
@@ -24,7 +24,7 @@
 	************************************************/
 
 	// Dolibarr environment *************************
-	$res															= 0;
+	$res	= 0;
 	// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
 	if (empty($res) && !empty($_SERVER['CONTEXT_DOCUMENT_ROOT'])) {
 		$res	= @include $_SERVER['CONTEXT_DOCUMENT_ROOT'].'/main.inc.php';
diff --git a/core/menus/standard/oblyon.lib.php b/core/menus/standard/oblyon.lib.php
index 1fd762c..fe2056d 100644
--- a/core/menus/standard/oblyon.lib.php
+++ b/core/menus/standard/oblyon.lib.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Copyright (C) 2013-2016  Nicolas Rivera      <nrivera.pro@gmail.com>
- * Copyright (C) 2015-2024  Alexandre Spangaro  <alexandre@inovea-conseil.com>
+ * Copyright (C) 2013-2016  Nicolas Rivera	  <nrivera.pro@gmail.com>
+ * Copyright (C) 2015-2025  Alexandre Spangaro  <alexandre@inovea-conseil.com>
  *
  * Copyright (C) 2010-2013  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2010       Regis Houssin       <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2013  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2010	   Regis Houssin	   <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2013  Juanjo Menent	   <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,14 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 dol_include_once('/oblyon/backport/v21/core/lib/functions.lib.php');
 
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
+
 // Translations
 $langs->loadLangs(array('oblyon@oblyon'));
 
@@ -61,60 +69,60 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	$id = 'mainmenu';
 	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 
-    $classname = '';
+	$classname = '';
 
-    $menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
+	$menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
 
-    if (empty($noout)) print_start_menu_array();
+	if (empty($noout)) print_start_menu_array();
 
-    // Show logo company
+	// Show logo company
 	if (empty($menu_invert) && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO')) {
-        $mysoc->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI', '');
-
-        if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
-            $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-        }
-        /*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-        {
-            $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
-        }*/
-        else {
-            $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
-            $logoContainerAdditionalClass = '';
-        }
-        $title = $langs->trans("GoIntoSetupToChangeLogo");
-
-        print "\n".'<!-- Show logo on menu -->'."\n";
-        print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1);
-
-        print '<div class="center backgroundforcompanylogo menulogocontainer">';
-        print '<a href="' . $landingpage . '" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'">';
-        print '<img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px; height: 32px;">';
-        print '</a>'."\n";
-        print '</div>'."\n";
-
-        print_end_menu_entry(1);
+		$mysoc->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI', '');
+
+		if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		}
+		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+		{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
+		}*/
+		else {
+			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+			$logoContainerAdditionalClass = '';
+		}
+		$title = $langs->trans("GoIntoSetupToChangeLogo");
+
+		print "\n".'<!-- Show logo on menu -->'."\n";
+		print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1);
+
+		print '<div class="center backgroundforcompanylogo menulogocontainer">';
+		print '<a href="' . $landingpage . '" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'">';
+		print '<img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px; height: 32px;">';
+		print '</a>'."\n";
+		print '</div>'."\n";
+
+		print_end_menu_entry(1);
 	}
 
-    if (is_array($moredata) && ! empty($moredata['searchform']) && empty($noout))	// searchform can contains select2 code or link to show old search form or link to switch on search page
-    {
-        print "\n";
-        print "<!-- Begin SearchForm -->\n";
-        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
-        print $moredata['searchform'];
-        print '</div>'."\n";
-        print "<!-- End SearchForm -->\n";
-    }
-
-    if (is_array($moredata) && ! empty($moredata['bookmarks']) && empty($noout))
-    {
-        print "\n";
-        print "<!-- Begin Bookmarks -->\n";
-        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-        print $moredata['bookmarks'];
-        print '</div>'."\n";
-        print "<!-- End Bookmarks -->\n";
-    }
+	if (is_array($moredata) && ! empty($moredata['searchform']) && empty($noout))	// searchform can contains select2 code or link to show old search form or link to switch on search page
+	{
+		print "\n";
+		print "<!-- Begin SearchForm -->\n";
+		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+		print $moredata['searchform'];
+		print '</div>'."\n";
+		print "<!-- End SearchForm -->\n";
+	}
+
+	if (is_array($moredata) && ! empty($moredata['bookmarks']) && empty($noout))
+	{
+		print "\n";
+		print "<!-- Begin Bookmarks -->\n";
+		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+		print $moredata['bookmarks'];
+		print '</div>'."\n";
+		print "<!-- End Bookmarks -->\n";
+	}
 
 	if ( empty($menu_invert) && (getDolGlobalInt('OBLYON_HIDE_LEFTMENU') || $conf->dol_optimize_smallscreen) && empty($noout) ) {
 		print '<div class="pushy-btn" title="'.$langs->trans("ShowLeftMenu").'">&#8801;</div>';
@@ -123,14 +131,14 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	// Home
 	$showmode=1;
 	if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "home") {
-        $itemsel=TRUE;
-        $_SESSION['idmenu']='';
-    } else {
-        $itemsel = FALSE;
-    }
-    $idsel='home';
+		$itemsel=TRUE;
+		$_SESSION['idmenu']='';
+	} else {
+		$itemsel = FALSE;
+	}
+	$idsel='home';
 
-    $chaine=$langs->trans("Home");
+	$chaine=$langs->trans("Home");
 
 	if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
 	if (empty($noout)) print_text_menu_entry($chaine, 1, $landingpage, $id, $idsel, $atarget);
@@ -143,23 +151,23 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 		'perms' => ($user->hasRight('adherent', 'lire')),
 		'module' => 'adherent'
 	);
-    $showmode = dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
+	$showmode = dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") {
-            $itemsel = TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel = TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='members';
 
-        $chaine=$langs->trans("MenuMembers");
+		$chaine=$langs->trans("MenuMembers");
 
-        if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (empty($noout)) print_text_menu_entry($chaine, 1, DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu=', $id, $idsel, $atarget);
-        if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/adherents/index.php?mainmenu=members&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "members", '');
+		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
+		if (empty($noout)) print_text_menu_entry($chaine, 1, DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu=', $id, $idsel, $atarget);
+		if (empty($noout)) print_end_menu_entry($showmode);
+		$menu->add('/adherents/index.php?mainmenu=members&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "members", '');
 	}
 
 	// Third parties
@@ -174,17 +182,17 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	);
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("companies","suppliers"));
+		$langs->loadLangs(array("companies","suppliers"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") {
-            $itemsel = TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel = TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='companies';
 
-        $chaine=$langs->trans("ThirdParties");
+		$chaine=$langs->trans("ThirdParties");
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
 		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu=', $id, $idsel, $atarget);
@@ -200,14 +208,14 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	);
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("products"));
+		$langs->loadLangs(array("products"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='products';
 
 		$chaine="";
@@ -225,25 +233,25 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 		'perms'=>($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
 		'module'=>'bom|mrp'
 	);
-    $showmode = dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
-    if ($showmode) {
-        $langs->loadLangs(array("mrp"));
-
-        if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel=FALSE;
-        }
-        $idsel='mrp';
-
-        $chaine = $langs->trans("TMenuMRP");
-
-        if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/mrp/index.php?mainmenu=mrp&amp;leftmenu=', $id, $idsel, $atarget);
-        if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/mrp/index.php?mainmenu=mrp&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "mrp", '');
-    }
+	$showmode = dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
+	if ($showmode) {
+		$langs->loadLangs(array("mrp"));
+
+		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") {
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel=FALSE;
+		}
+		$idsel='mrp';
+
+		$chaine = $langs->trans("TMenuMRP");
+
+		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
+		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/mrp/index.php?mainmenu=mrp&amp;leftmenu=', $id, $idsel, $atarget);
+		if (empty($noout)) print_end_menu_entry($showmode);
+		$menu->add('/mrp/index.php?mainmenu=mrp&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "mrp", '');
+	}
 
 	// Projects
 	$tmpentry=array('enabled'=>isModEnabled('projet'),
@@ -251,23 +259,23 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 		'module'=>'projet');
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("projects"));
+		$langs->loadLangs(array("projects"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
-        $idsel='project';
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
+		$idsel='project';
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (getDolGlobalString('PROJECT_FORCE_LIST_ACCESS')) {
-            if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/list.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
-        } else {
-            if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
-        }
-        if (empty($noout)) print_end_menu_entry($showmode);
+		if (getDolGlobalString('PROJECT_FORCE_LIST_ACCESS')) {
+			if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/list.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
+		} else {
+			if (empty($noout)) print_text_menu_entry($langs->trans("MenuProjectsOpportunities"), $showmode, DOL_URL_ROOT . '/projet/index.php?mainmenu=project&amp;leftmenu=', $id, $idsel, $atarget);
+		}
+		if (empty($noout)) print_end_menu_entry($showmode);
 		$title = $langs->trans("LeadsOrProjects");	// Leads and opportunities by default
 		$showmodel = $showmodep = $showmode;
 		if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES'))
@@ -279,12 +287,12 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 			$title = $langs->trans("Leads");
 			$showmodep = 0;
 		}
-        if (getDolGlobalString('PROJECT_FORCE_LIST_ACCESS')) {
-            $menu->add('/projet/list.php?mainmenu=project&amp;leftmenu=projets', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
-        } else {
-            $menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
-        }
-    }
+		if (getDolGlobalString('PROJECT_FORCE_LIST_ACCESS')) {
+			$menu->add('/projet/list.php?mainmenu=project&amp;leftmenu=projets', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
+		} else {
+			$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
+		}
+	}
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
@@ -309,23 +317,23 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	);
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("commercial"));
+		$langs->loadLangs(array("commercial"));
 
-        if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel=FALSE;
-        }
-        $idsel='commercial';
+		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") {
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel=FALSE;
+		}
+		$idsel='commercial';
 
-        $chaine=$langs->trans("Commercial");
+		$chaine=$langs->trans("Commercial");
 
-        if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu=', $id, $idsel, $atarget);
-        if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/comm/index.php?mainmenu=commercial&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "commercial", "");
-    }
+		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
+		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu=', $id, $idsel, $atarget);
+		if (empty($noout)) print_end_menu_entry($showmode);
+		$menu->add('/comm/index.php?mainmenu=commercial&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "commercial", "");
+	}
 
 	// Billing - Financial
 	$tmpentry = array(
@@ -347,21 +355,21 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	);
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("compta","accountancy"));
+		$langs->loadLangs(array("compta","accountancy"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") {
-            $itemsel=TRUE; $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel=TRUE; $_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='billing';
 
-        $chaine=$langs->trans("MenuFinancial");
+		$chaine=$langs->trans("MenuFinancial");
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
 		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/compta/index.php?mainmenu=billing&amp;leftmenu=', $id, $idsel, $atarget);
 		if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/compta/index.php?mainmenu=billing&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "billing", '');
+		$menu->add('/compta/index.php?mainmenu=billing&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "billing", '');
 	}
 
 	// Bank
@@ -372,16 +380,16 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	);
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode) {
-        $langs->loadLangs(array("compta","banks"));
+		$langs->loadLangs(array("compta","banks"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") {
-            $itemsel=TRUE; $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel=TRUE; $_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='bank';
 
-        $chaine=$langs->trans("MenuBankCash");
+		$chaine=$langs->trans("MenuBankCash");
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
 		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/compta/bank/list.php?mainmenu=bank&amp;leftmenu=', $id, $idsel, $atarget);
@@ -398,17 +406,17 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 
 	if ($showmode) {
-        $langs->loadLangs(array("compta", "accountancy", "assets", "intracommreport"));
+		$langs->loadLangs(array("compta", "accountancy", "assets", "intracommreport"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='accountancy';
 
-        $chaine=$langs->trans("MenuAccountancy");
+		$chaine=$langs->trans("MenuAccountancy");
 
 		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
 		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=', $id, $idsel, $atarget);
@@ -426,22 +434,22 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 
 	if ($showmode) {
-        $langs->loadLangs(array("holiday", "recruitment"));
-
-        if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
-        $idsel='hrm';
-
-        $chaine=$langs->trans("HRM");
-
-        if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $id, $idsel, $atarget);
-        if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "hrm", '');
+		$langs->loadLangs(array("holiday", "recruitment"));
+
+		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") {
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
+		$idsel='hrm';
+
+		$chaine=$langs->trans("HRM");
+
+		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
+		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $id, $idsel, $atarget);
+		if (empty($noout)) print_end_menu_entry($showmode);
+		$menu->add('/hrm/index.php?mainmenu=hrm&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "hrm", '');
 	}
 
 	// Tickets and knowledge base
@@ -457,16 +465,16 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 		$langs->loadLangs(array("other", "ticket"));
 
 		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
 		$idsel='ticket';
 
-        $chaine=$langs->trans("Tickets");
+		$chaine=$langs->trans("Tickets");
 
-        $link = '';
+		$link = '';
 		if (isModEnabled('ticket')) {
 			$link = '/ticket/index.php?mainmenu=ticket&amp;leftmenu=';
 		} else {
@@ -529,33 +537,33 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 		);
 	}
 
-    // Show menu tools in last position
-    // Tools
-    $tmpentry = array(
-        'enabled'=>1,
-        'perms'=>1,
-        'module'=>''
-    );
-    $showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
-
-    if ($showmode) {
-        $langs->loadLangs(array("other"));
-
-        if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") {
-            $itemsel=TRUE;
-            $_SESSION['idmenu']='';
-        } else {
-            $itemsel = FALSE;
-        }
-        $idsel='tools';
-
-        $chaine=$langs->trans("Tools");
-
-        if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
-        if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $atarget);
-        if (empty($noout)) print_end_menu_entry($showmode);
-        $menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "tools", '');
-    }
+	// Show menu tools in last position
+	// Tools
+	$tmpentry = array(
+		'enabled'=>1,
+		'perms'=>1,
+		'module'=>''
+	);
+	$showmode=dol_oblyon_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
+
+	if ($showmode) {
+		$langs->loadLangs(array("other"));
+
+		if (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") {
+			$itemsel=TRUE;
+			$_SESSION['idmenu']='';
+		} else {
+			$itemsel = FALSE;
+		}
+		$idsel='tools';
+
+		$chaine=$langs->trans("Tools");
+
+		if (empty($noout)) print_start_menu_entry($idsel,$itemsel,$showmode);
+		if (empty($noout)) print_text_menu_entry($chaine, $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu=', $id, $idsel, $atarget);
+		if (empty($noout)) print_end_menu_entry($showmode);
+		$menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $chaine, 0, $showmode, $atarget, "tools", '');
+	}
 
 	if (empty($noout)) print_end_menu_array();
 
@@ -571,9 +579,9 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 function print_start_menu_array() {
 	global $conf;
 
-    $menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
+	$menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
 
-    print '<nav class="tmenudiv db-nav main-nav'.(empty($menu_invert)?'':' is-inverted').'">';
+	print '<nav class="tmenudiv db-nav main-nav'.(empty($menu_invert)?'':' is-inverted').'">';
 	print '<ul role="navigation" class="tmenu main-nav__list">';
 }
 
@@ -609,21 +617,21 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $atarget)
 
 	if ($showmode == 1)
 	{
-        print '<div>'; // for myfield offset and uses div for background color
+		print '<div>'; // for myfield offset and uses div for background color
 		print '<a class="tmenu main-nav__link main-nav__'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').' title="'.dol_escape_htmltag($text).'">';
 		print '<i class="tmenuimage icon icon--'.$idsel.'"></i> ';
-        print '<span class="mainmenuaspan">'.$text.'</span>'; // for myfield label and link
+		print '<span class="mainmenuaspan">'.$text.'</span>'; // for myfield label and link
 		print '</a>';
-        print '</div>';
+		print '</div>';
 	}
 	if ($showmode == 2)
 	{
-        print '<div>'; // for myfield offset and uses div for background color
+		print '<div>'; // for myfield offset and uses div for background color
 		print '<a class="tmenu main-nav__link is-disabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 		print '<i class="tmenuimage icon icon--'.$idsel.'"></i> ';
-        print '<span class="mainmenuaspan">'.$text.'</span>'; // for myfield label and link
+		print '<span class="mainmenuaspan">'.$text.'</span>'; // for myfield label and link
 		print '</a>';
-        print '</div>';
+		print '</div>';
 	}
 }
 
@@ -658,16 +666,16 @@ function print_end_menu_array() {
 /**
  * Core function to output left menu oblyon
  *
- * @param	DoliDB		$db                 Database handler
+ * @param	DoliDB		$db				 Database handler
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array		$tabMenu	   		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
- * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
+ * @param 	int			$type_user	 		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
 function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
@@ -681,7 +689,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
 	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
 
-    $menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
+	$menu_invert = getDolGlobalInt('MAIN_MENU_INVERT');
 
 	$usemenuhider = !empty($menu_invert) && (getDolGlobalInt('OBLYON_HIDE_LEFTMENU') || $conf->dol_optimize_smallscreen);
 
@@ -699,35 +707,35 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 
 	// Show logo company
 	if (! empty($menu_invert) && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO')) {
-        $mysoc->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI', '');
-
-        if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
-        {
-            $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-        }
-        else
-        {
-            $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
-            $logoContainerAdditionalClass = '';
-        }
-        $title=$langs->trans("GoIntoSetupToChangeLogo");
+		$mysoc->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI', '');
+
+		if (! empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
+		{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		}
+		else
+		{
+			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+			$logoContainerAdditionalClass = '';
+		}
+		$title=$langs->trans("GoIntoSetupToChangeLogo");
 
 		print "\n".'<!-- Show logo on menu -->'."\n";
 
-        print '<div class="menu_contenu db-menu__society center backgroundforcompanylogo menulogocontainer">';
-        print '<a href="' . DOL_URL_ROOT . $landingpage . '" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'">';
-        print '<img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px; height: 32px;">';
-        print '</a>'."\n";
-        print '</div>'."\n";
+		print '<div class="menu_contenu db-menu__society center backgroundforcompanylogo menulogocontainer">';
+		print '<a href="' . DOL_URL_ROOT . $landingpage . '" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'">';
+		print '<img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px; height: 32px;">';
+		print '</a>'."\n";
+		print '</div>'."\n";
 	}
 
-    if (getDolGlobalInt('OBLYON_SHOW_COMPNAME') && getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {
-        if (! $menu_invert) {
-            print '<div class="blockvmenusocietyname">'."\n";
-            print '<span>'. getDolGlobalString('MAIN_INFO_SOCIETE_NOM') .'</span>'."\n";
-            print '</div>'."\n";
-        }
-    }
+	if (getDolGlobalInt('OBLYON_SHOW_COMPNAME') && getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {
+		if (! $menu_invert) {
+			print '<div class="blockvmenusocietyname">'."\n";
+			print '<span>'. getDolGlobalString('MAIN_INFO_SOCIETE_NOM') .'</span>'."\n";
+			print '</div>'."\n";
+		}
+	}
 
 	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page
 		print "\n";
@@ -768,7 +776,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			// Setup
 			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup');
 
-            if (! empty($menu_invert)) $leftmenu= 'setup';
+			if (! empty($menu_invert)) $leftmenu= 'setup';
 
 			if (!empty($user->admin) && ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")) {
 				// Load translation files required by the page
@@ -813,7 +821,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			// System tools
 			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools');
 
-            if (! empty($menu_invert)) $leftmenu= 'admintools';
+			if (! empty($menu_invert)) $leftmenu= 'admintools';
 
 			if (!empty($user->admin) && ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))) {
 				// Load translation files required by the page
@@ -821,12 +829,16 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 
 				$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
 
-                if (! empty($menu_invert)) $leftmenu= 'admintools_info';
+				if (! empty($menu_invert)) $leftmenu= 'admintools_info';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {
 					$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
 					$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
-					$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+					if ((float) DOL_VERSION >= 23.0) {
+						$newmenu->add('/blockedlog/admin/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+					} else {
+						$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+					}
 				}
 				$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
 				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
@@ -842,7 +854,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"), 1);
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);
 				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
-                $newmenu->add('/cron/list.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('CronList'), 1);
+				$newmenu->add('/cron/list.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('CronList'), 1);
 
 				if (isModEnabled('product') || isModEnabled('service')) {
 					$langs->load("products");
@@ -855,15 +867,17 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			if ($user->hasRight('user', 'user', 'lire')) {
 				if (! empty($menu_invert)) $leftmenu= 'users';
 
-			    if ($usemenuhider || empty($leftmenu) || $leftmenu=="users")
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="users")
 				{
 					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("Users"), 1, $user->hasRight('user', 'user', 'lire') || $user->admin);
 					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight('user', 'user', 'creer') || $user->admin) && !(!empty($conf->multicompany->enabled) && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')), '', 'home');
 					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
 					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
-					if (isModEnabled('categorie')) {
-						$langs->load("categories");
-						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+						if (isModEnabled('categorie') || isModEnabled('category')) {
+							$langs->load("categories");
+							$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+						}
 					}
 					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("Groups"), 1, ($user->hasRight('user', 'user', 'lire') || $user->admin) && !(!empty($conf->multicompany->enabled) && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
 					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('user', 'group_advance', 'write') : $user->hasRight('user', 'user', 'creer')) || $user->admin) && !(!empty($conf->multicompany->enabled) && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
@@ -915,7 +929,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			}
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('categorie') || isModEnabled('category')) {
 				$langs->load("categories");
 				if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 					// Categories prospects/customers
@@ -926,11 +940,15 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 						$menutoshow = $langs->trans("ProspectsCategoriesShort");
 					}
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+						$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					}
 				}
 				// Categories suppliers
-				if (isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-					$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'));
+				if (isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
+					if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+						$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'));
+					}
 				}
 			}
 
@@ -952,10 +970,12 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->hasRight('societe', 'contact', 'lire'));
 
 			// Categories
-			if (isModEnabled('categorie')) {
-				$langs->load("categories");
-				// Categories Contact
-				$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+			if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+				if (isModEnabled('categorie') || isModEnabled('category')) {
+					$langs->load("categories");
+					// Categories Contact
+					$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				}
 			}
 		}
 
@@ -972,7 +992,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propale', 'creer'));
 				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propale', 'lire'));
 
-                if (! empty($menu_invert)) $leftmenu= 'propals';
+				if (! empty($menu_invert)) $leftmenu= 'propals';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
 					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propale', 'lire'));
@@ -993,7 +1013,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->hasRight('commande', 'creer'));
 				$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->hasRight('commande', 'lire'));
 
-                if (! empty($menu_invert)) $leftmenu= 'orders';
+				if (! empty($menu_invert)) $leftmenu= 'orders';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire'));
@@ -1005,7 +1025,20 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->hasRight('commande', 'lire'));
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande', 'lire'));
 				}
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'lire'));
+				if (empty($user->socid) && (float) DOL_VERSION >= 21.0) {
+					$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande', 'lire'));
+				}
+				if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {
+					$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'commande', 'export'));
+				} else {
+					$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'lire'));
+				}
+
+				// Categories
+				if (isModEnabled('category') && getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP') && (float) DOL_VERSION >= 23.0) {
+					$langs->load("categories");
+					$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=16", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				}
 			}
 
 			// Supplier proposal
@@ -1024,7 +1057,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->hasRight('fournisseur', 'commande', 'creer'));
 				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));
 
-                if (! empty($menu_invert)) $leftmenu= 'orders_suppliers';
+				if (! empty($menu_invert)) $leftmenu= 'orders_suppliers';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
@@ -1040,8 +1073,17 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				}
 				// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
 
+				if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {
+					$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'export'));
+				} else {
+					$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));
+				}
 
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));
+				// Categories
+				if (isModEnabled('category') && getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP') && (float) DOL_VERSION >= 23.0) {
+					$langs->load("categories");
+					$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=20", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				}
 			}
 
 			// Contract
@@ -1053,22 +1095,22 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat', 'lire'));
 
 				if (!empty($menu_invert)) {
-                    $leftmenu = 'contracts';
-                }
+					$leftmenu = 'contracts';
+				}
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-                    if ((float) DOL_VERSION >= 18.0) {
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4%26filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));
-                    } else {
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));
-                        $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));
-                    }
-                }
+					if ((float) DOL_VERSION >= 18.0) {
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4%26filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));
+					} else {
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));
+						$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));
+					}
+				}
 			}
 
 			// Interventions
@@ -1098,7 +1140,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->hasRight('facture', 'creer'));
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_list');
 
-                if (! empty($menu_invert)) $leftmenu= 'customers_bills';
+				if (! empty($menu_invert)) $leftmenu= 'customers_bills';
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {
 					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('facture', 'lire'));
@@ -1113,10 +1155,16 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 					$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customer_bills_tovalid');
 				}
-                if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu)) {
-                    $newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_report');
-                }
+				if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu)) {
+					$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_report');
+				}
 				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_stats');
+
+				// Categories
+				if (isModEnabled('category') && getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP') && (float) DOL_VERSION >= 23.0) {
+					$langs->load("categories");
+					$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=17", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				}
 			}
 
 			// Suppliers invoices
@@ -1126,7 +1174,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')), '', $mainmenu, 'suppliers_bills_create');
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');
 
-                if (! empty($menu_invert)) $leftmenu= 'suppliers_bills';
+				if (! empty($menu_invert)) $leftmenu= 'suppliers_bills';
 
 				if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_draft');
@@ -1134,17 +1182,23 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_paid');
 				}
 
-                if ((float) DOL_VERSION >= 16.0) {
-                    $newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');
-                }
+				if ((float) DOL_VERSION >= 16.0) {
+					$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');
+				}
 
-                $newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');
+				$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');
 
-                if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
-                    $newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');
-                }
+				if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
+					$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');
+				}
 
 				$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_stats');
+
+				// Categories
+				if (isModEnabled('category') && getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP') && (float) DOL_VERSION >= 23.0) {
+					$langs->load("categories");
+					$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=21", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				}
 			}
 
 			// Orders
@@ -1171,7 +1225,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$langs->load("donations");
 				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing",$langs->trans("Donations"), 0, $user->hasRight('don', 'lire'), '', $mainmenu, 'donations');
 
-                if (! empty($menu_invert)) $leftmenu= 'donations';
+				if (! empty($menu_invert)) $leftmenu= 'donations';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
 					$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->hasRight('don', 'creer'));
@@ -1183,8 +1237,8 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			// Taxes and social contributions
 			if (isModEnabled('tax') || isModEnabled('salaries') || isModEnabled('loan') || isModEnabled('banque'))
 			{
-                global $mysoc;
-                $langs->load("compta");
+				global $mysoc;
+				$langs->load("compta");
 
 				$permtoshowmenu=((isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) || (isModEnabled('salaries') && $user->hasRight('salaries', 'read')) || (isModEnabled('loan') && $user->hasRight('loan', 'read')) || (isModEnabled('banque') && $user->hasRight('banque', 'lire')));
 				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing",$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');
@@ -1194,7 +1248,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				{
 					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social",$langs->trans("MenuSocialContributions"),1,$user->hasRight('tax', 'charges', 'lire'));
 
-                    if (! empty($menu_invert)) $leftmenu= 'tax_social';
+					if (! empty($menu_invert)) $leftmenu= 'tax_social';
 
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
 						$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->hasRight('tax', 'charges', 'creer'));
@@ -1207,7 +1261,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					{
 						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing",$langs->transcountry("MenuVAT", $mysoc->country_code),1,$user->hasRight('tax', 'charges', 'lire'), '', $mainmenu, 'tax_vat');
 
-                        if (! empty($menu_invert)) $leftmenu= 'tax_vat';
+						if (! empty($menu_invert)) $leftmenu= 'tax_vat';
 
 						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
 							$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
@@ -1225,7 +1279,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 						{
 							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1",$langs->transcountry("LT1",$mysoc->country_code),1,$user->hasRight('tax', 'charges', 'lire'));
 
-                            if (! empty($menu_invert)) $leftmenu= 'tax_1_vat';
+							if (! empty($menu_invert)) $leftmenu= 'tax_1_vat';
 
 							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
 								$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
@@ -1241,7 +1295,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 						{
 							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2",$langs->transcountry("LT2",$mysoc->country_code),1,$user->hasRight('tax', 'charges', 'lire'));
 
-                            if (! empty($menu_invert)) $leftmenu= 'tax_2_vat';
+							if (! empty($menu_invert)) $leftmenu= 'tax_2_vat';
 
 							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
 								$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
@@ -1259,7 +1313,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$langs->load("salaries");
 					$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing",$langs->trans("Salaries"),1,$user->hasRight('salaries', 'read'), '', $mainmenu, 'tax_salary');
 
-                    if (! empty($menu_invert)) $leftmenu= 'tax_salary';
+					if (! empty($menu_invert)) $leftmenu= 'tax_salary';
 
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
 						$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 2, $user->hasRight('salaries', 'write'));
@@ -1267,7 +1321,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 						$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->hasRight('salaries', 'read'));
 						$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->hasRight('salaries', 'read'));
 					}
-                }
+				}
 
 				// Loan
 				if (isModEnabled('loan')) {
@@ -1287,7 +1341,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$langs->load("banks");
 					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing",$langs->trans("MenuVariousPayment"),1,$user->hasRight('banque', 'lire'), '', $mainmenu, 'tax_various');
 
-                    if (! empty($menu_invert)) $leftmenu= 'tax_various';
+					if (! empty($menu_invert)) $leftmenu= 'tax_various';
 
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
 						$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 2, $user->hasRight('banque', 'modifier'));
@@ -1316,15 +1370,17 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque', 'transfer'));
 			}
 
-			if (isModEnabled('categorie')) {
-				$langs->load("categories");
-				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie', 'creer'), '', $mainmenu, 'tags');
-                if ((float) DOL_VERSION >= 21.0) {
-                    $newmenu->add("/categories/index.php?type=8", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
-                } else {
-                    $newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
-                }
-            }
+			if (isModEnabled('categorie') || isModEnabled('category')) {
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					$langs->load("categories");
+					$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie', 'creer'), '', $mainmenu, 'tags');
+					if ((float) DOL_VERSION >= 21.0) {
+						$newmenu->add("/categories/index.php?type=8", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
+					} else {
+						$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
+					}
+				}
+			}
 
 			// Direct debit order
 			if (isModEnabled('prelevement')) {
@@ -1362,9 +1418,9 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT') && isModEnabled('banque') && (isModEnabled('facture') || getDolGlobalString('MAIN_MENU_CHEQUE_DEPOSIT_ON'))) {
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->hasRight('banque', 'cheque'), '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
-                if (! empty($menu_invert)) $leftmenu= 'checks';
+				if (! empty($menu_invert)) $leftmenu= 'checks';
 
-                if ($usemenuhider || empty($leftmenu) || $leftmenu == "checks") {
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "checks") {
 					$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->hasRight('banque', 'cheque'));
 					$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque', 'cheque'));
 				}
@@ -1404,10 +1460,12 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				}
 
 				// Categories
-				if (isModEnabled('categorie')) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
-					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie', 'lire'));
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					if (isModEnabled('categorie') || isModEnabled('category')) {
+						$langs->load("categories");
+						$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+						//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie', 'lire'));
+					}
 				}
 			}
 
@@ -1420,10 +1478,12 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service', 'lire') || $user->hasRight('product', 'lire'));
 				}
 				// Categories
-				if (isModEnabled('categorie')) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
-					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie', 'lire'));
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					if (isModEnabled('categorie') || isModEnabled('category')) {
+						$langs->load("categories");
+						$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+						//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie', 'lire'));
+					}
 				}
 			}
 
@@ -1442,8 +1502,10 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('produit', 'lire') && $user->hasRight('stock', 'lire'));
 
 				// Categories for warehouses
-				if (isModEnabled('categorie')) {
-					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					if (isModEnabled('categorie') || isModEnabled('category')) {
+						$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					}
 				}
 			}
 
@@ -1475,7 +1537,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer'));
 				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->hasRight('expedition', 'lire'));
 
-                if (! empty($menu_invert)) $leftmenu= 'sendings';
+				if (! empty($menu_invert)) $leftmenu= 'sendings';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
 					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->hasRight('expedition', 'lire'));
@@ -1489,7 +1551,11 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			if (isModEnabled('reception')) {
 				$langs->load("receptions");
 				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->hasRight('reception', 'lire'), '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="pictofixedwidth"'));
-				$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception', 'creer'));
+				if ((float) DOL_VERSION >= 23.0) {
+					$newmenu->add("/reception/card.php?action=create&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception', 'creer'));
+				} else {
+					$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception', 'creer'));
+				}
 				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->hasRight('reception', 'lire'));
 
 				if (! empty($menu_invert)) $leftmenu= 'receptions';
@@ -1547,48 +1613,50 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 
 				$titleboth = $langs->trans("LeadsOrProjects");
 				$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-                if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
-                    $titleboth = $langs->trans("Projects");
-                    $titlenew = $langs->trans("NewProject");
-                }
-                if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
-                    $titleboth = $langs->trans("Leads");
-                    $titlenew = $langs->trans("NewLead");
-                }
+				if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
+					$titleboth = $langs->trans("Projects");
+					$titlenew = $langs->trans("NewProject");
+				}
+				if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
+					$titleboth = $langs->trans("Leads");
+					$titlenew = $langs->trans("NewLead");
+				}
 
 				// Project assigned to user
 				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'projects', 0);
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet', 'creer'));
 
-                if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
+				if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-                } elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 1) {
+				} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 1) {
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-                } elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
+				} elseif (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 				}
 
 				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
 
 				// Categories
-				if (isModEnabled('categorie')) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					if (isModEnabled('categorie') || isModEnabled('category')) {
+						$langs->load("categories");
+						$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					}
 				}
 
 				if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
-                    // Project affected to user
-                    $newmenu->add("/projet/activity/index.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("Activities"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'tasks', 0);
-                    $newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet', 'creer'));
-                    $newmenu->add("/projet/tasks/list.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));
-                    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
-
-                    if (!getDolGlobalString('PROJECT_HIDE_MENU_TASKS_ACTIVITY')) {
-                        $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'timespent', 0);
-                    }
-                }
+					// Project affected to user
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("Activities"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'tasks', 0);
+					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet', 'creer'));
+					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));
+					$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
+
+					if (!getDolGlobalString('PROJECT_HIDE_MENU_TASKS_ACTIVITY')) {
+						$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'timespent', 0);
+					}
+				}
 			}
 		}
 
@@ -1604,23 +1672,23 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 				$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->hasRight('user', 'user', 'creer'));
 				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&contextpage=employeelist", $langs->trans("List"), 1, $user->hasRight('user', 'user', 'lire'));
 
-                if ((float) DOL_VERSION >= 15.0) {
-                    $newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+				if ((float) DOL_VERSION >= 15.0) {
+					$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
 
-                    // Skills
-                    $newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+					// Skills
+					$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
 
-                    // Job (Description of work to do and skills required)
-                    $newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsProfiles"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+					// Job (Description of work to do and skills required)
+					$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsProfiles"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
 
-                    // Position = Link job - user
-                    $newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
+					// Position = Link job - user
+					$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
 
-                    // Evaluation
-                    $newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->hasRight('hrm', 'evaluation', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
-                    $newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read'));
-                }
-            }
+					// Evaluation
+					$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->hasRight('hrm', 'evaluation', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+					$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read'));
+				}
+			}
 
 			// Leave/Holiday/Vacation module
 			if (isModEnabled('holiday')) {
@@ -1629,8 +1697,8 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->hasRight('holiday', 'write'), '',$mainmenu);
-                $newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, $user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall'), '', $mainmenu, 'holiday_sm');
-                $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday', 'read'), '',$mainmenu);
+				$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, $user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday', 'read'), '',$mainmenu);
 
 				if (! empty($menu_invert)) $leftmenu= 'holiday';
 
@@ -1657,12 +1725,12 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 
 			// Expense report
 			if (isModEnabled('expensereport')) {
-                $langs->loadLangs(array("trips", "bills"));
+				$langs->loadLangs(array("trips", "bills"));
 				$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('expensereport', 'lire'), '', $mainmenu, 'expensereport', 0);
 				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('expensereport', 'creer'));
 				$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('expensereport', 'lire'));
 
-                if (! empty($menu_invert)) $leftmenu= 'expensereport';
+				if (! empty($menu_invert)) $leftmenu= 'expensereport';
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
 					$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->hasRight('expensereport', 'lire'));
@@ -1672,10 +1740,10 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport', 'lire'));
 					$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport', 'lire'));
 				}
-                if ((float) DOL_VERSION >= 16.0) {
-                    $newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, $user->hasRight('expensereport', 'lire'));
-                }
-                $newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));
+				if ((float) DOL_VERSION >= 16.0) {
+					$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, $user->hasRight('expensereport', 'lire'));
+				}
+				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));
 			}
 
 			if (isModEnabled('projet')) {
@@ -1701,356 +1769,387 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 			{
 				$permtoshowmenu=(isModEnabled('accounting') || $user->hasRight('accounting', 'bind', 'write') || $user->hasRight('compta', 'resultat', 'lire') || (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
 
-                // Transfer in accounting
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("TransferInAccounting"), 0, $permtoshowmenu, '', $mainmenu, 'transfer');
-
-                    // Binding
-                    if (isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES'))
-                    {
-                        $newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_customer');
-
-                        if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_customer';
-
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
-                    }
-                    if (isModEnabled('supplier_invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES'))
-                    {
-                        $newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy",$langs->trans("SuppliersVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_supplier');
-
-                        if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_supplier';
-
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
-                    }
-                    if (isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS'))
-                    {
-                        $newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy",$langs->trans("ExpenseReportsVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_expensereport');
-
-                        if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_expensereport';
-
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/',$leftmenu)) $newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/',$leftmenu)) $newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
-                    }
-
-                    // Journals
-                    if(isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
-                        $newmenu->add('',$langs->trans("RegistrationInAccounting"),1,$user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy_journal');
-
-                        // Multi journal
-                        $sql = "SELECT rowid, code, label, nature";
-                        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-                        $sql.= " WHERE entity = ".$conf->entity;
-                        $sql.= " AND active = 1";
-                        $sql.= " ORDER BY nature ASC, label DESC";
-
-                        $resql = $db->query($sql);
-                        if ($resql)
-                        {
-                            $numr = $db->num_rows($resql);
-                            $i = 0;
-
-                            if ($numr > 0) {
-                                while ($i < $numr) {
-                                    $objp = $db->fetch_object($resql);
-
-                                    $nature='';
-
-                                    // Must match array $sourceList defined into journals_list.php
-                                    if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
-                                        $nature="sells";
-                                    }
-                                    if ($objp->nature == 3 && isModEnabled('fournisseur') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
-                                        $nature="purchases";
-                                    }
-                                    if ($objp->nature == 4 && isModEnabled('banque')) {
-                                        $nature="bank";
-                                    }
-                                    if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
-                                        $nature="expensereports";
-                                    }
-                                    if ($objp->nature == 1 && isModEnabled('asset')) {
-                                        $nature = "various";
-                                    }
-                                    if ($objp->nature == 8) {
-                                        $nature="inventory";
-                                    }
-                                    if ($objp->nature == 9) {
-                                        $nature="hasnew";
-                                    }
-
-                                    // To enable when page exists
-                                    if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL'))
-                                    {
-                                        if ($nature == 'hasnew' || $nature == 'inventory') $nature='';
-                                    }
-
-                                    // Remove all type when treasury accounting is on
-                                    if (isModEnabled('treasuryaccounting')) {
-                                        if ($nature == 'sells' || $nature == 'purchases' || $nature == 'bank' || $nature == 'expensereports') $nature='';
-                                    }
-
-                                    if ($nature) {
-                                        $langs->load('accountancy');
-                                        $journallabel = $langs->transnoentities($objp->label); // Label of bank account in llx_accounting_journal
-
-                                        $key = $langs->trans("AccountingJournalType".strtoupper($objp->nature));
-                                        $transferlabel = ($objp->nature && $key != "AccountingJournalType".strtoupper($langs->trans($objp->nature)) ? $key.($journallabel != $key ? ' '.$journallabel : ''): $journallabel);
-
-                                        $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                                    }
-                                    $i++;
-                                }
-                            } else {
-                                // Should not happened. Entries are added
-                                $newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            }
-                        } else {
-                            dol_print_error($db);
-                        }
-                        $db->free($resql);
-                    }
-
-                    // Accountancy
-                    $newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
-
-                    // Balance
-                    $newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_balance",$langs->trans("AccountBalance"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
-
-                    // General Ledger
-                    $newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_ledger",$langs->trans("Bookkeeping"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
-
-                    // Journals
-                    $newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_journals",$langs->trans("Journals"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
-
-                    // Export accountancy
-                    if (getDolGlobalFloat('EASYA_VERSION') >= 2022.5 || (float) DOL_VERSION >= 18.0) {
-                        $newmenu->add("/accountancy/bookkeeping/export.php?mainmenu=accountancy&amp;leftmenu=accountancy_export",$langs->trans("MenuExportAccountancy"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
-                    }
-
-                    // Files
-                    if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU'))
-                    {
-                        $newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
-                    }
-
-                    // Closure
-                    $newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'closure');
-
-                    // Reports
-                    $newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'ca');
-
-                    if (! empty($menu_invert)) $leftmenu= 'accountancy_report';
-
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                        $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        $newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                    }
-
-                    $modecompta='CREANCES-DETTES';
-                    if(isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
-                        $modecompta='BOOKKEEPING';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-                    }
-                    if ($modecompta) {
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                            $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        }
-                    }
-
-                    $modecompta='RECETTES-DEPENSES';
-                    if ($modecompta) {
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                            $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                            $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        }
-                    }
-
-                $modecompta = 'CREANCES-DETTES';
-                if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
-                    $modecompta = 'BOOKKEEPING'; // Not yet implemented.
-                }
-                if ($modecompta && ((!empty($conf->fournisseur->enabled) && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || !empty($conf->supplier_invoice->enabled))) {
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                        $newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        $newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        $newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                    }
-                }
-
-                $modecompta = 'RECETTES-DEPENSES';
-                if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
-                    $modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
-                }
-                if ($modecompta && ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || isModEnabled('supplier_invoice'))) {
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                        $newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                        $newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
-                    }
-                }
-
-                // Configuration
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1);
-
-                if (! empty($menu_invert)) $leftmenu= 'accountancy_admin';
-
-                if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {
-                    $newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);
-                    $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'fiscalyear', 20);
-                    $newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_journal', 30);
-                    $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);
-                    $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
-                    $newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 42);
-                    $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);
-                    if (isModEnabled('banque')) {
-                        $newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
-                    }
-                    if (isModEnabled('facture') || isModEnabled('fournisseur')) {
-                        $newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);
-                    }
-                    if (isModEnabled('tax')) {
-                        $newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);
-                    }
-                    if (isModEnabled('expensereport')) {
-                        $newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);
-                    }
-                    $newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
-                    $newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
-                    if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && (float) DOL_VERSION >= 21.0) {
-                        $newmenu->add("/accountancy/admin/report_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingReport"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_report', 125);
-                    }
-                    $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 130);
-
-                    if ((float) DOL_VERSION < 21.0) {
-                        $newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
-                    }
-                }
-            }
+				// Transfer in accounting
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("TransferInAccounting"), 0, $permtoshowmenu, '', $mainmenu, 'transfer');
+
+					// Binding
+					if (isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES'))
+					{
+						$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy",$langs->trans("CustomersVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_customer');
+
+						if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_customer';
+
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/',$leftmenu)) $newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
+					}
+					if (isModEnabled('supplier_invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES'))
+					{
+						$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy",$langs->trans("SuppliersVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_supplier');
+
+						if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_supplier';
+
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/',$leftmenu)) $newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
+					}
+					if (isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS'))
+					{
+						$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy",$langs->trans("ExpenseReportsVentilation"),1,$user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_expensereport');
+
+						if (! empty($menu_invert)) $leftmenu= 'accountancy_dispatch_expensereport';
+
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/',$leftmenu)) $newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport",$langs->trans("ToBind"),2,$user->hasRight('accounting', 'bind', 'write'));
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/',$leftmenu)) $newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport",$langs->trans("Binded"),2,$user->hasRight('accounting', 'bind', 'write'));
+					}
+
+					// Journals
+					if(isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+						$newmenu->add('',$langs->trans("RegistrationInAccounting"),1,$user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy_journal');
+
+						// Multi journal
+						$sql = "SELECT rowid, code, label, nature";
+						$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+						$sql.= " WHERE entity = ".$conf->entity;
+						if (getDolGlobalString('ACCOUNTING_MODE') == 'RECETTES-DEPENSES' && (float) DOL_VERSION >= 22.0) {
+							$sql .= " AND nature = 4"; // only bank journal when using treasury accounting mode
+						}
+						$sql.= " AND active = 1";
+						$sql.= " ORDER BY nature ASC, label DESC";
+
+						$resql = $db->query($sql);
+						if ($resql)
+						{
+							$numr = $db->num_rows($resql);
+							$i = 0;
+
+							if ($numr > 0) {
+								while ($i < $numr) {
+									$objp = $db->fetch_object($resql);
+
+									$nature='';
+
+									// Must match array $sourceList defined into journals_list.php
+									if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
+										$nature="sells";
+									}
+									if ($objp->nature == 3 && isModEnabled('fournisseur') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
+										$nature="purchases";
+									}
+									if ($objp->nature == 4 && isModEnabled('banque')) {
+										$nature="bank";
+									}
+									if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
+										$nature="expensereports";
+									}
+									if ($objp->nature == 1 && (isModEnabled('asset') || isModEnabled('invoice') || isModEnabled('supplier_invoice'))) {
+										$nature = "various";
+									}
+									if ($objp->nature == 8) {
+										$nature="inventory";
+									}
+									if ($objp->nature == 9) {
+										$nature="hasnew";
+									}
+
+									// To enable when page exists
+									if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL'))
+									{
+										if ($nature == 'hasnew' || $nature == 'inventory') $nature='';
+									}
+
+									// Remove all type when treasury accounting is on
+									if (isModEnabled('treasuryaccounting')) {
+										if ($nature == 'sells' || $nature == 'purchases' || $nature == 'bank' || $nature == 'expensereports') $nature='';
+									}
+
+									if ($nature) {
+										$langs->load('accountancy');
+										$journallabel = $langs->transnoentities($objp->label); // Label of bank account in llx_accounting_journal
+
+										$key = $langs->trans("AccountingJournalType".strtoupper($objp->nature));
+										$transferlabel = ($objp->nature && $key != "AccountingJournalType".strtoupper($langs->trans($objp->nature)) ? $key.($journallabel != $key ? ' '.$journallabel : ''): $journallabel);
+
+										$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+									}
+									$i++;
+								}
+							} else {
+								// Should not happened. Entries are added
+								$newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							}
+						} else {
+							dol_print_error($db);
+						}
+						$db->free($resql);
+					}
+
+					// Accountancy
+					$newmenu->add("/accountancy/index.php?leftmenu=accountancy",$langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
+
+					// Balance
+					$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_balance",$langs->trans("AccountBalance"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
+
+					// General Ledger
+					$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_ledger",$langs->trans("Bookkeeping"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
+
+					// Journals
+					$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_journals",$langs->trans("Journals"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
+
+					// Export accountancy
+					if (getDolGlobalFloat('EASYA_VERSION') >= 2022.5 || (float) DOL_VERSION >= 18.0) {
+						$newmenu->add("/accountancy/bookkeeping/export.php?mainmenu=accountancy&amp;leftmenu=accountancy_export",$langs->trans("MenuExportAccountancy"),1,$user->hasRight('accounting', 'mouvements', 'lire'));
+					}
+
+					// Files
+					if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU'))
+					{
+						$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
+					}
+
+					// Closure
+					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'closure');
+
+					// Reports
+					$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'ca');
+
+					if (! empty($menu_invert)) $leftmenu= 'accountancy_report';
+
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+						$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					}
+
+					$modecompta='CREANCES-DETTES';
+					if(isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+						$modecompta='BOOKKEEPING';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+					}
+					if ($modecompta) {
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+							$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						}
+					}
+
+					$modecompta='RECETTES-DEPENSES';
+					if ($modecompta) {
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+							$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+							$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						}
+					}
+
+				$modecompta = 'CREANCES-DETTES';
+				if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPING'; // Not yet implemented.
+				}
+				if ($modecompta && ((!empty($conf->fournisseur->enabled) && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || !empty($conf->supplier_invoice->enabled))) {
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					}
+				}
+
+				$modecompta = 'RECETTES-DEPENSES';
+				if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+					$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
+				}
+				if ($modecompta && ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || isModEnabled('supplier_invoice'))) {
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+						$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					}
+				}
+
+				// Configuration
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1);
+
+				if (! empty($menu_invert)) $leftmenu= 'accountancy_admin';
+
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {
+					$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);
+					$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'fiscalyear', 20);
+					$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_journal', 30);
+					$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);
+					$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
+					$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 42);
+					$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);
+					if (isModEnabled('banque')) {
+						$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
+					}
+					if (isModEnabled('facture') || isModEnabled('fournisseur')) {
+						$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);
+					}
+					if (isModEnabled('tax')) {
+						$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);
+					}
+					if (isModEnabled('expensereport')) {
+						$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);
+					}
+					$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
+					$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
+					if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && (float) DOL_VERSION >= 21.0) {
+						$newmenu->add("/accountancy/admin/report_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingReport"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_report', 125);
+					}
+					$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 130);
+
+					if ((float) DOL_VERSION < 21.0) {
+						$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
+					}
+				}
+			}
 
 			// Accountancy (simple)
 			if (isModEnabled('comptabilite')) {
-                // Files
-                if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {
-                    $newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'files');
-                }
-
-                // Bilan, resultats
-                $newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'ca');
-
-                if (! empty($menu_invert)) $leftmenu= 'report';
-
-                if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-                    $newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $modecompta = 'CREANCES-DETTES';
-                    $newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-
-                    $modecompta = 'RECETTES-DEPENSES';
-                    $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-
-                    //Achats
-                    $modecompta = 'CREANCES-DETTES';
-                    $newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-                    $newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
-
-                    // Journaux
-                    $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 50);
-                    $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 51);
-                }
-            }
-
-            // Intracomm report
-            if (isModEnabled('intracommreport')) {
-                $langs->load("intracommreport");
-
-                $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
-
-                if (! empty($menu_invert)) $leftmenu= 'intracommreport';
-
-                if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
-                    // DEB / DES
-                    $newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport', 'write'), '', $mainmenu, 'intracommreport', 1);
-                    $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 1);
-                }
-            }
+				// Files
+				if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'files');
+				}
+
+				// Bilan, resultats
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'ca');
+
+				if (! empty($menu_invert)) $leftmenu= 'report';
+
+				if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
+					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$modecompta = 'CREANCES-DETTES';
+					$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+
+					$modecompta = 'RECETTES-DEPENSES';
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+
+					//Achats
+					$modecompta = 'CREANCES-DETTES';
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+
+					// Journaux
+					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 50);
+					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 51);
+				}
+			}
+
+			// Intracomm report
+			if (isModEnabled('intracommreport')) {
+				$langs->load("intracommreport");
+
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
+
+				if (! empty($menu_invert)) $leftmenu= 'intracommreport';
+
+				if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
+					// DEB / DES
+					$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport', 'write'), '', $mainmenu, 'intracommreport', 1);
+					$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 1);
+				}
+			}
 
 			// Assets
 			if (isModEnabled('asset'))
-            {
-                $langs->load("assets");
+			{
+				$langs->load("assets");
 
 				if (getDolGlobalFloat('EASYA_VERSION') >= 2022.5 || (float) DOL_VERSION >= 16.0) {
-                    $newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
-                    $newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
-                    $newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
-                    $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')), '', $mainmenu, 'asset_model');
-
-                    if (!empty($menu_invert)) $leftmenu = 'asset_model';
-
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
-                        $newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write')));
-                        $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
-                    }
-                } elseif ((float) DOL_VERSION >= 17.0) {
-                    $newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset');
-                    $newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
-                    $newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
-                    $newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset_type');
-
-                    if (!empty($menu_invert)) $leftmenu = 'asset_type';
-
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
-                        $newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->hasRight('asset', 'configurer'));
-                        $newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->hasRight('asset', 'read'));
-                    }
-                }
-            }
+					$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+					$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
+					$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
+					$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')), '', $mainmenu, 'asset_model');
+
+					if (!empty($menu_invert)) $leftmenu = 'asset_model';
+
+					if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
+						$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write')));
+						$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
+					}
+				} elseif ((float) DOL_VERSION >= 17.0) {
+					$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset');
+					$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
+					$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
+					$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset_type');
+
+					if (!empty($menu_invert)) $leftmenu = 'asset_type';
+
+					if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
+						$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->hasRight('asset', 'configurer'));
+						$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->hasRight('asset', 'read'));
+					}
+				}
+			}
 		}
 
 		/*
 		 * Menu TOOLS
 		 */
 		if ($mainmenu == 'tools') {
-            if (empty($user->socid)) { // limit to internal users
-                $langs->load("mails");
-                $newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0);
-            }
-
-            if (isModEnabled('mailing')) {
-                $newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 0);
-                $newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->hasRight('mailing', 'creer'));
-                $newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->hasRight('mailing', 'lire'));
-            }
-
-            if (isModEnabled('import')) {
-                $langs->load("exports");
-                $newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0);
-                $newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
-            }
-
-            if (isModEnabled('export')) {
-                $langs->load("exports");
-                $newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export', 'lire'), '', $mainmenu, 'export', 0);
-                $newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
-                //$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export', 'lire'));
-            }
-
-            if ((float) DOL_VERSION >= 21.0) {
-                $newmenu->add("/core/customreports.php?leftmenu=customreports", $langs->trans("CustomReports"), 0, 1, '', $mainmenu, 'customreports', 0, '', '', '', img_picto('', 'graph', 'class="paddingright pictofixedwidth"'));
-            }
-        }
+			if ((isModEnabled('category') || isModEnabled('category')) && (float) DOL_VERSION >= 22.0) {
+				$titleindex = $langs->trans("Categories");
+				$newmenu->add("/categories/index.php?leftmenu=category", $titleindex, 0, $user->hasRight('category', 'read'), '', $mainmenu, 'email_templates', 0);
+			}
+
+			if (!getDolGlobalInt('MENU_HIDE_EMAIL_TEMPLATES') && empty($user->socid)) { // limit to internal users
+				$langs->load("mails");
+				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0);
+			}
+
+			if (isModEnabled('mailing')) {
+				$titleindex = $langs->trans("EMailings");
+				$titlenew = $langs->trans("NewMailing");
+				$titlelist = $langs->trans("List");
+				if (getDolGlobalInt('EMAILINGS_SUPPORT_ALSO_SMS') && (float) DOL_VERSION >= 20.0) {
+					$titleindex .= ' | '.$langs->trans("SMSings");
+					$titlenew .= ' | '.$langs->trans("NewSMSing");
+				}
+				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $titleindex, 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 0);
+				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $titlenew, 1, $user->hasRight('mailing', 'creer'));
+				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $titlelist, 1, $user->hasRight('mailing', 'lire'));
+			}
+
+			if ((float) DOL_VERSION >= 23.0) {
+				$title = "ImportExportArea";
+				if (isModEnabled('import') && !isModEnabled('export')) {
+					$title = "FormatedImport";
+				}
+				if (!isModEnabled('import') && isModEnabled('export')) {
+					$title = "FormatedExport";
+				}
+				if (isModEnabled('import') || isModEnabled('export')) {
+					$langs->load("exports");
+					$newmenu->add(dolBuildUrl('/imports/index.php', ['leftmenu' => 'import']), $langs->trans($title), 0, (int) ($user->hasRight('import', 'run') || $user->hasRight('export', 'lire')), '', $mainmenu, 'import', 20, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+					$newmenu->add(dolBuildUrl('/imports/import.php', ['leftmenu' => 'import']), $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
+					$newmenu->add(dolBuildUrl('/exports/export.php', ['leftmenu' => 'export']), $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
+				}
+			} else {
+				if (isModEnabled('import')) {
+					$langs->load("exports");
+					$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0);
+					$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
+				}
+
+				if (isModEnabled('export')) {
+					$langs->load("exports");
+					$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export', 'lire'), '', $mainmenu, 'export', 0);
+					$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
+					//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export', 'lire'));
+				}
+			}
+
+			if ((float) DOL_VERSION >= 21.0) {
+				$newmenu->add("/core/customreports.php?leftmenu=customreports", $langs->trans("CustomReports"), 0, 1, '', $mainmenu, 'customreports', 0, '', '', '', img_picto('', 'graph', 'class="paddingright pictofixedwidth"'));
+			}
+		}
 
 		/*
 		 * Menu MEMBERS
@@ -2079,9 +2178,11 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->hasRight('adherent', 'export'));
 				}
 
-				if (isModEnabled('categorie')) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+				if ((float) DOL_VERSION < 22.0 || getDolGlobalString('CATEGORY_EDIT_IN_MENU_NOT_IN_POPUP')) {
+					if (isModEnabled('categorie') || isModEnabled('category')) {
+						$langs->load("categories");
+						$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
+					}
 				}
 
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->hasRight('adherent', 'cotisation', 'lire'), '', $mainmenu, 'members', 0);
@@ -2183,20 +2284,20 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 		return 0;
 	}
 
-    // Allow the $menu_array of the menu to be manipulated by modules
-    $parameters = array(
-        'mainmenu' => $mainmenu,
-    );
-    $hook_items = $menu_array;
-    $reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
-
-    if (is_numeric($reshook)) {
-        if ($reshook == 0 && !empty($hookmanager->results)) {
-            $menu_array[] = $hookmanager->results; // add
-        } elseif ($reshook == 1) {
-            $menu_array = $hookmanager->results; // replace
-        }
-    }
+	// Allow the $menu_array of the menu to be manipulated by modules
+	$parameters = array(
+		'mainmenu' => $mainmenu,
+	);
+	$hook_items = $menu_array;
+	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+
+	if (is_numeric($reshook)) {
+		if ($reshook == 0 && !empty($hookmanager->results)) {
+			$menu_array[] = $hookmanager->results; // add
+		} elseif ($reshook == 1) {
+			$menu_array = $hookmanager->results; // replace
+		}
+	}
 
 	// TODO Use the position property in menu_array to reorder the $menu_array
 
diff --git a/core/modules/modOblyon.class.php b/core/modules/modOblyon.class.php
index 6976626..068323e 100644
--- a/core/modules/modOblyon.class.php
+++ b/core/modules/modOblyon.class.php
@@ -69,14 +69,14 @@ function __construct($db)
 													'hooks' => array('data' => array('main'), 'entity' => '0')
 													);
 			$this->dirs						= array('/'.$this->name.'/sql');														// Data directories to create when module is enabled. Example: this->dirs = array("/mymodule/temp");
-			$this->config_page_url			= array('menus.php@'.$this->name);														// List of php page, stored into mymodule/admin directory, to use to setup module.
+			$this->config_page_url			= array('options.php@'.$this->name);														// List of php page, stored into mymodule/admin directory, to use to setup module.
 			// Dependencies
 			$this->hidden					= false;																				// A condition to hide module
 			$this->depends					= array();																				// List of modules id that must be enabled if this module is enabled
 			$this->requiredby				= array();																				// List of modules id to disable if this one is disabled
 			$this->conflictwith				= array("modQuickUX");																	// List of modules id this module is in conflict with
 			$this->phpmin					= array(7,1);																			// Minimum version of PHP required by module
-      		$this->need_dolibarr_version	= array(14,0);																			// Minimum version of Dolibarr required by module
+      		$this->need_dolibarr_version	= array(18,0);																			// Minimum version of Dolibarr required by module
 			if ($easyaVersion >= '2024') {
 				$easya_info = json_decode(file_get_contents(__DIR__ . '/../../.easya_info.json'));
 				$this->phpmin = explode('.', $easya_info->php_min_version);										// Minimum version of PHP required by module
diff --git a/img/example_FAdownload.png b/img/example_FAdownload.png
new file mode 100644
index 0000000..3bb8d05
Binary files /dev/null and b/img/example_FAdownload.png differ
diff --git a/langs/en_US/oblyon.lang b/langs/en_US/oblyon.lang
index 8601dd7..c7cdc1d 100644
--- a/langs/en_US/oblyon.lang
+++ b/langs/en_US/oblyon.lang
@@ -1,6 +1,6 @@
 # < Oblyon Control Panel - English translation >
 # Copyright (C) 2015       Nicolas Rivera       <nrivera.pro@gmail.com>
-# Copyright (C) 2015-2024  Alexandre Spangaro   <alexandre@inovea-conseil.com>
+# Copyright (C) 2015-2025  Alexandre Spangaro   <alexandre@inovea-conseil.com>
 #
 Module432573Name   = Oblyon
 Module432573Desc   = Options panel allows you to personalize the Oblyon theme
@@ -68,6 +68,7 @@ CardBehavior                         = Behavior of the cards
 FixAreaRefAndTabAction               = Fix the reference banner and action buttons during vertical scrolling
 FixStickyTabsCard                    = Fix tab banner when scrolling vertically
 SwitchColunmOnLeft                   = Toggle selection / search / mass action column to the left
+FixTitleInList                       = Sticky list title bar so that title, mass action, pagination and “Add” element are always visible
 RemoveKanbanViewInList               = Remove the "Kanban view" button at the top right of the lists
 FixStickyTableHeadersColumns         = Fix the table column header on the elements during vertical scrolling
 FixStickyFirstColumn                 = Fix first column of tables when scrolling horizontally
@@ -166,32 +167,33 @@ OblyonWarningColorWhiteHelp        = This text color is white. It might not be v
 #
 # Dashboard page
 #
-OblyonDashboardTitle                   = Oblyon configurator - Dashboard
-OblyonDashboardDisableBlocks           =Thumbs of open objects (to process or late) on main dashboard
-DisableGlobalBoxStats                  = Disable the global statistics widget (number of items in database)
-InfoboxColorOnBackground               = Invert the colors of the icons and the background of the thumbnails
-OblyonInfoboxSingleWidth               = Standardize the width of the thumbnails (Dolibarr standard 280px)
-OblyonInfoboxSingleWidthHelp           = Otherwise the width will adapt to the length of the information presented (the minimum width is 260px)
-ColorIntensity                         = Color intensity
-ColorIntensityDesc                     = Set the intensity to the colors below (Currently %s)
-ColorMoreDarker                        = Less intense
-ColorMoreLighter                       = More intense
-OBLYON_INFOXBOX_BACKGROUND             = Thumb background color
-OBLYON_INFOXBOX_WEATHER_COLOR          = Thumb color 'weather'
-OBLYON_INFOXBOX_ACTION_COLOR           = Thumb color 'agenda'
-OBLYON_INFOXBOX_PROJECT_COLOR          = Thumb color 'project'
-OBLYON_INFOXBOX_CUSTOMER_PROPAL_COLOR  = Thumb color 'customer sales proposals'
-OBLYON_INFOXBOX_CUSTOMER_ORDER_COLOR   = Thumb color 'customer orders'
-OBLYON_INFOXBOX_CUSTOMER_INVOICE_COLOR = Thumb color 'customer invoices'
-OBLYON_INFOXBOX_SUPPLIER_PROPAL_COLOR  = Thumb color 'requests for quotations from suppliers'
-OBLYON_INFOXBOX_SUPPLIER_ORDER_COLOR   = Thumb color 'supplier orders'
-OBLYON_INFOXBOX_SUPPLIER_INVOICE_COLOR = Thumb color 'supplier invoices'
-OBLYON_INFOXBOX_CONTRAT_COLOR          = Thumb color 'contract'
-OBLYON_INFOXBOX_BANK_COLOR             = Thumb color 'bank'
-OBLYON_INFOXBOX_ADHERENT_COLOR         = Thumb color 'members'
-OBLYON_INFOXBOX_EXPENSEREPORT_COLOR    = Thumb color 'expense reports'
-OBLYON_INFOXBOX_HOLIDAY_COLOR          = Thumb color 'holidays'
-OBLYON_INFOXBOX_TICKET_COLOR           = Thumb color 'tickets'
+OblyonDashboardTitle                    = Oblyon configurator - Dashboard
+OblyonDashboardDisableBlocks            = Thumbs of open objects (to process or late) on main dashboard
+DisableGlobalBoxStats                   = Disable the global statistics widget (number of items in database)
+InfoboxColorOnBackground                = Invert the colors of the icons and the background of the thumbnails
+OblyonInfoboxSingleWidth                = Standardize the width of the thumbnails (Dolibarr standard 280px)
+OblyonInfoboxSingleWidthHelp            = Otherwise the width will adapt to the length of the information presented (the minimum width is 260px)
+ColorIntensity                          = Color intensity
+ColorIntensityDesc                      = Set the intensity to the colors below (Currently %s)
+ColorMoreDarker                         = Less intense
+ColorMoreLighter                        = More intense
+OBLYON_INFOXBOX_BACKGROUND              = Thumb background color
+OBLYON_INFOXBOX_WEATHER_COLOR           = Thumb color 'weather'
+OBLYON_INFOXBOX_ACTION_COLOR            = Thumb color 'agenda'
+OBLYON_INFOXBOX_PROJECT_COLOR           = Thumb color 'project'
+OBLYON_INFOXBOX_CUSTOMER_PROPAL_COLOR   = Thumb color 'customer sales proposals'
+OBLYON_INFOXBOX_CUSTOMER_ORDER_COLOR    = Thumb color 'customer orders'
+OBLYON_INFOXBOX_CUSTOMER_INVOICE_COLOR  = Thumb color 'customer invoices'
+OBLYON_INFOXBOX_SUPPLIER_PROPAL_COLOR   = Thumb color 'requests for quotations from suppliers'
+OBLYON_INFOXBOX_SUPPLIER_ORDER_COLOR    = Thumb color 'supplier orders'
+OBLYON_INFOXBOX_SUPPLIER_INVOICE_COLOR  = Thumb color 'supplier invoices'
+OBLYON_INFOXBOX_CONTRAT_COLOR           = Thumb color 'contract'
+OBLYON_INFOXBOX_BANK_COLOR              = Thumb color 'bank'
+OBLYON_INFOXBOX_ADHERENT_COLOR          = Thumb color 'members'
+OBLYON_INFOXBOX_EXPENSEREPORT_COLOR     = Thumb color 'expense reports'
+OBLYON_INFOXBOX_HOLIDAY_COLOR           = Thumb color 'holidays'
+OBLYON_INFOXBOX_TICKET_COLOR            = Thumb color 'tickets'
+OBLYON_INFOXBOX_MRP_COLOR               = Thumb color 'production (MRP)'
 
 #
 # Login page
@@ -254,18 +256,28 @@ LimitTabLineToOne            = (Allows you to limit the tabs to a single line =>
 FixAbsoluteButtonsActionCard = Sticky action buttons at bottom of the page
 ShowLineNumberCard           = Show line number (Invoice, proposal, etc)
 
+# FCK Editor
+OptionsCKEditor                             = WYSIWYG editor options (CKEditor)
+FckeditorAllowAnyContent                    = Allow any content in WYSIWYG editor
+FckeditorEnableScaytAutostartup             = Enable automatic spell check (SCAYT)
+MainSecurityAllowUnsecuredLabelsWithHtml    = Allow unsecured label with html
+NotRecommended                              = Not recommended
+
 #
 # Icons page
 #
-OblyonIconsTitle = Oblyon Configurator - Icons
-Icons            = Icons
-IconsStyle       = Icons style
-IconApplied      = Icons style applied
-Iconfas          = Solid
-Iconfar          = Regular
-Iconfal          = Light
-Iconfat          = Thin
-Iconfad          = Duotone
+Icons=Icons
+OblyonSetupIcons=Oblyon Configurator - Icons
+OblyonIconsUseFA6 = QuickUXIconsUseFA6 = Enable use of FontAwesome 6 icons (Free) (Font Awesome 5 by default)
+FontAwesomeSelectPack=Select which FontAwesome pack to use:
+FontAwesomeAction=Action
+FontAwesomeFolder=Folder
+FontAwesomeVersion=Version
+FontAwesomeLicence=Licence
+FontAwesomeAvailableStyles=Available Styles
+FontAwesomeSaveButton=Save
+FontAwesomeSuccessMessage=✅ You are now using %s (%s, weight %s) from %s
+FontAwesomeDirectoryDownload=To add a new FontAwesome pack, you need to create a new “fontawesome-<i><b>x(p)</b></i>” directory (x for the major version, p if it's a pro version) (Example for FontAwesome 6.0.72 Pro: “fontawesome-6p”) in <b>/theme/common/</b>. This directory will contain your unzipped FontAwesome package.
 
 #
 # Custom CSS page
diff --git a/langs/fr_FR/oblyon.lang b/langs/fr_FR/oblyon.lang
index 256d31e..c13784e 100644
--- a/langs/fr_FR/oblyon.lang
+++ b/langs/fr_FR/oblyon.lang
@@ -1,6 +1,6 @@
 # < Oblyon Control Panel - French translation >
 # Copyright (C) 2015       Nicolas Rivera       <nrivera.pro@gmail.com>
-# Copyright (C) 2015-2024  Alexandre Spangaro   <alexandre@inovea-conseil.com>
+# Copyright (C) 2015-2025  Alexandre Spangaro   <alexandre@inovea-conseil.com>
 # Copyright (C) 2015-2025  Sylvain Legrand      <technique@infras.fr>
 #
 Module432573Name        = Oblyon
@@ -68,6 +68,7 @@ CardBehavior                         = Comportement des fiches
 FixAreaRefAndTabAction               = Fixer le bandeau des références et les boutons d'actions pendant le défilement vertical
 FixStickyTabsCard                    = Fixer le bandeau des onglets lors d'un défilement vertical
 SwitchColunmOnLeft                   = Basculer la colonne de sélection / recherche / action en masse à gauche
+FixTitleInList                       = Fixer la barre de titre des listes de manière à toujours voir le titre, l'action en masse, la pagination et l'élément "Ajouter"
 RemoveKanbanViewInList               = Retirer le bouton "Vue kanban" en haut à droite des listes
 FixStickyTableHeadersColumns         = Fixer l'entête de colonne des tableaux sur les éléments lors d'un défilement vertical
 FixStickyFirstColumn                 = Fixer la première colonne des tableaux lors d'un défilement horizontal
@@ -166,32 +167,33 @@ OblyonWarningColorWhiteHelp        = La couleur du texte est blanche. Le texte p
 #
 # Dashboard page
 #
-OblyonDashboardTitle                   = Configurateur Oblyon - Tableau de bord
-OblyonDashboardDisableBlocks           = Vignette des éléments ouverts (à traiter ou en retard) sur le tableau de bord principal
-DisableGlobalBoxStats                  = Désactiver le widget des statistiques globales (nombres d'éléments en base de données)
-InfoboxColorOnBackground               = Inverser les couleurs des icônes et du fond des vignettes
-OblyonInfoboxSingleWidth               = Uniformiser la largeur des vignettes (standard Dolibarr 280px)
-OblyonInfoboxSingleWidthHelp           = Sinon la largeur s'adaptera à la longueur des informations présentées (la largeur minimum est de 260px)
-ColorIntensity                         = Intensité des couleurs
-ColorIntensityDesc                     = Définir l'intensité sur les couleurs ci-dessous (Actuellement %s)
-ColorMoreDarker                        = Moins intense
-ColorMoreLighter                       = Plus intense
-OBLYON_INFOXBOX_BACKGROUND             = Couleur de fond de la vignette
-OBLYON_INFOXBOX_WEATHER_COLOR          = Couleur vignette 'météo'
-OBLYON_INFOXBOX_ACTION_COLOR           = Couleur vignette 'agenda'
-OBLYON_INFOXBOX_PROJECT_COLOR          = Couleur vignette 'projet'
-OBLYON_INFOXBOX_CUSTOMER_PROPAL_COLOR  = Couleur vignette 'propositions commerciales clients'
-OBLYON_INFOXBOX_CUSTOMER_ORDER_COLOR   = Couleur vignette 'commandes clients'
-OBLYON_INFOXBOX_CUSTOMER_INVOICE_COLOR = Couleur vignette 'factures clients'
-OBLYON_INFOXBOX_SUPPLIER_PROPAL_COLOR  = Couleur vignette 'demandes de prix fournisseurs'
-OBLYON_INFOXBOX_SUPPLIER_ORDER_COLOR   = Couleur vignette 'commandes fournisseurs'
-OBLYON_INFOXBOX_SUPPLIER_INVOICE_COLOR = Couleur vignette 'factures fournisseurs'
-OBLYON_INFOXBOX_CONTRAT_COLOR          = Couleur vignette 'contrat'
-OBLYON_INFOXBOX_BANK_COLOR             = Couleur vignette 'banque'
-OBLYON_INFOXBOX_ADHERENT_COLOR         = Couleur vignette 'adhérent'
-OBLYON_INFOXBOX_EXPENSEREPORT_COLOR    = Couleur vignette 'note de frais'
-OBLYON_INFOXBOX_HOLIDAY_COLOR          = Couleur vignette 'congés payés'
-OBLYON_INFOXBOX_TICKET_COLOR           = Couleur vignette 'tickets'
+OblyonDashboardTitle                    = Configurateur Oblyon - Tableau de bord
+OblyonDashboardDisableBlocks            = Vignette des éléments ouverts (à traiter ou en retard) sur le tableau de bord principal
+DisableGlobalBoxStats                   = Désactiver le widget des statistiques globales (nombres d'éléments en base de données)
+InfoboxColorOnBackground                = Inverser les couleurs des icônes et du fond des vignettes
+OblyonInfoboxSingleWidth                = Uniformiser la largeur des vignettes (standard Dolibarr 280px)
+OblyonInfoboxSingleWidthHelp            = Sinon la largeur s'adaptera à la longueur des informations présentées (la largeur minimum est de 260px)
+ColorIntensity                          = Intensité des couleurs
+ColorIntensityDesc                      = Définir l'intensité sur les couleurs ci-dessous (Actuellement %s)
+ColorMoreDarker                         = Moins intense
+ColorMoreLighter                        = Plus intense
+OBLYON_INFOXBOX_BACKGROUND              = Couleur de fond de la vignette
+OBLYON_INFOXBOX_WEATHER_COLOR           = Couleur vignette 'météo'
+OBLYON_INFOXBOX_ACTION_COLOR            = Couleur vignette 'agenda'
+OBLYON_INFOXBOX_PROJECT_COLOR           = Couleur vignette 'projet'
+OBLYON_INFOXBOX_CUSTOMER_PROPAL_COLOR   = Couleur vignette 'propositions commerciales clients'
+OBLYON_INFOXBOX_CUSTOMER_ORDER_COLOR    = Couleur vignette 'commandes clients'
+OBLYON_INFOXBOX_CUSTOMER_INVOICE_COLOR  = Couleur vignette 'factures clients'
+OBLYON_INFOXBOX_SUPPLIER_PROPAL_COLOR   = Couleur vignette 'demandes de prix fournisseurs'
+OBLYON_INFOXBOX_SUPPLIER_ORDER_COLOR    = Couleur vignette 'commandes fournisseurs'
+OBLYON_INFOXBOX_SUPPLIER_INVOICE_COLOR  = Couleur vignette 'factures fournisseurs'
+OBLYON_INFOXBOX_CONTRAT_COLOR           = Couleur vignette 'contrat'
+OBLYON_INFOXBOX_BANK_COLOR              = Couleur vignette 'banque'
+OBLYON_INFOXBOX_ADHERENT_COLOR          = Couleur vignette 'adhérent'
+OBLYON_INFOXBOX_EXPENSEREPORT_COLOR     = Couleur vignette 'note de frais'
+OBLYON_INFOXBOX_HOLIDAY_COLOR           = Couleur vignette 'congés payés'
+OBLYON_INFOXBOX_TICKET_COLOR            = Couleur vignette 'tickets'
+OBLYON_INFOXBOX_MRP_COLOR               = Couleur vignette 'fabrication (MRP)'
 
 #
 # Login page
@@ -254,18 +256,28 @@ LimitTabLineToOne            = (Permet de limiter les onglets à une seule ligne
 FixAbsoluteButtonsActionCard = Fixer les boutons d'actions en bas de page
 ShowLineNumberCard           = Afficher le numéro des lignes (Facture, proposition commerciale, etc)
 
+# FCK Editor
+OptionsCKEditor                             = Options de l'éditeur WYSIWYG (CKEditor)
+FckeditorAllowAnyContent                    = Autoriser tout contenu dans l'éditeur WYSIWYG
+FckeditorEnableScaytAutostartup             = Activer la correction orthographique automatique (SCAYT)
+MainSecurityAllowUnsecuredLabelsWithHtml    = Autoriser les libellés non sécurisés avec HTML
+NotRecommended                              = Non recommandé
+
 #
 # Icons page
 #
-OblyonIconsTitle = Configurateur Oblyon - Icônes
-Icons            = Icônes
-IconsStyle       = Style d'icônes
-IconApplied      = Style d'icônes appliqué
-Iconfas          = Solid
-Iconfar          = Regular
-Iconfal          = Light
-Iconfat          = Thin
-Iconfad          = Duotone
+Icons=Icônes
+OblyonSetupIcons=Configurateur Oblyon - Icônes
+OblyonIconsUseFA6 = Activer l'utilisation des icônes FontAwesome 6 (Free) (Font Awesome 5 par défaut)
+FontAwesomeSelectPack=Sélectionner le pack FontAwesome à utiliser :
+FontAwesomeAction=Action
+FontAwesomeFolder=Direction
+FontAwesomeVersion=Version
+FontAwesomeLicence=Licence
+FontAwesomeAvailableStyles=Style d'icônes disponible
+FontAwesomeSaveButton=Sauvegarder
+FontAwesomeSuccessMessage=✅ Vous utilisez maintenant %s (%s, taille %s) du répertoire %s
+FontAwesomeDirectoryDownload=Pour ajouter un nouveau pack FontAwesome, vous devez créer un nouveau répertoire "fontawesome-<i><b>x(p)</b></i>" (x pour la version majeure, p s'il s'agit d'une version pro) (Exemple pour FontAwesome 6.0.72 Pro : "fontawesome-6p") dans <b>/theme/common/</b>. Ce répertoire contiendra votre pack FontAwesome dézippé.
 
 #
 # Custom CSS page
diff --git a/lib/oblyon.lib.php b/lib/oblyon.lib.php
index 793d73a..ef3bac1 100644
--- a/lib/oblyon.lib.php
+++ b/lib/oblyon.lib.php
@@ -39,19 +39,20 @@ function oblyon_admin_prepare_head()
 		$h = 0;
 		$head = array();
 
+        $head[$h][0] = dol_buildpath("/oblyon/admin/options.php", 1);
+        $head[$h][1] = $langs->trans("OblyonOptions");
+        $head[$h][2] = 'options';
+        $h++;
+
 		$head[$h][0] = dol_buildpath("/oblyon/admin/menus.php", 1);
 		$head[$h][1] = $langs->trans("Menus");
 		$head[$h][2] = 'menus';
 		$h++;
 
-		$fontawesomeFamily	= explode(' ', getDolGlobalString('MAIN_FONTAWESOME_FAMILY', ''));
-		dol_syslog('ici  $fontawesomeFamily[3] = '. $fontawesomeFamily[3]);
-		if (!empty($fontawesomeFamily[3]) && $fontawesomeFamily[3] != 'Free') {
-			$head[$h][0] = dol_buildpath("/oblyon/admin/icons.php", 1);
-			$head[$h][1] = $langs->trans("Icons");
-			$head[$h][2] = 'icons';
-			$h++;
-		}
+		$head[$h][0] = dol_buildpath("/oblyon/admin/icons.php", 1);
+		$head[$h][1] = $langs->trans("Icons");
+		$head[$h][2] = 'icons';
+		$h++;
 
 		$head[$h][0] = dol_buildpath("/oblyon/admin/colors.php", 1);
 		$head[$h][1] = $langs->trans("Colors");
@@ -63,11 +64,6 @@ function oblyon_admin_prepare_head()
 		$head[$h][2] = 'dashboard';
 		$h++;
 
-		$head[$h][0] = dol_buildpath("/oblyon/admin/options.php", 1);
-		$head[$h][1] = $langs->trans("OblyonOptions");
-		$head[$h][2] = 'options';
-		$h++;
-
 		$head[$h][0] = dol_buildpath("/oblyon/admin/customcss.php", 1);
 		$head[$h][1] = $langs->trans("CustomCSS");
 		$head[$h][2] = 'customcss';
diff --git a/sql/data.sql b/sql/data.sql
index 47d90df..7f0ac40 100644
--- a/sql/data.sql
+++ b/sql/data.sql
@@ -131,6 +131,7 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_D
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_DISABLE_BLOCK_EXPENSEREPORT',		'__ENTITY__', '0',					'yesno',	'0',	'Oblyon module');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_DISABLE_BLOCK_HOLIDAY',				'__ENTITY__', '0',					'chaine',	'0',	'Oblyon module');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_DISABLE_BLOCK_TICKET',				'__ENTITY__', '0',					'yesno',	'0',	'Oblyon module');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('MAIN_DISABLE_BLOCK_BOM',				'__ENTITY__', '0',					'yesno',	'0',	'Oblyon module');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_INFOXBOX_SINGLE_WIDTH',			'__ENTITY__', '0',					'yesno',	'0',	'Oblyon module');
 
 -- Dashboard - color
@@ -151,6 +152,7 @@ INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_INFOXBOX_EXPENSEREPORT_COLOR',				'__ENTITY__', '#D1D12A',			'chaine',	'0',	'Oblyon expense report background color');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_INFOXBOX_HOLIDAY_COLOR',					'__ENTITY__', '#E0A01F',			'chaine',	'0',	'Oblyon Dashboard holiday background color');
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_INFOXBOX_TICKET_COLOR',					'__ENTITY__', '#C93E28',			'chaine',	'0',	'Oblyon Dashboard ticket background color');
+INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_INFOXBOX_MRP_COLOR',					'__ENTITY__', '#212529',			'chaine',	'0',	'Oblyon Dashboard mrp background color');
 
 -- Options - general
 INSERT INTO llx_const (name, entity, value, type, visible, note) VALUES ('OBLYON_FONT_FAMILY',								'__ENTITY__', 'Arial',              'chaine',   '0',    'Oblyon module') ON DUPLICATE KEY UPDATE value = 'Arial';
diff --git a/themeoblyon/btn.inc.php b/themeoblyon/btn.inc.php
index cae1804..c46b89c 100644
--- a/themeoblyon/btn.inc.php
+++ b/themeoblyon/btn.inc.php
@@ -113,12 +113,12 @@
     box-shadow: unset !important;
 }
 
-.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
+.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete, .cke_dialog_ui_button_cancel, .ui-button {
 	background: <?php print $colorButtonDelete1; ?> !important;
     color: #ffffff;
 }
 
-.butActionDelete:hover {
+.butActionDelete:hover, .cke_dialog_ui_button_cancel:hover, .ui-button:hover, .ui-button:focus {
 	background: <?php print $colorButtonDelete2; ?> !important;
     -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
     box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
diff --git a/themeoblyon/dropdown.inc.php b/themeoblyon/dropdown.inc.php
index 2e74f26..5deef38 100644
--- a/themeoblyon/dropdown.inc.php
+++ b/themeoblyon/dropdown.inc.php
@@ -22,7 +22,7 @@
     font-size: 14px;
     text-align: left;
     list-style: none;
-    background-color: <?php print (isset($bgcolor)) ? $bgcolor : '#fff' ?>;
+    background-color: var(--bgcolor);
     -webkit-background-clip: padding-box;
     background-clip: padding-box;
 	border: 1px solid var(--colorboxstatsborder);
@@ -126,9 +126,9 @@
 
 .dropdown-menu > .user-header{
 <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-	background-color: <?php print $bgnavtop_hover; ?>;
+	background-color: var(--bgnavtop_hover);
 <?php } else { ?>
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 <?php } ?>
 }
 
@@ -138,9 +138,9 @@
 
 .dropdown-menu > .user-footer {
 <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-	background-color: <?php print $bgnavtop_hover; ?>;
+	background-color: var(--bgnavtop_hover);
 <?php } else { ?>
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 <?php } ?>
     padding: 10px;
 }
@@ -179,9 +179,9 @@
     -webkit-border-radius: 0;
     border-radius: 0;
 <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-    background-color: <?php print $bgnavtop; ?>;
+    background-color: var(--bgnavtop);
 <?php } else { ?>
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
 <?php } ?>
 }
 .dropdown-body::-webkit-scrollbar-track {
@@ -260,7 +260,7 @@
 	}
 
     .dropdown-menu a.top-menu-dropdown-link {
-        color: <?php echo (isset($colorfline)) ? $colorfline : '#212529' ?> !important;
+        color: var(--colorfline) !important;
         -webkit-box-shadow: none;
         -moz-box-shadow: none;
         box-shadow: none;
@@ -274,7 +274,7 @@
         padding: .25rem 1.5rem .25rem 1rem;
         clear: both;
         font-weight: 400;
-        color: <?php echo (isset($colorfline)) ? $colorfline : '#212529' ?> !important;
+        color: var(--colorfline) !important;
         text-align: inherit;
         background-color: transparent;
         border: 0;
@@ -300,11 +300,11 @@
     .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus, .dropdown-menu a.top-menu-dropdown-link:hover   {
         text-decoration: none;
 <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-    background-color: <?php print $bgnavtop; ?>;
-    color: <?php echo (isset($bgnavtop_txt)) ? $bgnavtop_txt : 'white' ?> !important;
+    background-color: var(--bgnavtop);
+    color: var(--bgnavtop_txt) !important;
 <?php } else { ?>
-    background-color: <?php print $bgnavleft; ?>;
-    color: <?php echo (isset($bgnavleft_txt)) ? $bgnavleft_txt : 'white' ?> !important;
+    background-color: var(--bgnavleft);
+    color: var(--bgnavleft_txt) !important;
 <?php } ?>
     }
     /*
@@ -317,7 +317,7 @@
         font-size: 14px;
         line-height: 16px;
         box-sizing: border-box;
-        color: <?php echo (isset($colorfline)) ? $colorfline : '#575756' ?>;
+        color: var(--colorfline);
         background-color: transparent;
         background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E");
         background-repeat: no-repeat;
@@ -330,7 +330,7 @@
         transform-style: preserve-3d;
     }
     .dropdown-search-input::placeholder {
-        color: color(<?php echo (isset($colorfline)) ? $colorfline : '#575756' ?> a(0.8));
+        color: color(var(--colorfline) a(0.8));
         letter-spacing: 1.5px;
     }
     .hidden-search-result{
@@ -377,7 +377,7 @@
     }
 
     div.quickadd a:hover, div.quickadd a:active {
-        color: <?php print $bgnavtop_txt; ?>;
+        color: var(--bgnavtop_txt);
     }
 
     div.quickaddblock {
diff --git a/themeoblyon/font.css b/themeoblyon/font.css
new file mode 100644
index 0000000..e69de29
diff --git a/themeoblyon/fonts/oblyon-icons.eot b/themeoblyon/fonts/oblyon-icons.eot
new file mode 100644
index 0000000..6c2af6f
Binary files /dev/null and b/themeoblyon/fonts/oblyon-icons.eot differ
diff --git a/themeoblyon/fonts/oblyon-icons.svg b/themeoblyon/fonts/oblyon-icons.svg
new file mode 100644
index 0000000..8528fe9
--- /dev/null
+++ b/themeoblyon/fonts/oblyon-icons.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="oblyon-icons" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe600;" glyph-name="users" d="M320 768c0 106.039 85.961 192 192 192s192-85.961 192-192c0-106.039-85.961-192-192-192s-192 85.961-192 192zM768.078 512h-35.424l-199.104-404.244 74.45 372.244-96 96-96-96 74.45-372.244-199.102 404.244h-35.424c-127.924 0-127.924-85.986-127.924-192v-320h768v320c0 106.014 0 192-127.922 192z" />
+<glyph unicode="&#xe601;" glyph-name="gravatar" d="M0-64v1024h1024v-1024h-1024zM960 896h-896v-768h896v768zM448 413v13q-67 22-97.5 90t-30.5 165q0 74 53.5 112.5t138.5 38.5 138.5-38.5 53.5-112.5q0-217-128-256v-12q113-10 183.5-53t72.5-114q0-10-8.5-18t-26-13.5-36-9.5-47-6.5-50-4-54.5-2-50.5-0.5h-95t-50.5 0.5-54.5 2-50 4-47 6.5-36 9.5-26 13.5-8.5 18q2 71 72.5 114t183.5 53z" />
+<glyph unicode="&#xe602;" glyph-name="home" d="M416.154 266.138c-35.328-61.235-11.571-111.616 37.427-139.878s104.55-23.757 139.878 37.478c35.328 61.184 258.406 607.539 239.002 618.752-19.354 11.213-380.979-455.117-416.307-516.352zM512 655.258c22.426 0 44.288-1.946 65.587-5.53 22.426 28.058 47.565 58.982 71.987 88.422-43.622 12.646-89.651 19.507-137.574 19.507-287.078 0-512-242.074-512-551.117 0-19.046 0.87-38.042 2.509-56.576 2.509-28.16 27.648-48.896 55.552-46.438 28.16 2.56 48.947 27.392 46.438 55.552-1.382 15.514-2.099 31.488-2.099 47.462 0 251.597 179.968 448.717 409.6 448.717zM881.613 591.309c-14.285-38.4-29.389-77.517-42.701-111.36 52.070-75.264 82.688-169.626 82.688-273.408 0-16.23-0.717-32.563-2.15-48.384-2.56-28.16 18.176-53.043 46.336-55.654 1.587-0.154 3.123-0.205 4.71-0.205 26.163 0 48.486 20.019 50.893 46.541 1.741 18.944 2.611 38.349 2.611 57.702 0 151.091-53.862 286.157-142.387 384.768z" />
+<glyph unicode="&#xe603;" glyph-name="ftp" d="M896 192h-320v-128h128q26 0 45-19t19-45.5-19-45-45-18.5h-384q-27 0-45.5 18.5t-18.5 45 19 45.5 45 19h128v128h-320q-53 0-90.5 37.5t-37.5 90.5v384q0 26 19 45t45 19h480l46 84q7 19 28 31.5t44 12.5h240q24 0 45-12.5t28-31.5l49-84v-448q0-53-37.5-90.5t-90.5-37.5zM442 486l-135 145q-8 9-19 9t-19-9l-135-145q-8-9-5-23.5t11-14.5h52v-96q0-13 9.5-22.5t22.5-9.5h128q13 0 22.5 9.5t9.5 22.5v96h52q8 0 11 14.5t-5 23.5zM884 512h-52v96q0 13-9.5 22.5t-22.5 9.5h-128q-13 0-22.5-9.5t-9.5-22.5v-96h-52q-8 0-11-14.5t5-23.5l135-145q8-9 19-9t19 9l135 145q8 9 5 23.5t-11 14.5zM46 916q7 19 28 31.5t44 12.5h240q24 0 45-12.5t29-31.5l48-84h-480z" />
+<glyph unicode="&#xe604;" glyph-name="contracts" horiz-adv-x="1056" d="M205.887 461.329l-0.854 0.854c-10.308 10.080-23.971 15.619-38.487 15.619-14.996 0-28.99-5.852-39.383-16.494l-90.971-92.325c-21.202-21.701-20.807-56.628 0.915-77.829l0.876-0.854c10.308-10.080 23.949-15.619 38.487-15.619 14.996 0 28.969 5.852 39.361 16.494l90.971 92.347c21.183 21.66 20.807 56.583-0.915 77.808zM317.662 378.982l-0.876 0.854c-10.308 10.060-23.949 15.619-38.466 15.619-15.015 0-28.99-5.852-39.407-16.494l-90.929-92.365c-21.202-21.682-20.807-56.605 0.893-77.829l0.876-0.833c10.308-10.080 23.971-15.639 38.487-15.639 14.996 0 28.99 5.852 39.383 16.494l90.949 92.365c21.202 21.682 20.786 56.605-0.915 77.829zM436.644 306.401l-0.893 0.876c-10.29 10.060-23.949 15.599-38.487 15.599-14.996 0-28.969-5.852-39.361-16.494l-90.971-92.347c-21.202-21.701-20.807-56.628 0.915-77.829l0.876-0.854c10.29-10.060 23.949-15.619 38.487-15.619 14.996 0 28.969 5.852 39.383 16.494l90.949 92.365c21.202 21.682 20.786 56.605-0.893 77.808zM548.693 212.59l-0.953 0.953c-10.976 10.706-25.522 16.619-41.030 16.619-15.996 0-30.9-6.242-42.009-17.594l-97.012-98.503c-22.641-23.127-22.194-60.379 0.953-83.018l0.953-0.911c10.976-10.731 25.546-16.66 41.030-16.66 15.996 0 30.923 6.242 42.009 17.594l97.012 98.523c22.641 23.127 22.194 60.379-0.953 82.995zM646.14 629.007c-96.343-91.155-170.924-125.23-174.087-126.667l-0.622-0.231c-14.349-4.564-31.47-6.956-49.482-6.956-22.869 0-41.757 3.771-51.005 6.997-18.66 6.519-50.483 37.238-64.227 61.981-14.161 25.493-1.856 64.083-1.29 65.707l0.434 1.437 211.452 199.414c-10.124 10.101-30.22 15.203-59.835 15.203-80.765 0-203.019-39.047-209.867-41.255-9.205-4.081-22.556-6.166-39.673-6.166-30.596 0-63.791 6.434-69.102 7.497-0.062 0-0.103 0-0.167 0-17.934 0-64.916 28.198-72.475 32.823-7.686 2.71-14.978 4.1-21.617 4.1-18.077 0-26.596-10.080-28.178-12.142l-101.925-232.549c-31.994-60.189-34.32-77.702-34.052-82.18 55.962-13.601 130.144-93.969 148.577-114.735l106.092 103.652 1.686 0.353c9.017 1.894 17.725 2.873 25.868 2.873 65.229 0 83.492-60.21 87.637-79.347 5.353 0.522 10.581 0.795 15.58 0.795 77.203 0 93.283-61.811 96.507-82.91 10.766 2.167 20.971 3.247 30.468 3.247 70.79 0 87.095-59.439 90.574-79.412 37.238 5.627 65.894-2.373 85.095-23.514 30.549-33.553 25.783-87.909 25.575-90.199l-0.187-2.103-105.028-106.691c14.662-7.809 28.617-11.745 41.571-11.745 51.985 0 74.602 63.979 74.831 64.645l1.644 4.769 4.976-0.893c8.686-1.541 16.95-2.334 24.594-2.334 70.189 0 73.787 66.289 73.911 69.079l0.311 7.329 7.102-1.831c14.098-3.645 27.282-5.497 39.152-5.497 73.124 0 80.432 68.875 80.702 71.787l0.604 6.458 6.372-1.187c10.851-2.042 20.971-3.041 30.115-3.041 24.452 0 42.798 7.267 54.505 21.577 22.597 27.596 14.453 72.873 13.977 75.476-19.162 76.246-262.811 260.727-297.091 286.384zM1057.899 812.172l-0.147 0.706c-5.979 29.034-23.702 33.364-33.718 33.364-1.040 0-1.915-0.039-2.564-0.103-53.69-41.86-112.297-48.151-142.578-48.151-11.579 0-18.848 0.915-19.973 1.061-53.668 5.247-120.022 28.075-122.813 29.054l-0.667 0.27c-40.925 19.991-75.956 30.137-104.194 30.137-28.347 0-39.152-10.666-39.259-10.788-121.294-130.042-234.258-216.032-247.191-225.738-20.494-45.382 33.034-82.743 40.051-87.385 14.62-3.563 28.323-5.353 40.757-5.353 20.572 0 30.596 5.038 30.698 5.084l1.351 0.706 1.981-0.039c31.676 0 145.639 95.179 186.897 131.852l2.977 2.644 3.581-1.747c137.331-67.394 311.106-269.39 320.934-280.927 9.619-7.289 18.579-10.956 26.575-10.956 9.329 0 14.206 5.101 14.393 5.309l0.582 0.561 140.391 117.251 0.976 0.353c15.619 5.747 25.597 13.725 29.614 23.659 4.58 11.287-0.167 21.701-0.231 21.805l-128.436 267.37z" />
+<glyph unicode="&#xe605;" glyph-name="reports" d="M128 64h896v-128h-1024v1024h128zM288 128c-53.020 0-96 42.98-96 96s42.98 96 96 96c2.828 0 5.622-0.148 8.388-0.386l103.192 171.986c-9.84 15.070-15.58 33.062-15.58 52.402 0 53.020 42.98 96 96 96s96-42.98 96-96c0-19.342-5.74-37.332-15.58-52.402l103.192-171.986c2.766 0.238 5.56 0.386 8.388 0.386 2.136 0 4.248-0.094 6.35-0.23l170.356 298.122c-10.536 15.408-16.706 34.036-16.706 54.11 0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96-2.14 0-4.248 0.094-6.35 0.232l-170.356-298.124c10.536-15.406 16.706-34.036 16.706-54.11 0-53.020-42.98-96-96-96s-96 42.98-96 96c0 19.34 5.74 37.332 15.578 52.402l-103.19 171.984c-2.766-0.238-5.56-0.386-8.388-0.386s-5.622 0.146-8.388 0.386l-103.192-171.986c9.84-15.068 15.58-33.060 15.58-52.4 0-53.020-42.98-96-96-96z" />
+<glyph unicode="&#xe606;" glyph-name="commercial" d="M702 899l-124-143 121-570q6-16 8-22.5t0.5-14.5-8.5-15l-156-187q-10-11-25.5-11t-26.5 11l-155 187q-10 13-9.5 21.5t9.5 30.5l121 571-123 142q-13 12-6.5 36.5t28.5 24.5h325q22 0 27.5-24.5t-6.5-36.5z" />
+<glyph unicode="&#xe607;" glyph-name="cat" d="M640 224q0 13 9.5 22.5t22.5 9.5h128q13 0 22.5-9.5t9.5-22.5v-32h160q13 0 22.5-9.5t9.5-22.5v-192q0-13-9.5-22.5t-22.5-9.5h-320q-13 0-22.5 9.5t-9.5 22.5v32h-416q-13 0-22.5 9.5t-9.5 22.5v544h-160q-13 0-22.5 9.5t-9.5 22.5v320q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5-9.5t9.5-22.5v-32h160q13 0 22.5-9.5t9.5-22.5v-256q0-13-9.5-22.5t-22.5-9.5h-160v-128h384v160q0 13 9.5 22.5t22.5 9.5h128q13 0 22.5-9.5t9.5-22.5v-32h160q13 0 22.5-9.5t9.5-22.5v-192q0-13-9.5-22.5t-22.5-9.5h-320q-13 0-22.5 9.5t-9.5 22.5v32h-384v-320h384v160z" />
+<glyph unicode="&#xe608;" glyph-name="externalsite" d="M480 896c-265.096 0-480-214.904-480-480 0-265.098 214.904-480 480-480 265.098 0 480 214.902 480 480 0 265.096-214.902 480-480 480zM751.59 256c8.58 40.454 13.996 83.392 15.758 128h127.446c-3.336-44.196-13.624-87.114-30.68-128h-112.524zM208.41 576c-8.58-40.454-13.996-83.392-15.758-128h-127.444c3.336 44.194 13.622 87.114 30.678 128h112.524zM686.036 576c9.614-40.962 15.398-83.854 17.28-128h-191.316v128h174.036zM512 640v187.338c14.59-4.246 29.044-11.37 43.228-21.37 26.582-18.74 52.012-47.608 73.54-83.486 14.882-24.802 27.752-52.416 38.496-82.484h-155.264zM331.232 722.484c21.528 35.878 46.956 64.748 73.54 83.486 14.182 10 28.638 17.124 43.228 21.37v-187.34h-155.264c10.746 30.066 23.616 57.68 38.496 82.484zM448 576v-128h-191.314c1.88 44.146 7.666 87.038 17.278 128h174.036zM95.888 256c-17.056 40.886-27.342 83.804-30.678 128h127.444c1.762-44.608 7.178-87.546 15.758-128h-112.524zM256.686 384h191.314v-128h-174.036c-9.612 40.96-15.398 83.854-17.278 128zM448 192v-187.34c-14.588 4.246-29.044 11.372-43.228 21.37-26.584 18.74-52.014 47.61-73.54 83.486-14.882 24.804-27.75 52.418-38.498 82.484h155.266zM628.768 109.516c-21.528-35.876-46.958-64.746-73.54-83.486-14.184-9.998-28.638-17.124-43.228-21.37v187.34h155.266c-10.746-30.066-23.616-57.68-38.498-82.484zM512 256v128h191.314c-1.88-44.146-7.666-87.040-17.28-128h-174.034zM767.348 448c-1.762 44.608-7.178 87.546-15.758 128h112.524c17.056-40.886 27.344-83.806 30.68-128h-127.446zM830.658 640h-95.9c-18.638 58.762-44.376 110.294-75.316 151.428 42.536-20.34 81.058-47.616 114.714-81.272 21.48-21.478 40.362-44.938 56.502-70.156zM185.844 710.156c33.658 33.658 72.18 60.932 114.714 81.272-30.942-41.134-56.676-92.666-75.316-151.428h-95.898c16.138 25.218 35.022 48.678 56.5 70.156zM129.344 192h95.898c18.64-58.762 44.376-110.294 75.318-151.43-42.536 20.34-81.058 47.616-114.714 81.274-21.48 21.478-40.364 44.938-56.502 70.156zM774.156 121.844c-33.656-33.658-72.18-60.934-114.714-81.274 30.942 41.134 56.678 92.668 75.316 151.43h95.9c-16.14-25.218-35.022-48.678-56.502-70.156z" />
+<glyph unicode="&#xe609;" glyph-name="filemanager" d="M1024 128q0-53-37.5-90.5t-90.5-37.5h-768q-53 0-90.5 37.5t-37.5 90.5v512q0 26 18.5 45t45.5 19h480q0 12 11.5 33t22.5 36l12 16q7 18 28 30.5t44 12.5h240q24 0 45-12.5t28-30.5q49-58 49-85v-576zM46 853q7 18 28 30.5t44 12.5h240q24 0 45-12.5t29-30.5l48-85h-480z" />
+<glyph unicode="&#xe60a;" glyph-name="members" d="M734.994 154.626c-18.952 2.988-19.384 54.654-19.384 54.654s55.688 54.656 67.824 128.152c32.652 0 52.814 78.138 20.164 105.628 1.362 28.94 41.968 227.176-163.598 227.176-205.564 0-164.958-198.236-163.598-227.176-32.654-27.49-12.488-105.628 20.162-105.628 12.134-73.496 67.826-128.152 67.826-128.152s-0.432-51.666-19.384-54.654c-61.048-9.632-289.006-109.316-289.006-218.626h768c0 109.31-227.958 208.994-289.006 218.626zM344.054 137.19c44.094 27.15 97.626 52.308 141.538 67.424-15.752 22.432-33.294 52.936-44.33 89.062-15.406 12.566-27.944 30.532-35.998 52.602-8.066 22.104-11.122 46.852-8.608 69.684 1.804 16.392 6.478 31.666 13.65 45.088-4.35 46.586-7.414 138.034 52.448 204.732 23.214 25.866 52.556 44.46 87.7 55.686-6.274 64.76-39.16 140.77-166.454 140.77-205.564 0-164.958-198.236-163.598-227.176-32.654-27.49-12.488-105.628 20.162-105.628 12.134-73.496 67.826-128.152 67.826-128.152s-0.432-51.666-19.384-54.654c-61.048-9.634-289.006-109.318-289.006-218.628h329.596c4.71 3.074 9.506 6.14 14.458 9.19z" />
+<glyph unicode="&#xe60b;" glyph-name="tools" d="M1005.632-45.632c-24.896-24.896-65.024-24.896-89.856 0l-449.472 449.408c-24.832 24.896-24.832 65.088 0 89.984 24.896 24.832 65.152 24.832 89.984 0l449.344-449.472c24.896-24.896 24.896-65.024 0-89.92zM311.616 648.384c23.872-23.872-22.272-200.512-22.272-200.512-48.768 48.768-111.424 155.968-111.424 155.968s-178.176-25.856-178.176 0 89.152 133.696 89.152 133.696c-45.376 104.832-44.608 178.176-44.608 178.176s73.344 0.768 178.176-44.544c0 0 107.84 89.152 133.696 89.152s0-178.176 0-178.176 107.2-62.72 155.904-111.488c0 0-176.576-46.144-200.448-22.272z" />
+<glyph unicode="&#xe60c;" glyph-name="geopipmaxmind" d="M0 768l320 128v-768l-320-128zM704 768v-768l-320 106.666v768zM1024 896v-768l-256-102.4v768z" />
+<glyph unicode="&#xe60d;" glyph-name="orders" d="M977.582 765.538c-33.984 9.708-69.41-9.97-79.12-43.956l-5.022-17.582h-596.942l-8.992 71.938c-4.004 32.028-31.23 56.062-63.506 56.062h-160c-35.346 0-64-28.654-64-64s28.654-64 64-64h103.502l56.992-455.938c4.004-32.026 31.23-56.062 63.506-56.062h544c28.574 0 53.688 18.944 61.538 46.418l128 448c9.71 33.986-9.97 69.41-43.956 79.12zM512 448v64h127.996v-64h-127.996zM639.996 384v-64h-127.996v64h127.996zM512 576v64h127.996v-64h-127.996zM304.498 640h143.502v-64h-135.502l-8 64zM320.498 512h127.502v-64h-119.502l-8 64zM336.498 384h111.502v-64h-103.502l-8 64zM783.724 320h-79.728v64h98.014l-18.286-64zM820.296 448h-116.3v64h134.586l-18.286-64zM856.868 576h-152.872v64h171.158l-18.286-64zM256 32c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM640 32c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96z" />
+<glyph unicode="&#xe60e;" glyph-name="margins" d="M960-64h-896q-26 0-45 18.5t-19 45.5 19 45.5 45 18.5h896q26 0 45-18.5t19-45-19-45.5-45-19zM928 128h-864l176 330q5 9 16 12.5t21-0.5v1q-4 3-3 3 2 0 9-6t11-15l35-35 185 263q2 9 7 14 9 9 23 9 13 0 23-9 0-1 1-2.5l1-1.5 89-72 240 319q8 22 30 22h1q13 0 22-9t9-22v-769q0-13-9.5-22.5t-22.5-9.5z" />
+<glyph unicode="&#xe60f;" glyph-name="project" d="M987.429 252.081v-169.796q0-21.224-14.857-36.082t-36.082-14.857h-169.796q-21.224 0-36.081 14.857t-14.857 36.082v169.796q0 21.224 14.857 36.082t36.081 14.857h50.939v101.877h-271.673v-101.877h50.939q21.224 0 36.082-14.857t14.857-36.082v-169.796q0-21.224-14.857-36.082t-36.082-14.857h-169.796q-21.224 0-36.081 14.857t-14.857 36.082v169.796q0 21.224 14.857 36.082t36.081 14.857h50.939v101.877h-271.673v-101.877h50.939q21.224 0 36.082-14.857t14.857-36.082v-169.796q0-21.224-14.857-36.082t-36.082-14.857h-169.796q-21.224 0-36.081 14.857t-14.857 36.082v169.796q0 21.224 14.857 36.082t36.081 14.857h50.939v101.877q0 27.592 20.163 47.755t47.755 20.163h271.673v101.877h-50.939q-21.224 0-36.081 14.857t-14.857 36.082v169.796q0 21.224 14.857 36.082t36.081 14.857h169.796q21.224 0 36.082-14.857t14.857-36.082v-169.796q0-21.224-14.857-36.082t-36.082-14.857h-50.939v-101.877h271.673q27.592 0 47.755-20.163t20.163-47.755v-101.877h50.939q21.224 0 36.082-14.857t14.857-36.082z" />
+<glyph unicode="&#xe610;" glyph-name="product" d="M613.877 472.816q0 13.796-10.082 23.878t-23.876 10.082h-135.837q-13.796 0-23.876-10.081t-10.082-23.876 10.082-23.878 23.876-10.081h135.837q13.796 0 23.876 10.081t10.082 23.878zM919.51 574.694v-509.387q0-13.796-10.081-23.876t-23.876-10.082h-747.102q-13.796 0-23.876 10.082t-10.082 23.876v509.387q0 13.796 10.082 23.878t23.876 10.082h747.102q13.796 0 23.876-10.081t10.081-23.878zM953.47 812.408v-135.837q0-13.796-10.082-23.878t-23.876-10.082h-815.020q-13.796 0-23.876 10.082t-10.082 23.878v135.837q0 13.796 10.082 23.878t23.876 10.082h815.020q13.796 0 23.876-10.082t10.081-23.878z" />
+<glyph unicode="&#xe611;" glyph-name="thirdparties" horiz-adv-x="1097" d="M338.857 438.857q-92.571-2.857-151.429-73.143h-76.571q-46.857 0-78.857 23.143t-32 67.714q0 201.714 70.857 201.714 3.429 0 24.857-12t55.714-24.286 68-12.286q38.286 0 76 13.143-2.857-21.143-2.857-37.714 0-79.429 46.286-146.286zM950.857 74.857q0-68.571-41.714-108.286t-110.857-39.714h-499.429q-69.143 0-110.857 39.714t-41.714 108.286q0 30.286 2 59.143t8 62.286 15.143 62 24.571 55.714 35.429 46.286 48.857 30.571 63.714 11.429q5.714 0 24.571-12.286t41.714-27.429 61.143-27.429 77.143-12.286 77.143 12.286 61.143 27.429 41.714 27.429 24.571 12.286q34.857 0 63.714-11.429t48.857-30.571 35.429-46.286 24.571-55.714 15.143-62 8-62.286 2-59.143zM365.714 804.571q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429 42.857 103.429 103.429 42.857 103.429-42.857 42.857-103.429zM768 585.143q0-90.857-64.286-155.143t-155.143-64.286-155.143 64.286-64.286 155.143 64.286 155.143 155.143 64.286 155.143-64.286 64.286-155.143zM1097.143 456.571q0-44.571-32-67.714t-78.857-23.143h-76.571q-58.857 70.286-151.429 73.143 46.286 66.857 46.286 146.286 0 16.571-2.857 37.714 37.714-13.143 76-13.143 33.714 0 68 12.286t55.714 24.286 24.857 12q70.857 0 70.857-201.714zM1024 804.571q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429 42.857 103.429 103.429 42.857 103.429-42.857 42.857-103.429z" />
+<glyph unicode="&#xe612;" glyph-name="accountancy" d="M858.648 211.853c0 0 133.080 91.037 133.080 270.596 0 267.278-283.264 366.11-435.567 363.473-152.343-2.678-197.74-42.762-197.74-42.762s-51.834 37.686-106.784 69.258c-42.042 16.386-51.795 18.744-81.006 9.351-23.379 0-8.672-38.924 0.719-52.952 9.312-14.027 54.592-91.518 54.592-91.518s-95.035-97.873-102.067-162.214c0 1.159-44.76 0.36-69.298 0.36s-22.22-26.737-22.22-26.737l0.68-188.389c0 0-1.518-26.737 20.741-26.737 22.22 0 69.458-0.519 69.458-0.519s66.46-96.512 108.582-114.056c0-1.159-36.407-100.030-36.407-100.030s-17.544-30.413 14.027-42.121c31.572-11.669 113.937-46.239 149.026-56.788 35.048-10.509 40.084 13.347 40.084 13.347l34.729 75.013 227.195-0.36 34.729-77.33c0 0 6.675-35.889 53.433-16.025 46.798 19.863 97.873 43.441 136.476 63.301 38.564 19.863 13.189 56.987 13.189 56.987l-39.644 76.851zM245.122 537.359c-21.301 0-38.564 17.304-38.564 38.605s17.263 38.564 38.564 38.564 38.605-17.263 38.605-38.564-17.304-38.605-38.605-38.605zM788.749 657.57c-12.31-14.587-20.342-3.837-30.253-0.92 0 0-42.003 38.965-103.706 57.149-63.904 18.784-131.162 9.711-131.162 9.711-9.912 2.917-21.94 3.237-22.021 18.542 0.519 18.902 23.458 19.063 23.18 19.702 0 0 75.69 6.994 139.035-11.628 62.303-18.304 109.9-58.107 109.9-58.107s25.459-17.544 15.028-34.45z" />
+<glyph unicode="&#xe613;" glyph-name="bank" d="M864 32l-63.968 1.984v-65.984h-96v64h-382.016l-1.984-64h-96v62.016l-64.032 1.984c-35.328 0-64 28.672-64 64v768c0 35.328 28.672 64 64 64h704c35.328 0 64-28.672 64-64v-768c0-35.328-28.672-64-64-64zM832 832h-640v-126.656l-31.328 0.64v-98.656h31.328v-253.344h-32v-97.984h32v-128h640v704zM800 160h-576v96h32v97.984h-32v254.016h32l0.672 97.344h-32.672v94.656h576v-640zM465.984 622.016c-70.688 0-128-57.312-128-128s57.312-128 128-128c70.72 0 128 57.312 128 128s-57.28 128-128 128zM752 591.424c0 17.696-14.304 32-32 32-17.664 0-32-14.304-32-32 0-11.712 6.624-21.536 16-27.104v-169.248c-9.376-5.568-16-15.36-16-27.104 0-17.664 14.336-32 32-32 17.696 0 32 14.336 32 32 0 12.608-7.424 23.232-17.984 28.448v166.56c10.56 5.248 17.984 15.872 17.984 28.448zM464 440c-26.496 0-48 21.504-48 48 0 26.528 21.504 48 48 48 26.528 0 48-21.472 48-48 0-26.496-21.472-48-48-48z" />
+<glyph unicode="&#xe614;" glyph-name="admintools" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" />
+<glyph unicode="&#xe615;" glyph-name="setup" d="M896 512h16c26.4 0 48 21.6 48 48v160c0 26.4-21.6 48-48 48h-16v192h-128v-192h-16c-26.4 0-48-21.6-48-48v-160c0-26.4 21.6-48 48-48h16v-576h128v576zM768 704h128v-128h-128v128zM592 128c26.4 0 48 21.6 48 48v160c0 26.4-21.6 48-48 48h-16v576h-128v-576h-16c-26.4 0-48-21.6-48-48v-160c0-26.4 21.6-48 48-48h16v-192h128v192h16zM448 320h128v-128h-128v128zM272 512c26.4 0 48 21.6 48 48v160c0 26.4-21.6 48-48 48h-16v192h-128v-192h-16c-26.4 0-48-21.6-48-48v-160c0-26.4 21.6-48 48-48h16v-576h128v576h16zM128 704h128v-128h-128v128z" />
+<glyph unicode="&#xe616;" glyph-name="hrm" d="M1032 288q0-70-14.5-115.5t-45.5-68.5-68.5-31.5-95.5-8.5-95.5 8.5-68.5 31.5-45.5 68.5-14.5 115.5q0 26-19 45t-45.5 19-45-19-18.5-45q0-70-14.5-115.5t-45.5-68.5-68.5-31.5-95.5-8.5-95.5 8.5-68.5 31.5-45.5 68.5-14.5 115.5q0 57 8 89-16 28-1 55l217 342q11 19 31.5 24.5t39-5.5 24-32.5-5.5-40.5l-156-245q42 5 99 5 75 0 114.5-11t56.5-37q51-16 85-16t85 16q17 26 56.5 37t114.5 11q56 0 99-5l-156 245q-11 19-5.5 40.5t24 32.5 39 5.5 31.5-24.5l217-342q15-27-1-55 8-32 8-89zM136 416q-30 0-47-18t-17-46 17-46 47-18q53 0 90.5 18.5t37.5 45.5-37.5 45.5-90.5 18.5zM712 416q-30 0-47-18t-17-46 17-46 47-18q53 0 90.5 18.5t37.5 45.5-37.5 45.5-90.5 18.5z" />
+<glyph unicode="&#xe617;" glyph-name="service" horiz-adv-x="1088" d="M1015.449 157.428c-1.729 56.216-44.083 52.279-97.994 52.279h-746.911c-53.912 0-96.265 3.936-97.994-52.279-1.729-22.971-68.627-37.494-68.627-77.614s21.195-40.841 75.117-40.841h929.924c53.922 0 75.117 2.616 75.117 40.841s-66.91 54.644-68.638 77.614zM92.029 248.040c21.063 0 873.11 0 897.953 0 40.158 0 40.158 22.876 40.158 22.876 0 233.851-182.666 307.375-393.125 360.89v75.767c0 0 1.956 21.926-25.443 21.926s-33.533 0-33.533 0v47.287h81.851c0 46.771-52.363 80.256-116.931 80.256-64.665 0-116.931-33.485-116.931-80.256h81.851v-47.287c0 0-9.409 0-35.19 0s-23.788-23.644-23.788-23.644v-74.051c-210.461-53.564-391.039-127.037-391.039-360.89 0 0 0-22.876 34.168-22.876zM383.405 563.276c-31.385-11.414-150.814-65.277-150.814-224.131l-56.683 0.204c-0.010 157.258 99.147 187.898 207.496 223.927z" />
+<glyph unicode="&#xe618;" glyph-name="withdraw" d="M960 64h-896q-26 0-45.001 18.5t-19.001 45.5v640q0 26 18.5 45.001t45.5 19.001h896q27.001 0 45.5-19.001t18.5-45.001v-640q0-26-18.5-45.001t-45.5-19.001zM640 640q-73.001 0-128-50-55.001 50-128 50-80 0-136-56.5t-56-136 56-135.5 136-56q73.001 0 128 50 55.001-50 128-50 79.001 0 135.5 56t56.5 135.5-56.5 136-135.5 56.5zM640 320q-53.001 0-90.5 37.5t-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5-37.5-90.5-90.5-37.5z" />
+<glyph unicode="&#xe619;" glyph-name="agenda" d="M864-32h-704c-35.328 0-64 28.672-64 64v704c0 35.36 28.672 64 64 64h64v-32c0-53.024 42.976-96 96-96 52.992 0 96 42.976 96 96v32h192v-32c0-53.024 43.008-96 96-96s96 42.976 96 96v32h64c35.328 0 64-28.64 64-64v-704c0-35.328-28.672-64-64-64zM864 576h-704v-544h704v544zM320 416h-96v96h96v-96zM320 256h-96v96h96v-96zM320 96h-96v96h96v-96zM480 416h-96v96h96v-96zM480 256h-96v96h96v-96zM480 96h-96v96h96v-96zM640 416h-96v96h96v-96zM640 256h-96v96h96v-96zM640 96h-96v96h96v-96zM800 416h-96v96h96v-96zM800 256h-96v96h96v-96zM800 96h-96v96h96v-96zM703.008 704c-34.816 0-63.008 28.224-63.008 63.008v65.984c0 34.816 28.192 63.008 63.008 63.008s63.008-28.192 63.008-63.008v-65.984c0-34.784-28.192-63.008-63.008-63.008zM319.008 704c-34.816 0-63.008 28.224-63.008 63.008v65.984c0 34.816 28.192 63.008 63.008 63.008s63.008-28.192 63.008-63.008v-65.984c0-34.784-28.224-63.008-63.008-63.008z" />
+<glyph unicode="&#xe61a;" glyph-name="ecm" horiz-adv-x="1097" d="M1073.714 406.857q0-17.714-17.714-37.714l-192-226.286q-24.571-29.143-68.857-49.429t-82-20.286h-621.714q-19.429 0-34.571 7.429t-15.143 24.571q0 17.714 17.714 37.714l192 226.286q24.571 29.143 68.857 49.429t82 20.286h621.714q19.429 0 34.571-7.429t15.143-24.571zM877.714 603.428v-91.429h-475.429q-53.714 0-112.571-27.143t-93.714-68.286l-195.428-229.715q0 2.286-0.286 7.143t-0.286 7.143v548.571q0 52.571 37.714 90.286t90.286 37.714h182.857q52.571 0 90.286-37.714t37.714-90.286v-18.286h310.857q52.571 0 90.286-37.714t37.714-90.286z" />
+<glyph unicode="&#xe61b;" glyph-name="checks" horiz-adv-x="1468" d="M1244.458 130.233h-1081.102v635.478h1081.102l0.551-175.431 82.97 104.81v70.621c0 0 0 105.913-83.521 105.913-84.395 0-1081.102 0-1081.102 0s-83.521 0-83.521-105.913c0-103.714 0-635.458 0-635.458s0-105.876 83.521-105.876c83.521 0 1081.102 0 1081.102 0s83.521 0 83.521 105.876c0 108.149 0 575.705 0 575.705l-82.879-83.933zM231.189 467.294h944.669v-36.283h-944.669v36.283zM917.78 262.655h174.347v-20.048h-174.347v20.048zM377.129 337.681h378.807v-45.643h-378.807v45.643zM885.222 702.978h290.565v-108.042h-290.565v108.042zM231.189 706.15h311.619v-36.283h-311.619v36.283zM231.296 631.33h277.299v-36.283h-277.299v36.283zM377.147 267.632h378.807v-45.643h-378.807v45.643zM946.443 194.405l103.722 143.997-18.883 13.95-103.722-143.997 18.883-13.95zM1057.813 354.061l0.275-162.169-26.094-1.577-0.275 162.169 26.094 1.577z" />
+<glyph unicode="&#xe61c;" glyph-name="scanner" horiz-adv-x="1028" d="M80.395 431.178h39.536v-377.816h-39.536v377.816zM95.208 461.6h886.759v-237.209h-886.759v237.209zM95.208 219.517h886.759v-191.104h-886.759v191.104zM70.385 54.049h39.536v-25.636h-39.536v25.636zM47.013 514.223l823.444 400.3 32.734-99.648-823.444-400.3-32.734 99.648z" />
+<glyph unicode="&#xe61d;" glyph-name="click2dial" d="M1024 530.744c0 200.926-58.792 363.938-131.482 365.226 0.292 0.006 0.578 0.030 0.872 0.030h-82.942c0 0-194.8-146.336-475.23-203.754-8.56-45.292-14.030-99.274-14.030-161.502s5.466-116.208 14.030-161.5c280.428-57.418 475.23-203.756 475.23-203.756h82.942c-0.292 0-0.578 0.024-0.872 0.032 72.696 1.288 131.482 164.298 131.482 365.224zM864.824 220.748c-9.382 0-19.532 9.742-24.746 15.548-12.63 14.064-24.792 35.96-35.188 63.328-23.256 61.232-36.066 143.31-36.066 231.124 0 87.81 12.81 169.89 36.066 231.122 10.394 27.368 22.562 49.266 35.188 63.328 5.214 5.812 15.364 15.552 24.746 15.552 9.38 0 19.536-9.744 24.744-15.552 12.634-14.064 24.796-35.958 35.188-63.328 23.258-61.23 36.068-143.312 36.068-231.122 0-87.804-12.81-169.888-36.068-231.124-10.39-27.368-22.562-49.264-35.188-63.328-5.208-5.806-15.36-15.548-24.744-15.548zM251.812 530.744c0 51.95 3.81 102.43 11.052 149.094-47.372-6.554-88.942-10.324-140.34-10.324-67.058 0-67.058 0-67.058 0l-55.466-94.686v-88.17l55.46-94.686c0 0 0 0 67.060 0 51.398 0 92.968-3.774 140.34-10.324-7.236 46.664-11.048 97.146-11.048 149.096zM368.15 317.828l-127.998 24.51 81.842-321.544c4.236-16.634 20.744-25.038 36.686-18.654l118.556 47.452c15.944 6.376 22.328 23.964 14.196 39.084l-123.282 229.152zM864.824 411.27c-3.618 0-7.528 3.754-9.538 5.992-4.87 5.42-9.556 13.86-13.562 24.408-8.962 23.6-13.9 55.234-13.9 89.078s4.938 65.478 13.9 89.078c4.006 10.548 8.696 18.988 13.562 24.408 2.010 2.24 5.92 5.994 9.538 5.994 3.616 0 7.53-3.756 9.538-5.994 4.87-5.42 9.556-13.858 13.56-24.408 8.964-23.598 13.902-55.234 13.902-89.078 0-33.842-4.938-65.478-13.902-89.078-4.004-10.548-8.696-18.988-13.56-24.408-2.008-2.238-5.92-5.992-9.538-5.992z" />
+<glyph unicode="&#xe61e;" glyph-name="paypal" d="M880.634 829.226c25.698-12.576 48.094-30.486 64.502-52.482 34.536-46.3 44.236-109.372 28.836-187.466-15.56-79.026-50.416-145.734-101.166-194.044-9.282-9.702-19.222-18.746-29.804-27.080-54.356-42.802-122.998-65.428-198.508-65.428h-240.060l-64.564-302.726h-132.424l10.086 46.3h46.128l64.564 302.726h188.27c180.25 0 330.938 111.078 371.258 299.936 45.722 213.834-107.598 311.038-239.41 311.038h-449.278l-199.064-913.7h152.032l-24.032-110.3h263.66l64.564 302.726h188.27c180.25 0 330.938 111.078 371.258 299.936 33.716 157.68-40.804 251.932-135.118 290.564zM422.344 773.918h129.132c64.592 0 107.602-55.538 88.786-124.956-16.136-69.44-83.386-124.976-150.64-124.976h-123.758l56.48 249.932z" />
+<glyph unicode="&#xe61f;" glyph-name="google" d="M789.534 896c0 0-200.956 0-267.94 0-120.122 0-233.17-91.006-233.17-196.422 0-107.726 81.882-194.666 204.088-194.666 8.498 0 16.756 0.17 24.84 0.752-7.928-15.186-13.6-32.288-13.6-50.042 0-29.938 16.104-54.21 36.468-74.024-15.386 0-30.242-0.448-46.452-0.448-148.782 0.002-263.3-94.76-263.3-193.022 0-96.778 125.542-157.312 274.334-157.312 169.624 0 263.306 96.244 263.306 193.028 0 77.602-22.896 124.072-93.686 174.134-24.216 17.142-70.532 58.836-70.532 83.344 0 28.72 8.196 42.868 51.428 76.646 44.312 34.624 75.674 83.302 75.674 139.916 0 67.406-30.022 133.098-86.374 154.772h84.956l59.96 43.344zM695.948 240.542c2.126-8.972 3.284-18.208 3.284-27.628 0-78.2-50.39-139.31-194.974-139.31-102.842 0-177.116 65.104-177.116 143.3 0 76.642 92.126 140.444 194.964 139.332 24-0.254 46.368-4.116 66.668-10.69 55.828-38.828 95.876-60.76 107.174-105.004zM531.286 532.224c-69.038 2.064-134.636 77.226-146.552 167.86-11.916 90.666 34.37 160.042 103.388 157.99 69.008-2.074 134.636-74.814 146.558-165.458 11.906-90.66-34.39-162.458-103.394-160.392z" />
+<glyph unicode="&#xe620;" glyph-name="webservices" d="M512.448 253.376c-1.184 0-2.368 0-3.552 0-281.024 0-508.32 68.256-508.384 120.672l-0.512 205.856c0 0.32 0.128 0.608 0.128 0.864 46.272-21.952 100.64-32.064 133.152-38.112 101.024-18.784 234.464-29.152 375.616-29.152h3.552c142.048 0.16 276.256 10.784 378.016 29.888 32.544 6.112 86.72 16.288 133.024 38.112 0-0.096 0-0.288 0-0.288l0.544-205.856c0.064-52.64-228.896-121.6-511.584-121.984zM512.448 575.488c-1.184 0-2.368 0-3.552 0-281.024 0-508.32 62.272-508.384 114.688l-0.512 173.888c-0.096 52.608 228.992 95.584 511.68 95.936 1.248 0 2.432 0 3.68 0 280.928 0 508.064-42.24 508.128-94.656l0.544-173.888c0.064-52.608-228.896-115.584-511.584-115.968zM508.864 191.36h3.552c142.048 0.192 276.288 16.768 378.016 35.872 32.544 6.112 86.72 16.288 133.056 38.144l0.512-233.472c0.064-52.64-228.896-95.584-511.584-95.936-1.216 0-2.368 0-3.616 0-280.96 0-508.256 42.24-508.32 94.624l-0.48 234.080c46.272-21.984 100.672-32.096 133.248-38.144 101.024-18.816 234.432-35.168 375.616-35.168z" />
+<glyph unicode="&#xe621;" glyph-name="modulesadmintools" d="M1024 677.5l-90.506 90.5-178.746-178.752-101.5 101.502 178.75 178.75-90.5 90.5-178.75-178.75-114.748 114.75-86.626-86.624 512.002-512.002 86.624 86.624-114.752 114.752zM274.748 210.746c165.768-165.762 385.194-36.362 519.292 75.464l-443.824 443.824c-111.824-134.096-241.228-353.522-75.468-519.288zM191.998 255.996l127.994-127.996-191.992-191.992-127.996 127.994z" />
+<glyph unicode="&#xe622;" glyph-name="contacts" d="M960 704c35.346 0 64 28.654 64 64v128h-128v64h-832c-35.2 0-64-28.798-64-64v-896c0-35.2 28.796-64 64-64h832v256h64c35.346 0 64 28.654 64 64v128h-128v64h64c35.346 0 64 28.654 64 64v128h-128v64h64zM576 703.67c70.51 0 127.67-57.16 127.67-127.67s-57.16-127.67-127.67-127.67c-70.51 0-127.67 57.16-127.67 127.67s57.16 127.67 127.67 127.67zM256 0h-64v896h64v-896zM768 192h-384v64c0 70.694 57.308 128 128 128v0h128c70.696 0 128-57.306 128-128v-64z" />
+<glyph unicode="&#xe623;" glyph-name="sendings" d="M1024 384l-128 256h-192v128c0 35.2-28.8 64-64 64h-576c-35.2 0-64-28.8-64-64v-512l64-64h81.166c-10.898-18.832-17.166-40.678-17.166-64 0-70.692 57.308-128 128-128s128 57.308 128 128c0 23.322-6.268 45.168-17.166 64h354.334c-10.898-18.832-17.168-40.678-17.168-64 0-70.692 57.308-128 128-128s128 57.308 128 128c0 23.322-6.27 45.168-17.168 64h81.168v192zM704 384v160h132.668l80-160h-212.668z" />
+<glyph unicode="&#xe624;" glyph-name="ficheinter" d="M896 704h-192v128c0 35.2-28.8 64-64 64h-256c-35.2 0-64-28.8-64-64v-128h-192c-70.4 0-128-57.6-128-128v-512c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v512c0 70.4-57.6 128-128 128zM384 832h256v-128h-256v128zM768 256h-192v-192h-128v192h-192v128h192v192h128v-192h192v-128z" />
+<glyph unicode="&#xe625;" glyph-name="tax" d="M760.58 35.367c-39.656 0-73.363 15.635-101.122 46.905s-41.638 68.905-41.638 112.905c0 44 13.879 81.496 41.638 112.49s61.466 46.49 101.122 46.49c39.656 0 73.363-15.497 101.122-46.49s41.638-68.49 41.638-112.49c0-44-13.879-81.635-41.638-112.905s-61.466-46.905-101.122-46.905zM760.952 247.894c-13.136 0-24.413-5.119-33.831-15.358s-14.127-22.692-14.127-37.358c0-14.667 4.709-27.258 14.127-37.773s20.695-15.773 33.831-15.773c13.136 0 24.289 5.258 33.459 15.773s13.756 23.107 13.756 37.773c0 14.667-4.585 27.119-13.756 37.358s-20.324 15.358-33.459 15.358zM284.713 566.684c-39.656 0-73.363 15.635-101.122 46.905s-41.638 68.905-41.638 112.905c0 44 13.879 81.496 41.638 112.49s61.466 46.49 101.122 46.49c39.656 0 73.363-15.497 101.122-46.49s41.638-68.49 41.638-112.49c0-44-13.879-81.635-41.638-112.905s-61.466-46.905-101.122-46.905zM284.341 779.211c-13.136 0-24.289-5.119-33.459-15.358s-13.756-22.692-13.756-37.358c0-14.667 4.585-27.258 13.756-37.773s20.447-15.773 33.831-15.773c13.384 0 24.661 5.258 33.831 15.773s13.756 23.107 13.756 37.773-4.709 27.119-14.127 37.358c-9.418 10.239-20.695 15.358-33.831 15.358zM738.896 877.822l165.021-99.773-592.362-740.52-165.021 99.773 592.362 740.52zM344.235 294.43h35.488v-39.037h-35.488v39.037z" />
+<glyph unicode="&#xe626;" glyph-name="donations" d="M933.875 504.25h-365.625v112.5h365.625q11.426 0 19.776-7.911t8.349-20.215v-56.25q0-11.426-8.349-19.776t-19.776-8.349zM624.5 673h-281.25q-46.582 0-79.541 32.959t-32.959 79.541 32.959 79.541 79.541 32.959q47.461 0 70.752-11.865t29.443-35.156 8.349-49.219 16.26-61.963 43.945-66.797v38.232t0.879 35.596 3.076 35.156 5.713 31.201 9.229 29.004 14.063 22.412 19.776 18.457 26.367 10.547 33.398 4.395q46.582 0 79.541-32.959t32.959-79.541-32.959-79.541-79.541-32.959zM342.81 841.75q-23.291 0-39.551-16.26t-16.26-39.551 16.26-39.99 39.551-16.7 39.99 16.7 16.7 39.99-16.7 39.551-39.99 16.26zM624.060 841.75q-23.291 0-39.551-16.26t-16.26-39.551 16.7-39.99 39.551-16.7 39.551 16.7 16.7 39.99-16.7 39.551-39.99 16.26zM455.75 504.25h-365.625q-11.426 0-19.776 8.349t-8.349 19.776v56.25q0 12.305 8.349 20.215t19.776 7.911h365.625v-112.5zM455.75-2h-281.25q-23.731 0-39.99 16.7t-16.26 39.551v393.75h337.5v-450zM905.75 448v-393.75q0-22.852-16.26-39.551t-39.99-16.7h-281.25v450h337.5z" />
+<glyph unicode="&#xe627;" glyph-name="ca" d="M384 896h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h320c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM384 640h-320v64h320v-64zM896 896h-320c-35.204 0-64-28.8-64-64v-832c0-35.2 28.796-64 64-64h320c35.2 0 64 28.8 64 64v832c0 35.2-28.8 64-64 64zM896 320h-320v64h320v-64zM896 512h-320v64h320v-64zM384 384h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h320c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM384 128h-128v-128h-64v128h-128v64h128v128h64v-128h128v-64z" />
+<glyph unicode="&#xe628;" glyph-name="mailing" d="M512 383l-449 449h898zM7 99q-7 14-7 29v640q0 15 7 29l350-349zM473 331q6-5 15.5-8t16.5-3h7q26-1 39 11l71 72 339-339h-898l339 339zM1017 797q7-14 7-29v-640q0-15-7-29l-350 349z" />
+<glyph unicode="&#xe629;" glyph-name="export" d="M960-64h-704q-26 0-45 18.5t-19 45.5v11q-165 160-166 162-26 24-26 77.5t26 78.5l166 160v407q0 26 19 45t45 19h384v-352q0-14 9.5-23t22.5-9h351q1-1 1-2v-574q0-27-18.5-45.5t-45.5-18.5zM640 321q0 26-18.5 45t-45.5 19h-192v58q4 30-17 51-18 19-43.5 19t-43.5-19l-198-197q-18-18-18-43.5t18-43.5q12-12 96.5-93.5t101.5-98.5q18-18 43.5-18t43.5 18q21 21 17 52v59h192q27 0 45.5 18.5t18.5 45.5v128zM704 960q26 0 44-18l257-257q19-19 18-45h-319v320z" />
+<glyph unicode="&#xe62a;" glyph-name="import" d="M960-64h-704q-27 0-45.5 18.5t-18.5 45.5v65h-101q-38 0-64.5 28t-26.5 68v192q0 39 26.5 67.5t64.5 28.5h101v447q0 26 18.5 45t45.5 19h384v-352q0-13 9.5-22.5t22.5-9.5h351l1-1v-575q0-27-18.5-45.5t-45.5-18.5zM622 297l-198 198q-18 18-43.5 18t-43.5-18q-19-19-17-48v-62h-192q-26 0-45-19t-19-45v-128q0-27 19-45.5t45-18.5h192v-63q-2-29 17-48 18-18 43.5-18t43.5 18l182 182q11 5 16 10 18 18 18 43.5t-18 43.5zM704 961q26 0 44-19l257-257q19-19 18-45h-319v321z" />
+<glyph unicode="&#xe62b;" glyph-name="bittorrent" horiz-adv-x="1022" d="M452.604 933.077c-283.813 0-433.685-150.561-433.685-435.504v-106.238c0-235.237 102.276-378.703 297.612-421.678 61.649-8.378 102.506-12.413 134.253-14.189 0.617-0.002 1.201 0 1.819 0 54.965-2.968 81.863 0.815 137.164 0.728 0.701 0.030 4.366 0 4.366 0 44.636 2.076 85.619 8.241 122.974 18.191 56.649 13.887 158.993 85.136 158.993 85.136 8.122 7.619 15.619 15.577 22.921 24.013 17.577 23.028 50.572 78.223 50.572 78.223 29.615 62.731 44.751 139.464 44.751 229.576v106.238c0 284.943-150.561 435.504-435.504 435.504h-106.238zM475.525 803.553c6.035 0.224 9.46 0 9.46 0v-72.038c0 0-172.688 8.182-282.695-151.717-81.983-119.164-72.017-302.014 14.553-401.304 76.533-87.778 106.437-95.563 143.349-118.608 71.241-44.478 212.961-56.152 212.84-56.030 0 0-141.113-1.445-189.919 2.183s-102.236 13.462-102.236 13.462c0 0-79.71 49.526-139.347 138.255-29.157 43.381-65.373 135.47-67.672 192.466-6.592 163.446 43.507 231.941 80.77 285.97 103.455 150.004 278.651 165.796 320.898 167.362zM506.814 702.045c97.286 1.058 158.993-41.84 158.993-41.84l-36.019-61.851c0 0-78.28 43.507-149.17 31.653-40.036-6.695-161.145-31.613-203.744-155.719-33.998-99.046-21.552-207.208 104.783-302.342 47.141-35.499 129.305-57.738 207.019-65.489 145.829-14.545 271.417 14.917 271.417 14.917s-69.051-40.129-102.236-55.302c-33.185-15.173-96.779-35.655-96.779-35.655s-15.741-7.713-110.968 6.913c-126.69 19.458-201.879 59.503-263.049 121.155s-106.406 135.068-96.415 261.23c10.053 126.944 104.22 241.481 243.402 273.6 25.905 5.978 50.315 8.488 72.766 8.732zM515.182 598.354c123.697 6.564 185.917-108.785 185.917-108.785s-60.151-32.402-61.123-30.926c-45.159 68.6-129.673 92.388-198.651 50.572-103.301-62.623-76.632-185.646-18.919-233.942 30.662-25.659 93.607-62.414 189.555-68.036 84.207-4.934 172.629 0.137 216.842 5.094 77.743 8.726 115.196 14.779 114.606 14.189l-24.013-36.383-34.928-41.477c0 0-212.774-37.152-372.925 5.094-125.774 33.178-191.566 107.297-207.747 208.474-11.169 69.842 33.153 226.667 211.385 236.125zM372.925-39.803c7.516-0.908 15.174-1.532 22.921-2.183-7.549 0.582-15.279 1.31-22.921 2.183zM395.846-41.986c8.541-0.717 17.007-1.427 25.832-1.819-8.502 0.364-17.203 1.154-25.832 1.819z" />
+<glyph unicode="&#xe62c;" glyph-name="propals" d="M928 384c73 0 32-192-32-192 32 0 0-160-64-160 0-64-64-96-128-96-270.352 0-175.264 67.65-448 96v512c240.922 72.268 480 253.424 480 416 53 0 192-64 0-384 0 0 160 0 192 0 96 0 64-192 0-192zM192 544v-512h64v-32h-128c-35.2 0-64 43.2-64 96v384c0 52.8 28.8 96 64 96h128v-32h-64z" />
+<glyph unicode="&#xe62d;" glyph-name="opensurvey" d="M448 152.69l-205.254 237.254 58.508 58.51 146.746-114.744 274.744 242.744 58.512-58.508zM831.772 819.2c0.078-0.066 0.162-0.15 0.228-0.23v-767.542c-0.066-0.078-0.15-0.162-0.228-0.228h-639.544c-0.080 0.066-0.162 0.15-0.228 0.228v767.544c0.066 0.080 0.15 0.162 0.23 0.228h-128.23v-768c0-70.4 57.6-128 128-128h640c70.4 0 128 57.6 128 128v768h-128.228zM640 819.2v64c0 35.346-28.654 64-64 64h-128c-35.346 0-64-28.654-64-64v-64h-128v-128h512v128h-128zM576 819.2h-128v64h128v-64z" />
+<glyph unicode="&#xe62e;" glyph-name="suppliers_bills" d="M980.814 185.463h-459.289c13.466 23.217 23.778 48.383 30.603 75.011h428.684c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM980.814 297.979h-421.408c1.538 12.302 2.588 24.79 2.588 37.505 0 12.751-1.051 25.204-2.588 37.505h421.408c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM980.814 410.495h-428.684c-6.863 26.629-17.141 51.796-30.603 75.011h459.289c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM980.814 523.011h-484.868c-24.379 30.417-54.495 55.995-88.85 75.011h573.717c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM980.814 635.526h-600.084c-20.74 0-37.505 16.802-37.505 37.505 0 20.74 16.765 37.505 37.505 37.505h600.084c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM980.814 748.040h-600.084c-20.74 0-37.505 16.802-37.505 37.505 0 20.74 16.765 37.505 37.505 37.505h600.084c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505zM530.753 335.484c0-144.994-117.579-262.537-262.537-262.537-144.994 0-262.537 117.54-262.537 262.537s117.54 262.537 262.537 262.537c144.957 0 262.537-117.54 262.537-262.537zM361.153 306.943c-3.788 8.964-8.663 16.765-14.777 23.402s-13.052 12.341-20.853 17.103c-7.802 4.763-15.753 9.002-23.892 12.789-8.138 3.751-16.090 7.275-23.892 10.651-7.802 3.338-14.814 6.938-20.966 10.764-6.187 3.826-11.102 8.214-14.777 13.126-3.675 4.914-5.514 10.727-5.514 17.478 0 4.501 0.825 8.776 2.437 12.826 1.65 4.012 4.126 7.5 7.5 10.39 3.338 2.85 7.538 5.139 12.526 6.751 4.988 1.65 10.876 2.437 17.591 2.437 8.588 0 16.465-1.014 23.665-3.112 7.164-2.139 13.503-4.426 18.978-7.013 5.477-2.55 10.089-4.914 13.839-7.089s6.488-3.227 8.214-3.227 3.075 0.45 4.089 1.387c0.977 0.938 1.801 2.4 2.325 4.463 0.562 2.025 0.9 4.613 1.162 7.727 0.225 3.15 0.338 7.013 0.338 11.552 0 4.051-0.074 7.463-0.225 10.165-0.15 2.738-0.45 5.025-0.788 6.826-0.412 1.801-0.863 3.264-1.387 4.352-0.601 1.088-1.612 2.4-3.19 3.937-1.575 1.575-4.763 3.525-9.602 5.813-4.837 2.325-10.39 4.426-16.614 6.264-6.264 1.876-12.978 3.338-20.14 4.426-1.463 0.225-2.964 0.15-4.426 0.338v38.78h-36.905v-38.78c-6.789-0.9-13.351-2.25-19.727-4.089-12.415-3.601-23.179-9.002-32.33-16.277s-16.427-16.427-21.791-27.38c-5.4-11.026-8.063-23.778-8.063-38.293 0-12.64 1.876-23.516 5.589-32.555 3.751-9.039 8.626-16.916 14.665-23.553 6.039-6.639 12.826-12.302 20.479-17.065 7.651-4.8 15.563-9.039 23.665-12.789 8.138-3.751 16.015-7.275 23.665-10.651s14.476-6.976 20.479-10.764c6.039-3.863 10.913-8.214 14.665-13.126 3.751-4.951 5.626-10.839 5.626-17.702 0-5.963-1.088-11.364-3.264-16.239-2.213-4.837-5.363-8.89-9.489-12.188-4.126-3.301-9.151-5.813-15.076-7.613-5.963-1.801-12.64-2.7-20.178-2.7-11.401 0-21.451 1.275-30.117 3.863-8.663 2.588-16.127 5.44-22.391 8.588-6.264 3.112-11.364 5.925-15.339 8.551-3.975 2.55-7.050 3.863-9.263 3.863-1.575 0-2.964-0.45-4.089-1.275-1.199-0.863-2.139-2.325-2.812-4.352-0.713-2.063-1.199-4.687-1.538-7.989s-0.487-7.352-0.487-12.188c0-7.201 0.45-12.714 1.275-16.54 0.863-3.863 2.325-6.789 4.352-8.776 2.025-2.025 5.325-4.315 9.939-6.976s10.351-5.139 17.215-7.538c6.863-2.363 14.814-4.426 23.778-6.15 8.964-1.687 18.716-2.513 29.179-2.513 0.45 0 0.863 0.074 1.35 0.074v-36.117h36.867v40.956c1.763 0.45 3.638 0.675 5.363 1.162 13.577 4.051 25.467 10.127 35.63 18.153 10.165 8.026 18.19 18.041 24.153 30.080 5.925 12.038 8.852 25.99 8.852 41.93 0.037 12.114-1.838 22.653-5.551 31.653zM495.947 147.96h484.868c20.74 0 37.505-16.765 37.505-37.505 0-20.703-16.765-37.505-37.505-37.505h-573.717c34.356 19.015 64.472 44.594 88.85 75.011z" />
+<glyph unicode="&#xe62f;" glyph-name="cron" horiz-adv-x="1243" d="M139.403 845.158v-794.306h963.94v794.306zM341.891 742.841l188.284-207.434 5.533-5.194-0.429-0.429 2.19-2.417-67.091-65.373c-41.489-40.428-97.036-92.916-141.224-136.778l-68.286 64.108 144.929 143.821-130.995 144.319zM405.797 533.149c-166.998-319.61-83.499-159.806 0 0zM614.158 442.664h204.589v-71.087h-204.589z" />
+<glyph unicode="&#xe630;" glyph-name="customers_bills" d="M873.415 54.25l-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25v843.75q0 22.852 18.463 39.551t43.729 16.7h746.307q25.266 0 43.729-16.7t18.463-39.551v-843.75zM220.395 166.75h186.577q12.633 0 21.864 8.349t9.232 19.776-9.232 19.776-21.864 8.349h-186.577q-12.633 0-21.864-8.349t-9.233-19.776 9.233-19.776q9.232-8.349 21.864-8.349zM811.223 757.375q0 11.426-9.232 19.776t-21.864 8.349h-559.731q-12.633 0-21.864-8.349t-9.232-19.776v-337.5q0-11.426 9.232-19.776t21.864-8.349h342.058v-84.375q0-11.426 9.232-19.776t21.864-8.349h186.577q12.633 0 21.864 8.349t9.232 19.776v450zM624.646 391.75h124.385v-56.25h-124.385v56.25zM624.646 504.25h124.385v-56.25h-124.385v56.25zM624.646 616.75h124.385v-56.25h-124.385v56.25zM624.646 729.25h124.385v-56.25h-124.385v56.25zM251.492 504.25h310.961v-56.25h-310.961v56.25zM251.492 616.75h310.961v-56.25h-310.961v56.25zM251.492 729.25h310.961v-56.25h-310.961v56.25z" />
+<glyph unicode="&#xe631;" glyph-name="stock" d="M896 320q-76-3-134-60t-58-132v-64h-64v64q0 75-60.5 133.5t-131.5 58.5h-192v-224q0-12-7.5-20.5t-18.5-10.5q-2-1-6-1h-192q-13 0-22.5 9.5t-9.5 22.5 9.5 22.5 22.5 9.5h160v736q0 13 9.5 22.5t22.5 9.5 22.5-9.5 9.5-22.5v-480h128l128 448q0 26 18.5 45t45.5 19h384q26 0 45-19t19-45v-512h-128zM896 732q0 15-11.5 25.5t-26.5 10.5h-231q-16 0-27-10.5t-11-25.5l-77-248q0-15 11.5-25.5t26.5-10.5h90q0 27 19 45.5t45 18.5h64v160q0 13 9.5 22.5t22.5 9.5 22.5-9.5 9.5-22.5v-160h64v220zM448 256q53 0 90.5-37.5t37.5-90.5-37.5-90.5-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5zM896 256q53 0 90.5-37.5t37.5-90.5-37.5-90.5-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5z" />
+<glyph unicode="&#xe632;" glyph-name="tripsandexpenses" horiz-adv-x="1216" d="M1152.064 223.68l1.824 546.848-993.6-0.608-0.032 62.72h1055.744v-608.992l-63.936 0.032zM1119.84 127.456l-63.904 0.064 1.824 546.848-993.6-0.64-0.032 62.72h1055.744v-608.992zM1025.696 63.36h-1025.696v576.96h1025.696v-576.96zM961.568 578.208h-897.472v-450.752h897.44v450.752zM865.44 175.52c0-5.664 1.408-10.944 3.232-16h-355.84c88.512 0 160.288 86.080 160.288 192.32s-71.776 192.32-160.288 192.32h355.808c-1.824-5.056-3.232-10.336-3.232-16.032 0-26.56 21.504-48.064 48.064-48.064 5.696 0 10.976 1.408 16.032 3.232v-262.88c-5.056 1.792-10.336 3.232-16.032 3.232-26.528-0.032-48.032-21.568-48.032-48.128zM801.312 418.592c-26.56 0-48.064-28.672-48.064-64.096s21.504-64.096 48.064-64.096 48.064 28.672 48.064 64.096-21.504 64.096-48.064 64.096zM579.936 467.392c0.48-0.928 0.864-2.176 1.184-3.712 0.352-1.536 0.576-3.488 0.672-5.824 0.16-2.336 0.224-5.248 0.224-8.736 0-3.872-0.096-7.168-0.288-9.824-0.224-2.688-0.576-4.896-0.992-6.624-0.512-1.76-1.152-3.040-1.984-3.808-0.864-0.8-2.048-1.216-3.52-1.216s-3.776 0.928-7.008 2.784c-3.232 1.888-7.168 3.872-11.808 6.048s-10.080 4.192-16.224 5.984-12.864 2.688-20.224 2.688c-5.76 0-10.752-0.672-15.008-2.080-4.288-1.408-7.872-3.328-10.72-5.792-2.88-2.464-5.024-5.44-6.4-8.864-1.408-3.456-2.112-7.136-2.112-10.976 0-5.76 1.568-10.72 4.704-14.944 3.136-4.192 7.328-7.936 12.64-11.2 5.28-3.296 11.264-6.336 17.92-9.216s13.472-5.92 20.416-9.088c6.944-3.232 13.76-6.848 20.448-10.944 6.688-4.064 12.64-8.928 17.824-14.592 5.216-5.696 9.44-12.352 12.64-20.032s4.8-16.704 4.8-27.136c0-13.6-2.56-25.568-7.616-35.808-5.056-10.272-11.936-18.88-20.64-25.76s-18.816-12.032-30.432-15.488c-1.472-0.448-3.072-0.64-4.576-0.992v-35.008h-31.52v30.88c-0.416 0-0.768-0.096-1.184-0.096-8.928 0-17.248 0.736-24.928 2.176-7.68 1.472-14.464 3.232-20.32 5.248-5.888 2.048-10.784 4.224-14.72 6.464-3.968 2.24-6.784 4.224-8.512 5.952s-2.976 4.224-3.712 7.488-1.12 8-1.12 14.144c0 4.128 0.128 7.616 0.416 10.4 0.256 2.816 0.704 5.088 1.312 6.848 0.608 1.728 1.408 2.976 2.4 3.712 0.992 0.704 2.176 1.088 3.488 1.088 1.888 0 4.512-1.088 7.936-3.328 3.392-2.176 7.776-4.64 13.12-7.296s11.712-5.088 19.136-7.296c7.392-2.208 16-3.328 25.728-3.328 6.4 0 12.16 0.768 17.216 2.304 5.088 1.536 9.376 3.712 12.928 6.496 3.52 2.816 6.208 6.304 8.096 10.432 1.888 4.16 2.816 8.768 2.816 13.856 0 5.888-1.632 10.944-4.8 15.136-3.2 4.224-7.36 7.936-12.512 11.232-5.152 3.264-10.976 6.336-17.504 9.184-6.56 2.88-13.28 5.92-20.224 9.12s-13.696 6.848-20.224 10.912c-6.528 4.064-12.384 8.928-17.504 14.624-5.12 5.664-9.312 12.384-12.512 20.096-3.2 7.744-4.8 17.024-4.8 27.84 0 12.416 2.304 23.328 6.912 32.704 4.608 9.408 10.816 17.216 18.624 23.424 7.808 6.176 17.024 10.848 27.616 13.92 5.44 1.568 11.072 2.72 16.864 3.488v33.12h31.52v-33.12c1.248-0.16 2.496-0.096 3.744-0.288 6.144-0.928 11.904-2.176 17.248-3.776 5.312-1.6 10.048-3.36 14.176-5.376 4.16-1.984 6.88-3.616 8.256-4.96 1.248-1.184 2.144-2.304 2.624-3.264zM352.576 351.84c0-106.208 71.744-192.32 160.256-192.32h-355.808c1.792 5.056 3.232 10.336 3.232 16 0 26.56-21.536 48.096-48.064 48.096-5.696 0-10.976-1.44-16.032-3.232v262.88c5.056-1.824 10.336-3.232 16.032-3.232 26.56 0 48.064 21.504 48.064 48.064 0 5.696-1.44 10.976-3.232 16.032h355.808c-88.512 0.032-160.256-86.080-160.256-192.288zM224.352 418.592c-26.56 0-48.064-28.672-48.064-64.096s21.536-64.096 48.064-64.096c26.56 0 48.064 28.672 48.064 64.096s-21.504 64.096-48.064 64.096z" />
+<glyph unicode="&#xe640;" glyph-name="printer" d="M256 883.2h512v-128h-512v128zM960 691.2h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.794-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM128 499.2c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.652-64-64-64zM704 51.2h-384v320h384v-320z" />
+<glyph unicode="&#xe641;" glyph-name="exit" d="M768 307.2v128h-320v128h320v128l192-192zM704 371.2v-256h-320v-192l-384 192v832h704v-320h-64v256h-512l256-128v-576h256v192z" />
+<glyph unicode="&#xe900;" glyph-name="loginphoto" d="M617.093 261.868c-22.536 3.553-23.050 64.989-23.050 64.989s66.219 64.992 80.65 152.386c38.827 0 62.801 92.914 23.977 125.603 1.62 34.413 49.904 270.136-194.535 270.136-244.437 0-196.152-235.723-194.535-270.136-38.829-32.688-14.85-125.603 23.975-125.603 14.429-87.394 80.652-152.386 80.652-152.386s-0.514-61.436-23.050-64.989c-72.592-11.453-343.658-129.988-343.658-259.969h913.232c0 129.981-271.066 248.516-343.658 259.969z" />
+<glyph unicode="&#xe901;" glyph-name="help" horiz-adv-x="878" d="M512 173.714v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 557.714q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 448q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
+<glyph unicode="&#xe902;" glyph-name="generic" d="M41.143 919.812v-945.231h945.231v945.231h-945.231zM450.202 705.197c30.948 0 81.747-2.166 132.57-15.963 88.987-24.166 178.751-98.442 178.751-222.381 0-95.649-27.245-157.397-66.489-198.924-92.993-98.399-250.317-76.725-250.317-76.725l-0.354 151.221c0 0 160.517-20.917 159.095 109.714-0.938 86.126-57.357 102.006-111.475 104.767-26.367 1.339-67.475 1.418-70.995 1.457v-368.447h-154.995v514.836l156.706 0.028c1.617 0 10.253 0.394 27.502 0.433z" />
+<glyph unicode="&#xe641b;" glyph-name="log-out" d="M972.8 448l-307.2 256v-153.6h-358.4v-204.8h358.4v-153.6l307.2 256zM153.6 806.4h409.6v102.4h-409.6c-56.32 0-102.4-46.080-102.4-102.4v-716.8c0-56.32 46.080-102.4 102.4-102.4h409.6v102.4h-409.6v716.8z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/themeoblyon/fonts/oblyon-icons.ttf b/themeoblyon/fonts/oblyon-icons.ttf
new file mode 100644
index 0000000..4200d9b
Binary files /dev/null and b/themeoblyon/fonts/oblyon-icons.ttf differ
diff --git a/themeoblyon/fonts/oblyon-icons.woff b/themeoblyon/fonts/oblyon-icons.woff
new file mode 100644
index 0000000..5203dce
Binary files /dev/null and b/themeoblyon/fonts/oblyon-icons.woff differ
diff --git a/themeoblyon/fonts/puentebolds.ttf b/themeoblyon/fonts/puentebolds.ttf
new file mode 100644
index 0000000..837ac2a
Binary files /dev/null and b/themeoblyon/fonts/puentebolds.ttf differ
diff --git a/themeoblyon/fonts/selection.json b/themeoblyon/fonts/selection.json
new file mode 100644
index 0000000..ff3cf8a
--- /dev/null
+++ b/themeoblyon/fonts/selection.json
@@ -0,0 +1,1585 @@
+{
+    "IcoMoonType": "selection",
+    "icons": [
+        {
+            "icon": {
+                "paths": [
+                    "M320 192c0-106.039 85.961-192 192-192s192 85.961 192 192c0 106.039-85.961 192-192 192s-192-85.961-192-192zM768.078 448h-35.424l-199.104 404.244 74.45-372.244-96-96-96 96 74.45 372.244-199.102-404.244h-35.424c-127.924 0-127.924 85.986-127.924 192v320h768v-320c0-106.014 0-192-127.922-192z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "users"
+                ],
+                "defaultCode": 58880,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 1,
+                "order": 67,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58880,
+                "name": "users"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 0
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 1024v-1024h1024v1024h-1024zM960 64h-896v768h896v-768zM448 547v-13q-67-22-97.5-90t-30.5-165q0-74 53.5-112.5t138.5-38.5 138.5 38.5 53.5 112.5q0 217-128 256v12q113 10 183.5 53t72.5 114q0 10-8.5 18t-26 13.5-36 9.5-47 6.5-50 4-54.5 2-50.5 0.5h-95t-50.5-0.5-54.5-2-50-4-47-6.5-36-9.5-26-13.5-8.5-18q2-71 72.5-114t183.5-53z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "gravatar"
+                ],
+                "defaultCode": 58881,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 2,
+                "order": 68,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58881,
+                "name": "gravatar"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 1
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M416.154 693.862c-35.328 61.235-11.571 111.616 37.427 139.878s104.55 23.757 139.878-37.478c35.328-61.184 258.406-607.539 239.002-618.752-19.354-11.213-380.979 455.117-416.307 516.352zM512 304.742c22.426 0 44.288 1.946 65.587 5.53 22.426-28.058 47.565-58.982 71.987-88.422-43.622-12.646-89.651-19.507-137.574-19.507-287.078 0-512 242.074-512 551.117 0 19.046 0.87 38.042 2.509 56.576 2.509 28.16 27.648 48.896 55.552 46.438 28.16-2.56 48.947-27.392 46.438-55.552-1.382-15.514-2.099-31.488-2.099-47.462 0-251.597 179.968-448.717 409.6-448.717zM881.613 368.691c-14.285 38.4-29.389 77.517-42.701 111.36 52.070 75.264 82.688 169.626 82.688 273.408 0 16.23-0.717 32.563-2.15 48.384-2.56 28.16 18.176 53.043 46.336 55.654 1.587 0.154 3.123 0.205 4.71 0.205 26.163 0 48.486-20.019 50.893-46.541 1.741-18.944 2.611-38.349 2.611-57.702 0-151.091-53.862-286.157-142.387-384.768z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "home"
+                ],
+                "defaultCode": 58882,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 3,
+                "order": 69,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58882,
+                "name": "home"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 2
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 768h-320v128h128q26 0 45 19t19 45.5-19 45-45 18.5h-384q-27 0-45.5-18.5t-18.5-45 19-45.5 45-19h128v-128h-320q-53 0-90.5-37.5t-37.5-90.5v-384q0-26 19-45t45-19h480l46-84q7-19 28-31.5t44-12.5h240q24 0 45 12.5t28 31.5l49 84v448q0 53-37.5 90.5t-90.5 37.5zM442 474l-135-145q-8-9-19-9t-19 9l-135 145q-8 9-5 23.5t11 14.5h52v96q0 13 9.5 22.5t22.5 9.5h128q13 0 22.5-9.5t9.5-22.5v-96h52q8 0 11-14.5t-5-23.5zM884 448h-52v-96q0-13-9.5-22.5t-22.5-9.5h-128q-13 0-22.5 9.5t-9.5 22.5v96h-52q-8 0-11 14.5t5 23.5l135 145q8 9 19 9t19-9l135-145q8-9 5-23.5t-11-14.5zM46 44q7-19 28-31.5t44-12.5h240q24 0 45 12.5t29 31.5l48 84h-480z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "ftp"
+                ],
+                "defaultCode": 58883,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 4,
+                "order": 70,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58883,
+                "name": "ftp"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 3
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M205.887 498.671l-0.854-0.854c-10.308-10.080-23.971-15.619-38.487-15.619-14.996 0-28.99 5.852-39.383 16.494l-90.971 92.325c-21.202 21.701-20.807 56.628 0.915 77.829l0.876 0.854c10.308 10.080 23.949 15.619 38.487 15.619 14.996 0 28.969-5.852 39.361-16.494l90.971-92.347c21.183-21.66 20.807-56.583-0.915-77.808zM317.662 581.018l-0.876-0.854c-10.308-10.060-23.949-15.619-38.466-15.619-15.015 0-28.99 5.852-39.407 16.494l-90.929 92.365c-21.202 21.682-20.807 56.605 0.893 77.829l0.876 0.833c10.308 10.080 23.971 15.639 38.487 15.639 14.996 0 28.99-5.852 39.383-16.494l90.949-92.365c21.202-21.682 20.786-56.605-0.915-77.829zM436.644 653.599l-0.893-0.876c-10.29-10.060-23.949-15.599-38.487-15.599-14.996 0-28.969 5.852-39.361 16.494l-90.971 92.347c-21.202 21.701-20.807 56.628 0.915 77.829l0.876 0.854c10.29 10.060 23.949 15.619 38.487 15.619 14.996 0 28.969-5.852 39.383-16.494l90.949-92.365c21.202-21.682 20.786-56.605-0.893-77.808zM548.693 747.41l-0.953-0.953c-10.976-10.706-25.522-16.619-41.030-16.619-15.996 0-30.9 6.242-42.009 17.594l-97.012 98.503c-22.641 23.127-22.194 60.379 0.953 83.018l0.953 0.911c10.976 10.731 25.546 16.66 41.030 16.66 15.996 0 30.923-6.242 42.009-17.594l97.012-98.523c22.641-23.127 22.194-60.379-0.953-82.995zM646.14 330.993c-96.343 91.155-170.924 125.23-174.087 126.667l-0.622 0.231c-14.349 4.564-31.47 6.956-49.482 6.956-22.869 0-41.757-3.771-51.005-6.997-18.66-6.519-50.483-37.238-64.227-61.981-14.161-25.493-1.856-64.083-1.29-65.707l0.434-1.437 211.452-199.414c-10.124-10.101-30.22-15.203-59.835-15.203-80.765 0-203.019 39.047-209.867 41.255-9.205 4.081-22.556 6.166-39.673 6.166-30.596 0-63.791-6.434-69.102-7.497-0.062 0-0.103 0-0.167 0-17.934 0-64.916-28.198-72.475-32.823-7.686-2.71-14.978-4.1-21.617-4.1-18.077 0-26.596 10.080-28.178 12.142l-101.925 232.549c-31.994 60.189-34.32 77.702-34.052 82.18 55.962 13.601 130.144 93.969 148.577 114.735l106.092-103.652 1.686-0.353c9.017-1.894 17.725-2.873 25.868-2.873 65.229 0 83.492 60.21 87.637 79.347 5.353-0.522 10.581-0.795 15.58-0.795 77.203 0 93.283 61.811 96.507 82.91 10.766-2.167 20.971-3.247 30.468-3.247 70.79 0 87.095 59.439 90.574 79.412 37.238-5.627 65.894 2.373 85.095 23.514 30.549 33.553 25.783 87.909 25.575 90.199l-0.187 2.103-105.028 106.691c14.662 7.809 28.617 11.745 41.571 11.745 51.985 0 74.602-63.979 74.831-64.645l1.644-4.769 4.976 0.893c8.686 1.541 16.95 2.334 24.594 2.334 70.189 0 73.787-66.289 73.911-69.079l0.311-7.329 7.102 1.831c14.098 3.645 27.282 5.497 39.152 5.497 73.124 0 80.432-68.875 80.702-71.787l0.604-6.458 6.372 1.187c10.851 2.042 20.971 3.041 30.115 3.041 24.452 0 42.798-7.267 54.505-21.577 22.597-27.596 14.453-72.873 13.977-75.476-19.162-76.246-262.811-260.727-297.091-286.384zM1057.899 147.828l-0.147-0.706c-5.979-29.034-23.702-33.364-33.718-33.364-1.040 0-1.915 0.039-2.564 0.103-53.69 41.86-112.297 48.151-142.578 48.151-11.579 0-18.848-0.915-19.973-1.061-53.668-5.247-120.022-28.075-122.813-29.054l-0.667-0.27c-40.925-19.991-75.956-30.137-104.194-30.137-28.347 0-39.152 10.666-39.259 10.788-121.294 130.042-234.258 216.032-247.191 225.738-20.494 45.382 33.034 82.743 40.051 87.385 14.62 3.563 28.323 5.353 40.757 5.353 20.572 0 30.596-5.038 30.698-5.084l1.351-0.706 1.981 0.039c31.676 0 145.639-95.179 186.897-131.852l2.977-2.644 3.581 1.747c137.331 67.394 311.106 269.39 320.934 280.927 9.619 7.289 18.579 10.956 26.575 10.956 9.329 0 14.206-5.101 14.393-5.309l0.582-0.561 140.391-117.251 0.976-0.353c15.619-5.747 25.597-13.725 29.614-23.659 4.58-11.287-0.167-21.701-0.231-21.805l-128.436-267.37z"
+                ],
+                "width": 1056,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "contracts"
+                ],
+                "defaultCode": 58884,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 5,
+                "order": 71,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58884,
+                "name": "contracts"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 4
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M128 896h896v128h-1024v-1024h128zM288 832c-53.020 0-96-42.98-96-96s42.98-96 96-96c2.828 0 5.622 0.148 8.388 0.386l103.192-171.986c-9.84-15.070-15.58-33.062-15.58-52.402 0-53.020 42.98-96 96-96s96 42.98 96 96c0 19.342-5.74 37.332-15.58 52.402l103.192 171.986c2.766-0.238 5.56-0.386 8.388-0.386 2.136 0 4.248 0.094 6.35 0.23l170.356-298.122c-10.536-15.408-16.706-34.036-16.706-54.11 0-53.020 42.98-96 96-96s96 42.98 96 96c0 53.020-42.98 96-96 96-2.14 0-4.248-0.094-6.35-0.232l-170.356 298.124c10.536 15.406 16.706 34.036 16.706 54.11 0 53.020-42.98 96-96 96s-96-42.98-96-96c0-19.34 5.74-37.332 15.578-52.402l-103.19-171.984c-2.766 0.238-5.56 0.386-8.388 0.386s-5.622-0.146-8.388-0.386l-103.192 171.986c9.84 15.068 15.58 33.060 15.58 52.4 0 53.020-42.98 96-96 96z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "reports"
+                ],
+                "defaultCode": 58885,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 6,
+                "order": 72,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58885,
+                "name": "reports"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 5
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M702 61l-124 143 121 570q6 16 8 22.5t0.5 14.5-8.5 15l-156 187q-10 11-25.5 11t-26.5-11l-155-187q-10-13-9.5-21.5t9.5-30.5l121-571-123-142q-13-12-6.5-36.5t28.5-24.5h325q22 0 27.5 24.5t-6.5 36.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "commercial"
+                ],
+                "defaultCode": 58886,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 7,
+                "order": 73,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58886,
+                "name": "commercial"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 6
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M640 736q0-13 9.5-22.5t22.5-9.5h128q13 0 22.5 9.5t9.5 22.5v32h160q13 0 22.5 9.5t9.5 22.5v192q0 13-9.5 22.5t-22.5 9.5h-320q-13 0-22.5-9.5t-9.5-22.5v-32h-416q-13 0-22.5-9.5t-9.5-22.5v-544h-160q-13 0-22.5-9.5t-9.5-22.5v-320q0-13 9.5-22.5t22.5-9.5h192q13 0 22.5 9.5t9.5 22.5v32h160q13 0 22.5 9.5t9.5 22.5v256q0 13-9.5 22.5t-22.5 9.5h-160v128h384v-160q0-13 9.5-22.5t22.5-9.5h128q13 0 22.5 9.5t9.5 22.5v32h160q13 0 22.5 9.5t9.5 22.5v192q0 13-9.5 22.5t-22.5 9.5h-320q-13 0-22.5-9.5t-9.5-22.5v-32h-384v320h384v-160z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "cat"
+                ],
+                "defaultCode": 58887,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 8,
+                "order": 74,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58887,
+                "name": "cat"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 7
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M480 64c-265.096 0-480 214.904-480 480 0 265.098 214.904 480 480 480 265.098 0 480-214.902 480-480 0-265.096-214.902-480-480-480zM751.59 704c8.58-40.454 13.996-83.392 15.758-128h127.446c-3.336 44.196-13.624 87.114-30.68 128h-112.524zM208.41 384c-8.58 40.454-13.996 83.392-15.758 128h-127.444c3.336-44.194 13.622-87.114 30.678-128h112.524zM686.036 384c9.614 40.962 15.398 83.854 17.28 128h-191.316v-128h174.036zM512 320v-187.338c14.59 4.246 29.044 11.37 43.228 21.37 26.582 18.74 52.012 47.608 73.54 83.486 14.882 24.802 27.752 52.416 38.496 82.484h-155.264zM331.232 237.516c21.528-35.878 46.956-64.748 73.54-83.486 14.182-10 28.638-17.124 43.228-21.37v187.34h-155.264c10.746-30.066 23.616-57.68 38.496-82.484zM448 384v128h-191.314c1.88-44.146 7.666-87.038 17.278-128h174.036zM95.888 704c-17.056-40.886-27.342-83.804-30.678-128h127.444c1.762 44.608 7.178 87.546 15.758 128h-112.524zM256.686 576h191.314v128h-174.036c-9.612-40.96-15.398-83.854-17.278-128zM448 768v187.34c-14.588-4.246-29.044-11.372-43.228-21.37-26.584-18.74-52.014-47.61-73.54-83.486-14.882-24.804-27.75-52.418-38.498-82.484h155.266zM628.768 850.484c-21.528 35.876-46.958 64.746-73.54 83.486-14.184 9.998-28.638 17.124-43.228 21.37v-187.34h155.266c-10.746 30.066-23.616 57.68-38.498 82.484zM512 704v-128h191.314c-1.88 44.146-7.666 87.040-17.28 128h-174.034zM767.348 512c-1.762-44.608-7.178-87.546-15.758-128h112.524c17.056 40.886 27.344 83.806 30.68 128h-127.446zM830.658 320h-95.9c-18.638-58.762-44.376-110.294-75.316-151.428 42.536 20.34 81.058 47.616 114.714 81.272 21.48 21.478 40.362 44.938 56.502 70.156zM185.844 249.844c33.658-33.658 72.18-60.932 114.714-81.272-30.942 41.134-56.676 92.666-75.316 151.428h-95.898c16.138-25.218 35.022-48.678 56.5-70.156zM129.344 768h95.898c18.64 58.762 44.376 110.294 75.318 151.43-42.536-20.34-81.058-47.616-114.714-81.274-21.48-21.478-40.364-44.938-56.502-70.156zM774.156 838.156c-33.656 33.658-72.18 60.934-114.714 81.274 30.942-41.134 56.678-92.668 75.316-151.43h95.9c-16.14 25.218-35.022 48.678-56.502 70.156z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "externalsite"
+                ],
+                "defaultCode": 58888,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 9,
+                "order": 75,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58888,
+                "name": "externalsite"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 8
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 832q0 53-37.5 90.5t-90.5 37.5h-768q-53 0-90.5-37.5t-37.5-90.5v-512q0-26 18.5-45t45.5-19h480q0-12 11.5-33t22.5-36l12-16q7-18 28-30.5t44-12.5h240q24 0 45 12.5t28 30.5q49 58 49 85v576zM46 107q7-18 28-30.5t44-12.5h240q24 0 45 12.5t29 30.5l48 85h-480z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "filemanager"
+                ],
+                "defaultCode": 58889,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 10,
+                "order": 76,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58889,
+                "name": "filemanager"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 9
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M734.994 805.374c-18.952-2.988-19.384-54.654-19.384-54.654s55.688-54.656 67.824-128.152c32.652 0 52.814-78.138 20.164-105.628 1.362-28.94 41.968-227.176-163.598-227.176-205.564 0-164.958 198.236-163.598 227.176-32.654 27.49-12.488 105.628 20.162 105.628 12.134 73.496 67.826 128.152 67.826 128.152s-0.432 51.666-19.384 54.654c-61.048 9.632-289.006 109.316-289.006 218.626h768c0-109.31-227.958-208.994-289.006-218.626zM344.054 822.81c44.094-27.15 97.626-52.308 141.538-67.424-15.752-22.432-33.294-52.936-44.33-89.062-15.406-12.566-27.944-30.532-35.998-52.602-8.066-22.104-11.122-46.852-8.608-69.684 1.804-16.392 6.478-31.666 13.65-45.088-4.35-46.586-7.414-138.034 52.448-204.732 23.214-25.866 52.556-44.46 87.7-55.686-6.274-64.76-39.16-140.77-166.454-140.77-205.564 0-164.958 198.236-163.598 227.176-32.654 27.49-12.488 105.628 20.162 105.628 12.134 73.496 67.826 128.152 67.826 128.152s-0.432 51.666-19.384 54.654c-61.048 9.634-289.006 109.318-289.006 218.628h329.596c4.71-3.074 9.506-6.14 14.458-9.19z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "members"
+                ],
+                "defaultCode": 58890,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 11,
+                "order": 77,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58890,
+                "name": "members"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 10
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1005.632 1005.632c-24.896 24.896-65.024 24.896-89.856 0l-449.472-449.408c-24.832-24.896-24.832-65.088 0-89.984 24.896-24.832 65.152-24.832 89.984 0l449.344 449.472c24.896 24.896 24.896 65.024 0 89.92zM311.616 311.616c23.872 23.872-22.272 200.512-22.272 200.512-48.768-48.768-111.424-155.968-111.424-155.968s-178.176 25.856-178.176 0 89.152-133.696 89.152-133.696c-45.376-104.832-44.608-178.176-44.608-178.176s73.344-0.768 178.176 44.544c0 0 107.84-89.152 133.696-89.152s0 178.176 0 178.176 107.2 62.72 155.904 111.488c0 0-176.576 46.144-200.448 22.272z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "tools"
+                ],
+                "defaultCode": 58891,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 12,
+                "order": 78,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58891,
+                "name": "tools"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 11
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M0 192l320-128v768l-320 128zM704 192v768l-320-106.666v-768zM1024 64v768l-256 102.4v-768z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "geopipmaxmind"
+                ],
+                "defaultCode": 58892,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 13,
+                "order": 79,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58892,
+                "name": "geopipmaxmind"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 12
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M977.582 194.462c-33.984-9.708-69.41 9.97-79.12 43.956l-5.022 17.582h-596.942l-8.992-71.938c-4.004-32.028-31.23-56.062-63.506-56.062h-160c-35.346 0-64 28.654-64 64s28.654 64 64 64h103.502l56.992 455.938c4.004 32.026 31.23 56.062 63.506 56.062h544c28.574 0 53.688-18.944 61.538-46.418l128-448c9.71-33.986-9.97-69.41-43.956-79.12zM512 512v-64h127.996v64h-127.996zM639.996 576v64h-127.996v-64h127.996zM512 384v-64h127.996v64h-127.996zM304.498 320h143.502v64h-135.502l-8-64zM320.498 448h127.502v64h-119.502l-8-64zM336.498 576h111.502v64h-103.502l-8-64zM783.724 640h-79.728v-64h98.014l-18.286 64zM820.296 512h-116.3v-64h134.586l-18.286 64zM856.868 384h-152.872v-64h171.158l-18.286 64zM256 928c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96zM640 928c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "orders"
+                ],
+                "defaultCode": 58893,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 14,
+                "order": 80,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58893,
+                "name": "orders"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 13
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 1024h-896q-26 0-45-18.5t-19-45.5 19-45.5 45-18.5h896q26 0 45 18.5t19 45-19 45.5-45 19zM928 832h-864l176-330q5-9 16-12.5t21 0.5v-1q-4-3-3-3 2 0 9 6t11 15l35 35 185-263q2-9 7-14 9-9 23-9 13 0 23 9 0 1 1 2.5l1 1.5 89 72 240-319q8-22 30-22h1q13 0 22 9t9 22v769q0 13-9.5 22.5t-22.5 9.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "margins"
+                ],
+                "defaultCode": 58894,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 15,
+                "order": 81,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58894,
+                "name": "margins"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 14
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M987.429 707.919v169.796q0 21.224-14.857 36.082t-36.082 14.857h-169.796q-21.224 0-36.081-14.857t-14.857-36.082v-169.796q0-21.224 14.857-36.082t36.081-14.857h50.939v-101.877h-271.673v101.877h50.939q21.224 0 36.082 14.857t14.857 36.082v169.796q0 21.224-14.857 36.082t-36.082 14.857h-169.796q-21.224 0-36.081-14.857t-14.857-36.082v-169.796q0-21.224 14.857-36.082t36.081-14.857h50.939v-101.877h-271.673v101.877h50.939q21.224 0 36.082 14.857t14.857 36.082v169.796q0 21.224-14.857 36.082t-36.082 14.857h-169.796q-21.224 0-36.081-14.857t-14.857-36.082v-169.796q0-21.224 14.857-36.082t36.081-14.857h50.939v-101.877q0-27.592 20.163-47.755t47.755-20.163h271.673v-101.877h-50.939q-21.224 0-36.081-14.857t-14.857-36.082v-169.796q0-21.224 14.857-36.082t36.081-14.857h169.796q21.224 0 36.082 14.857t14.857 36.082v169.796q0 21.224-14.857 36.082t-36.082 14.857h-50.939v101.877h271.673q27.592 0 47.755 20.163t20.163 47.755v101.877h50.939q21.224 0 36.082 14.857t14.857 36.082z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "project"
+                ],
+                "defaultCode": 58895,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 16,
+                "order": 82,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58895,
+                "name": "project"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 15
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M613.877 487.184q0-13.796-10.082-23.878t-23.876-10.082h-135.837q-13.796 0-23.876 10.081t-10.082 23.876 10.082 23.878 23.876 10.081h135.837q13.796 0 23.876-10.081t10.082-23.878zM919.51 385.306v509.387q0 13.796-10.081 23.876t-23.876 10.082h-747.102q-13.796 0-23.876-10.082t-10.082-23.876v-509.387q0-13.796 10.082-23.878t23.876-10.082h747.102q13.796 0 23.876 10.081t10.081 23.878zM953.47 147.592v135.837q0 13.796-10.082 23.878t-23.876 10.082h-815.020q-13.796 0-23.876-10.082t-10.082-23.878v-135.837q0-13.796 10.082-23.878t23.876-10.082h815.020q13.796 0 23.876 10.082t10.081 23.878z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "product"
+                ],
+                "defaultCode": 58896,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 17,
+                "order": 83,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58896,
+                "name": "product"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 16
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M338.857 521.143q-92.571 2.857-151.429 73.143h-76.571q-46.857 0-78.857-23.143t-32-67.714q0-201.714 70.857-201.714 3.429 0 24.857 12t55.714 24.286 68 12.286q38.286 0 76-13.143-2.857 21.143-2.857 37.714 0 79.429 46.286 146.286zM950.857 885.143q0 68.571-41.714 108.286t-110.857 39.714h-499.429q-69.143 0-110.857-39.714t-41.714-108.286q0-30.286 2-59.143t8-62.286 15.143-62 24.571-55.714 35.429-46.286 48.857-30.571 63.714-11.429q5.714 0 24.571 12.286t41.714 27.429 61.143 27.429 77.143 12.286 77.143-12.286 61.143-27.429 41.714-27.429 24.571-12.286q34.857 0 63.714 11.429t48.857 30.571 35.429 46.286 24.571 55.714 15.143 62 8 62.286 2 59.143zM365.714 155.429q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429 42.857-103.429 103.429-42.857 103.429 42.857 42.857 103.429zM768 374.857q0 90.857-64.286 155.143t-155.143 64.286-155.143-64.286-64.286-155.143 64.286-155.143 155.143-64.286 155.143 64.286 64.286 155.143zM1097.143 503.429q0 44.571-32 67.714t-78.857 23.143h-76.571q-58.857-70.286-151.429-73.143 46.286-66.857 46.286-146.286 0-16.571-2.857-37.714 37.714 13.143 76 13.143 33.714 0 68-12.286t55.714-24.286 24.857-12q70.857 0 70.857 201.714zM1024 155.429q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429 42.857-103.429 103.429-42.857 103.429 42.857 42.857 103.429z"
+                ],
+                "width": 1097,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "thirdparties"
+                ],
+                "defaultCode": 58897,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 18,
+                "order": 84,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58897,
+                "name": "thirdparties"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 17
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M858.648 748.147c0 0 133.080-91.037 133.080-270.596 0-267.278-283.264-366.11-435.567-363.473-152.343 2.678-197.74 42.762-197.74 42.762s-51.834-37.686-106.784-69.258c-42.042-16.386-51.795-18.744-81.006-9.351-23.379 0-8.672 38.924 0.719 52.952 9.312 14.027 54.592 91.518 54.592 91.518s-95.035 97.873-102.067 162.214c0-1.159-44.76-0.36-69.298-0.36s-22.22 26.737-22.22 26.737l0.68 188.389c0 0-1.518 26.737 20.741 26.737 22.22 0 69.458 0.519 69.458 0.519s66.46 96.512 108.582 114.056c0 1.159-36.407 100.030-36.407 100.030s-17.544 30.413 14.027 42.121c31.572 11.669 113.937 46.239 149.026 56.788 35.048 10.509 40.084-13.347 40.084-13.347l34.729-75.013 227.195 0.36 34.729 77.33c0 0 6.675 35.889 53.433 16.025 46.798-19.863 97.873-43.441 136.476-63.301 38.564-19.863 13.189-56.987 13.189-56.987l-39.644-76.851zM245.122 422.641c-21.301 0-38.564-17.304-38.564-38.605s17.263-38.564 38.564-38.564 38.605 17.263 38.605 38.564-17.304 38.605-38.605 38.605zM788.749 302.43c-12.31 14.587-20.342 3.837-30.253 0.92 0 0-42.003-38.965-103.706-57.149-63.904-18.784-131.162-9.711-131.162-9.711-9.912-2.917-21.94-3.237-22.021-18.542 0.519-18.902 23.458-19.063 23.18-19.702 0 0 75.69-6.994 139.035 11.628 62.303 18.304 109.9 58.107 109.9 58.107s25.459 17.544 15.028 34.45z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "accountancy"
+                ],
+                "defaultCode": 58898,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 19,
+                "order": 85,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58898,
+                "name": "accountancy"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 18
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M864 928l-63.968-1.984v65.984h-96v-64h-382.016l-1.984 64h-96v-62.016l-64.032-1.984c-35.328 0-64-28.672-64-64v-768c0-35.328 28.672-64 64-64h704c35.328 0 64 28.672 64 64v768c0 35.328-28.672 64-64 64zM832 128h-640v126.656l-31.328-0.64v98.656h31.328v253.344h-32v97.984h32v128h640v-704zM800 800h-576v-96h32v-97.984h-32v-254.016h32l0.672-97.344h-32.672v-94.656h576v640zM465.984 337.984c-70.688 0-128 57.312-128 128s57.312 128 128 128c70.72 0 128-57.312 128-128s-57.28-128-128-128zM752 368.576c0-17.696-14.304-32-32-32-17.664 0-32 14.304-32 32 0 11.712 6.624 21.536 16 27.104v169.248c-9.376 5.568-16 15.36-16 27.104 0 17.664 14.336 32 32 32 17.696 0 32-14.336 32-32 0-12.608-7.424-23.232-17.984-28.448v-166.56c10.56-5.248 17.984-15.872 17.984-28.448zM464 520c-26.496 0-48-21.504-48-48 0-26.528 21.504-48 48-48 26.528 0 48 21.472 48 48 0 26.496-21.472 48-48 48z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "bank"
+                ],
+                "defaultCode": 58899,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 20,
+                "order": 86,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58899,
+                "name": "bank"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 19
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "admintools"
+                ],
+                "defaultCode": 58900,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 21,
+                "order": 87,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58900,
+                "name": "admintools"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 20
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 448h16c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-16v-192h-128v192h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h16v576h128v-576zM768 256h128v128h-128v-128zM592 832c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-16v-576h-128v576h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h16v192h128v-192h16zM448 640h128v128h-128v-128zM272 448c26.4 0 48-21.6 48-48v-160c0-26.4-21.6-48-48-48h-16v-192h-128v192h-16c-26.4 0-48 21.6-48 48v160c0 26.4 21.6 48 48 48h16v576h128v-576h16zM128 256h128v128h-128v-128z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "setup"
+                ],
+                "defaultCode": 58901,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 22,
+                "order": 88,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58901,
+                "name": "setup"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 21
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1032 672q0 70-14.5 115.5t-45.5 68.5-68.5 31.5-95.5 8.5-95.5-8.5-68.5-31.5-45.5-68.5-14.5-115.5q0-26-19-45t-45.5-19-45 19-18.5 45q0 70-14.5 115.5t-45.5 68.5-68.5 31.5-95.5 8.5-95.5-8.5-68.5-31.5-45.5-68.5-14.5-115.5q0-57 8-89-16-28-1-55l217-342q11-19 31.5-24.5t39 5.5 24 32.5-5.5 40.5l-156 245q42-5 99-5 75 0 114.5 11t56.5 37q51 16 85 16t85-16q17-26 56.5-37t114.5-11q56 0 99 5l-156-245q-11-19-5.5-40.5t24-32.5 39-5.5 31.5 24.5l217 342q15 27-1 55 8 32 8 89zM136 544q-30 0-47 18t-17 46 17 46 47 18q53 0 90.5-18.5t37.5-45.5-37.5-45.5-90.5-18.5zM712 544q-30 0-47 18t-17 46 17 46 47 18q53 0 90.5-18.5t37.5-45.5-37.5-45.5-90.5-18.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "hrm"
+                ],
+                "defaultCode": 58902,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 23,
+                "order": 89,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58902,
+                "name": "hrm"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 22
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1015.449 802.572c-1.729-56.216-44.083-52.279-97.994-52.279h-746.911c-53.912 0-96.265-3.936-97.994 52.279-1.729 22.971-68.627 37.494-68.627 77.614s21.195 40.841 75.117 40.841h929.924c53.922 0 75.117-2.616 75.117-40.841s-66.91-54.644-68.638-77.614zM92.029 711.96c21.063 0 873.11 0 897.953 0 40.158 0 40.158-22.876 40.158-22.876 0-233.851-182.666-307.375-393.125-360.89v-75.767c0 0 1.956-21.926-25.443-21.926s-33.533 0-33.533 0v-47.287h81.851c0-46.771-52.363-80.256-116.931-80.256-64.665 0-116.931 33.485-116.931 80.256h81.851v47.287c0 0-9.409 0-35.19 0s-23.788 23.644-23.788 23.644v74.051c-210.461 53.564-391.039 127.037-391.039 360.89 0 0 0 22.876 34.168 22.876zM383.405 396.724c-31.385 11.414-150.814 65.277-150.814 224.131l-56.683-0.204c-0.010-157.258 99.147-187.898 207.496-223.927z"
+                ],
+                "width": 1088,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "service"
+                ],
+                "defaultCode": 58903,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 24,
+                "order": 90,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58903,
+                "name": "service"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 23
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 896h-896q-26 0-45.001-18.5t-19.001-45.5v-640q0-26 18.5-45.001t45.5-19.001h896q27.001 0 45.5 19.001t18.5 45.001v640q0 26-18.5 45.001t-45.5 19.001zM640 320q-73.001 0-128 50-55.001-50-128-50-80 0-136 56.5t-56 136 56 135.5 136 56q73.001 0 128-50 55.001 50 128 50 79.001 0 135.5-56t56.5-135.5-56.5-136-135.5-56.5zM640 640q-53.001 0-90.5-37.5t-37.5-90.5 37.5-90.5 90.5-37.5 90.5 37.5 37.5 90.5-37.5 90.5-90.5 37.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "withdraw"
+                ],
+                "defaultCode": 58904,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 25,
+                "order": 91,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58904,
+                "name": "withdraw"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 24
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M864 992h-704c-35.328 0-64-28.672-64-64v-704c0-35.36 28.672-64 64-64h64v32c0 53.024 42.976 96 96 96 52.992 0 96-42.976 96-96v-32h192v32c0 53.024 43.008 96 96 96s96-42.976 96-96v-32h64c35.328 0 64 28.64 64 64v704c0 35.328-28.672 64-64 64zM864 384h-704v544h704v-544zM320 544h-96v-96h96v96zM320 704h-96v-96h96v96zM320 864h-96v-96h96v96zM480 544h-96v-96h96v96zM480 704h-96v-96h96v96zM480 864h-96v-96h96v96zM640 544h-96v-96h96v96zM640 704h-96v-96h96v96zM640 864h-96v-96h96v96zM800 544h-96v-96h96v96zM800 704h-96v-96h96v96zM800 864h-96v-96h96v96zM703.008 256c-34.816 0-63.008-28.224-63.008-63.008v-65.984c0-34.816 28.192-63.008 63.008-63.008s63.008 28.192 63.008 63.008v65.984c0 34.784-28.192 63.008-63.008 63.008zM319.008 256c-34.816 0-63.008-28.224-63.008-63.008v-65.984c0-34.816 28.192-63.008 63.008-63.008s63.008 28.192 63.008 63.008v65.984c0 34.784-28.224 63.008-63.008 63.008z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "agenda"
+                ],
+                "defaultCode": 58905,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 26,
+                "order": 92,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58905,
+                "name": "agenda"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 25
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1073.714 553.143q0 17.714-17.714 37.714l-192 226.286q-24.571 29.143-68.857 49.429t-82 20.286h-621.714q-19.429 0-34.571-7.429t-15.143-24.571q0-17.714 17.714-37.714l192-226.286q24.571-29.143 68.857-49.429t82-20.286h621.714q19.429 0 34.571 7.429t15.143 24.571zM877.714 356.572v91.429h-475.429q-53.714 0-112.571 27.143t-93.714 68.286l-195.428 229.715q0-2.286-0.286-7.143t-0.286-7.143v-548.571q0-52.571 37.714-90.286t90.286-37.714h182.857q52.571 0 90.286 37.714t37.714 90.286v18.286h310.857q52.571 0 90.286 37.714t37.714 90.286z"
+                ],
+                "width": 1097,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "ecm"
+                ],
+                "defaultCode": 58906,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 27,
+                "order": 93,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58906,
+                "name": "ecm"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 26
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1244.458 829.767h-1081.102v-635.478h1081.102l0.551 175.431 82.97-104.81v-70.621c0 0 0-105.913-83.521-105.913-84.395 0-1081.102 0-1081.102 0s-83.521 0-83.521 105.913c0 103.714 0 635.458 0 635.458s0 105.876 83.521 105.876c83.521 0 1081.102 0 1081.102 0s83.521 0 83.521-105.876c0-108.149 0-575.705 0-575.705l-82.879 83.933zM231.189 492.706h944.669v36.283h-944.669v-36.283zM917.78 697.345h174.347v20.048h-174.347v-20.048zM377.129 622.319h378.807v45.643h-378.807v-45.643zM885.222 257.022h290.565v108.042h-290.565v-108.042zM231.189 253.85h311.619v36.283h-311.619v-36.283zM231.296 328.67h277.299v36.283h-277.299v-36.283zM377.147 692.368h378.807v45.643h-378.807v-45.643zM946.443 765.595l103.722-143.997-18.883-13.95-103.722 143.997 18.883 13.95zM1057.813 605.939l0.275 162.169-26.094 1.577-0.275-162.169 26.094-1.577z"
+                ],
+                "width": 1468,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "checks"
+                ],
+                "defaultCode": 58907,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 28,
+                "order": 94,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58907,
+                "name": "checks"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 27
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M80.395 528.822h39.536v377.816h-39.536v-377.816zM95.208 498.4h886.759v237.209h-886.759v-237.209zM95.208 740.483h886.759v191.104h-886.759v-191.104zM70.385 905.951h39.536v25.636h-39.536v-25.636zM47.013 445.777l823.444-400.3 32.734 99.648-823.444 400.3-32.734-99.648z"
+                ],
+                "width": 1028,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "scanner"
+                ],
+                "defaultCode": 58908,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 29,
+                "order": 95,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58908,
+                "name": "scanner"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 28
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 429.256c0-200.926-58.792-363.938-131.482-365.226 0.292-0.006 0.578-0.030 0.872-0.030h-82.942c0 0-194.8 146.336-475.23 203.754-8.56 45.292-14.030 99.274-14.030 161.502s5.466 116.208 14.030 161.5c280.428 57.418 475.23 203.756 475.23 203.756h82.942c-0.292 0-0.578-0.024-0.872-0.032 72.696-1.288 131.482-164.298 131.482-365.224zM864.824 739.252c-9.382 0-19.532-9.742-24.746-15.548-12.63-14.064-24.792-35.96-35.188-63.328-23.256-61.232-36.066-143.31-36.066-231.124 0-87.81 12.81-169.89 36.066-231.122 10.394-27.368 22.562-49.266 35.188-63.328 5.214-5.812 15.364-15.552 24.746-15.552 9.38 0 19.536 9.744 24.744 15.552 12.634 14.064 24.796 35.958 35.188 63.328 23.258 61.23 36.068 143.312 36.068 231.122 0 87.804-12.81 169.888-36.068 231.124-10.39 27.368-22.562 49.264-35.188 63.328-5.208 5.806-15.36 15.548-24.744 15.548zM251.812 429.256c0-51.95 3.81-102.43 11.052-149.094-47.372 6.554-88.942 10.324-140.34 10.324-67.058 0-67.058 0-67.058 0l-55.466 94.686v88.17l55.46 94.686c0 0 0 0 67.060 0 51.398 0 92.968 3.774 140.34 10.324-7.236-46.664-11.048-97.146-11.048-149.096zM368.15 642.172l-127.998-24.51 81.842 321.544c4.236 16.634 20.744 25.038 36.686 18.654l118.556-47.452c15.944-6.376 22.328-23.964 14.196-39.084l-123.282-229.152zM864.824 548.73c-3.618 0-7.528-3.754-9.538-5.992-4.87-5.42-9.556-13.86-13.562-24.408-8.962-23.6-13.9-55.234-13.9-89.078s4.938-65.478 13.9-89.078c4.006-10.548 8.696-18.988 13.562-24.408 2.010-2.24 5.92-5.994 9.538-5.994 3.616 0 7.53 3.756 9.538 5.994 4.87 5.42 9.556 13.858 13.56 24.408 8.964 23.598 13.902 55.234 13.902 89.078 0 33.842-4.938 65.478-13.902 89.078-4.004 10.548-8.696 18.988-13.56 24.408-2.008 2.238-5.92 5.992-9.538 5.992z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "click2dial"
+                ],
+                "defaultCode": 58909,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 30,
+                "order": 96,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58909,
+                "name": "click2dial"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 29
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M880.634 130.774c25.698 12.576 48.094 30.486 64.502 52.482 34.536 46.3 44.236 109.372 28.836 187.466-15.56 79.026-50.416 145.734-101.166 194.044-9.282 9.702-19.222 18.746-29.804 27.080-54.356 42.802-122.998 65.428-198.508 65.428h-240.060l-64.564 302.726h-132.424l10.086-46.3h46.128l64.564-302.726h188.27c180.25 0 330.938-111.078 371.258-299.936 45.722-213.834-107.598-311.038-239.41-311.038h-449.278l-199.064 913.7h152.032l-24.032 110.3h263.66l64.564-302.726h188.27c180.25 0 330.938-111.078 371.258-299.936 33.716-157.68-40.804-251.932-135.118-290.564zM422.344 186.082h129.132c64.592 0 107.602 55.538 88.786 124.956-16.136 69.44-83.386 124.976-150.64 124.976h-123.758l56.48-249.932z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "paypal"
+                ],
+                "defaultCode": 58910,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 31,
+                "order": 97,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58910,
+                "name": "paypal"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 30
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M789.534 64c0 0-200.956 0-267.94 0-120.122 0-233.17 91.006-233.17 196.422 0 107.726 81.882 194.666 204.088 194.666 8.498 0 16.756-0.17 24.84-0.752-7.928 15.186-13.6 32.288-13.6 50.042 0 29.938 16.104 54.21 36.468 74.024-15.386 0-30.242 0.448-46.452 0.448-148.782-0.002-263.3 94.76-263.3 193.022 0 96.778 125.542 157.312 274.334 157.312 169.624 0 263.306-96.244 263.306-193.028 0-77.602-22.896-124.072-93.686-174.134-24.216-17.142-70.532-58.836-70.532-83.344 0-28.72 8.196-42.868 51.428-76.646 44.312-34.624 75.674-83.302 75.674-139.916 0-67.406-30.022-133.098-86.374-154.772h84.956l59.96-43.344zM695.948 719.458c2.126 8.972 3.284 18.208 3.284 27.628 0 78.2-50.39 139.31-194.974 139.31-102.842 0-177.116-65.104-177.116-143.3 0-76.642 92.126-140.444 194.964-139.332 24 0.254 46.368 4.116 66.668 10.69 55.828 38.828 95.876 60.76 107.174 105.004zM531.286 427.776c-69.038-2.064-134.636-77.226-146.552-167.86-11.916-90.666 34.37-160.042 103.388-157.99 69.008 2.074 134.636 74.814 146.558 165.458 11.906 90.66-34.39 162.458-103.394 160.392z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "google"
+                ],
+                "defaultCode": 58911,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 32,
+                "order": 98,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58911,
+                "name": "google"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 31
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512.448 706.624c-1.184 0-2.368 0-3.552 0-281.024 0-508.32-68.256-508.384-120.672l-0.512-205.856c0-0.32 0.128-0.608 0.128-0.864 46.272 21.952 100.64 32.064 133.152 38.112 101.024 18.784 234.464 29.152 375.616 29.152h3.552c142.048-0.16 276.256-10.784 378.016-29.888 32.544-6.112 86.72-16.288 133.024-38.112 0 0.096 0 0.288 0 0.288l0.544 205.856c0.064 52.64-228.896 121.6-511.584 121.984zM512.448 384.512c-1.184 0-2.368 0-3.552 0-281.024 0-508.32-62.272-508.384-114.688l-0.512-173.888c-0.096-52.608 228.992-95.584 511.68-95.936 1.248 0 2.432 0 3.68 0 280.928 0 508.064 42.24 508.128 94.656l0.544 173.888c0.064 52.608-228.896 115.584-511.584 115.968zM508.864 768.64h3.552c142.048-0.192 276.288-16.768 378.016-35.872 32.544-6.112 86.72-16.288 133.056-38.144l0.512 233.472c0.064 52.64-228.896 95.584-511.584 95.936-1.216 0-2.368 0-3.616 0-280.96 0-508.256-42.24-508.32-94.624l-0.48-234.080c46.272 21.984 100.672 32.096 133.248 38.144 101.024 18.816 234.432 35.168 375.616 35.168z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "webservices"
+                ],
+                "defaultCode": 58912,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 33,
+                "order": 99,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58912,
+                "name": "webservices"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 32
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 282.5l-90.506-90.5-178.746 178.752-101.5-101.502 178.75-178.75-90.5-90.5-178.75 178.75-114.748-114.75-86.626 86.624 512.002 512.002 86.624-86.624-114.752-114.752zM274.748 749.254c165.768 165.762 385.194 36.362 519.292-75.464l-443.824-443.824c-111.824 134.096-241.228 353.522-75.468 519.288zM191.998 704.004l127.994 127.996-191.992 191.992-127.996-127.994z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "modulesadmintools"
+                ],
+                "defaultCode": 58913,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 34,
+                "order": 100,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58913,
+                "name": "modulesadmintools"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 33
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 256c35.346 0 64-28.654 64-64v-128h-128v-64h-832c-35.2 0-64 28.798-64 64v896c0 35.2 28.796 64 64 64h832v-256h64c35.346 0 64-28.654 64-64v-128h-128v-64h64c35.346 0 64-28.654 64-64v-128h-128v-64h64zM576 256.33c70.51 0 127.67 57.16 127.67 127.67s-57.16 127.67-127.67 127.67c-70.51 0-127.67-57.16-127.67-127.67s57.16-127.67 127.67-127.67zM256 960h-64v-896h64v896zM768 768h-384v-64c0-70.694 57.308-128 128-128v0h128c70.696 0 128 57.306 128 128v64z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "contacts"
+                ],
+                "defaultCode": 58914,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 35,
+                "order": 101,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58914,
+                "name": "contacts"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 34
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1024 576l-128-256h-192v-128c0-35.2-28.8-64-64-64h-576c-35.2 0-64 28.8-64 64v512l64 64h81.166c-10.898 18.832-17.166 40.678-17.166 64 0 70.692 57.308 128 128 128s128-57.308 128-128c0-23.322-6.268-45.168-17.166-64h354.334c-10.898 18.832-17.168 40.678-17.168 64 0 70.692 57.308 128 128 128s128-57.308 128-128c0-23.322-6.27-45.168-17.168-64h81.168v-192zM704 576v-160h132.668l80 160h-212.668z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "sendings"
+                ],
+                "defaultCode": 58915,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 36,
+                "order": 102,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58915,
+                "name": "sendings"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 35
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 256h-192v-128c0-35.2-28.8-64-64-64h-256c-35.2 0-64 28.8-64 64v128h-192c-70.4 0-128 57.6-128 128v512c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-512c0-70.4-57.6-128-128-128zM384 128h256v128h-256v-128zM768 704h-192v192h-128v-192h-192v-128h192v-192h128v192h192v128z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "ficheinter"
+                ],
+                "defaultCode": 58916,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 37,
+                "order": 103,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58916,
+                "name": "ficheinter"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 36
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M760.58 924.633c-39.656 0-73.363-15.635-101.122-46.905s-41.638-68.905-41.638-112.905c0-44 13.879-81.496 41.638-112.49s61.466-46.49 101.122-46.49c39.656 0 73.363 15.497 101.122 46.49s41.638 68.49 41.638 112.49c0 44-13.879 81.635-41.638 112.905s-61.466 46.905-101.122 46.905zM760.952 712.106c-13.136 0-24.413 5.119-33.831 15.358s-14.127 22.692-14.127 37.358c0 14.667 4.709 27.258 14.127 37.773s20.695 15.773 33.831 15.773c13.136 0 24.289-5.258 33.459-15.773s13.756-23.107 13.756-37.773c0-14.667-4.585-27.119-13.756-37.358s-20.324-15.358-33.459-15.358zM284.713 393.316c-39.656 0-73.363-15.635-101.122-46.905s-41.638-68.905-41.638-112.905c0-44 13.879-81.496 41.638-112.49s61.466-46.49 101.122-46.49c39.656 0 73.363 15.497 101.122 46.49s41.638 68.49 41.638 112.49c0 44-13.879 81.635-41.638 112.905s-61.466 46.905-101.122 46.905zM284.341 180.789c-13.136 0-24.289 5.119-33.459 15.358s-13.756 22.692-13.756 37.358c0 14.667 4.585 27.258 13.756 37.773s20.447 15.773 33.831 15.773c13.384 0 24.661-5.258 33.831-15.773s13.756-23.107 13.756-37.773-4.709-27.119-14.127-37.358c-9.418-10.239-20.695-15.358-33.831-15.358zM738.896 82.178l165.021 99.773-592.362 740.52-165.021-99.773 592.362-740.52zM344.235 665.57h35.488v39.037h-35.488v-39.037z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "tax"
+                ],
+                "defaultCode": 58917,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 38,
+                "order": 104,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58917,
+                "name": "tax"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 37
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M933.875 455.75h-365.625v-112.5h365.625q11.426 0 19.776 7.911t8.349 20.215v56.25q0 11.426-8.349 19.776t-19.776 8.349zM624.5 287h-281.25q-46.582 0-79.541-32.959t-32.959-79.541 32.959-79.541 79.541-32.959q47.461 0 70.752 11.865t29.443 35.156 8.349 49.219 16.26 61.963 43.945 66.797v-38.232t0.879-35.596 3.076-35.156 5.713-31.201 9.229-29.004 14.063-22.412 19.776-18.457 26.367-10.547 33.398-4.395q46.582 0 79.541 32.959t32.959 79.541-32.959 79.541-79.541 32.959zM342.81 118.25q-23.291 0-39.551 16.26t-16.26 39.551 16.26 39.99 39.551 16.7 39.99-16.7 16.7-39.99-16.7-39.551-39.99-16.26zM624.060 118.25q-23.291 0-39.551 16.26t-16.26 39.551 16.7 39.99 39.551 16.7 39.551-16.7 16.7-39.99-16.7-39.551-39.99-16.26zM455.75 455.75h-365.625q-11.426 0-19.776-8.349t-8.349-19.776v-56.25q0-12.305 8.349-20.215t19.776-7.911h365.625v112.5zM455.75 962h-281.25q-23.731 0-39.99-16.7t-16.26-39.551v-393.75h337.5v450zM905.75 512v393.75q0 22.852-16.26 39.551t-39.99 16.7h-281.25v-450h337.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "donations"
+                ],
+                "defaultCode": 58918,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 39,
+                "order": 105,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58918,
+                "name": "donations"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 38
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M384 64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.796 64 64 64h320c35.2 0 64-28.8 64-64v-320c0-35.2-28.8-64-64-64zM384 320h-320v-64h320v64zM896 64h-320c-35.204 0-64 28.8-64 64v832c0 35.2 28.796 64 64 64h320c35.2 0 64-28.8 64-64v-832c0-35.2-28.8-64-64-64zM896 640h-320v-64h320v64zM896 448h-320v-64h320v64zM384 576h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.796 64 64 64h320c35.2 0 64-28.8 64-64v-320c0-35.2-28.8-64-64-64zM384 832h-128v128h-64v-128h-128v-64h128v-128h64v128h128v64z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "ca"
+                ],
+                "defaultCode": 58919,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 40,
+                "order": 106,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58919,
+                "name": "ca"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 39
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 577l-449-449h898zM7 861q-7-14-7-29v-640q0-15 7-29l350 349zM473 629q6 5 15.5 8t16.5 3h7q26 1 39-11l71-72 339 339h-898l339-339zM1017 163q7 14 7 29v640q0 15-7 29l-350-349z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "mailing"
+                ],
+                "defaultCode": 58920,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 41,
+                "order": 107,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58920,
+                "name": "mailing"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 40
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 1024h-704q-26 0-45-18.5t-19-45.5v-11q-165-160-166-162-26-24-26-77.5t26-78.5l166-160v-407q0-26 19-45t45-19h384v352q0 14 9.5 23t22.5 9h351q1 1 1 2v574q0 27-18.5 45.5t-45.5 18.5zM640 639q0-26-18.5-45t-45.5-19h-192v-58q4-30-17-51-18-19-43.5-19t-43.5 19l-198 197q-18 18-18 43.5t18 43.5q12 12 96.5 93.5t101.5 98.5q18 18 43.5 18t43.5-18q21-21 17-52v-59h192q27 0 45.5-18.5t18.5-45.5v-128zM704 0q26 0 44 18l257 257q19 19 18 45h-319v-320z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "export"
+                ],
+                "defaultCode": 58921,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 42,
+                "order": 108,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58921,
+                "name": "export"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 41
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M960 1024h-704q-27 0-45.5-18.5t-18.5-45.5v-65h-101q-38 0-64.5-28t-26.5-68v-192q0-39 26.5-67.5t64.5-28.5h101v-447q0-26 18.5-45t45.5-19h384v352q0 13 9.5 22.5t22.5 9.5h351l1 1v575q0 27-18.5 45.5t-45.5 18.5zM622 663l-198-198q-18-18-43.5-18t-43.5 18q-19 19-17 48v62h-192q-26 0-45 19t-19 45v128q0 27 19 45.5t45 18.5h192v63q-2 29 17 48 18 18 43.5 18t43.5-18l182-182q11-5 16-10 18-18 18-43.5t-18-43.5zM704-1q26 0 44 19l257 257q19 19 18 45h-319v-321z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "import"
+                ],
+                "defaultCode": 58922,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 43,
+                "order": 109,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58922,
+                "name": "import"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 42
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M452.604 26.923c-283.813 0-433.685 150.561-433.685 435.504v106.238c0 235.237 102.276 378.703 297.612 421.678 61.649 8.378 102.506 12.413 134.253 14.189 0.617 0.002 1.201 0 1.819 0 54.965 2.968 81.863-0.815 137.164-0.728 0.701-0.030 4.366 0 4.366 0 44.636-2.076 85.619-8.241 122.974-18.191 56.649-13.887 158.993-85.136 158.993-85.136 8.122-7.619 15.619-15.577 22.921-24.013 17.577-23.028 50.572-78.223 50.572-78.223 29.615-62.731 44.751-139.464 44.751-229.576v-106.238c0-284.943-150.561-435.504-435.504-435.504h-106.238zM475.525 156.447c6.035-0.224 9.46 0 9.46 0v72.038c0 0-172.688-8.182-282.695 151.717-81.983 119.164-72.017 302.014 14.553 401.304 76.533 87.778 106.437 95.563 143.349 118.608 71.241 44.478 212.961 56.152 212.84 56.030 0 0-141.113 1.445-189.919-2.183s-102.236-13.462-102.236-13.462c0 0-79.71-49.526-139.347-138.255-29.157-43.381-65.373-135.47-67.672-192.466-6.592-163.446 43.507-231.941 80.77-285.97 103.455-150.004 278.651-165.796 320.898-167.362zM506.814 257.955c97.286-1.058 158.993 41.84 158.993 41.84l-36.019 61.851c0 0-78.28-43.507-149.17-31.653-40.036 6.695-161.145 31.613-203.744 155.719-33.998 99.046-21.552 207.208 104.783 302.342 47.141 35.499 129.305 57.738 207.019 65.489 145.829 14.545 271.417-14.917 271.417-14.917s-69.051 40.129-102.236 55.302c-33.185 15.173-96.779 35.655-96.779 35.655s-15.741 7.713-110.968-6.913c-126.69-19.458-201.879-59.503-263.049-121.155s-106.406-135.068-96.415-261.23c10.053-126.944 104.22-241.481 243.402-273.6 25.905-5.978 50.315-8.488 72.766-8.732zM515.182 361.646c123.697-6.564 185.917 108.785 185.917 108.785s-60.151 32.402-61.123 30.926c-45.159-68.6-129.673-92.388-198.651-50.572-103.301 62.623-76.632 185.646-18.919 233.942 30.662 25.659 93.607 62.414 189.555 68.036 84.207 4.934 172.629-0.137 216.842-5.094 77.743-8.726 115.196-14.779 114.606-14.189l-24.013 36.383-34.928 41.477c0 0-212.774 37.152-372.925-5.094-125.774-33.178-191.566-107.297-207.747-208.474-11.169-69.842 33.153-226.667 211.385-236.125zM372.925 999.803c7.516 0.908 15.174 1.532 22.921 2.183-7.549-0.582-15.279-1.31-22.921-2.183zM395.846 1001.986c8.541 0.717 17.007 1.427 25.832 1.819-8.502-0.364-17.203-1.154-25.832-1.819z"
+                ],
+                "width": 1022,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "bittorrent"
+                ],
+                "defaultCode": 58923,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 44,
+                "order": 110,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58923,
+                "name": "bittorrent"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 43
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M928 576c73 0 32 192-32 192 32 0 0 160-64 160 0 64-64 96-128 96-270.352 0-175.264-67.65-448-96v-512c240.922-72.268 480-253.424 480-416 53 0 192 64 0 384 0 0 160 0 192 0 96 0 64 192 0 192zM192 416v512h64v32h-128c-35.2 0-64-43.2-64-96v-384c0-52.8 28.8-96 64-96h128v32h-64z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "propals"
+                ],
+                "defaultCode": 58924,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 45,
+                "order": 111,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58924,
+                "name": "propals"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 44
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M448 807.31l-205.254-237.254 58.508-58.51 146.746 114.744 274.744-242.744 58.512 58.508zM831.772 140.8c0.078 0.066 0.162 0.15 0.228 0.23v767.542c-0.066 0.078-0.15 0.162-0.228 0.228h-639.544c-0.080-0.066-0.162-0.15-0.228-0.228v-767.544c0.066-0.080 0.15-0.162 0.23-0.228h-128.23v768c0 70.4 57.6 128 128 128h640c70.4 0 128-57.6 128-128v-768h-128.228zM640 140.8v-64c0-35.346-28.654-64-64-64h-128c-35.346 0-64 28.654-64 64v64h-128v128h512v-128h-128zM576 140.8h-128v-64h128v64z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "opensurvey"
+                ],
+                "defaultCode": 58925,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 46,
+                "order": 112,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58925,
+                "name": "opensurvey"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 45
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M980.814 774.537h-459.289c13.466-23.217 23.778-48.383 30.603-75.011h428.684c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM980.814 662.021h-421.408c1.538-12.302 2.588-24.79 2.588-37.505 0-12.751-1.051-25.204-2.588-37.505h421.408c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM980.814 549.505h-428.684c-6.863-26.629-17.141-51.796-30.603-75.011h459.289c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM980.814 436.989h-484.868c-24.379-30.417-54.495-55.995-88.85-75.011h573.717c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM980.814 324.474h-600.084c-20.74 0-37.505-16.802-37.505-37.505 0-20.74 16.765-37.505 37.505-37.505h600.084c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM980.814 211.96h-600.084c-20.74 0-37.505-16.802-37.505-37.505 0-20.74 16.765-37.505 37.505-37.505h600.084c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505zM530.753 624.516c0 144.994-117.579 262.537-262.537 262.537-144.994 0-262.537-117.54-262.537-262.537s117.54-262.537 262.537-262.537c144.957 0 262.537 117.54 262.537 262.537zM361.153 653.057c-3.788-8.964-8.663-16.765-14.777-23.402s-13.052-12.341-20.853-17.103c-7.802-4.763-15.753-9.002-23.892-12.789-8.138-3.751-16.090-7.275-23.892-10.651-7.802-3.338-14.814-6.938-20.966-10.764-6.187-3.826-11.102-8.214-14.777-13.126-3.675-4.914-5.514-10.727-5.514-17.478 0-4.501 0.825-8.776 2.437-12.826 1.65-4.012 4.126-7.5 7.5-10.39 3.338-2.85 7.538-5.139 12.526-6.751 4.988-1.65 10.876-2.437 17.591-2.437 8.588 0 16.465 1.014 23.665 3.112 7.164 2.139 13.503 4.426 18.978 7.013 5.477 2.55 10.089 4.914 13.839 7.089s6.488 3.227 8.214 3.227 3.075-0.45 4.089-1.387c0.977-0.938 1.801-2.4 2.325-4.463 0.562-2.025 0.9-4.613 1.162-7.727 0.225-3.15 0.338-7.013 0.338-11.552 0-4.051-0.074-7.463-0.225-10.165-0.15-2.738-0.45-5.025-0.788-6.826-0.412-1.801-0.863-3.264-1.387-4.352-0.601-1.088-1.612-2.4-3.19-3.937-1.575-1.575-4.763-3.525-9.602-5.813-4.837-2.325-10.39-4.426-16.614-6.264-6.264-1.876-12.978-3.338-20.14-4.426-1.463-0.225-2.964-0.15-4.426-0.338v-38.78h-36.905v38.78c-6.789 0.9-13.351 2.25-19.727 4.089-12.415 3.601-23.179 9.002-32.33 16.277s-16.427 16.427-21.791 27.38c-5.4 11.026-8.063 23.778-8.063 38.293 0 12.64 1.876 23.516 5.589 32.555 3.751 9.039 8.626 16.916 14.665 23.553 6.039 6.639 12.826 12.302 20.479 17.065 7.651 4.8 15.563 9.039 23.665 12.789 8.138 3.751 16.015 7.275 23.665 10.651s14.476 6.976 20.479 10.764c6.039 3.863 10.913 8.214 14.665 13.126 3.751 4.951 5.626 10.839 5.626 17.702 0 5.963-1.088 11.364-3.264 16.239-2.213 4.837-5.363 8.89-9.489 12.188-4.126 3.301-9.151 5.813-15.076 7.613-5.963 1.801-12.64 2.7-20.178 2.7-11.401 0-21.451-1.275-30.117-3.863-8.663-2.588-16.127-5.44-22.391-8.588-6.264-3.112-11.364-5.925-15.339-8.551-3.975-2.55-7.050-3.863-9.263-3.863-1.575 0-2.964 0.45-4.089 1.275-1.199 0.863-2.139 2.325-2.812 4.352-0.713 2.063-1.199 4.687-1.538 7.989s-0.487 7.352-0.487 12.188c0 7.201 0.45 12.714 1.275 16.54 0.863 3.863 2.325 6.789 4.352 8.776 2.025 2.025 5.325 4.315 9.939 6.976s10.351 5.139 17.215 7.538c6.863 2.363 14.814 4.426 23.778 6.15 8.964 1.687 18.716 2.513 29.179 2.513 0.45 0 0.863-0.074 1.35-0.074v36.117h36.867v-40.956c1.763-0.45 3.638-0.675 5.363-1.162 13.577-4.051 25.467-10.127 35.63-18.153 10.165-8.026 18.19-18.041 24.153-30.080 5.925-12.038 8.852-25.99 8.852-41.93 0.037-12.114-1.838-22.653-5.551-31.653zM495.947 812.040h484.868c20.74 0 37.505 16.765 37.505 37.505 0 20.703-16.765 37.505-37.505 37.505h-573.717c34.356-19.015 64.472-44.594 88.85-75.011z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "suppliers_bills"
+                ],
+                "defaultCode": 58926,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 47,
+                "order": 113,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58926,
+                "name": "suppliers_bills"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 46
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M139.403 114.842v794.306h963.94v-794.306zM341.891 217.159l188.284 207.434 5.533 5.194-0.429 0.429 2.19 2.417-67.091 65.373c-41.489 40.428-97.036 92.916-141.224 136.778l-68.286-64.108 144.929-143.821-130.995-144.319zM405.797 426.851c-166.998 319.61-83.499 159.806 0 0zM614.158 517.336h204.589v71.087h-204.589z"
+                ],
+                "width": 1243,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "cron"
+                ],
+                "defaultCode": 58927,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 48,
+                "order": 114,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58927,
+                "name": "cron"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 47
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M873.415 905.75l-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25-62.192-56.25-62.192 56.25v-843.75q0-22.852 18.463-39.551t43.729-16.7h746.307q25.266 0 43.729 16.7t18.463 39.551v843.75zM220.395 793.25h186.577q12.633 0 21.864-8.349t9.232-19.776-9.232-19.776-21.864-8.349h-186.577q-12.633 0-21.864 8.349t-9.233 19.776 9.233 19.776q9.232 8.349 21.864 8.349zM811.223 202.625q0-11.426-9.232-19.776t-21.864-8.349h-559.731q-12.633 0-21.864 8.349t-9.232 19.776v337.5q0 11.426 9.232 19.776t21.864 8.349h342.058v84.375q0 11.426 9.232 19.776t21.864 8.349h186.577q12.633 0 21.864-8.349t9.232-19.776v-450zM624.646 568.25h124.385v56.25h-124.385v-56.25zM624.646 455.75h124.385v56.25h-124.385v-56.25zM624.646 343.25h124.385v56.25h-124.385v-56.25zM624.646 230.75h124.385v56.25h-124.385v-56.25zM251.492 455.75h310.961v56.25h-310.961v-56.25zM251.492 343.25h310.961v56.25h-310.961v-56.25zM251.492 230.75h310.961v56.25h-310.961v-56.25z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "customers_bills"
+                ],
+                "defaultCode": 58928,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 49,
+                "order": 115,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58928,
+                "name": "customers_bills"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 48
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M896 640q-76 3-134 60t-58 132v64h-64v-64q0-75-60.5-133.5t-131.5-58.5h-192v224q0 12-7.5 20.5t-18.5 10.5q-2 1-6 1h-192q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5h160v-736q0-13 9.5-22.5t22.5-9.5 22.5 9.5 9.5 22.5v480h128l128-448q0-26 18.5-45t45.5-19h384q26 0 45 19t19 45v512h-128zM896 228q0-15-11.5-25.5t-26.5-10.5h-231q-16 0-27 10.5t-11 25.5l-77 248q0 15 11.5 25.5t26.5 10.5h90q0-27 19-45.5t45-18.5h64v-160q0-13 9.5-22.5t22.5-9.5 22.5 9.5 9.5 22.5v160h64v-220zM448 704q53 0 90.5 37.5t37.5 90.5-37.5 90.5-90.5 37.5-90.5-37.5-37.5-90.5 37.5-90.5 90.5-37.5zM896 704q53 0 90.5 37.5t37.5 90.5-37.5 90.5-90.5 37.5-90.5-37.5-37.5-90.5 37.5-90.5 90.5-37.5z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "stock"
+                ],
+                "defaultCode": 58929,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 50,
+                "order": 116,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58929,
+                "name": "stock"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 49
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M1152.064 736.32l1.824-546.848-993.6 0.608-0.032-62.72h1055.744v608.992l-63.936-0.032zM1119.84 832.544l-63.904-0.064 1.824-546.848-993.6 0.64-0.032-62.72h1055.744v608.992zM1025.696 896.64h-1025.696v-576.96h1025.696v576.96zM961.568 381.792h-897.472v450.752h897.44v-450.752zM865.44 784.48c0 5.664 1.408 10.944 3.232 16h-355.84c88.512 0 160.288-86.080 160.288-192.32s-71.776-192.32-160.288-192.32h355.808c-1.824 5.056-3.232 10.336-3.232 16.032 0 26.56 21.504 48.064 48.064 48.064 5.696 0 10.976-1.408 16.032-3.232v262.88c-5.056-1.792-10.336-3.232-16.032-3.232-26.528 0.032-48.032 21.568-48.032 48.128zM801.312 541.408c-26.56 0-48.064 28.672-48.064 64.096s21.504 64.096 48.064 64.096 48.064-28.672 48.064-64.096-21.504-64.096-48.064-64.096zM579.936 492.608c0.48 0.928 0.864 2.176 1.184 3.712 0.352 1.536 0.576 3.488 0.672 5.824 0.16 2.336 0.224 5.248 0.224 8.736 0 3.872-0.096 7.168-0.288 9.824-0.224 2.688-0.576 4.896-0.992 6.624-0.512 1.76-1.152 3.040-1.984 3.808-0.864 0.8-2.048 1.216-3.52 1.216s-3.776-0.928-7.008-2.784c-3.232-1.888-7.168-3.872-11.808-6.048s-10.080-4.192-16.224-5.984-12.864-2.688-20.224-2.688c-5.76 0-10.752 0.672-15.008 2.080-4.288 1.408-7.872 3.328-10.72 5.792-2.88 2.464-5.024 5.44-6.4 8.864-1.408 3.456-2.112 7.136-2.112 10.976 0 5.76 1.568 10.72 4.704 14.944 3.136 4.192 7.328 7.936 12.64 11.2 5.28 3.296 11.264 6.336 17.92 9.216s13.472 5.92 20.416 9.088c6.944 3.232 13.76 6.848 20.448 10.944 6.688 4.064 12.64 8.928 17.824 14.592 5.216 5.696 9.44 12.352 12.64 20.032s4.8 16.704 4.8 27.136c0 13.6-2.56 25.568-7.616 35.808-5.056 10.272-11.936 18.88-20.64 25.76s-18.816 12.032-30.432 15.488c-1.472 0.448-3.072 0.64-4.576 0.992v35.008h-31.52v-30.88c-0.416 0-0.768 0.096-1.184 0.096-8.928 0-17.248-0.736-24.928-2.176-7.68-1.472-14.464-3.232-20.32-5.248-5.888-2.048-10.784-4.224-14.72-6.464-3.968-2.24-6.784-4.224-8.512-5.952s-2.976-4.224-3.712-7.488-1.12-8-1.12-14.144c0-4.128 0.128-7.616 0.416-10.4 0.256-2.816 0.704-5.088 1.312-6.848 0.608-1.728 1.408-2.976 2.4-3.712 0.992-0.704 2.176-1.088 3.488-1.088 1.888 0 4.512 1.088 7.936 3.328 3.392 2.176 7.776 4.64 13.12 7.296s11.712 5.088 19.136 7.296c7.392 2.208 16 3.328 25.728 3.328 6.4 0 12.16-0.768 17.216-2.304 5.088-1.536 9.376-3.712 12.928-6.496 3.52-2.816 6.208-6.304 8.096-10.432 1.888-4.16 2.816-8.768 2.816-13.856 0-5.888-1.632-10.944-4.8-15.136-3.2-4.224-7.36-7.936-12.512-11.232-5.152-3.264-10.976-6.336-17.504-9.184-6.56-2.88-13.28-5.92-20.224-9.12s-13.696-6.848-20.224-10.912c-6.528-4.064-12.384-8.928-17.504-14.624-5.12-5.664-9.312-12.384-12.512-20.096-3.2-7.744-4.8-17.024-4.8-27.84 0-12.416 2.304-23.328 6.912-32.704 4.608-9.408 10.816-17.216 18.624-23.424 7.808-6.176 17.024-10.848 27.616-13.92 5.44-1.568 11.072-2.72 16.864-3.488v-33.12h31.52v33.12c1.248 0.16 2.496 0.096 3.744 0.288 6.144 0.928 11.904 2.176 17.248 3.776 5.312 1.6 10.048 3.36 14.176 5.376 4.16 1.984 6.88 3.616 8.256 4.96 1.248 1.184 2.144 2.304 2.624 3.264zM352.576 608.16c0 106.208 71.744 192.32 160.256 192.32h-355.808c1.792-5.056 3.232-10.336 3.232-16 0-26.56-21.536-48.096-48.064-48.096-5.696 0-10.976 1.44-16.032 3.232v-262.88c5.056 1.824 10.336 3.232 16.032 3.232 26.56 0 48.064-21.504 48.064-48.064 0-5.696-1.44-10.976-3.232-16.032h355.808c-88.512-0.032-160.256 86.080-160.256 192.288zM224.352 541.408c-26.56 0-48.064 28.672-48.064 64.096s21.536 64.096 48.064 64.096c26.56 0 48.064-28.672 48.064-64.096s-21.504-64.096-48.064-64.096z"
+                ],
+                "width": 1216,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "tripsandexpenses"
+                ],
+                "defaultCode": 58930,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 51,
+                "order": 117,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58930,
+                "name": "tripsandexpenses"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 50
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M256 76.8h512v128h-512v-128zM960 268.8h-896c-35.2 0-64 28.8-64 64v320c0 35.2 28.794 64 64 64h192v256h512v-256h192c35.2 0 64-28.8 64-64v-320c0-35.2-28.8-64-64-64zM128 460.8c-35.346 0-64-28.654-64-64s28.654-64 64-64 64 28.654 64 64-28.652 64-64 64zM704 908.8h-384v-320h384v320z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "printer"
+                ],
+                "defaultCode": 58944,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 52,
+                "order": 118,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58944,
+                "name": "printer"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 51
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M768 652.8v-128h-320v-128h320v-128l192 192zM704 588.8v256h-320v192l-384-192v-832h704v320h-64v-256h-512l256 128v576h256v-192z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "exit"
+                ],
+                "defaultCode": 58945,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 53,
+                "order": 119,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 58945,
+                "name": "exit"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 52
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M617.093 698.132c-22.536-3.553-23.050-64.989-23.050-64.989s66.219-64.992 80.65-152.386c38.827 0 62.801-92.914 23.977-125.603 1.62-34.413 49.904-270.136-194.535-270.136-244.437 0-196.152 235.723-194.535 270.136-38.829 32.688-14.85 125.603 23.975 125.603 14.429 87.394 80.652 152.386 80.652 152.386s-0.514 61.436-23.050 64.989c-72.592 11.453-343.658 129.988-343.658 259.969h913.232c0-129.981-271.066-248.516-343.658-259.969z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "loginphoto"
+                ],
+                "defaultCode": 59648,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 54,
+                "order": 120,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 59648,
+                "name": "loginphoto"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 53
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M512 786.286v-109.714q0-8-5.143-13.143t-13.143-5.143h-109.714q-8 0-13.143 5.143t-5.143 13.143v109.714q0 8 5.143 13.143t13.143 5.143h109.714q8 0 13.143-5.143t5.143-13.143zM658.286 402.286q0-50.286-31.714-93.143t-79.143-66.286-97.143-23.429q-138.857 0-212 121.714-8.571 13.714 4.571 24l75.429 57.143q4 3.429 10.857 3.429 9.143 0 14.286-6.857 30.286-38.857 49.143-52.571 19.429-13.714 49.143-13.714 27.429 0 48.857 14.857t21.429 33.714q0 21.714-11.429 34.857t-38.857 25.714q-36 16-66 49.429t-30 71.714v20.571q0 8 5.143 13.143t13.143 5.143h109.714q8 0 13.143-5.143t5.143-13.143q0-10.857 12.286-28.286t31.143-28.286q18.286-10.286 28-16.286t26.286-20 25.429-27.429 16-34.571 7.143-46.286zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z"
+                ],
+                "width": 878,
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "help"
+                ],
+                "defaultCode": 59649,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 55,
+                "order": 121,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 59649,
+                "name": "help"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 54
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M972.8 512l-307.2-256v153.6h-358.4v204.8h358.4v153.6l307.2-256zM153.6 153.6h409.6v-102.4h-409.6c-56.32 0-102.4 46.080-102.4 102.4v716.8c0 56.32 46.080 102.4 102.4 102.4h409.6v-102.4h-409.6v-716.8z"
+                ],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "tags": [
+                    "log-out"
+                ],
+                "defaultCode": 943131,
+                "grid": 16,
+                "attrs": []
+            },
+            "attrs": [],
+            "properties": {
+                "id": 56,
+                "order": 122,
+                "ligatures": "",
+                "prevSize": 32,
+                "code": 943131,
+                "name": "log-out"
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 55
+        },
+        {
+            "icon": {
+                "paths": [
+                    "M41.143 40.188v945.231h945.231v-945.231h-945.231zM450.202 254.803c30.948 0 81.747 2.166 132.57 15.963 88.987 24.166 178.751 98.442 178.751 222.381 0 95.649-27.245 157.397-66.489 198.924-92.993 98.399-250.317 76.725-250.317 76.725l-0.354-151.221c0 0 160.517 20.917 159.095-109.714-0.938-86.126-57.357-102.006-111.475-104.767-26.367-1.339-67.475-1.418-70.995-1.457v368.447h-154.995v-514.836l156.706-0.028c1.617 0 10.253-0.394 27.502-0.433z"
+                ],
+                "attrs": [],
+                "isMulticolor": false,
+                "isMulticolor2": false,
+                "grid": 16,
+                "tags": [
+                    "generic"
+                ],
+                "colorPermutations": {}
+            },
+            "attrs": [],
+            "properties": {
+                "order": 123,
+                "id": 59,
+                "name": "generic",
+                "prevSize": 32,
+                "code": 59650
+            },
+            "setIdx": 0,
+            "setId": 0,
+            "iconIdx": 56
+        }
+    ],
+    "height": 1024,
+    "metadata": {
+        "name": "oblyon-icons"
+    },
+    "preferences": {
+        "showGlyphs": true,
+        "showCodes": true,
+        "showQuickUse": true,
+        "showQuickUse2": true,
+        "showSVGs": true,
+        "fontPref": {
+            "prefix": "icon-",
+            "metadata": {
+                "fontFamily": "icomoon"
+            },
+            "metrics": {
+                "emSize": 1024,
+                "baseline": 6.25,
+                "whitespace": 50
+            },
+            "embed": false
+        },
+        "imagePref": {
+            "prefix": "icon-",
+            "png": true,
+            "useClassSelector": true,
+            "color": 0,
+            "bgColor": 16777215
+        },
+        "historySize": 50,
+        "gridSize": 16
+    }
+}
\ No newline at end of file
diff --git a/themeoblyon/global.inc.php b/themeoblyon/global.inc.php
index 2628f57..41df13c 100644
--- a/themeoblyon/global.inc.php
+++ b/themeoblyon/global.inc.php
@@ -8,7 +8,7 @@
 :root {
 	--fontawesomeFamily: "<?php print $fontawesomeFamily; ?>";
 	--fontawesomeBrands: "<?php print $fontawesomeBrands; ?>";
-    --fontawesomeWeight: <?php echo getDolGlobalString('MAIN_FONTAWESOME_WEIGHT', '900'); ?>;
+    --fontawesomeWeight: <?php print getDolGlobalString('MAIN_FONTAWESOME_WEIGHT', '900'); ?>;
 	--bgcolor: <?php print $bgcolor; ?>;
 	--colorbackhmenu1: rgb(<?php print $colorbackhmenu1; ?>);
 	--colorbackvmenu1: rgb(<?php print $colorbackvmenu1; ?>);
@@ -25,7 +25,13 @@
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colorbackmobilemenu: #f8f8f8;
 	--colorbackgrey: #f0f0f0;
-    --colorfline: <?php echo $colorfline; ?>;
+	--colorbline: <?php print $colorbline; ?>;
+	--colorbline_hover: <?php print $colorbline_hover; ?>;
+    --colorfline: <?php print $colorfline; ?>;
+	--colorfline_hover: <?php print $colorfline_hover; ?>;
+	--colorbtitle: <?php print $colorbtitle; ?>;
+	--colorftitle: <?php print $colorftitle; ?>;
+	--colorstitle: <?php print $colorstitle; ?>;
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
 	--colortexttitle: rgba(<?php print $colortexttitle; ?>, 0.9);
@@ -35,21 +41,24 @@
 	--colortextbackhmenu: #<?php print $colortextbackhmenu; ?>;
 	--colortextbackvmenu: #<?php print $colortextbackvmenu; ?>;
 	--colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>);
+
 	--listetotal: #888888;
-	--inputbackgroundcolor: <?php echo $colorBckgrdInput; ?>;
-	--color1BckgrdInfobox: <?php echo $color1BckgrdInfobox; ?>;
-	--color2BckgrdInfobox: <?php echo $color2BckgrdInfobox; ?>;
-	--colorBorderActionColumn: <?php echo $colorBorderActionColumn; ?>;
+	--inputbackgroundcolor: <?php print $colorBckgrdInput; ?>;
+	--color1BckgrdInfobox: <?php print $color1BckgrdInfobox; ?>;
+	--color2BckgrdInfobox: <?php print $color2BckgrdInfobox; ?>;
+	--colorBorderActionColumn: <?php print $colorBorderActionColumn; ?>;
 	--inputbordercolor: rgba(0,0,0,.15);
 	--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
 	--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
 	--oddevencolor: #202020;
-	--bgnavtop: <?php echo $bgnavtop ?>;
-    --bgnavtop_hover: <?php echo $bgnavtop_hover ?>;
-    --bgnavtop_txt: <?php echo $bgnavtop_txt ?>;
-    --bgnavtop_txt_hover: <?php echo $bgnavtop_txt_hover ?>;
-    --bgnavtop_txt_active: <?php echo $bgnavtop_txt_active ?>;
-	--colorboxstatsborder: <?php echo $bgnavtop ?>;
+	--bgnavleft: <?php print $bgnavleft; ?>;
+	--bgnavleft_hover: <?php print $bgnavleft_hover; ?>;
+	--bgnavtop: <?php print $bgnavtop; ?>;
+    --bgnavtop_hover: <?php print $bgnavtop_hover; ?>;
+    --bgnavtop_txt: <?php print $bgnavtop_txt; ?>;
+    --bgnavtop_txt_hover: <?php print $bgnavtop_txt_hover; ?>;
+    --bgnavtop_txt_active: <?php print $bgnavtop_txt_active; ?>;
+	--colorboxstatsborder: <?php print $bgnavtop; ?>;
 	--dolgraphbg: rgba(255,255,255,0);
 	--fieldrequiredcolor: #400030;
     --fontfamilydol:<?php print $fontlisted; ?>;
@@ -158,7 +167,7 @@
 
 .thumbstat { font-weight: bold !important; }
 
-th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
+th a { font-weight: <?php print ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
 a.tab { font-weight: 500 !important; }
 
 a:link, a:visited, a:hover, a:active, .classlink { color: var(--colortextlink); text-decoration: none;  }
@@ -217,7 +226,7 @@
 	font-family: var(--fontfamilydol);
 	outline: none;
 	margin: 0px 0px 0px 0px;
-	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	border<?php print !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 }
 
 input {
@@ -334,7 +343,7 @@
     outline: none;
 }
 .fa-info-circle {
-    padding-<?php echo $left; ?>: 3px;
+    padding-<?php print $left; ?>: 3px;
 }
 .line-height-large {
     line-height: 1.8em;
@@ -608,7 +617,7 @@
 i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender::before  {
     color: #888 !important;
     opacity: 0.4;
-    padding-<?php echo $left; ?>: 3px;
+    padding-<?php print $left; ?>: 3px;
 }
 .stockmovemententry {
     color: #080;
@@ -641,7 +650,7 @@
     color: var(--colortextlink) !important;
 }
 .editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover {
-    color: <?php print $colorftitle; ?> !important;
+    color: var(--colorftitle) !important;
 }
 a.editfielda.nohover *:hover:before {
     color: #ccc !important;
@@ -702,7 +711,7 @@
 a.commonlink
 /* ,a.reposition */
 {
-    /* color: <?php print $colorfline; ?> !important; */
+    /* color: var(--colorfline) !important; */
     color: #f4f4f4 !important;
     text-decoration: none;
 }
@@ -854,7 +863,7 @@
     cursor: pointer;
 }
 td button.liste_titre span {
-    color: <?php print $colorftitle; ?>;
+    color: var(--colorftitle);
 }
 
 div.extra_inline_chkbxlst, div.extra_inline_checkbox {
@@ -1111,33 +1120,33 @@
     cursor: pointer;
 }
 input.buttonpaymentcb {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
     background-size: 26px;
     background-repeat: no-repeat;
     background-position: 5px 5px;
 }
 input.buttonpaymentcheque {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
     background-repeat: no-repeat;
     background-position: 8px 7px;
 }
 input.buttonpaymentcheque {
-    background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
     background-repeat: no-repeat;
     background-position: 5px 4px;
 }
 input.buttonpaymentpaypal {
-    background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
     background-repeat: no-repeat;
     background-position: 8px 7px;
 }
 input.buttonpaymentpaybox {
-    background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
     background-repeat: no-repeat;
     background-position: 8px 7px;
 }
 input.buttonpaymentstripe {
-    background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
+    background-image: url(<?php print dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
     background-repeat: no-repeat;
     background-position: 8px 7px;
 }
@@ -1219,7 +1228,7 @@
     filter: saturate(0.8);
 }
 .optionblue {
-    color: rgb(<?php echo $colortextlink; ?>);
+    color: rgb(<?php print $colortextlink; ?>);
 }
 .optiongrey, .opacitymedium {
     opacity: 0.4;
@@ -1387,7 +1396,7 @@
 }
 
 .buttonajax {
-    background-image: url(<?php echo $img_button; ?>);
+    background-image: url(<?php print $img_button; ?>);
     background-position: bottom;
     border: 0;
     border-radius: 0 5px 0 5px;
@@ -1427,11 +1436,11 @@
 .butActionDelete,
 .butActionRefused,
 .butActionNewRefused {
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
     color: var(--colorfline);
     font-weight: 500;
-    margin: 0 <?php echo ($dol_optimize_smallscreen?'.3':'.5'); ?>em;
-    padding: .3em <?php echo ($dol_optimize_smallscreen?'.4':'.7'); ?>em;
+    margin: 0 <?php print ($dol_optimize_smallscreen?'.3':'.5'); ?>em;
+    padding: .3em <?php print ($dol_optimize_smallscreen?'.4':'.7'); ?>em;
     white-space: nowrap;
     transition: all .3s ease-in-out;
     -moz-transition: all .3s ease-in-out;
@@ -1531,7 +1540,7 @@
     padding-bottom: 8px;
     margin: 0.5em 0em 0.5em 0em;
 	background: <?php print $colorWarningBg; ?>;
-	color: <?php echo $colorWarningTxt; ?>;
+	color: <?php print $colorWarningTxt; ?>;
 }
 
 /* Error message */
@@ -1544,7 +1553,7 @@
     padding-bottom: 8px;
     margin: 0.5em 0em 0.5em 0em;
 	background: <?php print $colorErrorBg; ?>;
-	color: <?php echo $colorErrorTxt; ?>;
+	color: <?php print $colorErrorTxt; ?>;
 	font-size: unset !important;
 }
 
@@ -1559,7 +1568,7 @@
 
 /* Warning message */
 	background: <?php print $colorInfoBg; ?>;
-	color: <?php echo $colorInfoTxt; ?>;
+	color: <?php print $colorInfoTxt; ?>;
 
 /* Error message */
 }
@@ -1658,8 +1667,8 @@
     background: #fff;
     padding-top: 3px;
     padding-bottom: 3px;
-    padding-<?php echo $left; ?>: 0;
-    padding-<?php echo $right; ?>: 0;
+    padding-<?php print $left; ?>: 0;
+    padding-<?php print $right; ?>: 0;
     border-bottom: solid 1px var(--inputbordercolor);
     height: 24px;
     border-radius: 3px;
@@ -1806,13 +1815,13 @@
     margin-right: 10px !important;
 }
 .marginleftonly {
-	margin-<?php echo $left; ?>: 10px !important;
+	margin-<?php print $left; ?>: 10px !important;
 }
 .marginleftonlyshort {
-	margin-<?php echo $left; ?>: 4px !important;
+	margin-<?php print $left; ?>: 4px !important;
 }
 .nomarginleft {
-	margin-<?php echo $left; ?>: 0px !important;
+	margin-<?php print $left; ?>: 0px !important;
 }
 .margintoponly {
 	margin-top: 10px !important;
@@ -2051,7 +2060,7 @@
 .flexcontainer {
 <?php
 	if (!empty($conf->browser->browsername) && in_array($conf->browser->browsername, array('chrome', 'firefox', 'safari'))) {
-		echo 'display: inline-flex;'."\n";
+		print 'display: inline-flex;'."\n";
 	}
 ?>
     flex-flow: row wrap;
@@ -2102,7 +2111,7 @@
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 3.4, 0) + 7 : 7); ?>px)
+@media only screen and (min-width: <?php print (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 3.4, 0) + 7 : 7); ?>px)
 {
     .width20  { width: 20px; }
     .width25  { width: 25px; }
@@ -2248,7 +2257,7 @@
     .margintoponsmartphone { margin-top: 6px; }
 
     span.pictotitle {
-        margin-<?php echo $left; ?>: 0 !important;
+        margin-<?php print $left; ?>: 0 !important;
     }
     div.fiche>table.table-fiche-title {
         margin-top: 7px !important;
@@ -2386,7 +2395,7 @@
     }
 
     div.divphotoref {
-        padding-<?php echo $right; ?>: 5px;
+        padding-<?php print $right; ?>: 5px;
         padding-bottom: 5px;
     }
     img.photoref, div.photoref {
@@ -2467,7 +2476,7 @@
 div.login_block_other {
 	display: inline-block;
 	vertical-align: middle;
-	clear: <?php echo $disableimages ? 'none' : 'both'; ?>;
+	clear: <?php print $disableimages ? 'none' : 'both'; ?>;
 	padding-top: 0;
 	text-align: right;
 	margin-right: 8px;
@@ -2514,7 +2523,7 @@
 <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
     background-color: var(--bgnavtop);
 <?php } else { ?>
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
 <?php } ?>
 }
 
@@ -2723,7 +2732,7 @@
 }
 
 #pictotitle, .pictotitle {
-    margin-<?php echo $right; ?>: 8px;
+    margin-<?php print $right; ?>: 8px;
     margin-bottom: 4px;
 }
 .pictoobjectwidth {
@@ -2739,7 +2748,7 @@
     margin-top: -3px
 }
 .pictowarning, .pictopreview {
-    padding-<?php echo $left; ?>: 3px;
+    padding-<?php print $left; ?>: 3px;
 }
 .pictowarning {
     vertical-align: text-bottom;
@@ -2753,7 +2762,7 @@
     opacity: 0.4;
 }
 .pictofixedwidth {
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
     width: 20px;
     padding-right: 0;
 }
@@ -2811,7 +2820,7 @@
 	min-height: 80px;
 }
 div.divphotoref {
-	padding-<?php echo $right; ?>: 20px;
+	padding-<?php print $right; ?>: 20px;
 }
 div.paginationref {
 	padding-bottom: 10px;
@@ -2866,11 +2875,11 @@
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
-	/* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>); */
+	border-bottom: <?php print $borderwidth ?>px solid var(--colortopbordertitle1);
+	/* border-bottom: 2px solid rgb(<?php print $colorbackhmenu1 ?>); */
 }
 .trextrafieldseparator td {
-    /* border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
+    /* border-bottom: 2px solid rgb(<?php print $colorbackhmenu1 ?>) !important; */
 	border-bottom: 2px dashed var(--colortopbordertitle1) !important;
 }
 
@@ -2971,7 +2980,7 @@
     <?php if (GETPOST("optioncss") == 'print') { ?>
         display: none;
     <?php } else { ?>
-        /*background-color: rgb(<?php echo (!empty($colorback1) ? $colorback1 : 0); ?>);*/
+        /*background-color: rgb(<?php print (!empty($colorback1) ? $colorback1 : 0); ?>);*/
         color: #fcfcfc;
         font-size: 13px;
         margin: 0;
@@ -3010,7 +3019,7 @@
 
 .main-nav__item.is-sel a {
 	<?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-		background-color: <?php print $bgnavleft_hover; ?>;
+		background-color: var(--bgnavleft_hover);
 		color: var(--bgnavleft_txt_active);
 	<?php } else { ?>
     background-color: var(--bgnavtop_hover);
@@ -3142,7 +3151,7 @@
     display: inline-table;
     overflow: auto;
     width: 100%;
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
     <?php if (!empty($usecss3)) { ?>
         <?php if (getDolGlobalString('OBLYON_STICKY_TOPBAR')) { ?>
             /*
@@ -3187,7 +3196,7 @@
 
 .sec-nav.is-inverted .sec-nav__item.item-heading,
 .sec-nav.is-inverted .sec-nav__item.is-disabled {
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
     float: <?php print $left; ?>;
     position: relative;
     padding: 0;
@@ -3195,7 +3204,7 @@
 }
 
 .sec-nav.is-inverted .sec-nav__item.item-heading:hover {
-    background-color: <?php print $bgnavleft_hover; ?>;
+    background-color: var(--bgnavleft_hover);
 }
 
 .sec-nav.is-inverted .sec-nav__link {
@@ -3225,7 +3234,7 @@
 }
 
 li.item-heading:hover > .sec-nav__link {
-    background-color: <?php print $bgnavleft_hover; ?>;
+    background-color: var(--bgnavleft_hover);
     color: var(--bgnavleft_txt_hover);
 }
 
@@ -3234,11 +3243,11 @@
     list-style: none;
 }
 li.sec-nav__sub-item:hover, li.sec-nav__sub-item sec-nav__link:hover {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 	color: var(--bgnavleft_txt_hover);
 }
 li.sec-nav__sub-item:focus, li.sec-nav__sub-item sec-nav__link:focus {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 	color: var(--bgnavleft_txt_active);
 }
 
@@ -3297,7 +3306,7 @@
 */
 
 .sec-nav.is-inverted .sec-nav__sub-list {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
     box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.055);
     display: none;
     list-style: none;
@@ -3324,7 +3333,7 @@
     padding: 0;
 }
 .sec-nav.is-inverted .sec-nav__sub-item:hover, .sec-nav.is-inverted .sec-nav__link:hover {
-	background-color: <?php print $bgnavleft; ?>;
+	background-color: var(--bgnavleft);
 }
 
 .sec-nav.is-inverted .sec-nav__sub-list .item-level1 .sec-nav__link {
@@ -3354,7 +3363,7 @@
 */
 div.login_block {
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-        background-color: <?php print $bgnavleft; ?>;
+        background-color: var(--bgnavleft);
         height: 40px;
     <?php } else { ?>
         background-color: var(--bgnavtop);
@@ -3422,18 +3431,18 @@
     color: <?php print $maincolor; ?>;
 }
 div.login_block_tools {
-    margin-<?php echo $right ?>: 8px;
+    margin-<?php print $right ?>: 8px;
     display: inline-block;
     vertical-align: middle;
-    line-height: <?php echo $disableimages ? '25' : '40'; ?>px;
-    height: <?php echo $disableimages ? '25' : '40'; ?>px;
+    line-height: <?php print $disableimages ? '25' : '40'; ?>px;
+    height: <?php print $disableimages ? '25' : '40'; ?>px;
 }
 div.login_block_other {
     display: inline-block;
     vertical-align: middle;
-    clear: <?php echo $disableimages ? 'none' : 'both'; ?>;
+    clear: <?php print $disableimages ? 'none' : 'both'; ?>;
     padding-top: 0;
-    text-align: <?php echo $right ?>;
+    text-align: <?php print $right ?>;
     max-width: 200px;
 }
 div.login_block_user {
@@ -3477,12 +3486,12 @@
 
 div.login_block_other {
     display: inline-block;
-    clear: <?php echo $disableimages ? 'none' : 'both'; ?>;
+    clear: <?php print $disableimages ? 'none' : 'both'; ?>;
 }
 
 .login_block_other {
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-        background: <?php print $bgnavleft; ?>;
+        background: var(--bgnavleft);
     <?php } else { ?>
         background: var(--bgnavtop);
     <?php } ?>
@@ -3520,7 +3529,7 @@
 .login_block_elem {
     float: <?php print $left; ?>;
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-        background-color: <?php print $bgnavleft; ?>;
+        background-color: var(--bgnavleft);
         height: 40px;
     <?php } else { ?>
         background-color: var(--bgnavtop);
@@ -3619,8 +3628,8 @@
 }
 
 .userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
-    width: <?php echo $disableimages ? '26' : '32'; ?>px;
-    height: <?php echo $disableimages ? '26' : '32'; ?>px;
+    width: <?php print $disableimages ? '26' : '32'; ?>px;
+    height: <?php print $disableimages ? '26' : '32'; ?>px;
     border-radius: 50%;
     background-size: contain;
 	border: 1px solid;
@@ -3650,12 +3659,12 @@
 }
 
 .span-icon-user {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
+    background-image: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
     background-repeat: no-repeat;
 }
 
 .span-icon-password {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+    background-image: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
     background-repeat: no-repeat;
 }
 
@@ -3670,7 +3679,7 @@
 .login_block .classfortooltip:hover,
 .login_block .classfortooltip:focus {
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-        background-color: <?php print $bgnavleft_hover; ?>;
+        background-color: var(--bgnavleft_hover);
     <?php } else { ?>
         background-color: var(--bgnavtop_hover);
     <?php } ?>
@@ -3700,7 +3709,7 @@
 
 .alogin {
     font-weight: normal !important;
-    font-size: <?php echo $fontsizesmaller; ?>px !important;
+    font-size: <?php print $fontsizesmaller; ?>px !important;
 }
 
 .alogin:hover {
@@ -3792,7 +3801,7 @@
 }
 
 .vmenu .sec-nav__item.item-heading > .sec-nav__link {
-    background-color: <?php print $bgnavleft_hover; ?>;
+    background-color: var(--bgnavleft_hover);
     font-weight: bold;
     display: block;
     line-height: 1em;
@@ -3802,7 +3811,7 @@
     <?php } ?>
 }
 
-.sec-nav { color: <?php print $bgnavleft; ?>; }
+.sec-nav { color: var(--bgnavleft); }
 
 .sec-nav .sec-nav__link {
     color: var(--bgnavleft_txt);
@@ -3817,11 +3826,11 @@
 }
 
 .sec-nav .sec-nav__link:hover {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 	color: var(--bgnavleft_txt_hover);
 }
 .sec-nav .sec-nav__link:focus {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 	color: var(--bgnavleft_txt_active);
 }
 
@@ -3830,7 +3839,7 @@
 }
 
 .sec-nav__sub-list {
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
     padding-top: 5px;
     /* padding-inline-start: 1.5em; */
 }
@@ -3882,7 +3891,7 @@
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
         background-color: var(--bgnavtop_hover);
     <?php } else { ?>
-        background-color: <?php print $bgnavleft_hover; ?>;
+        background-color: var(--bgnavleft_hover);
     <?php } ?>
     padding: 10px 0 10px 0;
 }
@@ -3908,8 +3917,8 @@
         background-color: var(--bgnavtop);
         border-bottom: 1px solid var(--bgnavtop_hover);
     <?php } else { ?>
-        background-color: <?php print $bgnavleft; ?>;
-        border-bottom: 1px solid <?php print $bgnavleft_hover; ?>;
+        background-color: var(--bgnavleft);
+        border-bottom: 1px solid var(--bgnavleft_hover);
     <?php } ?>
     box-shadow: 0 0 1px rgba(0,0,0, .04);
     -webkit-box-shadow: 0 0 1px rgba(0,0,0, .04);
@@ -3943,8 +3952,8 @@
         background-color: var(--bgnavtop);
         border-bottom: 1px solid var(--bgnavtop_hover);
     <?php } else { ?>
-        background-color: <?php print $bgnavleft; ?>;
-        border-bottom: 1px solid <?php print $bgnavleft_hover; ?>;
+        background-color: var(--bgnavleft);
+        border-bottom: 1px solid var(--bgnavleft_hover);
     <?php } ?>
     box-shadow: 0 0 1px rgba(0,0,0, .04);
     -webkit-box-shadow: 0 0 1px rgba(0,0,0, .04);
@@ -3995,7 +4004,7 @@
         <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
             background-color: var(--bgnavtop);
         <?php } else { ?>
-            background-color: <?php print $bgnavleft; ?>;
+            background-color: var(--bgnavleft);
         <?php } ?>
         color: <?php print $maincolor ?>;
         font-family: <?php print $fontmenuhelp; ?>;
@@ -4044,11 +4053,11 @@
 }
 .helppresentcircle {
     /*
-    color: rgb(<?php echo $colorbackhmenu1 ?>);
+    color: rgb(<?php print $colorbackhmenu1 ?>);
     filter: invert(0.8);
     */
     color: <?php print $badgeSecondary; ?>;
-    margin-<?php echo $left ?>: -7px;
+    margin-<?php print $left ?>: -7px;
     display: inline-block;
     margin-top: -10px;
     font-size: x-small;
@@ -4073,7 +4082,7 @@
         <?php } ?>
     <?php } ?>
 
-    background-color: <?php print $bgnavleft; ?>;
+    background-color: var(--bgnavleft);
     <?php if (!empty($usecss3)) { ?>
         box-shadow: 0 1px 2px rgba(0, 0, 0, .4);
         -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .4);
@@ -4489,17 +4498,17 @@
     border-bottom: 0 !important;
 }
 .menulogocontainer {
-    margin: <?php echo $disableimages?'0':'3'; ?>px;
+    margin: <?php print $disableimages?'0':'3'; ?>px;
     margin-left: 11px;
     margin-right: 9px;
     padding: 0;
-    height: <?php echo $disableimages?'20':'32'; ?>px;
+    height: <?php print $disableimages?'20':'32'; ?>px;
     /* width: 100px; */
     max-width: 100px;
     vertical-align: middle;
 }
 .backgroundforcompanylogo {
-    background-color: <?php echo $logo_background_color ?>;
+    background-color: <?php print $logo_background_color ?>;
     <?php if (getDolGlobalString('OBLYON_LOGO_PADDING') && getDolGlobalString('OBLYON_LOGO_PADDING') == "padding") { ?>
         padding: 0 5px 0 5px;
     <?php } else { ?>
@@ -4516,7 +4525,7 @@
 }
 li#mainmenutd_companylogo .tmenucenter {
     width: unset;
-    background-color: <?php echo $logo_background_color ?>;
+    background-color: <?php print $logo_background_color ?>;
 }
 li#mainmenutd_companylogo {
     min-width: unset !important;
@@ -4556,7 +4565,7 @@
 }
 
 #tmenu_tooltipinvert div.menu_titre:hover {
-    background-color: <?php print $bgnavleft_hover; ?>;
+    background-color: var(--bgnavleft_hover);
 }
 
 #tmenu_tooltipinvert div.menu_titre:hover + div.menu_contenu {
@@ -4581,7 +4590,7 @@
     <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
         background-color: var(--bgnavtop);
     <?php } else { ?>
-        background-color: <?php print $bgnavleft; ?>;
+        background-color: var(--bgnavleft);
     <?php } ?>
     float: <?php print $left; ?>;
     margin-<?php print $right; ?>: 0;
@@ -4648,7 +4657,7 @@
 
 .vmenu .blockvmenupair div.menu_titre a,
 .vmenu .blockvmenuimpair div.menu_titre a {
-    background-color: <?php print $bgnavleft_hover; ?>;
+    background-color: var(--bgnavleft_hover);
     color: #eee;
     display: block;
     padding: 8px;
@@ -4731,7 +4740,7 @@
 
 .vmenu div.blockvmenupair,
 .vmenu div.blockvmenuimpair {
-background-color: <?php print $bgnavleft; ?>;
+background-color: var(--bgnavleft);
 padding: 0;
 text-align: <?php print $left; ?>;
 }
@@ -4946,7 +4955,7 @@
 */
 
 .ui-layout-resizer { /* all 'resizer-bars' */
-width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px !important;
+width: <?php print (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px !important;
 }
 
 .ui-layout-resizer-hover {	 /* affects both open and closed states */
@@ -4957,7 +4966,7 @@
 /*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */
 .ui-layout-resizer-dragging {	 /* resizer beging 'dragging' */
     background-color: #ddd;
-    width: <?php echo (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px;
+    width: <?php print (empty($conf->dol_optimize_smallscreen)?'8':'24'); ?>px;
 }
 
 .ui-layout-resizer-dragging {	 /* CLONED resizer being dragged */
@@ -5015,15 +5024,15 @@
 
 .ui-layout-toggler-open {
     height: 54px !important;
-    width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
+    width: <?php print (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
     -moz-border-radius: 0 10px 10px 0;
     -webkit-border-radius: 0 10px 10px 0;
     border-radius: 0 10px 10px 0;
 }
 
 .ui-layout-toggler-closed {
-    height: <?php echo (empty($conf->dol_optimize_smallscreen)?'54':'2'); ?>px !important;
-    width: <?php echo (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
+    height: <?php print (empty($conf->dol_optimize_smallscreen)?'54':'2'); ?>px !important;
+    width: <?php print (empty($conf->dol_optimize_smallscreen)?'7':'22'); ?>px !important;
     -moz-border-radius: 0 10px 10px 0;
     -webkit-border-radius: 0 10px 10px 0;
     border-radius: 0 10px 10px 0;
@@ -5144,20 +5153,20 @@
 
 div.tabsElem:hover,
 div.tabsElem a.tab:hover {
-	background-color: <?php print $bgnavleft_hover; ?>;
+	background-color: var(--bgnavleft_hover);
 	color: var(--bgnavleft_txt_hover);
 }
 
 div.tabBar {
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
     border: 1px solid rgba(0,0,0, .16);
     box-shadow: 0 1px 1px rgba(0,0,0, .04);
     -webkit-box-shadow: 0 1px 1px rgba(0,0,0, .04);
     color: var(--colorfline);
     margin-bottom: 10px;
     padding-top: 8px;
-    padding-left: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
-    padding-right: <?php echo ($dol_optimize_smallscreen?'4':'8'); ?>px;
+    padding-left: <?php print ($dol_optimize_smallscreen?'4':'8'); ?>px;
+    padding-right: <?php print ($dol_optimize_smallscreen?'4':'8'); ?>px;
     padding-bottom: 8px;
     width: auto;
 }
@@ -5216,7 +5225,7 @@
 }
 
 td.tab {
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
     border: 1px solid rgba(0,0,0, .16) !important;
     box-shadow: 0 1px 1px rgba(0,0,0, .04);
     -webkit-box-shadow: 0 1px 1px rgba(0,0,0, .04);
@@ -5251,7 +5260,7 @@
 }
 
 div.popuptabset {
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
     padding: 5px;
     border: 1px solid #e5e5e5;
 }
@@ -5305,7 +5314,7 @@
 }
 
 a.tabunactive {
-	color: rgb(<?php echo $colortextlink; ?>) !important;
+	color: rgb(<?php print $colortextlink; ?>) !important;
 }
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: var(--fontfamilydol);
@@ -5371,7 +5380,7 @@
 
 #undertopmenu {
     background-repeat: repeat-x;
-    margin-top: <?php echo ($dol_hide_topmenu?'6':'0'); ?>px;
+    margin-top: <?php print ($dol_hide_topmenu?'6':'0'); ?>px;
 }
 
 .paddingrightonly {
@@ -5418,7 +5427,7 @@
     margin-bottom: 3px;
     padding: 8px 15px;
     text-decoration: underline;
-    color: rgb(<?php echo $colortextlink; ?>);
+    color: rgb(<?php print $colortextlink; ?>);
     background-color: transparent;
     cursor: pointer;
 }
@@ -5525,7 +5534,7 @@
 form#searchFormList div.liste_titre { padding: 3px 10px; }
 
 .liste_titre_filter {
-    background: <?php print $colorbtitle; ?> !important;
+    background: var(--colorbtitle) !important;
 }
 
 /* table liste -bank- e-mailing */
@@ -5618,13 +5627,13 @@
 tr.liste_titre_sel,
 form.liste_titre,
 form.liste_titre_sel {
-    background-color: <?php print $colorbtitle; ?>;
-    color: <?php print $colorftitle; ?>;
+    background-color: var(--colorbtitle);
+    color: var(--colorftitle);
     font-family: var(--fontfamilydol);
     font-size: 1em;
     font-weight: normal;
     line-height: 1em;
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
     white-space: normal;
 }
 
@@ -5635,7 +5644,7 @@
 th.liste_titre_sel a,
 form.liste_titre a,
 form.liste_titre_sel a {
-    color: <?php print $colorftitle; ?> !important;
+    color: var(--colorftitle) !important;
 }
 
 .liste_titre_sel { font-weight: bold!important; }
@@ -5666,21 +5675,21 @@
 table.noborder tr th a:visited,
 table.noborder tr th a:active {
     color: var(--colorfline);
-    font-family: <?php echo $fontlisted; ?>;
+    font-family: <?php print $fontlisted; ?>;
 }
 
-table.noborder tr td a:hover { color: <?php echo $colorfline_hover; ?>; }
+table.noborder tr td a:hover { color: var(--colorfline_hover); }
 
 table.noborder tr td a.button,
 table.noborder tr td a.button:hover { color: #fff; }
 
 
 .liste tr.liste_titre:nth-child(3) {
-    background-color: <?php print $colorbtitle; ?>;
+    background-color: var(--colorbtitle);
 }
 
 tr.liste_titre:nth-child(3) {
-    background-color: <?php print $colorbtitle; ?>;
+    background-color: var(--colorbtitle);
 }
 
 tr.liste_titre_sel th,
@@ -5707,16 +5716,22 @@
     padding: 0;
 }
 
+tr.liste_total td {
+	background-color: var(--colorbtitle) !important;
+	color: var(--colorftitle) !important;
+	font-weight: bold !important;
+}
+
 tr.liste_total,
 form.liste_total {
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
 }
 
 tr.liste_total td,
 form.liste_total div {
     height: 20px;
     border-top: 1px solid rgba(0,0,0, .42);
-    color: <?php echo $maincolor; ?>;
+    color: <?php print $maincolor; ?>;
     font-weight: normal;
     white-space: normal;
     padding: 0 5px 0 5px;
@@ -5917,8 +5932,8 @@
     margin-bottom: 8px !important;
     border-bottom-width: 1px;
 
-	border-top: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
-    /* border-top: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important; */
+	border-top: <?php print $borderwidth ?>px solid var(--colortopbordertitle1);
+    /* border-top: 2px solid rgb(<?php print $colorbackhmenu1 ?>) !important; */
 }
 table.noborder.boxtable tr td {
     height: unset;
@@ -5951,10 +5966,10 @@
     color: #000 !important;*/
 
     /* TO MATCH ELDY */
-    background: <?php print $colorbtitle; ?>;
-    color: <?php print $colorftitle; ?>;
+    background: var(--colorbtitle);
+    color: var(--colorftitle);
     font-family: var(--fontfamilydol), sans-serif;
-    font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+    font-weight: <?php print $useboldtitle?'bold':'normal'; ?>;
     border-bottom: 1px solid #FDFFFF;
     white-space: nowrap;
 }
@@ -6021,7 +6036,7 @@
 
 .fieldrequired { color: var(--colorfline); font-weight: bold; }
 
-.widthpictotitle { width: 40px; font-size: 1.5em; text-align: <?php echo $left; ?>; }
+.widthpictotitle { width: 40px; font-size: 1.5em; text-align: <?php print $left; ?>; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
 .dolgraphtitlecssboxes { /* margin: 0px; */ }
@@ -6056,7 +6071,7 @@
 
 .nographyet
 {
-    content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg',1) ?>);
+    content:url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg',1) ?>);
     display: inline-block;
     opacity: 0.1;
     background-repeat: no-repeat;
@@ -6072,7 +6087,7 @@
 }
 
 div.titre {
-	color: <?php print $colorStitle; ?>;
+	color: var(--colorstitle);
     font-weight: bold;
     font-size: 1.1em;
     text-decoration: none;
@@ -6309,7 +6324,7 @@
 
 table.dp {
     width: 180px;
-    background-color: <?php echo $colorbline; ?>;
+    background-color: var(--colorbline);
     /*border-top: solid 2px #f4f4f4;
     border-<?php print $left; ?>: solid 2px #f4f4f4;
     border-<?php print $right; ?>: solid 1px #222222;
@@ -6370,7 +6385,7 @@
 }
 .datenowlink
 {
-    color: rgb(<?php echo $colortextlink; ?>);
+    color: rgb(<?php print $colortextlink; ?>);
 }
 
 .categtextwhite, .treeview .categtextwhite.hover {
@@ -6410,7 +6425,7 @@
 
 .websiteformtoolbar {
     position: sticky;
-    top: <?php echo empty($dol_hide_topmenu) ? ($disableimages ? '32px' : '52px') : '0'; ?>;
+    top: <?php print empty($dol_hide_topmenu) ? ($disableimages ? '32px' : '52px') : '0'; ?>;
     z-index: 1002;	/* Dolibarr menu is 1001, Website menu is 1002 */
 }
 
@@ -6466,7 +6481,7 @@
 }
 .websiteselection {
     /* display: inline-block; */
-    padding-<?php echo $right; ?>: 10px;
+    padding-<?php print $right; ?>: 10px;
     vertical-align: middle;
     line-height: 2.2em;
 }
@@ -6581,14 +6596,14 @@
 	border-right: solid 1px #C0C0C0;
 }
 .cal_other_month {
-	background: <?php echo $colorbline; ?>;
+	background: var(--colorbline);
 	padding-<?php print $left; ?>: 2px;
 	padding-<?php print $right; ?>: 1px;
 	padding-top: 0px;
 	padding-bottom: 0px;
 }
 .cal_past_month	{
-	background: <?php echo $colorbline; ?>;
+	background: var(--colorbline);
 	padding-<?php print $left; ?>: 2px;
 	padding-<?php print $right; ?>: 1px;
 	padding-top: 0px;
@@ -6729,7 +6744,7 @@
 
 .ui-autocomplete-loading {
     color: #000;
-    background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif', 1) ?>) right center no-repeat;
+    background: white url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/working.gif', 1) ?>) right center no-repeat;
 }
 .ui-autocomplete {
     position:absolute;
@@ -6762,14 +6777,14 @@
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-    background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png', 1) ?>) right top no-repeat;
+    background: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/edit.png', 1) ?>) right top no-repeat;
     cursor: pointer;
     margin-right: 3px;
     margin-top: 3px;
 }
 
 .editkey_datepicker {
-    background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png', 1) ?>) right center no-repeat;
+    background: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png', 1) ?>) right center no-repeat;
     margin-right: 3px;
     cursor: pointer;
     margin-right: 3px;
@@ -7068,11 +7083,11 @@
     padding:.5em .6em;
     line-height:1.5;
     font-weight: normal;
-    font-family:<?php echo $fontlist; ?>;
+    font-family:<?php print $fontlist; ?>;
     font-size:1em;
 }
 .ui-widget {
-    font-family:<?php echo $fontlist; ?>;
+    font-family:<?php print $fontlist; ?>;
 }
 /* .ui-button { margin-left: -2px; <?php print(preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> } */
 .ui-button { margin-left: -2px; }
@@ -7105,7 +7120,7 @@
 a.cke_dialog_ui_button
 {
     font-family: <?php print $fontlist ?> !important;
-    background-image: url(<?php echo $img_button ?>) !important;
+    background-image: url(<?php print $img_button ?>) !important;
     background-position: bottom !important;
     border: 1px solid #C0C0C0 !important;
     -webkit-border-radius:0px 5px 0px 5px !important;
@@ -7161,7 +7176,7 @@
 .aceeditorstatusbar {
     margin: 0;
     padding: 0;
-    padding-<?php echo $left; ?>: 10px;
+    padding-<?php print $left; ?>: 10px;
     left: 0;
     right: 0;
     bottom: 0;
@@ -7444,8 +7459,8 @@
 div.ecmjqft {
     vertical-align: middle;
     display: inline-block !important;
-    text-align: <?php echo $right; ?>;
-    float: <?php echo $right; ?>;
+    text-align: <?php print $right; ?>;
+    float: <?php print $right; ?>;
     right:4px;
     clear: both;
     height: 16px;
@@ -7463,12 +7478,12 @@
 div#ecm-layout-center {
     width: calc(100% - 405px);
     vertical-align: top;
-    float: <?php echo $right; ?>;
+    float: <?php print $right; ?>;
 }
 
-.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
-.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
+.ecmjqft LI.directory { font-weight:normal; background: url(<?php print dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
+.ecmjqft LI.expanded { font-weight:normal; background: url(<?php print dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php print dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
 
 
 /* ============================================================================== */
@@ -7482,7 +7497,7 @@
     bottom: 4px !important;
 <?php } ?>
     text-align: center;
-    min-width: <?php echo $dol_optimize_smallscreen ? '200' : '480'; ?>px;
+    min-width: <?php print $dol_optimize_smallscreen ? '200' : '480'; ?>px;
     width: auto;
     max-width: 1024px;
     padding-left: 10px !important;
@@ -7568,10 +7583,10 @@
 table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
     background: none !important;
 }
-.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
-.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
-.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
-.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc  { background: url('<?php print dol_buildpath('/theme/'.$theme.'/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc { background: url('<?php print dol_buildpath('/theme/'.$theme.'/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc_disabled  { background: url('<?php print dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc_disabled { background: url('<?php print dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
 .dataTables_paginate {
     margin-top: 8px;
 }
@@ -7817,7 +7832,7 @@
     border-right: none;
     <?php } ?>
 
-    border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+    border<?php print !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 
     -webkit-box-shadow: none !important;
     box-shadow: none !important;
@@ -7861,7 +7876,7 @@
      border-right: none;
  <?php } ?>
 
-     border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+     border<?php print !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 
      -webkit-box-shadow: none !important;
      box-shadow: none !important;
@@ -7978,7 +7993,7 @@
 }
 .select2-results__option {
     word-break: break-word;
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
 }
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
     background-color: var(--colorbackvmenu1);
@@ -8011,7 +8026,7 @@
 
 /* Special case for the select2 add widget */
 #addbox .select2-container .select2-choice > .select2-chosen, #actionbookmark .select2-container .select2-choice > .select2-chosen {
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
     opacity: 0.4;
 }
 .select2-container--default .select2-selection--single .select2-selection__placeholder {
@@ -8019,7 +8034,7 @@
     opacity: 0.4;
 }
 span#select2-boxbookmark-container, span#select2-boxcombo-container {
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
     opacity: 0.4;
 }
 .select2-container .select2-selection--single .select2-selection__rendered {
@@ -8269,7 +8284,7 @@
 }
 .dropdown ul {
     margin: -1px 0 0 0;
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
 }
 .dropdown dd {
     position:relative;
@@ -8294,7 +8309,7 @@
     background-color: var(--inputbackgroundcolor);
     box-shadow: 1px 1px 10px #aaa;
     display:none;
-<?php echo $right; ?>:0px;						/* pop is align on right */
+<?php print $right; ?>:0px;						/* pop is align on right */
     padding: 0 0 0 0;
     position:absolute;
     top:2px;
@@ -8305,7 +8320,7 @@
     z-index: 1;
 }
 .dropdown dd ul.selectedfieldsleft {
-<?php echo $right; ?>: auto;
+<?php print $right; ?>: auto;
 }
 .dropdown dd ul li {
     white-space: nowrap;
@@ -8318,7 +8333,7 @@
     background: #eee;
 }
 .dropdown dd ul li input[type="checkbox"] {
-    margin-<?php echo $right; ?>: 3px;
+    margin-<?php print $right; ?>: 3px;
 }
 .dropdown dd ul li a, .dropdown dd ul li span {
     padding: 3px;
@@ -8442,10 +8457,10 @@
 }
 
 .ui-link {
-    color: <?php echo $colortext; ?>;
+    color: <?php print $colortext; ?>;
 }
 .liste_titre .ui-link {
-    color: <?php print $colorftitle; ?> !important;
+    color: var(--colorftitle) !important;
 }
 
 a.ui-link {
@@ -8528,7 +8543,7 @@
     border-bottom-width: 0px !important;
 }
 .alilevel0 {
-    color: <?php print $colorftitle; ?> !important;
+    color: var(--colorftitle) !important;
 }
 .ulmenu {
     box-shadow: none !important;
@@ -8546,10 +8561,10 @@
     text-shadow: none;
 }
 .ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover {
-    color: rgb(<?php echo $colortextlink; ?>);
+    color: rgb(<?php print $colortextlink; ?>);
 }
 .ui-btn-up-c .vsmenudisabled {
-    color: #<?php echo $colorshadowtitle; ?> !important;
+    color: #<?php print $colorshadowtitle; ?> !important;
     text-shadow: none !important;
 }
 /*
@@ -8606,12 +8621,12 @@
 /* ============================================================================== */
 
 .menu_choix1 a {
-    background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>') top left no-repeat;
+    background: url('<?php print dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>') top left no-repeat;
     background-position-y: 15px;
 }
 
 .menu_choix2 a {
-    background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>') top left no-repeat;
+    background: url('<?php print dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>') top left no-repeat;
     background-position-y: 15px;
 }
 .menu_choix1,.menu_choix2 {
@@ -9120,23 +9135,23 @@
 /* Set the color for hover lines */
 .oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
 {
-    background: <?php echo $colorbline_hover; ?> !important;		/* Must be background to be stronger than background of odd or even */
-	color: <?php echo $colorfline_hover; ?> !important;
+    background: var(--colorbline_hover) !important;		/* Must be background to be stronger than background of odd or even */
+	color: var(--colorfline_hover) !important;
 }
 .tredited, .tredited td {
-    background: <?php echo $colorbline_hover; ?> !important;   /* Must be background to be stronger than background of odd or even */
-	color: <?php echo $colorfline_hover; ?> !important;
+    background: var(--colorbline_hover) !important;   /* Must be background to be stronger than background of odd or even */
+	color: var(--colorfline_hover) !important;
     border-bottom: 0 !important;
 }
 .treditedlinefordate {
-    background: <?php echo $colorbline_hover; ?> !important;   /* Must be background to be stronger than background of odd or even */
-	color: <?php echo $colorfline_hover; ?> !important;
+    background: var(--colorbline_hover) !important;   /* Must be background to be stronger than background of odd or even */
+	color: var(--colorfline_hover) !important;
     border-bottom: 0px;
 }
 <?php if ($colorbline_hover) { ?>
 .highlight {
-    background: <?php echo $colorbline_hover; ?> !important;   /* Must be background to be stronger than background of odd or even */
-	color: <?php echo $colorfline_hover; ?> !important;
+    background: var(--colorbline_hover) !important;   /* Must be background to be stronger than background of odd or even */
+	color: var(--colorfline_hover) !important;
 }
 <?php } ?>
 
@@ -9156,10 +9171,10 @@
 }
 .impair, .nohover .impair:hover, tr.impair td.nohover
 {
-    background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
+    background: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 #GanttChartDIV {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
 .oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
@@ -9168,26 +9183,26 @@
 	color: var(--colortext);
 }
 .pair, .nohover .pair:hover, tr.pair td.nohover {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
 }
 
 table.dataTable tr.oddeven {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 
 /* For no hover style */
 td.oddeven, tr.nohover td, form.nohover, form.nohover:hover {
     /*
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
-    background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
+    background: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
     */
 }
 td.evenodd {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
-    background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
+    background: #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
 .trforbreak td {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important;
 }
 .trforbreak td, table.noborder tr.trforbreak td a:link {
     color: #000;
@@ -9232,7 +9247,7 @@
     padding-bottom: 2px;
 }
 div.liste_titre_bydiv {
-    border-top-width: <?php echo $borderwidth ?>px;
+    border-top-width: <?php print $borderwidth ?>px;
 	border-top-color: var(--colortopbordertitle1);
     border-top-style: solid;
 
@@ -9256,13 +9271,13 @@
 }
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, .tagtr.liste_titre, .tagtr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-    /*background: rgb(<?php echo $colorbacktitle1; ?>);*/
-    /*font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;*/
+    /*background: rgb(<?php print $colorbacktitle1; ?>);*/
+    /*font-weight: <?php print $useboldtitle ? 'bold' : 'normal'; ?>;*/
     font-weight: normal;
 
-    color: <?php print $colorftitle; ?>;
+    color: var(--colorftitle);
     font-family: var(--fontfamilydol);
-    text-align: <?php echo $left; ?>;
+    text-align: <?php print $left; ?>;
 }
 tr.liste_titre th, tr.liste_titre td, th.liste_titre
 {
@@ -9275,7 +9290,7 @@
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
 {
     font-family: var(--fontfamilydol);
-    font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
+    font-weight: <?php print $useboldtitle ? 'bold' : 'normal'; ?>;
     vertical-align: middle;
     height: 38px;
 }
@@ -9283,16 +9298,16 @@
     text-shadow: none !important;
 }
 tr.liste_titre_topborder td {
-    border-top-width: <?php echo $borderwidth; ?>px;
+    border-top-width: <?php print $borderwidth; ?>px;
 	border-top-color: var(--colortopbordertitle1);
     border-top-style: solid;
 }
 .liste_titre td a {
     text-shadow: none !important;
-    color: <?php print $colorftitle; ?>;
+    color: var(--colorftitle);
 }
 .liste_titre td a.notasortlink {
-    color: rgb(<?php echo $colortextlink; ?>);
+    color: rgb(<?php print $colortextlink; ?>);
 }
 .liste_titre td a.notasortlink:hover {
     background: transparent;
@@ -9308,12 +9323,12 @@
 tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
 {
 	font-family: var(--fontfamilydol);
-	color: <?php print $colorftitle; ?> !important;
+	color: var(--colorftitle) !important;
 	font-weight: bold;
 	background-color: <?php print colorDarker($colorbtitle, 5); ?>;
 	/* Test
 	text-decoration: underline;
-	border-bottom: 8px solid <?php print $colorftitle; ?> !important;
+	border-bottom: 8px solid var(--colorftitle) !important;
 	border-radius: 0.25rem;
 	*/
 }
@@ -9355,8 +9370,8 @@
 }
 
 .paymenttable, .margintable {
-    /*border-top-width: <?php echo $borderwidth ?>px !important;
-	border-top-color: <?php echo $colortopbordertitle1 ?> !important;
+    /*border-top-width: <?php print $borderwidth ?>px !important;
+	border-top-color: <?php print $colortopbordertitle1 ?> !important;
 	border-top-style: solid !important;*/
     border-top: none !important;
     margin: 0px 0px 0px 0px !important;
@@ -9399,11 +9414,11 @@
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre),
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
 {
-    background: linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
-    background: -o-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
-    background: -moz-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
-    background: -webkit-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
-    background: -ms-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
+    background: linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
+    background: -o-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
+    background: -moz-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
+    background: -webkit-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
+    background: -ms-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair2)); ?> 100%);
 }
 .noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre)
@@ -9415,11 +9430,11 @@
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
 {
-    background: linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
-    background: -o-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
-    background: -moz-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
-    background: -webkit-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
-    background: -ms-linear-gradient(to bottom, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
+    background: linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
+    background: -o-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
+    background: -moz-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
+    background: -webkit-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
+    background: -ms-linear-gradient(to bottom, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> 85%, #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> 100%);
 }
 .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre)
@@ -9428,7 +9443,7 @@
 }
 
 ul.noborder li:nth-child(even):not(.liste_titre) {
-    background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> !important;
+    background-color: #<?php print colorArrayToHex(colorStringToArray($colorbacklinepair2)); ?> !important;
 }
 
 /* ============================================================================== */
@@ -9483,7 +9498,7 @@
     overflow: auto;
 }
 .dropdown dd ul.selectedfieldsleft {
-    <?php echo $right; ?>: auto;
+    <?php print $right; ?>: auto;
 }
 .dropdown dd ul li {
     white-space: nowrap;
@@ -9494,7 +9509,7 @@
 	background: var(--colorbacklinepairhover);
 }
 .dropdown dd ul li input[type="checkbox"] {
-	margin-<?php echo $right; ?>: 3px;
+	margin-<?php print $right; ?>: 3px;
 }
 .dropdown dd ul li a, .dropdown dd ul li span {
     padding: 3px;
@@ -9513,10 +9528,10 @@
     height: 16px;
 }
 .span-icon-user {
-    background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px;
+    background: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px;
 }
 .span-icon-password {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+    background-image: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
     background-repeat: no-repeat;
 }
 
@@ -9643,10 +9658,10 @@
 }
 
 .ui-link {
-	color: <?php echo $colortext; ?>;
+	color: <?php print $colortext; ?>;
 }
 .liste_titre .ui-link {
-	color: <?php print $colorftitle; ?> !important;
+	color: var(--colorftitle) !important;
 }
 
 a.ui-link {
@@ -9731,7 +9746,7 @@
 	border-bottom-width: 0px !important;
 }
 .alilevel0 {
-	color: <?php print $colorftitle; ?> !important;
+	color: var(--colorftitle) !important;
 	background: var(--colorbackmobilemenu);
 }
 .ulmenu {
@@ -9750,10 +9765,10 @@
 	text-shadow: none;
 }
 .ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover {
-	color: rgb(<?php echo $colortextlink; ?>);
+	color: rgb(<?php print $colortextlink; ?>);
 }
 .ui-btn-up-c .vsmenudisabled {
-	color: #<?php echo $colorshadowtitle; ?> !important;
+	color: #<?php print $colorshadowtitle; ?> !important;
 	text-shadow: none !important;
 }
 .alilevel1 {
@@ -10062,7 +10077,7 @@
 .cd-timeline-content {
 	position: relative;
 	margin-left: 60px;
-	background: <?php echo (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
+	background: <?php print (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
 	border-radius: 0.25em;
 	padding: 1em;
 	background-image: -o-linear-gradient(to bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
@@ -10104,7 +10119,7 @@
 	height: 0;
 	width: 0;
 	border: 7px solid transparent;
-	border-right: 7px solid <?php echo (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
+	border-right: 7px solid <?php print (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
 }
 @media only screen and (min-width: 768px) {
 	.cd-timeline-content h2 {
@@ -10130,7 +10145,7 @@
 		top: 24px;
 		left: 100%;
 		border-color: transparent;
-		border-left-color: <?php echo (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
+		border-left-color: <?php print (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
 	}
 	.cd-timeline-content .cd-read-more {
 		float: left;
@@ -10151,7 +10166,7 @@
 		left: auto;
 		right: 100%;
 		border-color: transparent;
-		border-right-color: <?php echo (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
+		border-right-color: <?php print (!empty($colorbline_hover) ? $colorbline_hover : 'white'); ?>;
 	}
 	.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more {
 		float: right;
@@ -10382,7 +10397,7 @@
     border-radius: 8px;
 }
 .survey_borders .resultats .nom {
-    text-align: <?php echo $left; ?>
+    text-align: <?php print $left; ?>
 }
 .survey_borders .resultats .sujet, .survey_borders .resultats .jour {
     min-width: 100px;
@@ -10443,7 +10458,7 @@
         <?php } else { ?>
             top: 0;
         <?php } ?>
-        background-color: <?php print $colorbtitle; ?>;
+        background-color: var(--colorbtitle);
         z-index: 1;
     }
     tr.liste_titre.box_titre th {
@@ -10504,6 +10519,8 @@
 @media (min-width: 768px) {
     #id-right > .fiche > form[action*="list.php"] div.div-table-responsive > table > tbody > * > :first-of-type:not(.actioncolumn),
     #id-right > .fiche > .tabBar > form[action*="list.php"] div.div-table-responsive > table > tbody > * > :first-of-type,
+    #id-right > .fiche > form[action*="list.php"] div.div-table-responsive > div.div-table-responsive-inside > table > tbody > * > :first-of-type,
+    #id-right > .fiche > .tabBar > form[action*="list.php"] div.div-table-responsive > div.div-table-responsive-inside > table > tbody > * > :first-of-type,
     #id-right > .fiche > form[action*="bankrecords.php"] div.div-table-responsive > table > tbody > * > :first-of-type,
     #id-right > .fiche > .tabBar > form[action*="bankrecords.php"] div.div-table-responsive > table > tbody > * > :first-of-type,
     #id-right > .fiche > form[action*="prelink.php"] div.div-table-responsive > table > tbody > * > :first-of-type,
@@ -10517,8 +10534,8 @@
             left: 0;
         <?php } ?>
         z-index: 2;
-        background-color: <?php print $colorbtitle; ?>;
-        /* background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;*/
+        background-color: var(--colorbtitle);
+        /* background: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;*/
         border-right: 1px solid var(--colorBorderActionColumn);
     }
 
@@ -10533,8 +10550,8 @@
             left: 0;
         <?php } ?>
         z-index: 1;
-        background-color: <?php print $colorbtitle; ?>;
-        /* background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;*/
+        background-color: var(--colorbtitle);
+        /* background: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;*/
         border-right: 1px solid var(--colorBorderActionColumn);
     }
 
@@ -10561,6 +10578,8 @@
 <?php if (getDolGlobalString('FIX_STICKY_COLUMN_LAST') || getDolGlobalString('OBLYON_STICKY_COLUMN_LAST')) { ?>
 #id-right > .fiche > form[action*="list.php"] div.div-table-responsive > table > tbody > * > :last-of-type,
 #id-right > .fiche > .tabBar > form[action*="list.php"] div.div-table-responsive > table > tbody > * > :last-of-type,
+#id-right > .fiche > form[action*="list.php"] div.div-table-responsive > div.div-table-responsive-inside > table > tbody > * > :last-of-type,
+#id-right > .fiche > .tabBar > form[action*="list.php"] div.div-table-responsive > div.div-table-responsive-inside > table > tbody > * > :last-of-type,
 #id-right > .fiche > form[action*="bankrecords.php"] div.div-table-responsive > table > tbody > * > :last-of-type,
 #id-right > .fiche > .tabBar > form[action*="bankrecords.php"] div.div-table-responsive > table > tbody > * > :last-of-type,
 #id-right > .fiche > form[action*="prelink.php"] div.div-table-responsive > table > tbody > * > :last-of-type,
@@ -10568,8 +10587,8 @@
     position: sticky;
     right: 0;
     z-index: 1;
-    background-color: <?php print $colorbtitle; ?>;
-    /* background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; */
+    background-color: var(--colorbtitle);
+    /* background: #<?php print colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; */
     border-left: 1px solid #bbbbbb;
 }
 <?php } ?>
@@ -10819,16 +10838,16 @@
     }
 }
 
-/* nboftopmenuentries = <?php echo (!empty($nbtopmenuentries) ? $nbtopmenuentries : 0) ?>, fontsize=<?php echo (!empty($fontsize) ? $fontsize : 0) ?> */
+/* nboftopmenuentries = <?php print (!empty($nbtopmenuentries) ? $nbtopmenuentries : 0) ?>, fontsize=<?php print (!empty($fontsize) ? $fontsize : 0) ?> */
 /* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: <?php echo (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 6.7, 0) + 8 : 8); ?>px)
+@media only screen and (max-width: <?php print (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 6.7, 0) + 8 : 8); ?>px)
 {
     div.tmenucenter {
-        max-width: <?php echo (!empty($fontsize) ? round($fontsize * 4) : 0); ?>px;	/* size of viewport */
+        max-width: <?php print (!empty($fontsize) ? round($fontsize * 4) : 0); ?>px;	/* size of viewport */
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        color: #<?php echo $colortextbackhmenu; ?>;
+        color: #<?php print $colortextbackhmenu; ?>;
     }
     .mainmenuaspan {
         font-size: 10px;
@@ -10852,10 +10871,10 @@
 }
 
 /* rule to reduce top menu - 2nd reduction */
-@media only screen and (max-width: <?php echo (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 4.5, 0) + 8 : 8); ?>px)
+@media only screen and (max-width: <?php print (!empty($nbtopmenuentries) && !empty($fontsize) ? round($nbtopmenuentries * $fontsize * 4.5, 0) + 8 : 8); ?>px)
 {
     div.tmenucenter {
-        max-width: <?php echo (!empty($fontsize) ? round($fontsize * 2) : 0); ?>px;	/* size of viewport */
+        max-width: <?php print (!empty($fontsize) ? round($fontsize * 2) : 0); ?>px;	/* size of viewport */
         text-overflow: clip;
     }
     .mainmenuaspan {
@@ -10886,7 +10905,7 @@
         <?php if (GETPOST("optioncss") == 'print') {	?>
             display:none;
         <?php } else { ?>
-            padding-<?php echo $right; ?>: 92px;
+            padding-<?php print $right; ?>: 92px;
         <?php } ?>
     }
     div.login_block {
diff --git a/themeoblyon/img/statut0.png b/themeoblyon/img/statut0.png
index f5fce35..296a9c7 100644
Binary files a/themeoblyon/img/statut0.png and b/themeoblyon/img/statut0.png differ
diff --git a/themeoblyon/img/statut0_40x40.png b/themeoblyon/img/statut0_40x40.png
index 591aac8..884ceb0 100644
Binary files a/themeoblyon/img/statut0_40x40.png and b/themeoblyon/img/statut0_40x40.png differ
diff --git a/themeoblyon/img/statut1.png b/themeoblyon/img/statut1.png
index 87b0940..342f75e 100644
Binary files a/themeoblyon/img/statut1.png and b/themeoblyon/img/statut1.png differ
diff --git a/themeoblyon/img/statut1_40x40.png b/themeoblyon/img/statut1_40x40.png
index 6def06c..4185fc0 100644
Binary files a/themeoblyon/img/statut1_40x40.png and b/themeoblyon/img/statut1_40x40.png differ
diff --git a/themeoblyon/img/statut3.png b/themeoblyon/img/statut3.png
index bf4f7b8..8bf9eb6 100644
Binary files a/themeoblyon/img/statut3.png and b/themeoblyon/img/statut3.png differ
diff --git a/themeoblyon/img/statut3_40x40.png b/themeoblyon/img/statut3_40x40.png
index f71ef4e..70a05b5 100644
Binary files a/themeoblyon/img/statut3_40x40.png and b/themeoblyon/img/statut3_40x40.png differ
diff --git a/themeoblyon/img/statut4.png b/themeoblyon/img/statut4.png
index 7a680ad..09bae11 100644
Binary files a/themeoblyon/img/statut4.png and b/themeoblyon/img/statut4.png differ
diff --git a/themeoblyon/img/statut4_40x40.png b/themeoblyon/img/statut4_40x40.png
index 2da24b6..5de4d67 100644
Binary files a/themeoblyon/img/statut4_40x40.png and b/themeoblyon/img/statut4_40x40.png differ
diff --git a/themeoblyon/img/statut5.png b/themeoblyon/img/statut5.png
index 98bb941..c6fd3bd 100644
Binary files a/themeoblyon/img/statut5.png and b/themeoblyon/img/statut5.png differ
diff --git a/themeoblyon/img/statut5_40x40.png b/themeoblyon/img/statut5_40x40.png
index 7cac0ad..6f7c623 100644
Binary files a/themeoblyon/img/statut5_40x40.png and b/themeoblyon/img/statut5_40x40.png differ
diff --git a/themeoblyon/img/statut6.png b/themeoblyon/img/statut6.png
index fe93f1a..faefe04 100644
Binary files a/themeoblyon/img/statut6.png and b/themeoblyon/img/statut6.png differ
diff --git a/themeoblyon/img/statut6_40x40.png b/themeoblyon/img/statut6_40x40.png
index 0b847c3..74417e4 100644
Binary files a/themeoblyon/img/statut6_40x40.png and b/themeoblyon/img/statut6_40x40.png differ
diff --git a/themeoblyon/img/statut7.png b/themeoblyon/img/statut7.png
index 7747634..7893bbb 100644
Binary files a/themeoblyon/img/statut7.png and b/themeoblyon/img/statut7.png differ
diff --git a/themeoblyon/img/statut7_40x40.png b/themeoblyon/img/statut7_40x40.png
index 48314cc..f1b6800 100644
Binary files a/themeoblyon/img/statut7_40x40.png and b/themeoblyon/img/statut7_40x40.png differ
diff --git a/themeoblyon/img/statut8.png b/themeoblyon/img/statut8.png
index 2627aab..eeeeaca 100644
Binary files a/themeoblyon/img/statut8.png and b/themeoblyon/img/statut8.png differ
diff --git a/themeoblyon/img/statut8_40x40.png b/themeoblyon/img/statut8_40x40.png
index 0546ac2..10c6b53 100644
Binary files a/themeoblyon/img/statut8_40x40.png and b/themeoblyon/img/statut8_40x40.png differ
diff --git a/themeoblyon/img/statut9.png b/themeoblyon/img/statut9.png
index e5304dd..940bd51 100644
Binary files a/themeoblyon/img/statut9.png and b/themeoblyon/img/statut9.png differ
diff --git a/themeoblyon/img/statut9_40x40.png b/themeoblyon/img/statut9_40x40.png
index 445eac3..9fe65a8 100644
Binary files a/themeoblyon/img/statut9_40x40.png and b/themeoblyon/img/statut9_40x40.png differ
diff --git a/themeoblyon/img/title_accountancy.png b/themeoblyon/img/title_accountancy.png
new file mode 100644
index 0000000..f20abbc
Binary files /dev/null and b/themeoblyon/img/title_accountancy.png differ
diff --git a/themeoblyon/img/title_agenda.png b/themeoblyon/img/title_agenda.png
new file mode 100644
index 0000000..7db4377
Binary files /dev/null and b/themeoblyon/img/title_agenda.png differ
diff --git a/themeoblyon/img/title_bank.png b/themeoblyon/img/title_bank.png
new file mode 100644
index 0000000..ee648b6
Binary files /dev/null and b/themeoblyon/img/title_bank.png differ
diff --git a/themeoblyon/img/title_commercial.png b/themeoblyon/img/title_commercial.png
new file mode 100644
index 0000000..49436d5
Binary files /dev/null and b/themeoblyon/img/title_commercial.png differ
diff --git a/themeoblyon/img/title_companies.png b/themeoblyon/img/title_companies.png
new file mode 100644
index 0000000..5232b6f
Binary files /dev/null and b/themeoblyon/img/title_companies.png differ
diff --git a/themeoblyon/img/title_generic.png b/themeoblyon/img/title_generic.png
new file mode 100644
index 0000000..0651e43
Binary files /dev/null and b/themeoblyon/img/title_generic.png differ
diff --git a/themeoblyon/img/title_home.png b/themeoblyon/img/title_home.png
new file mode 100644
index 0000000..2f063dd
Binary files /dev/null and b/themeoblyon/img/title_home.png differ
diff --git a/themeoblyon/img/title_hrm.png b/themeoblyon/img/title_hrm.png
new file mode 100644
index 0000000..bea80c9
Binary files /dev/null and b/themeoblyon/img/title_hrm.png differ
diff --git a/themeoblyon/img/title_products.png b/themeoblyon/img/title_products.png
new file mode 100644
index 0000000..2b245cd
Binary files /dev/null and b/themeoblyon/img/title_products.png differ
diff --git a/themeoblyon/img/title_project.png b/themeoblyon/img/title_project.png
new file mode 100644
index 0000000..0b75ff5
Binary files /dev/null and b/themeoblyon/img/title_project.png differ
diff --git a/themeoblyon/img/title_setup.png b/themeoblyon/img/title_setup.png
new file mode 100644
index 0000000..a028ca2
Binary files /dev/null and b/themeoblyon/img/title_setup.png differ
diff --git a/themeoblyon/img/title_ticket.png b/themeoblyon/img/title_ticket.png
new file mode 100644
index 0000000..b1cf5df
Binary files /dev/null and b/themeoblyon/img/title_ticket.png differ
diff --git a/themeoblyon/info-box.inc.php b/themeoblyon/info-box.inc.php
index dc10ecd..b26a53c 100644
--- a/themeoblyon/info-box.inc.php
+++ b/themeoblyon/info-box.inc.php
@@ -1,8 +1,21 @@
 <?php
+/* Copyright (C) 2025       Alexandre Spangaro          <alexandre@inovea-conseil.com>
+ */
 if (!defined('ISLOADEDBYSTEELSHEET')) {
-    die('Must be call by steelsheet');
-} ?>
-/* <style type="text/css" > */
+	die('Must be call by steelsheet');
+}
+/**
+ * @var Conf $conf
+ * @var string $left
+ * @var string $right
+ */
+// Expected to be defined by including parent
+'
+@phan-var-force string $right
+@phan-var-force string $left
+';
+?>
+/* IDE Hack <style type="text/css"> */
 
 /*
  * Component: Info Box
@@ -10,38 +23,51 @@
  */
 
 .info-box-module.--external span.info-box-icon-version {
-    background: rgba(0,0,0,0.2);
+	background: rgba(0,0,0,0.2);
 }
 
 .info-box-module.--external.--need-update span.info-box-icon-version{
-    background: #bc9525;
+	background: #bc9525;
 }
 
 .info-box {
 	display: block;
-    position: relative;
-	min-height: 90px;
+	position: relative;
+	min-height: 94px;
 	background: #fff;
     <?php if(getDolGlobalString('OBLYON_INFOXBOX_BACKGROUND')) { ?>
         background: <?php print getDolGlobalString('OBLYON_INFOXBOX_BACKGROUND'); ?> !important;
     <?php } ?>
 	width: 100%;
-	box-shadow: 0 0 1px rgba(0,0,0,.125),0 1px 3px rgba(0,0,0,.2);
-    border-top-right-radius: 0.25em;
-    border-top-left-radius: 6px;
-    border-bottom-left-radius: 6px;
-    border-bottom-right-radius: 0.25em;
-    margin-bottom: 15px;
+	box-shadow: 1px 1px 20px rgba(192, 192, 192, 0.2);
+	border-radius: 2px;
+	border: 1px solid #e9e9e9;
+	/* border: 1px solid var(--colorbacktitle1); */
+	margin-bottom: 15px;
 }
-.info-box.info-box-sm{
-    min-height: 80px;
-    margin-bottom: 10px;
+.info-box.info-box-sm {
+	min-height: 80px;
+	margin-bottom: 10px;
+	/* background: #fff; */
+}
+.opened-dash-board-wrap .info-box, .opened-dash-board-wrap .info-box .info-box-icon  {
+	border-radius: 0 0 0 15px;
+}
+/*.opened-dash-board-wrap .box-flex-item {
+	border-radius: 10px;
+}*/
+
+.info-box-more {
+	float: right;
+	top: 5px;
+	position: absolute;
+	right: 8px;
 }
 
 .info-box small {
 	font-size: 14px;
 }
-.info-box .progress {
+.info-box:not(.info-box-kanban) .progress {
 	background: rgba(0, 0, 0, 0.2);
 	margin: 5px -10px 5px -10px;
 	height: 2px;
@@ -51,187 +77,200 @@
 	border-radius: 0;
 }
 
-.info-box .progress .progress-bar {
-    float: left;
-    width: 0;
-    height: 100%;
-    font-size: 12px;
-    line-height: 20px;
-    color: #fff;
-    text-align: center;
-    background-color: #337ab7;
-    -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
-    box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
-    -webkit-transition: width .6s ease;
-    -o-transition: width .6s ease;
-    transition: width .6s ease;
+.info-box:not(.info-box-kanban) .progress .progress-bar {
+	float: left;
+	width: 0;
+	height: 100%;
+	font-size: 12px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	background-color: #337ab7;
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+	-webkit-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
 }
 .info-box-icon {
-	border-top-left-radius: 6px;
+	border-top-left-radius: 2px;
 	border-top-right-radius: 0;
 	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 6px;
+	border-bottom-left-radius: 2px;
 	display: block;
-    overflow: hidden;
+	overflow: hidden;
 	float: left;
-	height: 90px;
-	width: 90px;
+	line-height: 94px;	/* must be same height as min-height of .info-box */
+	height: 94px; 	    /* must be same height as min-height of .info-box */
+	width: 88px;
 	text-align: center;
-	font-size: 45px;
-	line-height: 90px;
-	background: rgba(0, 0, 0, 0.2);
+	font-size: 2.8em;
+	background: var(--colorbacktitle1) !important;
 }
 
 .info-box-module .info-box-icon {
-    padding-top: 0px;
-    padding-bottom: 5px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 }
-.info-box-sm .info-box-icon {
-    height: 86px;		/* must match height of info-box-sm .info-box-content */
-    width: 78px;
-    font-size: 25px;
-    line-height: 92px;
+.info-box-sm .info-box-icon, .info-box-sm .info-box-img {
+	height: 98px !important;		/* must match height of info-box-sm .info-box-content */
+	width: 78px;
+	font-size: 25px;
+	line-height: 92px;
 }
 .info-box-order {
-    border-top-left-radius: 2px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 2px;
-    display: block;
-    overflow: hidden;
-    float: left;
-    height: 115px;
-    width: 88px;
-    text-align: center;
-    font-size: 2.3em;
-    line-height: 115px;
-    margin-right: 10px;
-    background: var(--colorbacktitle1) !important;
+	border-top-left-radius: 2px;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 2px;
+	display: block;
+	overflow: hidden;
+	float: left;
+	height: 115px;
+	width: 88px;
+	text-align: center;
+	font-size: 2.3em;
+	line-height: 115px;
+	margin-right: 10px;
+	background: var(--colorbacktitle1) !important;
 }
 .opened-dash-board-wrap .info-box .info-box-icon {
-    font-size: 2em;
+	font-size: 2em;
 }
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
-    border-radius: 6px 0 0 6px;
-    line-height: 80px;
+	border-radius: 0 0 0 20px;
+	line-height: 80px;
 }
 .info-box-module .info-box-icon {
-    height: 98px;
+	height: 98px;
 }
 .info-box-icon > img {
-    max-width: 85%;
+	max-width: 85%;
 }
 .info-box-module .info-box-icon > img {
-    max-width: 60%;
+	max-width: 60%;
 }
 
 a.info-box-text.info-box-text-a {
-    display: table-cell;
+	/* display: table-cell; */
+	display: contents;
 }
-a.info-box-text-a i.fa.fa-exclamation-triangle {
-    font-size: 0.9em;
+a.info-box-text-a i.fa.fa-exclamation-triangle, span.badge i.fa.fa-exclamation-triangle {
+	font-size: 0.9em;
 }
 
-.info-box-icon-text{
-    box-sizing: border-box;
-    display: block;
-    position: absolute;
-    width: 90px;
-    bottom: 0px;
-    color: #ffffff;
-    background-color: rgba(0,0,0,0.1);
-    cursor: default;
-
-    font-size: 10px;
-    line-height: 15px;
-    padding: 0px 3px;
-    text-align: center;
-    opacity: 0;
-    -webkit-transition: opacity 0.5s, visibility 0s 0.5s;
-    transition: opacity 0.5s, visibility 0s 0.5s;
+.info-box-line {
+	line-height: 1.35em;
+}
+.info-box-line-text {
+	overflow: hidden;
+	width: calc(100% - 92px);
+	max-width: calc(100% - 82px);
+	text-overflow: ellipsis;
+}
+
+.info-box-icon-text {
+	box-sizing: border-box;
+	display: block;
+	position: absolute;
+	width: 90px;
+	bottom: 0px;
+	color: #ffffff;
+	background-color: rgba(0,0,0,0.1);
+	cursor: default;
+
+	font-size: 10px;
+	line-height: 15px;
+	padding: 0px 3px;
+	text-align: center;
+	opacity: 0;
+	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
+	transition: opacity 0.5s, visibility 0s 0.5s;
 }
 
 .info-box-icon-version {
-    box-sizing: border-box;
-    display: block;
-    position: absolute;
-    width: 90px;
-    bottom: 0px;
-    color: #ffffff;
-    background-color: rgba(0,0,0,0.1);
-    cursor: default;
-
-    font-size: 10px;
-    line-height: 1.5em;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-    opacity: 1;
-    -webkit-transition: opacity 0.5s, visibility 0s 0.5s;
-    transition: opacity 0.5s, visibility 0s 0.5s;
-}
-.box-flex-item.info-box-module.info-box-module-disabled {
-    /* opacity: 0.6; */
+	box-sizing: border-box;
+	display: block;
+	position: absolute;
+	width: 90px;
+	bottom: 0px;
+	color: #ffffff;
+	background-color: rgba(0,0,0,0.1);
+	cursor: default;
+
+	font-size: 10px;
+	line-height: 1.5em;
+	padding: 4px 3px;
+	text-align: center;
+	opacity: 1;
+	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
+	transition: opacity 0.5s, visibility 0s 0.5s;
+}
+
+.box-flex-item.info-box-module.--disabled {
+	/* opacity: 0.6; */
 }
 
 .info-box-actions {
-    position: absolute;
-    right: 0;
-    bottom: 0;
+	position: absolute;
+	right: 0;
+	bottom: 0;
 }
 
 /* customize section img box on list of products */
 .info-box-img {
-    height: 105px !important;
-    width: 88px;
-    border-top-left-radius: 2px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 2px;
-    display: block;
-    overflow: hidden;
-    float: left;
-    text-align: center;
-    font-size: 2.8em;
-    line-height: 90px;
-    margin-right: 5px;
-    background: var(--colorbacktitle1) !important;
+	height: 105px !important;
+	width: 88px;
+	border-top-left-radius: 2px;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 2px;
+	display: block;
+	overflow: hidden;
+	float: left;
+	text-align: center;
+	font-size: 2.8em;
+	line-height: 90px;
+	margin-right: 5px;
+	background: var(--colorbacktitle1) !important;
 }
 .info-box-img > img {
-    width: 90%;
-    position: relative;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+	width: 90%;
+	position: relative;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
 }
 
 <?php if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_BOXSTATS') && getDolGlobalString('MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD')) { ?>
 .info-box-icon-text{
-    opacity: 1;
+	opacity: 1;
 }
 <?php } ?>
 
 .info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version {
-    overflow: hidden;
-    width: 78px;
+	overflow: hidden;
+	width: 80px;
 }
-.info-box:hover .info-box-icon-text{
-    opacity: 1;
+.info-box:hover .info-box-icon-text {
+	opacity: 1;
 }
 
 .info-box-content {
-    padding: 5px 10px;
-    margin-left: 84px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 10px;
+	padding-right: 5px;
+	margin-left: 84px;
 }
-
-.info-box-sm .info-box-content{
-    margin-left: 78px;
-    height: 86px;   /* 96 - margins of .info-box-sm .info-box-content */
+.info-box-sm .info-box-content {
+	margin-left: 80px;
+	height: 88px;   /* 96 - margins of .info-box-sm .info-box-content */
 }
 .info-box-sm .info-box-module-enabled {
 	background: linear-gradient(0.35turn, var(--color1BckgrdInfobox), var(--color1BckgrdInfobox), var(--color2BckgrdInfobox), var(--color2BckgrdInfobox));
 }
 .info-box-content-warning span.font-status4 {
-    color: #bc9526 !important;
+	color: #bc9526 !important;
 }
 
 .info-box-number {
@@ -251,10 +290,23 @@
 .info-box-title{
 	text-transform: uppercase;
 	font-weight: bold;
+	margin-bottom: 3px;	/* not too much space so we can add another lines */
+	opacity: 0.6;
+	/* color: var(--colortexttitlenotab); */
 }
 .info-box-text{
 	font-size: 0.92em;
 }
+/* Force values for small screen 480 */
+@media only screen and (max-width: 480px)
+{
+	.info-box-text {
+		font-size: 0.85em;
+	}
+	.info-box-line {
+		line-height: 1.25em;
+	}
+}
 .info-box-text:first-letter{text-transform: uppercase}
 a.info-box-text{ text-decoration: none;}
 
@@ -267,10 +319,39 @@
 }
 
 
+/* customize section for home box link */
+.infobox-haslink .info-box-icon i {
+	transition: opacity 0.2s ease-in-out;
+}
+.infobox-haslink .info-box-icon:hover i {
+	opacity: 0.2;
+}
+.infobox-haslink .info-box-icon .info-box-createlink {
+	height:100%;
+	width:100%;
+	display:block;
+	position:absolute;
+	top:0;
+	left:0;
+	font-size:0.6em;
+	display: flex;
+	opacity: 0;
+	transition: opacity 0.2s ease-in-out;
+	color:inherit;
+	text-decoration: none;
+}
+.infobox-haslink .info-box-icon:hover .info-box-createlink {
+	opacity: 1;
+}
+.infobox-haslink .info-box-icon .info-box-createlink span.fas {
+	margin:auto;
+}
+
 
 /* ICONS INFO BOX */
 <?php
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
 $prefix = '';
 if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 	$prefix = 'background-';
@@ -284,45 +365,50 @@
 	background-color: #fff !important;
 	<?php } ?>
     opacity: 0.95;
-<?php if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { ?>
-    filter: saturate(<?php echo getDolGlobalString('THEME_AGRESSIVENESS_RATIO'); ?>);
-<?php } ?>
+    <?php if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { ?>
+        filter: saturate(<?php echo getDolGlobalString('THEME_AGRESSIVENESS_RATIO'); ?>);
+    <?php } ?>
 }
 
+.spannature {
+	padding-top: 6px !important;
+	padding-bottom: 6px !important;
+	vertical-align: middle;
+}
+
+.nonature-back {
+	background-color: #EEE;
+}
+.prospect-back {
+	background-color: #a7c5b0 !important;
+	color: #FFF !important;
+}
 .customer-back {
 	background-color: #55955d !important;
 	color: #FFF !important;
-	padding: 2px;
-	margin: 2px;
-	border-radius: 3px;
 }
 .vendor-back {
 	background-color: #599caf !important;
 	color: #FFF !important;
-	padding: 2px 4px 2px 4px;
-	margin: 2px;
-	border-radius: 3px;
 }
 .user-back {
 	background-color: #79633f !important;
 	color: #FFF !important;
-	padding: 2px;
-	margin: 2px;
-	border-radius: 3px;
 }
 .member-company-back {
-    padding: 2px 7px 2px 7px;
-    background-color: #e4e4e4;
-    color: #666;
-    border-radius: 10px;
-    white-space: nowrap;
+	background-color: #e4e4e4;
+	color: #666;
+	white-space: nowrap;
 }
 .member-individual-back {
-    padding: 2px 7px 2px 7px;
-    background-color: #e4e4e4;
-    color: #666;
-    border-radius: 10px;
-    white-space: nowrap;
+	background-color: #e4e4e4;
+	color: #666;
+	white-space: nowrap;
+}
+.nonature-back, .prospect-back, .customer-back, .vendor-back, .user-back, .member-company-back, .member-individual-back {
+	padding: 2px;
+	margin: 2px;
+	border-radius: 5px;
 }
 
 .bg-infobox-action {
@@ -367,6 +453,9 @@
 .bg-infobox-ticket {
     <?php echo $prefix; ?>color: <?php print colorAgressiveness(getDolGlobalString('OBLYON_INFOXBOX_TICKET_COLOR'), getDolGlobalString('THEME_AGRESSIVENESS_RATIO')); ?>  !important;
 }
+.bg-infobox-cubes {
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness(getDolGlobalString('OBLYON_INFOXBOX_MRP_COLOR'), getDolGlobalString('THEME_AGRESSIVENESS_RATIO')); ?>  !important;
+}
 
 
 .fa-dol-action:before {
@@ -374,27 +463,30 @@
 }
 .fa-dol-propal:before,
 .fa-dol-supplier_proposal:before {
-	content: "\f2b5";
+	content: "\f573";
 }
 .fa-dol-facture:before,
 .fa-dol-invoice_supplier:before {
 	content: "\f571";
 }
 .fa-dol-project:before {
-	content: "\f0e8";
+	content: "\f542";
 }
 .fa-dol-commande:before,
 .fa-dol-order_supplier:before {
 	content: "\f570";
 }
 .fa-dol-contrat:before {
-	content: "\f1e6";
+	content: "\f0f2";
+}
+.fa-dol-ticket:before {
+	content: "\f3ff";
 }
 .fa-dol-bank_account:before {
 	content: "\f19c";
 }
 .fa-dol-member:before {
-	content: "\f0c0";
+	content: "\f007";
 }
 .fa-dol-expensereport:before {
 	content: "\f555";
@@ -405,6 +497,9 @@
 .fa-dol-ticket:before {
     content: "\f3ff";
 }
+.fa-dol-cubes:before {
+	content: "\f1b3";
+}
 
 
 /* USING FONTAWESOME FOR WEATHER */
@@ -413,104 +508,196 @@
 }
 .fa-weather-level0:before{
 	content: "\f185";
+	color : #cfbf00;
 }
 .fa-weather-level1:before{
 	content: "\f6c4";
+	color : #bc9526;
 }
 .fa-weather-level2:before{
-	content: "\f0c2";
+	content: "\f743";
+	color : #b16000;
 }
 .fa-weather-level3:before{
 	content: "\f740";
+	color : #b04000;
 }
 .fa-weather-level4:before{
 	content: "\f0e7";
+	color : #993013;
 }
 
 
-
-
 .box-flex-container{
 	display: flex; /* or inline-flex */
 	flex-direction: row;
 	flex-wrap: wrap;
-	width: 100%;
-	margin: 0 0 0 -15px;
+	width: calc(100% + 14px);
+	margin: 0 -8px 0 -8px;
 	/*justify-content: space-between;*/
 }
-.box-flex-item{
+.box-flex-container-columns {
+	display: flex; /* or inline-flex */
+	flex-direction: row;
+	flex-wrap: nowrap;
+	justify-content: space-between;
+}
+.box-flex-container-column {
+	flex-grow: 1;
+	}
+.box-flex-container-column:not(:last-of-type) {
+	border-right: 1px solid #AAA;
+}
+.box-flex-container-column.kanban {
+	flex: 1;
+}
+.kanban.kanbancollapsed {
+	flex: unset;
+	width: 80px;
+	max-width: 80px;
+	overflow: hidden;
+}
+.kanban.kanbancollapsed .kanbanlabel, .text-vertical {
+	writing-mode: vertical-rl;
+}
+
+.box-flex-grow-zero {
+	flex-grow: 0 !important;
+}
+
+.box-flex-item {
 	flex-grow : 1;
 	flex-shrink: 1;
 	flex-basis: auto;
 	<?php if (getDolGlobalString('OBLYON_INFOXBOX_SINGLE_WIDTH')) { ?>
-	width: 280px;
+	width: 290px;
 	<?php } else { ?>
-	min-width: 260px;
+	min-width: 270px;
 	<?php } ?>
-	margin: 5px 0px 0px 15px;
 }
-.box-flex-item.filler{
-	margin: 0px 0px 0px 15px !important;
+.box-flex-item.filler {
 	height: 0;
 }
+.box-flex-item, .kanbanlabel {
+	margin-top: 5px;
+	margin-<?php echo $right; ?>: 20px;
+	margin-bottom: 0px;
+	margin-<?php echo $left; ?>: 10px;
+}
+.kanbanlabel {
+	background: var(--colorbacktitle1);
+	padding: 5px;
+	margin-bottom: 10px;
+	border-radius: 5px;
+}
+.kanban .box-flex-item {
+	line-height: 1.4em;
+}
+.kanban .box-flex-item-5lines {
+	line-height: 1.2em;
+}
+
+/* css for small kanban */
+.box-flex-item-small {
+	width: 200px !important;
+}
+.box-flex-item-small .info-box-sm .info-box-content {
+	margin-left: 0;
+}
+.box-flex-item-small .info-box-icon.bg-infobox-action {
+	display: none;
+}
+
 
 .info-box-title {
-    width: calc(100% - 20px);
+	width: calc(100% - 20px);
 }
 .info-box-module {
-    min-width: 350px;
-    max-width: 350px;
+	min-width: 350px;
+	max-width: 350px;
+}
+.fright {
+	float:right;
 }
-
 @media only screen and (max-width: 1740px) {
-    .info-box-module {
-        min-width: 315px;
-        max-width: 315px;
-    }
+	.info-box-module {
+		min-width: 315px;
+		max-width: 315px;
+	}
 }
 
-@media only screen and (max-width: 767px) {
-    .info-box-module {
-        min-width: 260px;
-    }
+@media only screen and (max-width: 768px) {
+	.info-box-module {
+		min-width: 260px;
+	}
+	.box-flex-item {
+		width: 280px;
+	}
 }
 
+@media only screen and (max-width: 570px)
+{
+	.box-flex-item {
+		margin: 3px 8px 3px 8px !important;
+	}
+}
+
+@media only screen and (max-width: 480px) {
+	.info-box-module {
+		min-width: 250px;
+	}
+	.box-flex-item {
+		width: 250px;
+	}
+}
+
+
+
+
 .info-box-module .info-box-content {
-    height: 98px;
+	height: 98px;
 }
 /* Disabled. This break the responsive on smartphone
 .box{
-overflow: visible;
+	overflow: visible;
 }
 */
 
-@media only screen and (max-width: 767px)
+@media only screen and (max-width: 768px)
 {
-    .box-flex-container {
-        margin: 0 0 0 0px !important;
-        width: 100% !important;
-        justify-content: space-between;
-    }
-    .info-box-module {
-        width: 100%;
-        max-width: unset;
-    }
-
-    .info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version {
-        width: 60px;
-    }
-    .info-box-sm .info-box-icon {
-        width: 60px;
-    }
-    .info-box-sm .info-box-content {
-        margin-left: 60px;
-    }
-    .info-box {
-        border: 1px solid #e0e0e0;
-    }
-}
-
-/* Temporary fix problem with bg color on bank_account - Problem of dolibarr's core */
-td span.bg-infobox-bank_account {
-    background-color: unset !important;
+	.box-flex-container {
+		margin: 0 0 0 0px !important;
+		width: 100% !important;
+		/* justify-content: space-between; */
+	}
+	.info-box-module {
+		width: 100%;
+		max-width: unset;
+	}
+
+	.info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version {
+		width: 60px;
+	}
+	.info-box-sm .info-box-icon {
+		width: 60px;
+	}
+	.info-box-sm .info-box-content {
+		margin-left: 60px;
+	}
+	.info-box {
+		border: 1px solid #e0e0e0;
+	}
+
+	.info-box-content {
+		padding-top: 5px;
+		padding-bottom: 5px;
+		padding-left: 10px;
+		padding-right: 2px;
+	}
+	/*
+	.info-box-line-text {
+		width: calc(100% - 98px);
+		max-width: calc(100% - 88px);
+	}
+	*/
 }
diff --git a/themeoblyon/login.inc.php b/themeoblyon/login.inc.php
index 870e548..ed3c7b6 100644
--- a/themeoblyon/login.inc.php
+++ b/themeoblyon/login.inc.php
@@ -6,7 +6,7 @@
 
     .bodylogin
     {
-		background: <?php echo $colorbtitle; ?>;
+		background: var(--colorbtitle);
         display: table;
         position: absolute;
         height: 100%;
@@ -37,7 +37,7 @@
 		width: 530px;
 <?php } ?>
 		max-width: <?php echo !getDolGlobalString('MAIN_LOGIN_RIGHT') ? '530px' : 'calc(50vw - 70px)'; ?>;
-		color: <?php print $bgnavtop_txt; ?> !important;
+		color: var(--bgnavtop_txt) !important;
 		padding-bottom: 10px;
     }
 	.login_table_title a {
@@ -59,7 +59,7 @@
 		box-shadow: 12px 12px 25px 1px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
         <?php
             if (getDolGlobalString('MAIN_LOGIN_BACKGROUND')) {
-				print '	background-color: '.$colorbtitle.';';
+				print '	background-color: var(--colorbtitle);';
             } else {
                 print '	background-color: #FFFFFF;';
             }
@@ -148,32 +148,51 @@
     }
 
     div.backgroundsemitransparent {
-		background: <?php echo $colorbtitle; ?>;
+		background: var(--colorbtitle);
         padding-left: 10px;
         padding-right: 10px;
-		color: <?php echo $colorftitle; ?>;
+		color: var(--colorftitle);
     }
     div.login_block {
-        position: absolute;
-        text-align: <?php print $right; ?>;
-    <?php print $right; ?>: 0;
-        top: <?php print $disableimages?'4px':'0'; ?>;
-        line-height: 10px;
-    <?php // echo (empty($disableimages) && $maxwidthloginblock)?'max-width: '.$maxwidthloginblock.'px;':''; ?>
-    <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
-        display: none;
-    <?php } ?>
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            background-color: var(--bgnavleft);
+            height: 40px;
+        <?php } else { ?>
+            background-color: var(--bgnavtop);
+            height: 54px;
+        <?php } ?>
+        /* padding-right: 10px; */
+        <?php if (getDolGlobalString('OBLYON_STICKY_TOPBAR')) { ?>
+            position: fixed !important;
+        <?php } else { ?>
+            position: absolute !important;
+        <?php } ?>
+        top: 0;
+        <?php print $right; ?>: 0px;
+        z-index: 100;
+        <?php if (GETPOST("optioncss") == 'print') { ?>
+            display: none;
+        <?php } ?>
     }
     div.login_block a {
-        color: <?php echo $bgnavleft_txt; ?>;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt);
+        <?php } else { ?>
+            color: var(--bgnavtop_txt);
+        <?php } ?>
         display: inline-block;
     }
     div.login_block span.aversion {
-    <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
-        color: <?php echo $bgnavleft_txt; ?>;
-    <?php } else { ?>
-        color: <?php echo $bgnavtop_txt; ?>;
-    <?php } ?>
+        <?php if(getDolGlobalString('OBLYON_DISABLE_VERSION')) { ?>
+            display: none !important;
+        <?php } else { ?>
+            <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+                color: var(--bgnavleft_txt);
+            <?php } else { ?>
+                color: var(--bgnavtop_txt);
+            <?php } ?>
+            filter: contrast(0.7);
+        <?php } ?>
     }
     div.login_block table {
         display: inline;
@@ -183,14 +202,282 @@
         font-weight: bold;
         float: right;
     }
-    div.login a {
-        color: <?php echo $bgnavleft_txt; ?>;
+    div.login a, div.login_block_user a {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt);
+        <?php } else { ?>
+            color: var(--bgnavtop_txt);
+        <?php } ?>
     }
     div.login a:hover {
-        color: <?php echo $bgnavleft_txt; ?>;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt);
+        <?php } else { ?>
+            color: var(--bgnavtop_txt);
+        <?php } ?>
         text-decoration:underline;
     }
+    div.login_block:after {
+        /*content: '\f013';*/
+        color: var(--bgnavtop_txt);
+        font-family: var(--fontawesomeFamily) !important;
+        font-size: 20px;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            line-height: 40px;
+        <?php } else { ?>
+            line-height: 54px;
+        <?php } ?>
+    }
+    div.login_block:hover:after {
+        color: <?php print $maincolor; ?>;
+    }
+    div.login_block_tools {
+        margin-<?php print $right ?>: 8px;
+        display: inline-block;
+        vertical-align: middle;
+        line-height: <?php print $disableimages ? '25' : '40'; ?>px;
+        height: <?php print $disableimages ? '25' : '40'; ?>px;
+    }
+    div.login_block_other {
+        display: inline-block;
+        vertical-align: middle;
+        clear: <?php print $disableimages ? 'none' : 'both'; ?>;
+        padding-top: 0;
+        text-align: <?php print $right ?>;
+        max-width: 200px;
+    }
+    div.login_block_user {
+    	display: inline-block;
+    	vertical-align: middle;
+        /*clear: left;*/
+        /*float: <?php print $left; ?>;*/
+        margin-right: 0px;
+    }
+    div.login_block_user .login a,
+    div.login_block_user a {
+        display: table-cell;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            font-size: 13px;
+        <?php } ?>
+        font-family: <?php print $fontmainmenu; ?>;
+        font-weight: 500;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            height: 40px;
+        <?php } else { ?>
+            height: 54px;
+        <?php } ?>
+        max-width: 300px;
+        overflow: hidden;
+        padding: 0 3px;
+        text-overflow: ellipsis;
+        transition: all .2s ease-in-out;
+        -moz-transition: all .2s ease-in-out;
+        -webkit-transition: all .2s ease-in-out;
+        vertical-align: middle;
+    }
+    div.login_block_user > .classfortooltip.login_block_elem2 {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            height: 40px;
+        <?php } else { ?>
+            height: 54px;
+        <?php } ?>
+    }
+    div.login_block_other {
+        display: inline-block;
+        clear: <?php print $disableimages ? 'none' : 'both'; ?>;
+    }
+    .login_block_other {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            background: var(--bgnavleft);
+        <?php } else { ?>
+            background: var(--bgnavtop);
+        <?php } ?>
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            display: none;
+        <?php } ?>
+        /* position: absolute; */
+        right: 0;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            top: 40px;
+            height: 40px;
+            line-height: 36px;
+        <?php } else { ?>
+            top: 54px;
+            height: 54px;
+            line-height: 50px;
+        <?php } ?>
+        padding-top: 0;
+        text-align: right;
+        margin-right: 3px;
+    }
+    .login_block:hover > .login_block_other {
+        /* display: block; */
+    }
+
+    .login_block_user a img.loginphoto {
+        display: none;
+    }
+
+    .login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
+    	vertical-align: middle;
+    }
 
+    .login_block_elem {
+        float: <?php print $left; ?>;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            background-color: var(--bgnavleft);
+            height: 40px;
+        <?php } else { ?>
+            background-color: var(--bgnavtop);
+            height: 54px;
+        <?php } ?>
+        padding: 0;
+    }
+    .login_block_elem.classfortooltip {
+        margin: 0;
+    }
+    .login_block_elem a,
+    .login_block td.classfortooltip a {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt);
+            font-size: 16px;
+            height: 40px;
+            line-height: 36px;
+        <?php } else { ?>
+            color: var(--bgnavtop_txt);
+            font-size: 18px;
+            height: 54px;
+            line-height: 50px;
+        <?php } ?>
+        display: block;
+        font-family: var(--fontfamilydol);
+        padding: 0 3px;
+        text-decoration: none;
+        transition: all .2s ease-in-out;
+        -moz-transition: all .2s ease-in-out;
+        -webkit-transition: all .2s ease-in-out;
+    }
+    .login_block_elem a:hover,
+    .login_block td.classfortooltip a:hover {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt_hover);
+        <?php } else { ?>
+            color: var(--bgnavtop_txt_hover);
+        <?php } ?>
+    }
+    .atoplogin, .atoplogin:hover {
+    <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+        color: var(--bgnavleft_txt) !important;
+    <?php } else { ?>
+        color: var(--bgnavtop_txt) !important;
+    <?php } ?>
+    }
+    .login_block_getinfo {
+        text-align: center;
+    }
+    .login_block_getinfo div.login_block_user {
+        display: block;
+    }
+    .login_block_getinfo .atoplogin, .login_block_getinfo .atoplogin:hover {
+    	color: #333 !important;
+    	font-weight: normal !important;
+    }
+    .alogin, .alogin:hover {
+    	font-weight: normal !important;
+    	padding-top: 2px;
+    }
+    .alogin:hover, .atoplogin:hover {
+    	text-decoration:underline !important;
+    }
+    span.fa.atoplogin, span.fa.atoplogin:hover {
+    	font-size: 16px;
+    	text-decoration: none !important;
+    }
+    .atoplogin #dropdown-icon-down, .atoplogin #dropdown-icon-up {
+    	font-size: 0.7em;
+    }
+    .login_block_elem img.printer,
+    .login_block_elem img.login,
+    .login_block_elem img.help,
+    .login_block td.classfortooltip img.printer,
+    .login_block td.classfortooltip img.login,
+    .login_block td.classfortooltip img.help {
+        vertical-align: baseline;
+    }
+    img.login, img.printer, img.help, img.entity {
+        /* padding: 0px 0px 0px 4px; */
+        /* margin: 0px 0px 0px 8px; */
+        text-decoration: none;
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            color: var(--bgnavleft_txt);
+        <?php } else { ?>
+            color: var(--bgnavtop_txt);
+        <?php } ?>
+        font-weight: bold;
+    }
+    .userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
+        width: <?php print $disableimages ? '26' : '32'; ?>px;
+        height: <?php print $disableimages ? '26' : '32'; ?>px;
+        border-radius: 50%;
+        background-size: contain;
+    	border: 1px solid;
+    	border-color: rgba(255, 255, 255, 0.2);
+    }
+    img.userphoto {				/* size for user photo in lists */
+        border-radius: 0.72em;
+        width: 1.4em;
+        height: 1.4em;
+        background-size: contain;
+        vertical-align: middle;
+    }
+    img.userphotosmall {		/* size for user photo in lists */
+        border-radius: 0.6em;
+        width: 1.2em;
+        height: 1.2em;
+        background-size: contain;
+        vertical-align: middle;
+    	background-color: #FFF;
+    }
+    img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] {
+    	background: #fff;
+    }
+    form[name="addtime"] img.userphoto {
+    	border: 1px solid #444;
+    }
+    .span-icon-user {
+        background-image: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
+        background-repeat: no-repeat;
+    }
+    .span-icon-password {
+        background-image: url(<?php print dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+        background-repeat: no-repeat;
+    }
+    .login_block td.classfortooltip { height: 40px; }
+    .login_block .classfortooltip:hover,
+    .login_block .classfortooltip:focus {
+        <?php if (getDolGlobalString('MAIN_MENU_INVERT')) { ?>
+            background-color: var(--bgnavleft_hover);
+        <?php } else { ?>
+            background-color: var(--bgnavtop_hover);
+        <?php } ?>
+    }
+    div.login_block table { display: inline; }
+    /* db inf v3.5 */
+    td div.login {
+        white-space: nowrap;
+        padding: 0;
+        margin: 0;
+        font-weight: bold;
+        color: #f4f4f4;
+    }
+    .alogin {
+        font-weight: normal !important;
+        font-size: <?php print $fontsizesmaller; ?>px !important;
+    }
+    .alogin:hover {
+        text-decoration: underline !important;
+        color: <?php print $maincolor; ?> !important;
+    }
 /*------------------------------------------------------------------
 [ Responsive ]*/
 
diff --git a/themeoblyon/main_menu_fa_icons.inc.php b/themeoblyon/main_menu_fa_icons.inc.php
index d42099c..4d603ed 100644
--- a/themeoblyon/main_menu_fa_icons.inc.php
+++ b/themeoblyon/main_menu_fa_icons.inc.php
@@ -297,6 +297,14 @@
     content: '\f79c';
 }
 
+icon--customreports:before {
+    content: '\f201';
+}
+
+icon--blockedlogbrowser:before {
+    content: '\f013';
+}
+
 /* External modules */
 .icon--cron:before {
     content: '\f017';
diff --git a/themeoblyon/modules/subtotal.inc.php b/themeoblyon/modules/subtotal.inc.php
index 1768761..3339151 100644
--- a/themeoblyon/modules/subtotal.inc.php
+++ b/themeoblyon/modules/subtotal.inc.php
@@ -6,11 +6,35 @@
 }
 
 .subtitleLevel2 {
-    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorDarker(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), 20) : '#ddddff'); ?> !important;
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10)) : '#ddddff'); ?> !important;
 }
 
-.subtitleLevel3to9 {
-    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorDarker(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), 40) : '#eeeeff'); ?> !important;
+.subtitleLevel3 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 2)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel4 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 3)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel5 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 4)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel6 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 5)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel7 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 6)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel8 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 7)) : '#eeeeff'); ?> !important;
+}
+
+.subtitleLevel9 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_TITLE_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 8)) : '#eeeeff'); ?> !important;
 }
 
 .subtotalLevel1 {
@@ -18,9 +42,33 @@
 }
 
 .subtotalLevel2 {
-    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorDarker(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), 20) : '#ddddff'); ?> !important;
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 1)) : '#ddddff'); ?> !important;
+}
+
+.subtotalLevel3 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 2)) : '#eeeeff'); ?> !important;
+}
+
+.subtotalLevel4 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 3)) : '#eeeeff'); ?> !important;
+}
+
+.subtotalLevel5 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 4)) : '#eeeeff'); ?> !important;
+}
+
+.subtotalLevel6 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 5)) : '#eeeeff'); ?> !important;
+}
+
+.subtotalLevel7 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 6)) : '#eeeeff'); ?> !important;
+}
+
+.subtotalLevel8 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 7)) : '#eeeeff'); ?> !important;
 }
 
-.subtotalLevel3to9 {
-    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorDarker(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), 40) : '#eeeeff'); ?> !important;
+.subtotalLevel9 {
+    background-color: <?php print (getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR') ? colorLighten(getDolGlobalString('SUBTOTAL_SUBTOTAL_BACKGROUNDCOLOR'), (getDolGlobalInt('SUBTOTAL_TITLE_AND_SUBTOTAL_BRIGHTNESS_PERCENTAGE', 10) * 8)) : '#eeeeff'); ?> !important;
 }
\ No newline at end of file
diff --git a/themeoblyon/style.css.php b/themeoblyon/style.css.php
index f360cee..c280817 100644
--- a/themeoblyon/style.css.php
+++ b/themeoblyon/style.css.php
@@ -176,7 +176,7 @@ function txt_color(&$bgcolor)
 	$colorNotifErrorTxt			= getDolGlobalString('OBLYON_COLOR_NOTIF_ERROR_TEXT', '#a72947');		// default value: #a72947
 	$colorTextTabActive			= getDolGlobalString('OBLYON_COLOR_TEXTTABACTIVE', '#222222');			// default value: #222222
 	$colorBckgrdInput			= getDolGlobalString('OBLYON_COLOR_INPUT_BCKGRD', '#DEDEDE');			// default value: #DEDEDE
-	$color1BckgrdInfobox		= getDolGlobalString('OBLYON_COLOR_INFOBOX_BCKGRD1', '#444444');		// default value: #444444
+	$color1BckgrdInfobox		= getDolGlobalString('OBLYON_COLOR_INFOBOX_BCKGRD1', '#a2e0b8');		// default value: #a2e0b8
 	$color2BckgrdInfobox		= getDolGlobalString('OBLYON_COLOR_INFOBOX_BCKGRD2', '#E4EFE8');		// default value: #E4EFE8
 	$colorBorderActionColumn	= getDolGlobalString('OBLYON_COLOR_BORDER_ACTIONCOLUMN', '#BBBBBB');	// default value: #BBBBBB
 	$bgotherbox					= '#f4f4f4';															// default value: #E6E6E6	//	Other information boxes on home page
@@ -203,7 +203,7 @@ function txt_color(&$bgcolor)
 	$login_bgcolor				= getDolGlobalString('OBLYON_COLOR_LOGIN_BCKGRD', '#F4F4F4');	// default value : #F4F4F4
 	$colorbtitle				= getDolGlobalString('OBLYON_COLOR_BTITLE', '#E09430');			// default value : #E09430
 	$colorftitle				= getDolGlobalString('OBLYON_COLOR_FTITLE', '#F4F4F4');			// default value : #F4F4F4
-	$colorStitle				= getDolGlobalString('OBLYON_COLOR_STITLE', '#F4F4F4');			// default value : #F4F4F4
+	$colorstitle				= getDolGlobalString('OBLYON_COLOR_STITLE', '#F4F4F4');			// default value : #F4F4F4
 	$colorbline					= getDolGlobalString('OBLYON_COLOR_BLINE', '#FFFFFF');			// default value : #FFFFFF
 	$colorbline_hover			= getDolGlobalString('OBLYON_COLOR_BLINE_HOVER', '#F1F1F1');	// default value : #F1F1F1
 	$colorfline					= getDolGlobalString('OBLYON_COLOR_FLINE', '#444444');			// default value : #444444