diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index d20bcc7..c2260af 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -496,7 +496,7 @@ class layout extends common
     public function showMenu()
     {
         // Met en forme les items du menu
-        $itemsLeft = $this->formatMenu(false);
+        $itemsLeft = $this->formatMenu();
 
         // Menu extra
         $itemsRight = $this->formatMenu(true);
diff --git a/core/core.js.php b/core/core.js.php
index 26ce5c7..78a063d 100644
--- a/core/core.js.php
+++ b/core/core.js.php
@@ -221,7 +221,6 @@ core.start = function () {
         var e = new Date();
         e.setFullYear(e.getFullYear() + 1);
         var expires = "expires=" + e.toUTCString() + ";";
-    
         // Stocke le cookie d'acceptation
         document.cookie = "ZWII_COOKIE_CONSENT=true; samesite=lax; " + domain + path + expires;
     });
@@ -254,8 +253,6 @@ core.start = function () {
         }
     });
 
-
-
     /**
      * Choix de page dans la barre de membre
      */
@@ -372,9 +369,13 @@ core.start = function () {
             }
         }
     }).trigger("resize");
-
-
-
+    /**
+     * Masque les pages du menu si demandé dans la configuration du thème du menu
+     */
+    var hidePages = "<?php echo $this->getData(['theme', 'menu', 'hidePages'])?>";
+    if (hidePages == 1) {
+        $("#menuLeft").css("visibility", "hidden");
+    }
 };
 
 
diff --git a/core/core.php b/core/core.php
index 9f2da92..ae07065 100644
--- a/core/core.php
+++ b/core/core.php
@@ -51,7 +51,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.15.04';
+	const ZWII_VERSION = '1.16.0';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php
index ee48bb7..fc3bc8e 100644
--- a/core/module/config/view/connect/connect.php
+++ b/core/module/config/view/connect/connect.php
@@ -26,13 +26,13 @@
 				</div>
 				<div class="row">
 					<div class="col3">
-						<?php echo template::select('connectAttempt', $module::$connectAttempt, [
+						<?php echo template::select('connectAttempt', config::$connectAttempt, [
 							'label' => 'Limitation des tentatives',
 							'selected' => $this->getData(['config', 'connect', 'attempt'])
 						]); ?>
 					</div>
 					<div class="col3">
-						<?php echo template::select('connectTimeout', $module::$connectTimeout, [
+						<?php echo template::select('connectTimeout', config::$connectTimeout, [
 							'label' => 'Blocage après échecs',
 							'selected' => $this->getData(['config', 'connect', 'timeout'])
 						]); ?>
@@ -73,7 +73,7 @@
 						]); ?>
 					</div>
 					<div class="col3">
-						<?php echo template::select('connectCaptchaType', $module::$captchaTypes, [
+						<?php echo template::select('connectCaptchaType', config::$captchaTypes, [
 							'label' => 'Type de captcha',
 							'selected' => $this->getData(['config', 'connect', 'captchaType'])
 						]); ?>
@@ -96,7 +96,7 @@
 								]); ?>
 							</div>
 							<div class="col6">
-								<?php echo template::select('connectAnonymousIp', $module::$anonIP, [
+								<?php echo template::select('connectAnonymousIp', config::$anonIP, [
 									'label' => 'Anonymat des adresses IP',
 									'selected' => $this->getData(['config', 'connect', 'anonymousIp']),
 									'help' => 'La règlementation française impose un anonymat de niveau 2'
diff --git a/core/module/config/view/locale/locale.php b/core/module/config/view/locale/locale.php
index 69ddcac..c04f28e 100644
--- a/core/module/config/view/locale/locale.php
+++ b/core/module/config/view/locale/locale.php
@@ -44,21 +44,21 @@
                 </h4>
                 <div class="row">
                     <div class="col4">
-                        <?php echo template::select('configLocaleHomePageId', helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC'), [
+                        <?php echo template::select('configLocaleHomePageId', helper::arrayColumn(config::$pagesList, 'title', 'SORT_ASC'), [
                             'label' => 'Page d\'accueil de la plate-forme',
                             'selected' => $this->homePageId(),
                             'help' => 'Ce n\'est pas la page d\'accueil d\'un espace.'
                         ]); ?>
                     </div>
                     <div class="col4">
-                        <?php echo template::select('configLocalePage403', array_merge(['none' => 'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
+                        <?php echo template::select('configLocalePage403', array_merge(['none' => 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [
                             'label' => 'Accès interdit, erreur 403',
                             'selected' => $this->getData(['config', 'page403']),
                             'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
                         ]); ?>
                     </div>
                     <div class="col4">
-                        <?php echo template::select('configLocalePage404', array_merge(['none' => 'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
+                        <?php echo template::select('configLocalePage404', array_merge(['none' => 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [
                             'label' => 'Page inexistante, erreur 404',
                             'selected' => $this->getData(['config', 'page404']),
                             'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
@@ -67,14 +67,14 @@
                 </div>
                 <div class="row">
                     <div class="col4">
-                        <?php echo template::select('configLocaleLegalPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [
+                        <?php echo template::select('configLocaleLegalPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn(config::$pagesList, 'title', 'SORT_ASC')), [
                             'label' => 'Mentions légales',
                             'selected' => $this->getData(['config', 'legalPageId']),
                             'help' => 'Les mentions légales sont obligatoires en France. Une option du pied de page ajoute un lien discret vers cette page.'
                         ]); ?>
                     </div>
                     <div class="col4">
-                        <?php echo template::select('configLocaleSearchPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [
+                        <?php echo template::select('configLocaleSearchPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn(config::$pagesList, 'title', 'SORT_ASC')), [
                             'label' => 'Recherche dans le site',
                             'selected' => $this->getData(['config', 'searchPageId']),
                             'help' => 'Sélectionnez une page contenant le module \'Recherche\'. Une option du pied de page ajoute un lien discret vers cette page.'
@@ -82,7 +82,7 @@
                     </div>
                     <div class="col4">
                         <?php
-                        echo template::select('configLocalePage302', array_merge(['none' => 'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
+                        echo template::select('configLocalePage302', array_merge(['none' => 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [
                             'label' => 'Site en maintenance',
                             'selected' => $this->getData(['config', 'page302']),
                             'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
diff --git a/core/module/config/view/network/network.php b/core/module/config/view/network/network.php
index a419595..aa4077d 100644
--- a/core/module/config/view/network/network.php
+++ b/core/module/config/view/network/network.php
@@ -7,7 +7,7 @@
 				</h4>
 				<div class="row">
 					<div class="col2">
-						<?php echo template::select('configProxyType', $module::$proxyType, [
+						<?php echo template::select('configProxyType', config::$proxyType, [
 							'label' => 'Type de proxy',
 							'selected' => $this->getData(['config', 'proxyType'])
 						]); ?>
@@ -69,7 +69,7 @@
 								]); ?>
 							</div>
 							<div class="col2">
-								<?php echo template::select('smtpAuth', $module::$SMTPauth, [
+								<?php echo template::select('smtpAuth', config::$SMTPauth, [
 									'label' => 'Authentification',
 									'selected' => $this->getData(['config', 'smtp', 'auth'])
 								]); ?>
@@ -91,7 +91,7 @@
 									]); ?>
 								</div>
 								<div class="col2">
-									<?php echo template::select('smtpSecure', $module::$SMTPEnc, [
+									<?php echo template::select('smtpSecure', config::$SMTPEnc, [
 										'label' => 'Sécurité',
 										'selected' => $this->getData(['config', 'smtp', 'secure'])
 									]); ?>
diff --git a/core/module/config/view/setup/setup.php b/core/module/config/view/setup/setup.php
index d254279..12fbcad 100644
--- a/core/module/config/view/setup/setup.php
+++ b/core/module/config/view/setup/setup.php
@@ -26,7 +26,7 @@
 						]); ?>
 					</div>
 					<div class="col4">
-						<?php echo template::select('configTimezone', $module::$timezones, [
+						<?php echo template::select('configTimezone', config::$timezones, [
 							'label' => 'Fuseau horaire',
 							'selected' => $this->getData(['config', 'timezone']),
 							'help' => 'Le fuseau horaire est utile au bon référencement'
@@ -44,7 +44,7 @@
 						<?php echo template::checkbox('configRewrite', true, 'Apache URL intelligentes', [
 							'checked' => helper::checkRewrite(),
 							'help' => 'Supprime le point d\'interrogation dans les URL, l\'option est indisponible avec les autres serveurs Web',
-							'disabled' => helper::checkServerSoftware() === false and $module->isModRewriteEnabled()
+							'disabled' => helper::checkServerSoftware() === false and config->isModRewriteEnabled()
 						]); ?>
 					</div>
 				</div>
@@ -74,7 +74,7 @@
 				</div>
 				<div class="row">
 					<div class="col3">
-						<?php echo template::select('configAutoUpdateDelay', $module::$updateDelay, [
+						<?php echo template::select('configAutoUpdateDelay', config::$updateDelay, [
 							'label' => 'Fréquence de recherche',
 							'selected' => $this->getData(['config', 'autoUpdateDelay']),
 						]); ?>
@@ -87,7 +87,7 @@
 						<?php echo template::button('configUpdateForced', [
 							'ico' => 'download-cloud',
 							'href' => helper::baseUrl() . 'install/update',
-							'value' => $module::$updateButtonText,
+							'value' => config::$updateButtonText,
 							'class' => 'buttonRed',
 						]); ?>
 					</div>
diff --git a/core/module/config/view/social/social.php b/core/module/config/view/social/social.php
index cf64beb..e4043ca 100644
--- a/core/module/config/view/social/social.php
+++ b/core/module/config/view/social/social.php
@@ -24,18 +24,18 @@
 						</div>
 						<div class="row">
 							<div class="col10 textAlignCenter">
-								<?php if (!empty($module::$imageOpenGraph['type'])): ?>
+								<?php if (!empty(config::$imageOpenGraph['type'])): ?>
 									<p>
-										<?php echo sprintf('%s : <span id="screenType">%s</span>', helper::translate('Format'), $module::$imageOpenGraph['type']); ?>
+										<?php echo sprintf('%s : <span id="screenType">%s</span>', helper::translate('Format'), config::$imageOpenGraph['type']); ?>
 									</p>
 									<p>
-										<?php echo sprintf('%s : <span id="screenWide">%s</span> x <span id="screenHeight">%s</span> pixels', helper::translate('Dimensions minimales'), $module::$imageOpenGraph['wide'], $module::$imageOpenGraph['height']); ?>
+										<?php echo sprintf('%s : <span id="screenWide">%s</span> x <span id="screenHeight">%s</span> pixels', helper::translate('Dimensions minimales'), config::$imageOpenGraph['wide'], config::$imageOpenGraph['height']); ?>
 									</p>
 									<p>
-										<?php echo sprintf('%s : <span id="screenRatio">%s</span><span id="screenFract">:1</span>', helper::translate('Ratio'), round($module::$imageOpenGraph['ratio'], 2)); ?>
+										<?php echo sprintf('%s : <span id="screenRatio">%s</span><span id="screenFract">:1</span>', helper::translate('Ratio'), round(config::$imageOpenGraph['ratio'], 2)); ?>
 									</p>
 									<p>
-										<?php echo sprintf('%s : <span id="screenWeight">%s</span>', helper::translate('Poids'), $module::$imageOpenGraph['size']); ?>
+										<?php echo sprintf('%s : <span id="screenWeight">%s</span>', helper::translate('Poids'), config::$imageOpenGraph['size']); ?>
 									</p>
 								<?php endif; ?>
 							</div>
diff --git a/core/module/course/view/add/add.php b/core/module/course/view/add/add.php
index dade2aa..776ee58 100644
--- a/core/module/course/view/add/add.php
+++ b/core/module/course/view/add/add.php
@@ -31,19 +31,19 @@
                     ]); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('courseAddAuthor', $module::$courseTeachers, [
+                    <?php echo template::select('courseAddAuthor', course::$courseTeachers, [
                         'label' => 'Auteur'
                     ]); ?>
                 </div>
             </div>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('courseAddTheme', $module::$courses, [
+                    <?php echo template::select('courseAddTheme', course::$courses, [
                         'label' => 'Copier le thème depuis',
                     ]); ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('courseAddCategorie', $module::$courseCategories, [
+                    <?php echo template::select('courseAddCategorie', course::$courseCategories, [
                         'label' => 'Catégorie',
                     ]); ?>
                 </div>
@@ -57,7 +57,7 @@
             </div>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('courseAddAccess', $module::$courseAccess, [
+                    <?php echo template::select('courseAddAccess', course::$courseAccess, [
                         'label' => 'Accès'
                     ]); ?>
                 </div>
@@ -76,7 +76,7 @@
             </div>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('courseAddEnrolment', $module::$courseEnrolment, [
+                    <?php echo template::select('courseAddEnrolment', course::$courseEnrolment, [
                         'label' => 'Participation'
                     ]); ?>
                 </div>
diff --git a/core/module/course/view/category/category.php b/core/module/course/view/category/category.php
index a8a99e4..2484a76 100644
--- a/core/module/course/view/category/category.php
+++ b/core/module/course/view/category/category.php
@@ -15,8 +15,8 @@
     </div>
 </div>
 
-<?php if($module::$courseCategories): ?>
-	<?php echo template::table([5,5,1,1], $module::$courseCategories, ['Id', 'Titre', '','']); ?>
+<?php if(course::$courseCategories): ?>
+	<?php echo template::table([5,5,1,1], course::$courseCategories, ['Id', 'Titre', '','']); ?>
 <?php else: ?>
 	<?php echo template::speech('Aucune catégorie'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/course/view/edit/edit.php b/core/module/course/view/edit/edit.php
index 96b1b17..59f7d59 100644
--- a/core/module/course/view/edit/edit.php
+++ b/core/module/course/view/edit/edit.php
@@ -25,7 +25,7 @@
                     ]); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('courseEditAuthor', $module::$courseTeachers, [
+                    <?php echo template::select('courseEditAuthor', course::$courseTeachers, [
                         'label' => 'Auteur',
                         'selected' => $this->getdata(['course', $this->getUrl(2), 'author'])
                     ]); ?>
@@ -33,13 +33,13 @@
             </div>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('courseEditHomePageId', helper::arrayColumn($module::$pagesList, 'title'), [
+                    <?php echo template::select('courseEditHomePageId', helper::arrayColumn(course::$pagesList, 'title'), [
                         'label' => 'Page d\'accueil',
                         'selected' => $this->getdata(['course', $this->getUrl(2), 'homePageId']),
                     ]); ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('courseEditCategorie', $module::$courseCategories, [
+                    <?php echo template::select('courseEditCategorie', course::$courseCategories, [
                         'label' => 'Catégorie',
                         'selected' => $this->getdata(['course', $this->getUrl(2), 'category'])
                     ]); ?>
@@ -55,7 +55,7 @@
             </div>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('courseEditAccess', $module::$courseAccess, [
+                    <?php echo template::select('courseEditAccess', course::$courseAccess, [
                         'label' => 'Disponibilité',
                         'selected' => $this->getdata(['course', $this->getUrl(2), 'access'])
                     ]); ?>
@@ -77,7 +77,7 @@
             </div>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('courseEditEnrolment', $module::$courseEnrolment, [
+                    <?php echo template::select('courseEditEnrolment', course::$courseEnrolment, [
                         'label' => 'Participation',
                         'selected' => $this->getdata(['course', $this->getUrl(2), 'enrolment'])
                     ]); ?>
diff --git a/core/module/course/view/export/export.php b/core/module/course/view/export/export.php
index 174ba9c..1543219 100644
--- a/core/module/course/view/export/export.php
+++ b/core/module/course/view/export/export.php
@@ -31,7 +31,7 @@
             <h4><?php echo helper::translate('Sélection des pages de l\'espace') ?></h4>
             <div class='row'>
                 <div class='col10 offset2'>
-                    <?php foreach ($module::$pagesList as $key => $value) {
+                    <?php foreach (course::$pagesList as $key => $value) {
                         echo $value;
                     }
                     ?>
diff --git a/core/module/course/view/index/index.php b/core/module/course/view/index/index.php
index a374468..de1c107 100644
--- a/core/module/course/view/index/index.php
+++ b/core/module/course/view/index/index.php
@@ -36,8 +36,8 @@
 
     </div>
 </div>
-<?php if ($module::$courses): ?>
-    <?php echo template::table([4, 3, 3, 1, 1], $module::$courses, ['Titre court', 'Description', 'Inscription', '', '',], ['id' => 'dataTables']); ?>
+<?php if (course::$courses): ?>
+    <?php echo template::table([4, 3, 3, 1, 1], course::$courses, ['Titre court', 'Description', 'Inscription', '', '',], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun espace'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/course/view/manage/manage.php b/core/module/course/view/manage/manage.php
index 97beec4..7c380a2 100644
--- a/core/module/course/view/manage/manage.php
+++ b/core/module/course/view/manage/manage.php
@@ -98,14 +98,14 @@
                 <div class="col6">
                     <?php echo template::text('courseManageHomePageId', [
                         'label' => 'Page d\'accueil',
-                        'value' => $module::$pagesList[$this->getdata(['course', $this->getUrl(2), 'homePageId'])]['shortTitle'],
+                        'value' => course::$pagesList[$this->getdata(['course', $this->getUrl(2), 'homePageId'])]['shortTitle'],
                         'readonly' => true,
                     ]); ?>
                 </div>
                 <div class="col6">
                     <?php echo template::text('courseManageCategorie', [
                         'label' => 'Catégorie',
-                        'value' => $module::$courseCategories[$this->getdata(['course', $this->getUrl(2), 'category'])],
+                        'value' => course::$courseCategories[$this->getdata(['course', $this->getUrl(2), 'category'])],
                         'readonly' => true,
                     ]); ?>
                 </div>
@@ -123,7 +123,7 @@
                 <div class="col4">
                     <?php echo template::text('courseManageAccess', [
                         'label' => 'Disponibilité',
-                        'value' => $module::$courseAccess[$this->getdata(['course', $this->getUrl(2), 'access'])],
+                        'value' => course::$courseAccess[$this->getdata(['course', $this->getUrl(2), 'access'])],
                         'readonly' => true,
                     ]); ?>
                 </div>
@@ -148,7 +148,7 @@
                 <div class="col4">
                     <?php echo template::text('courseManageEnrolment', [
                         'label' => 'Participation',
-                        'value' => $module::$courseEnrolment[$this->getdata(['course', $this->getUrl(2), 'enrolment'])],
+                        'value' => course::$courseEnrolment[$this->getdata(['course', $this->getUrl(2), 'enrolment'])],
                         'readonly' => true,
                     ]); ?>
                 </div>
diff --git a/core/module/course/view/suscribe/suscribe.php b/core/module/course/view/suscribe/suscribe.php
index a821150..f8518ae 100644
--- a/core/module/course/view/suscribe/suscribe.php
+++ b/core/module/course/view/suscribe/suscribe.php
@@ -4,14 +4,14 @@
         <?php echo "<h3>Auteur : " . $this->signature($this->getData(['course', $this->getUrl(2), 'author'])) . "</h3>"; ?>
         <?php echo "<p>Description : " . $this->getData(['course', $this->getUrl(2), 'description']) . "</p>"; ?>
          <!--Restriction de date limite d'ouverture-->
-        <?php echo "<p>Disponibilité : " . $module::$courseAccess[$this->getData(['course', $this->getUrl(2), 'access'])]; ?>
-        <?php if ($this->getData(['course', $this->getUrl(2), 'access']) === $module::COURSE_ACCESS_DATE): ?>
+        <?php echo "<p>Disponibilité : " . course::$courseAccess[$this->getData(['course', $this->getUrl(2), 'access'])]; ?>
+        <?php if ($this->getData(['course', $this->getUrl(2), 'access']) === course::COURSE_ACCESS_DATE): ?>
             <?php $from = helper::dateUTF8('%d %B %Y', $this->getData(['course', $this->getUrl(2), 'openingDate']), self::$i18nUI) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $this->getData(['course', $this->getUrl(2), 'openingDate']), self::$i18nUI); ?>
             <?php $to = helper::dateUTF8('%d %B %Y', $this->getData(['course', $this->getUrl(2), 'closingDate']), self::$i18nUI) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $this->getData(['course', $this->getUrl(2), 'closingDate']), self::$i18nUI); ?>
             <?php echo sprintf(helper::translate(' du %s au %s'), $from, $to); ?>
         <?php endif; ?>
         <?php echo '</p>'; ?>
-        <?php echo "<p>Inscription : " . $module::$courseEnrolment[$this->getData(['course', $this->getUrl(2), 'enrolment'])] . '.'; ?>
+        <?php echo "<p>Inscription : " . course::$courseEnrolment[$this->getData(['course', $this->getUrl(2), 'enrolment'])] . '.'; ?>
                 <!--Restriction de date limite d'insription-->
                 <?php if ($this->getData(['course', $this->getUrl(2), 'limitEnrolment']) === true && $this->getData(['course', $this->getUrl(2), 'limitEnrolmentDate']) <= time()):?>
             <?php echo  helper::translate(' Les inscriptions sont closes depuis le ') ?>
@@ -22,12 +22,12 @@
 </div>
 <div class="row">
     <div class="col12">
-        <?php if ($module::$swapMessage['enrolmentKey']) {
-            echo $module::$swapMessage['enrolmentKey'];
+        <?php if (course::$swapMessage['enrolmentKey']) {
+            echo course::$swapMessage['enrolmentKey'];
         }
         ?>
-        <?php if ($module::$swapMessage['enrolmentMessage']) {
-            echo $module::$swapMessage['enrolmentMessage'];
+        <?php if (course::$swapMessage['enrolmentMessage']) {
+            echo course::$swapMessage['enrolmentMessage'];
         }
         ?>
     </div>
@@ -40,7 +40,7 @@
             'value' => template::ico('left')
         ]); ?>
     </div>
-    <?php if ($module::$swapMessage['submitLabel'] === 'Connexion'): ?>
+    <?php if (course::$swapMessage['submitLabel'] === 'Connexion'): ?>
         <div class="col2 offset8">
             <?php echo template::button('courseConnect', [
                 'href' => helper::baseUrl(true) . 'user/login',
@@ -51,8 +51,8 @@
     <?php else: ?>
         <div class="col3 offset7">
             <?php echo template::submit('courseSwapSubmit', [
-                'value' => $module::$swapMessage['submitLabel'],
-                'disabled' => !($module->courseIsAvailable($this->getUrl(2))
+                'value' => course::$swapMessage['submitLabel'],
+                'disabled' => !(course->courseIsAvailable($this->getUrl(2))
                     && !($this->getData(['course', $this->getUrl(2), 'limitEnrolment']) === true
                         && $this->getData(['course', $this->getUrl(2), 'limitEnrolmentDate']) <= time())
                 ),
diff --git a/core/module/course/view/userReport/userReport.js.php b/core/module/course/view/userReport/userReport.js.php
index bebd5c1..3556dc5 100644
--- a/core/module/course/view/userReport/userReport.js.php
+++ b/core/module/course/view/userReport/userReport.js.php
@@ -13,9 +13,9 @@
 
 $(document).ready((function () {
 
-    var dataX = <?php echo json_encode(array_map(function ($item) { return $item[0]; }, $module::$userGraph)); ?>;
-    var dataY = <?php echo json_encode(array_map(function ($item) { return $item[1];}, $module::$userGraph)); ?>;
-    var dataText = <?php echo json_encode(array_map(function ($item) { return $item[2];}, $module::$userGraph)); ?>;
+    var dataX = <?php echo json_encode(array_map(function ($item) { return $item[0]; }, course::$userGraph)); ?>;
+    var dataY = <?php echo json_encode(array_map(function ($item) { return $item[1];}, course::$userGraph)); ?>;
+    var dataText = <?php echo json_encode(array_map(function ($item) { return $item[2];}, course::$userGraph)); ?>;
 
     var data = [{
         x: dataX,
diff --git a/core/module/course/view/userReport/userReport.php b/core/module/course/view/userReport/userReport.php
index 0d0d390..417a1f7 100644
--- a/core/module/course/view/userReport/userReport.php
+++ b/core/module/course/view/userReport/userReport.php
@@ -20,7 +20,7 @@
         </div>
     </div>
 </div>
-<?php if ($module::$userReport): ?>
+<?php if (course::$userReport): ?>
     <div class="row">
         <div class="col4 offset2">
             <?php if ($this->getData(['course', $this->getUrl(2), 'access']) === self::COURSE_ACCESS_DATE): ?>
@@ -34,19 +34,19 @@
         </div>
         <div class="col4">
             <p>Commencé le :
-                <?php echo $module::$userStat['floor']; ?>
+                <?php echo course::$userStat['floor']; ?>
             </p>
             <p>Terminé le :
-                <?php echo $module::$userStat['top']; ?>
+                <?php echo course::$userStat['top']; ?>
             </p>
             <p>Temps passé :
-                <?php echo $module::$userStat['time']; ?>
+                <?php echo course::$userStat['time']; ?>
             </p>
         </div>
     </div>
     <div class="row textAlignCenter">
         <div class="col8">
-            <?php echo template::table([6, 3, 3], $module::$userReport, ['Page', 'Début de Consultation', 'Temps consultation']); ?>
+            <?php echo template::table([6, 3, 3], course::$userReport, ['Page', 'Début de Consultation', 'Temps consultation']); ?>
         </div>
     </div>
 <?php else: ?>
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php
index 981a09c..726dd62 100644
--- a/core/module/course/view/users/users.php
+++ b/core/module/course/view/users/users.php
@@ -33,27 +33,27 @@
 <?php echo template::formOpen('courseFilterUserForm'); ?>
 <div class="row" id="Bfrtip">
     <div class="col3">
-        <?php echo template::select('courseFilterGroup', $module::$courseGroups, [
+        <?php echo template::select('courseFilterGroup', course::$courseGroups, [
             'label' => 'Groupes / Profils',
             'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterFirstName', $module::$alphabet, [
+        <?php echo template::select('courseFilterFirstName', course::$alphabet, [
             'label' => 'Prénom commence par',
             'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterLastName', $module::$alphabet, [
+        <?php echo template::select('courseFilterLastName', course::$alphabet, [
             'label' => 'Nom commence par',
             'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all',
         ]); ?>
     </div>
 </div>
 <?php echo template::formClose(); ?>
-<?php if ($module::$courseUsers): ?>
-    <?php echo template::table([3, 4, 1, 1, 1, 1, 1], $module::$courseUsers, ['Nom Prénom', 'Dernière page vue', 'Date' , 'Heure', 'Étiquettes', 'Progression', ''], ['id' => 'dataTables']); ?>
+<?php if (course::$courseUsers): ?>
+    <?php echo template::table([3, 4, 1, 1, 1, 1, 1], course::$courseUsers, ['Nom Prénom', 'Dernière page vue', 'Date' , 'Heure', 'Étiquettes', 'Progression', ''], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun participant'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/course/view/usersAdd/usersAdd.php b/core/module/course/view/usersAdd/usersAdd.php
index 9ceaac3..7a6761f 100644
--- a/core/module/course/view/usersAdd/usersAdd.php
+++ b/core/module/course/view/usersAdd/usersAdd.php
@@ -16,19 +16,19 @@
 </div>
 <div class="row" id="Bfrtip">
     <div class="col3">
-        <?php echo template::select('courseFilterGroup', $module::$courseGroups, [
+        <?php echo template::select('courseFilterGroup', course::$courseGroups, [
             'label' => 'Groupes / Profils',
             'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterFirstName', $module::$alphabet, [
+        <?php echo template::select('courseFilterFirstName', course::$alphabet, [
             'label' => 'Prénom commence par',
             'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterLastName', $module::$alphabet, [
+        <?php echo template::select('courseFilterLastName', course::$alphabet, [
             'label' => 'Nom commence par',
             'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all',
         ]); ?>
@@ -46,8 +46,8 @@
         ]); ?>
     </div>
 </div>
-<?php if ($module::$courseUsers): ?>
-    <?php echo template::table([1, 2, 3, 3, 3], $module::$courseUsers, ['', 'Id',  'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php if (course::$courseUsers): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], course::$courseUsers, ['', 'Id',  'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>
diff --git a/core/module/course/view/usersDelete/usersDelete.php b/core/module/course/view/usersDelete/usersDelete.php
index 71c2fad..3309305 100644
--- a/core/module/course/view/usersDelete/usersDelete.php
+++ b/core/module/course/view/usersDelete/usersDelete.php
@@ -17,19 +17,19 @@
 </div>
 <div class="row" id="Bfrtip">
     <div class="col3">
-        <?php echo template::select('courseFilterGroup', $module::$courseGroups, [
+        <?php echo template::select('courseFilterGroup', course::$courseGroups, [
             'label' => 'Groupes / Profils',
             'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterFirstName', $module::$alphabet, [
+        <?php echo template::select('courseFilterFirstName', course::$alphabet, [
             'label' => 'Prénom commence par',
             'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('courseFilterLastName', $module::$alphabet, [
+        <?php echo template::select('courseFilterLastName', course::$alphabet, [
             'label' => 'Nom commence par',
             'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all',
         ]); ?>
@@ -47,8 +47,8 @@
         ]); ?>
     </div>
 </div>
-<?php if ($module::$courseUsers): ?>
-    <?php echo template::table([1, 2, 3, 3, 3], $module::$courseUsers, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php if (course::$courseUsers): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], course::$courseUsers, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>
diff --git a/core/module/install/view/index/index.php b/core/module/install/view/index/index.php
index a81dbf3..51fafaf 100644
--- a/core/module/install/view/index/index.php
+++ b/core/module/install/view/index/index.php
@@ -4,7 +4,7 @@
 </h3>
 <div class="row">
     <div class="col6 offset3">
-            <?php echo template::select('installLanguage', $module::$i18nFiles, [
+            <?php echo template::select('installLanguage', install::$i18nFiles, [
                 'label' =>  'Langues installées',
 				'selected' => isset(self::$i18nUI) ?  self::$i18nUI : 'fr_FR',
             ]); ?>
diff --git a/core/module/install/view/postinstall/postinstall.php b/core/module/install/view/postinstall/postinstall.php
index e984b10..b5b95b7 100644
--- a/core/module/install/view/postinstall/postinstall.php
+++ b/core/module/install/view/postinstall/postinstall.php
@@ -65,7 +65,7 @@
 			</summary>
 			<div class="row">
 				<div class="col3">
-					<?php echo template::select('installProxyType', $module::$proxyType, [
+					<?php echo template::select('installProxyType', install::$proxyType, [
 						'label' => 'Type de proxy'
 					]); ?>
 				</div>
diff --git a/core/module/install/view/update/update.php b/core/module/install/view/update/update.php
index 9e951e5..ddc82e9 100644
--- a/core/module/install/view/update/update.php
+++ b/core/module/install/view/update/update.php
@@ -5,7 +5,7 @@
 			<?php echo self::ZWII_VERSION; ?>
 			<?php echo helper::translate('vers'); ?>
 			&nbsp;
-			<?php echo $module::$newVersion; ?>
+			<?php echo install::$newVersion; ?>
 		</strong></p>
 	<p>
 		<?php echo helper::translate('Afin d\'assurer le bon fonctionnement de Zwii, veuillez ne pas fermer cette page avant la fin de l\'opération.'); ?>
diff --git a/core/module/language/view/add/add.php b/core/module/language/view/add/add.php
index 4027b20..abb0eb9 100644
--- a/core/module/language/view/add/add.php
+++ b/core/module/language/view/add/add.php
@@ -18,7 +18,7 @@
             </h4>
             <div class="row">
                 <div class="col4 offset4">
-                    <?php echo template::select('translateAddContent', $module::$i18nFiles, [
+                    <?php echo template::select('translateAddContent', language::$i18nFiles, [
                         'label' =>  'Langues disponibles'
                     ]); ?>
                 </div>
diff --git a/core/module/language/view/copy/copy.php b/core/module/language/view/copy/copy.php
index ee4daf0..20e42dc 100644
--- a/core/module/language/view/copy/copy.php
+++ b/core/module/language/view/copy/copy.php
@@ -20,12 +20,12 @@
             </h4>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('translateFormCopySource', $module::$languagesInstalled, [
+                    <?php echo template::select('translateFormCopySource', language::$languagesInstalled, [
                         'label' => 'Source'
                     ]); ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('translateFormCopyTarget', $module::$languagesTarget, [
+                    <?php echo template::select('translateFormCopyTarget', language::$languagesTarget, [
                         'label' => 'Cible'
                     ]); ?>
                 </div>
diff --git a/core/module/language/view/edit/edit.php b/core/module/language/view/edit/edit.php
index ed934ff..5e18a11 100644
--- a/core/module/language/view/edit/edit.php
+++ b/core/module/language/view/edit/edit.php
@@ -39,7 +39,7 @@
     <div class="col12">
         <div class="block">
             <div class="row">
-                <?php  foreach ($module::$dialogues as $key => $value) : ?>
+                <?php  foreach (language::$dialogues as $key => $value) : ?>
                     <div class="col6">
                         <?php echo sprintf('%g -', $key); ?>
                         <?php echo $value['source']; ?>
@@ -52,7 +52,7 @@
                     </div>
                 <?php endforeach; ?>
             </div>
-            <?php echo $module::$pages; ?>
+            <?php echo language::$pages; ?>
         </div>
     </div>
 </div>
diff --git a/core/module/language/view/index/index.php b/core/module/language/view/index/index.php
index 1060a5c..3773225 100644
--- a/core/module/language/view/index/index.php
+++ b/core/module/language/view/index/index.php
@@ -23,8 +23,8 @@
 			<h4>
 				<?php echo helper::translate('Langues installées'); ?>
 			</h4>
-			<?php if ($module::$languagesUiInstalled): ?>
-				<?php echo template::table([2, 1, 1, 4, 1, 1, 1], $module::$languagesUiInstalled, ['Langues', 'Version', 'Date', '', '', '', '']); ?>
+			<?php if (language::$languagesUiInstalled): ?>
+				<?php echo template::table([2, 1, 1, 4, 1, 1, 1], language::$languagesUiInstalled, ['Langues', 'Version', 'Date', '', '', '', '']); ?>
 			<?php endif; ?>
 		</div>
 	</div>
@@ -35,8 +35,8 @@
 			<h4>
 				<?php echo helper::translate('Catalogue'); ?>
 			</h4>
-			<?php if ($module::$languagesStore): ?>
-				<?php echo template::table([2, 1, 2, 6, 1], $module::$languagesStore, ['Langues', 'Version', 'Date', '', '']); ?>
+			<?php if (language::$languagesStore): ?>
+				<?php echo template::table([2, 1, 2, 6, 1], language::$languagesStore, ['Langues', 'Version', 'Date', '', '']); ?>
 			<?php endif; ?>
 		</div>
 	</div>
diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php
index 2f76a2a..b38bf05 100644
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@@ -128,14 +128,14 @@
 									'value' => $this->getData(['page', $this->getUrl(2), 'parentPageId'])
 								]); ?>
 							<?php else: ?>
-								<?php echo template::select('pageEditParentPageId', $module::$pagesNoParentId, [
+								<?php echo template::select('pageEditParentPageId', page::$pagesNoParentId, [
 									'label' => 'Page parent',
 									'selected' => $this->getData(['page', $this->getUrl(2), 'parentPageId'])
 								]); ?>
 							<?php endif; ?>
 						</div>
 						<div class="col4">
-							<?php echo template::select('pageEditExtraPosition', $module::$extraPosition, [
+							<?php echo template::select('pageEditExtraPosition', page::$extraPosition, [
 								'label' => 'Emplacement',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'extraPosition']),
 								'help' => 'Le menu accessoire est aligné à droite de la barre de menu, c\'est un emplacement réservé aux drapeaux et au bouton de connexion.'
@@ -168,7 +168,7 @@
 				<div class="blockContainer">
 					<div class="row">
 						<div class="col3">
-							<?php echo template::select('pageTypeMenu', $module::$typeMenu, [
+							<?php echo template::select('pageTypeMenu', page::$typeMenu, [
 								'label' => 'Apparence',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'typeMenu'])
 							]); ?>
@@ -212,14 +212,14 @@
 				<div class="row">
 					<div class="col10">
 						<?php echo template::hidden('pageEditModuleRedirect'); ?>
-						<?php echo template::select('pageEditModuleId', $module::$moduleIds, [
+						<?php echo template::select('pageEditModuleId', page::$moduleIds, [
 							'help' => 'En cas de changement de module, les données du module précédent seront supprimées.',
 							'label' => 'Module',
 							'selected' => $this->getData(['page', $this->getUrl(2), 'moduleId'])
 						]); ?>
 						<?php echo template::hidden('pageEditModuleIdOld', ['value' => $this->getData(['page', $this->getUrl(2), 'moduleId'])]); ?>
 						<?php echo template::hidden('pageEditModuleIdOldText', [
-							'value' => array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']), $module::$moduleIds) ? $module::$moduleIds[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId']))
+							'value' => array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']), page::$moduleIds) ? page::$moduleIds[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId']))
 						]); ?>
 					</div>
 					<div class="col2 verticalAlignBottom">
@@ -232,7 +232,7 @@
 				</div>
 				<div class="row">
 					<div class="col12">
-						<?php echo template::select('pageModulePosition', $module::$modulePosition, [
+						<?php echo template::select('pageModulePosition', page::$modulePosition, [
 							'help' => 'En position libre ajoutez le module en plaçant [MODULE] à l\'endroit voulu dans votre page.',
 							'label' => 'Position du module',
 							'selected' => $this->getData(['page', $this->getUrl(2), 'modulePosition'])
@@ -282,7 +282,7 @@
 						<div class="col6">
 							<div class="row">
 								<div class="col12">
-									<?php echo template::select('pageEditBlock', $module::$pageBlocks, [
+									<?php echo template::select('pageEditBlock', page::$pageBlocks, [
 										'label' => 'Gabarits de page - Barre latérale',
 										'help' => 'Pour définir la page comme barre latérale, choisissez l\'option dans la liste.',
 										'selected' => $this->getData(['page', $this->getUrl(2), 'block'])
@@ -297,7 +297,7 @@
 									'value' => $this->getData(['page', $this->getUrl(2), 'barLeft'])
 								]); ?>
 							<?php else: ?>
-								<?php echo template::select('pageEditBarLeft', $module::$pagesBarId, [
+								<?php echo template::select('pageEditBarLeft', page::$pagesBarId, [
 									'label' => 'Barre latérale gauche :',
 									'selected' => $this->getData(['page', $this->getUrl(2), 'barLeft'])
 								]); ?>
@@ -307,12 +307,12 @@
 									'value' => $this->getData(['page', $this->getUrl(2), 'barRight'])
 								]); ?>
 							<?php else: ?>
-								<?php echo template::select('pageEditBarRight', $module::$pagesBarId, [
+								<?php echo template::select('pageEditBarRight', page::$pagesBarId, [
 									'label' => 'Barre latérale droite :',
 									'selected' => $this->getData(['page', $this->getUrl(2), 'barRight'])
 								]); ?>
 							<?php endif; ?>
-							<?php echo template::select('pageEditDisplayMenu', $module::$displayMenu, [
+							<?php echo template::select('pageEditDisplayMenu', page::$displayMenu, [
 								'label' => 'Contenu du menu vertical',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'displayMenu']),
 								'help' => 'Par défaut le menu est affiché APRES le contenu de la page. Pour le positionner à un emplacement précis, insérez [MENU] dans le contenu de la page.'
@@ -321,19 +321,19 @@
 					</div>
 					<div class="row navSelect">
 						<div class="col4">
-							<?php echo template::select('pageEditNavLeft', $module::$navIconPosition, [
+							<?php echo template::select('pageEditNavLeft', page::$navIconPosition, [
 								'label' => 'Bouton de navigation gauche',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'navLeft']),
 							]); ?>
 						</div>
 						<div class="col4">
-							<?php echo template::select('pageEditNavTemplate', $module::$navIconTemplate, [
+							<?php echo template::select('pageEditNavTemplate', page::$navIconTemplate, [
 								'label' => 'Modèle',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'navTemplate']),
 							]); ?>
 						</div>
 						<div class="col4">
-							<?php echo template::select('pageEditNavRight', $module::$navIconPosition, [
+							<?php echo template::select('pageEditNavRight', page::$navIconPosition, [
 								'label' => 'Bouton de navigation droit',
 								'selected' => $this->getData(['page', $this->getUrl(2), 'navRight']),
 							]); ?>
@@ -364,7 +364,7 @@
 						<div class="col6">
 							<div class="pageEditGroupProfil displayNone"
 								id="pageEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
-								<?php echo template::select('pageEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
+								<?php echo template::select('pageEditProfil' . self::GROUP_MEMBER, page::$userProfils[self::GROUP_MEMBER], [
 									'label' => 'Profil minimal pour accéder à la page',
 									'selected' => $this->getData(['page', $this->getUrl(2), 'profil']),
 									'help' => 'Les profils de niveau supérieur accèdent à la page.',
@@ -372,7 +372,7 @@
 							</div>
 							<div class="pageEditGroupProfil displayNone"
 								id="pageEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
-								<?php echo template::select('pageEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
+								<?php echo template::select('pageEditProfil' . self::GROUP_EDITOR, page::$userProfils[self::GROUP_EDITOR], [
 									'label' => 'Profil minimal pour accéder à la page',
 									'selected' => $this->getData(['page', $this->getUrl(2), 'profil']),
 									'help' => 'Les profils de niveau supérieur accèdent à la page.',
diff --git a/core/module/plugin/view/index/index.php b/core/module/plugin/view/index/index.php
index 6ce377a..df22c45 100644
--- a/core/module/plugin/view/index/index.php
+++ b/core/module/plugin/view/index/index.php
@@ -30,28 +30,28 @@
 		]); ?>
 	</div>
 </div>
-<?php if ($module::$modulesInstalled): ?>
+<?php if (plugin::$modulesInstalled): ?>
 	<div class="row">
 		<div class="col12">
 			<div class="block">
 				<h4>
 					<?php echo helper::translate('Sauvegarde'); ?>
 				</h4>
-				<?php echo template::table([2, 2, 1, 5, 1, 1], $module::$modulesInstalled, ['Module', 'Identifiant', 'Version', '', '', '']); ?>
+				<?php echo template::table([2, 2, 1, 5, 1, 1], plugin::$modulesInstalled, ['Module', 'Identifiant', 'Version', '', '', '']); ?>
 			</div>
 		</div>
 	</div>
 <?php else: ?>
 	<?php echo template::speech('Aucun module installé.'); ?>
 <?php endif; ?>
-<?php if ($module::$modulesOrphan): ?>
+<?php if (plugin::$modulesOrphan): ?>
 	<div class="row">
 		<div class="col12">
 			<div class="block">
 				<h4>
 					<?php echo helper::translate('Modules orphelins'); ?>
 				</h4>
-				<?php echo template::table([2, 2, 1, 6, 1], $module::$modulesOrphan, ['Module', 'Identifiant', 'Version', '', '']); ?>
+				<?php echo template::table([2, 2, 1, 6, 1], plugin::$modulesOrphan, ['Module', 'Identifiant', 'Version', '', '']); ?>
 			</div>
 		</div>
 	</div>
diff --git a/core/module/plugin/view/item/item.php b/core/module/plugin/view/item/item.php
index efb6cb7..fec44be 100644
--- a/core/module/plugin/view/item/item.php
+++ b/core/module/plugin/view/item/item.php
@@ -2,33 +2,33 @@
     <div class="col9">
         <div class="row">
             <div class="col12">
-                <?php echo $module::$storeItem['content'];  ?>
+                <?php echo plugin::$storeItem['content'];  ?>
             </div>
         </div>
     </div>
     <div class="row">
         <div class="col12">
             <?php
-            echo '<img class="downloadItemPicture" src="' . $module::BASEURL_STORE . 'site/file/source/' . $module::$storeItem['picture'] .
-                '" alt="' . $module::$storeItem['picture'] . '">';
+            echo '<img class="downloadItemPicture" src="' . plugin::BASEURL_STORE . 'site/file/source/' . plugin::$storeItem['picture'] .
+                '" alt="' . plugin::$storeItem['picture'] . '">';
             ?>
         </div>
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
-            <?php echo helper::translate('Version n°') . $module::$storeItem['fileVersion']; ?>
+            <?php echo helper::translate('Version n°') . plugin::$storeItem['fileVersion']; ?>
         </div>
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
-            &nbsp;<?php echo helper::translate('date') . '&nbsp;' .  $module::$storeItem['fileDate']; ?>
+            &nbsp;<?php echo helper::translate('date') . '&nbsp;' .  plugin::$storeItem['fileDate']; ?>
         </div>
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
             <span>
                 <?php echo helper::translate('Auteur :'); ?>
-                <?php echo $module::$storeItem['fileAuthor']; ?>
+                <?php echo plugin::$storeItem['fileAuthor']; ?>
             </span>
         </div>
     </div>
@@ -37,7 +37,7 @@
             <span>
                 <?php echo helper::translate('Licence'); ?>
                 &nbsp;
-                <?php echo $module::$storeItem['fileLicense']; ?>
+                <?php echo plugin::$storeItem['fileLicense']; ?>
             </span>
         </div>
     </div>
diff --git a/core/module/plugin/view/store/store.php b/core/module/plugin/view/store/store.php
index e7ae184..eb03c20 100644
--- a/core/module/plugin/view/store/store.php
+++ b/core/module/plugin/view/store/store.php
@@ -7,8 +7,8 @@
 		]); ?>
 	</div>
 </div>
-<?php if ($module::$storeList) : ?>
-	<?php echo template::table([2, 2, 1, 2, 2, 1], $module::$storeList, ['Catégorie', 'Module', 'Version', 'Date', 'Page', '']); ?>
+<?php if (plugin::$storeList) : ?>
+	<?php echo template::table([2, 2, 1, 2, 2, 1], plugin::$storeList, ['Catégorie', 'Module', 'Version', 'Date', 'Page', '']); ?>
 <?php else : ?>
 	<?php echo template::speech('Le catalogue est vide.'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php
index f0ef04c..31e48a7 100644
--- a/core/module/sitemap/view/index/index.php
+++ b/core/module/sitemap/view/index/index.php
@@ -1,4 +1,4 @@
 <?php
 echo "<div  id='siteMap'>";
-echo $module::$siteMap;
+echo sitemap::$siteMap;
 echo "</div>";
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 917ea52..784f217 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -597,8 +597,9 @@ class theme extends common
 					'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN),
 					'memberBar' => $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN),
 					'selectSpace' => $this->getInput('themeMenuSelectSpace', helper::FILTER_BOOLEAN),
+					'hidePages' => $this->getInput('themeMenuHidePages', helper::FILTER_BOOLEAN),
 					'burgerLogo' => $this->getInput('themeMenuBurgerLogo'),
-					'burgerContent' => $this->getInput('themeMenuBurgerContent')
+					'burgerContent' => $this->getInput('themeMenuBurgerContent'),
 				]
 			]);
 			// Valeurs en sortie
diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php
index dc4e251..1de6e46 100644
--- a/core/module/theme/view/admin/admin.php
+++ b/core/module/theme/view/admin/admin.php
@@ -36,7 +36,7 @@
 			</h4>
 			<div class="row">
 			<div class="col3">
-					<?php echo template::select('adminSiteWidth', $module::$siteWidths, [
+					<?php echo template::select('adminSiteWidth', theme::$siteWidths, [
 						'label' => 'Largeur',
 						'selected' => $this->getData(['admin', 'width'])
 					]); ?>
@@ -136,23 +136,23 @@
 			</h4>
 			<div class="row">
 				<div class="col4">
-					<?php echo template::select('adminFontText', $module::$fonts['name'], [
+					<?php echo template::select('adminFontText', theme::$fonts['name'], [
 						'label' => 'Police du texte',
 						'selected' => $this->getData(['admin', 'fontText']),
-						'font' => $module::$fonts['family']
+						'font' => theme::$fonts['family']
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('adminFontTextSize', $module::$siteFontSizes, [
+					<?php echo template::select('adminFontTextSize', theme::$siteFontSizes, [
 						'label' => 'Taille',
 						'selected' => $this->getData(['admin', 'fontSize'])
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('adminFontTitle', $module::$fonts['name'], [
+					<?php echo template::select('adminFontTitle', theme::$fonts['name'], [
 						'label' => 'Police des titres',
 						'selected' => $this->getData(['admin', 'fontTitle']),
-						'font' => $module::$fonts['family']
+						'font' => theme::$fonts['family']
 					]); ?>
 				</div>
 			</div>
diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php
index 4067b49..f9b21ba 100644
--- a/core/module/theme/view/body/body.php
+++ b/core/module/theme/view/body/body.php
@@ -68,13 +68,13 @@
 			<div id="themeBodyImageOptions" class="displayNone">
 				<div class="row">
 					<div class="col6">
-						<?php echo template::select('themeBodyImageRepeat', $module::$repeats, [
+						<?php echo template::select('themeBodyImageRepeat', theme::$repeats, [
 							'label' => 'Répétition',
 							'selected' => $this->getData(['theme', 'body', 'imageRepeat'])
 						]); ?>
 					</div>
 					<div class="col6">
-						<?php echo template::select('themeBodyImagePosition', $module::$imagePositions, [
+						<?php echo template::select('themeBodyImagePosition', theme::$imagePositions, [
 							'label' => 'Position',
 							'selected' => $this->getData(['theme', 'body', 'imagePosition'])
 						]); ?>
@@ -82,13 +82,13 @@
 				</div>
 				<div class="row">
 					<div class="col6">
-						<?php echo template::select('themeBodyImageAttachment', $module::$attachments, [
+						<?php echo template::select('themeBodyImageAttachment', theme::$attachments, [
 							'label' => 'Défilement',
 							'selected' => $this->getData(['theme', 'body', 'imageAttachment'])
 						]); ?>
 					</div>
 					<div class="col6">
-						<?php echo template::select('themeBodyImageSize', $module::$bodySizes, [
+						<?php echo template::select('themeBodyImageSize', theme::$bodySizes, [
 							'label' => 'Taille',
 							'selected' => $this->getData(['theme', 'body', 'imageSize'])
 						]); ?>
diff --git a/core/module/theme/view/font/font.php b/core/module/theme/view/font/font.php
index 2b69d8c..d574875 100644
--- a/core/module/theme/view/font/font.php
+++ b/core/module/theme/view/font/font.php
@@ -23,8 +23,8 @@
 		]); ?>
 	</div>
 </div>
-<?php if ($module::$fontsDetail) : ?>
-	<?php echo template::table([2, 2, 3, 2, 1, 1, 1], $module::$fontsDetail, ['FontId', 'Nom', 'Famille', 'Affectation', 'Origine', '', ''], ['id' => 'dataTables']); ?>
+<?php if (theme::$fontsDetail) : ?>
+	<?php echo template::table([2, 2, 3, 2, 1, 1, 1], theme::$fontsDetail, ['FontId', 'Nom', 'Famille', 'Affectation', 'Origine', '', ''], ['id' => 'dataTables']); ?>
 <?php else : ?>
 	<?php echo template::speech('Aucune fonte !'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index c2f6265..5340cf2 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -27,13 +27,13 @@
             </h4>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('themeFooterPosition', $module::$footerPositions, [
+                    <?php echo template::select('themeFooterPosition', theme::$footerPositions, [
                         'label' => 'Position',
                         'selected' => $this->getData(['theme', 'footer', 'position'])
                     ]); ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('themeFooterHeight', $module::$footerHeights, [
+                    <?php echo template::select('themeFooterHeight', theme::$footerHeights, [
                         'label' => 'Marges verticales',
                         'selected' => $this->getData(['theme', 'footer', 'height'])
                     ]); ?>
@@ -137,7 +137,7 @@
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('configLegalPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [
+                    <?php echo template::select('configLegalPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn(theme::$pagesList, 'title', 'SORT_ASC')), [
                         'label' =>  helper::translate('Mentions légales') ,
                         'selected' => $this->getData(['config', 'legalPageId'])
                     ]); ?>
@@ -151,7 +151,7 @@
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('configSearchPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [
+                    <?php echo template::select('configSearchPageId', array_merge(['none' => 'Aucune'], helper::arrayColumn(theme::$pagesList, 'title', 'SORT_ASC')), [
                         'label' =>  helper::translate('Rechercher dans le site'),
                         'selected' => $this->getData(['config', 'searchPageId'])
                     ]); ?>
@@ -177,27 +177,27 @@
             </h4>
             <div class="row">
                 <div class="col3">
-                    <?php echo template::select('themeFooterFont', $module::$fonts['name'], [
+                    <?php echo template::select('themeFooterFont', theme::$fonts['name'], [
                         'label' => 'Fonte',
                         'selected' => $this->getData(['theme', 'footer', 'font']),
-                        'font' => $module::$fonts['family']
+                        'font' => theme::$fonts['family']
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeFooterFontSize', $module::$footerFontSizes, [
+                    <?php echo template::select('themeFooterFontSize', theme::$footerFontSizes, [
                         'label' => 'Taille',
                         'help' => 'Proportionnelle à la taille définie dans le site.',
                         'selected' => $this->getData(['theme', 'footer', 'fontSize'])
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeFooterFontWeight', $module::$fontWeights, [
+                    <?php echo template::select('themeFooterFontWeight', theme::$fontWeights, [
                         'label' => 'Style',
                         'selected' => $this->getData(['theme', 'footer', 'fontWeight'])
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeFooterTextTransform', $module::$textTransforms, [
+                    <?php echo template::select('themeFooterTextTransform', theme::$textTransforms, [
                         'label' => 'Casse',
                         'selected' => $this->getData(['theme', 'footer', 'textTransform'])
                     ]); ?>
@@ -214,8 +214,8 @@
             </h4>
             <div class="row">
                 <div class="col4">
-                    <?php $footerBlockPosition = is_null($this->getData(['theme', 'footer', 'template'])) ? $module::$footerblocks[3] : $module::$footerblocks[$this->getData(['theme', 'footer', 'template'])]; ?>
-                    <?php echo template::select('themeFooterTemplate', $module::$footerTemplate, [
+                    <?php $footerBlockPosition = is_null($this->getData(['theme', 'footer', 'template'])) ? theme::$footerblocks[3] : theme::$footerblocks[$this->getData(['theme', 'footer', 'template'])]; ?>
+                    <?php echo template::select('themeFooterTemplate', theme::$footerTemplate, [
                         'label' => 'Répartition',
                         'selected' => is_null($this->getData(['theme', 'footer', 'template'])) ? 4 : $this->getData(['theme', 'footer', 'template'])
                     ]); ?>
@@ -239,7 +239,7 @@
                     </div>
                     <div class="row">
                         <div class="col12">
-                            <?php echo template::select('themeFooterTextAlign', $module::$aligns, [
+                            <?php echo template::select('themeFooterTextAlign', theme::$aligns, [
                                 'label' => 'Alignement',
                                 'selected' => $this->getData(['theme', 'footer', 'textAlign'])
                             ]); ?>
@@ -263,7 +263,7 @@
                     </div>
                     <div class="row">
                         <div class="col12">
-                            <?php echo template::select('themeFooterSocialsAlign', $module::$aligns, [
+                            <?php echo template::select('themeFooterSocialsAlign', theme::$aligns, [
                                 'label' => 'Alignement',
                                 'selected' => $this->getData(['theme', 'footer', 'socialsAlign'])
                             ]); ?>
@@ -287,7 +287,7 @@
                     </div>
                     <div class="row">
                         <div class="col12">
-                            <?php echo template::select('themeFooterCopyrightAlign', $module::$aligns, [
+                            <?php echo template::select('themeFooterCopyrightAlign', theme::$aligns, [
                                 'label' => 'Alignement',
                                 'selected' => $this->getData(['theme', 'footer', 'copyrightAlign'])
                             ]); ?>
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index afc5d21..894498c 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -18,20 +18,20 @@
             </h4>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('themeHeaderPosition', $module::$headerPositions, [
+                    <?php echo template::select('themeHeaderPosition', theme::$headerPositions, [
                         'label' => 'Position',
                         'selected' => $this->getData(['theme', 'header', 'position'])
                     ]); ?>
                 </div>
                 <div class="col4">
-                    <?php echo template::select('themeHeaderFeature', $module::$headerFeatures, [
+                    <?php echo template::select('themeHeaderFeature', theme::$headerFeatures, [
                         'label' => 'Contenu',
                         'selected' => $this->getData(['theme', 'header', 'feature'])
                     ]); ?>
                 </div>
 
                 <div class="col4">
-                    <?php echo template::select('themeHeaderHeight', $module::$headerHeights, [
+                    <?php echo template::select('themeHeaderHeight', theme::$headerHeights, [
                         'label' => 'Hauteur maximale',
                         'selected' => $this->getData(['theme', 'header', 'height']),
                     ]); ?>
@@ -39,7 +39,7 @@
             </div>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('themeHeaderWide', $module::$containerWides, [
+                    <?php echo template::select('themeHeaderWide', theme::$containerWides, [
                         'label' => 'Largeur',
                         'selected' => $this->getData(['theme', 'header', 'wide'])
                     ]); ?>
@@ -102,33 +102,33 @@
             </div>
             <div class="row">
                 <div class="col3">
-                    <?php echo template::select('themeHeaderFont', $module::$fonts['name'], [
+                    <?php echo template::select('themeHeaderFont', theme::$fonts['name'], [
                         'label' => 'Fonte',
                         'selected' => $this->getData(['theme', 'header', 'font']),
-                        'font' => $module::$fonts['family']
+                        'font' => theme::$fonts['family']
                     ]); ?>
                 </div>
                 <div class="col2">
-                    <?php echo template::select('themeHeaderFontSize', $module::$headerFontSizes, [
+                    <?php echo template::select('themeHeaderFontSize', theme::$headerFontSizes, [
                         'label' => 'Taille',
                         'help' => 'Proportionnelle à la taille définie dans le site.',
                         'selected' => $this->getData(['theme', 'header', 'fontSize'])
                     ]); ?>
                 </div>
                 <div class="col2">
-                    <?php echo template::select('themeHeaderFontWeight', $module::$fontWeights, [
+                    <?php echo template::select('themeHeaderFontWeight', theme::$fontWeights, [
                         'label' => 'Style',
                         'selected' => $this->getData(['theme', 'header', 'fontWeight'])
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeHeaderTextTransform', $module::$textTransforms, [
+                    <?php echo template::select('themeHeaderTextTransform', theme::$textTransforms, [
                         'label' => 'Casse',
                         'selected' => $this->getData(['theme', 'header', 'textTransform'])
                     ]); ?>
                 </div>
                 <div class="col2">
-                    <?php echo template::select('themeHeaderTextAlign', $module::$aligns, [
+                    <?php echo template::select('themeHeaderTextAlign', theme::$aligns, [
                         'label' => 'Alignement',
                         'selected' => $this->getData(['theme', 'header', 'textAlign'])
                     ]); ?>
@@ -169,19 +169,19 @@
             <div class="themeHeaderImageOptions" class="displayNone">
                 <div class="row">
                     <div class="col3">
-                        <?php echo template::select('themeHeaderImageRepeat', $module::$repeats, [
+                        <?php echo template::select('themeHeaderImageRepeat', theme::$repeats, [
                             'label' => 'Répétition',
                             'selected' => $this->getData(['theme', 'header', 'imageRepeat'])
                         ]); ?>
                     </div>
                     <div class="col3">
-                        <?php echo template::select('themeHeaderImageContainer', $module::$headerWide, [
+                        <?php echo template::select('themeHeaderImageContainer', theme::$headerWide, [
                             'label' => 'Adaptation',
                             'selected' => $this->getData(['theme', 'header', 'imageContainer']),
                         ]); ?>
                     </div>
                     <div class="col3">
-                        <?php echo template::select('themeHeaderImagePosition', $module::$imagePositions, [
+                        <?php echo template::select('themeHeaderImagePosition', theme::$imagePositions, [
                             'label' => 'Position',
                             'selected' => $this->getData(['theme', 'header', 'imagePosition'])
                         ]); ?>
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 1516532..641725c 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -21,12 +21,12 @@
                 <div class="col6">
                     <?php
                     if ($this->getData(['theme', 'header', 'position']) == "site") {
-                        echo template::select('themeMenuPosition', $module::$menuPositionsSite, [
+                        echo template::select('themeMenuPosition', theme::$menuPositionsSite, [
                             'label' => 'Position',
                             'selected' => $this->getData(['theme', 'menu', 'position'])
                         ]);
                     } else {
-                        echo template::select('themeMenuPosition', $module::$menuPositionsBody, [
+                        echo template::select('themeMenuPosition', theme::$menuPositionsBody, [
                             'label' => 'Position',
                             'selected' => $this->getData(['theme', 'menu', 'position'])
                         ]);
@@ -34,7 +34,7 @@
                     ?>
                 </div>
                 <div class="col6">
-                    <?php echo template::select('themeMenuWide', $module::$containerWides, [
+                    <?php echo template::select('themeMenuWide', theme::$containerWides, [
                         'label' => 'Largeur',
                         'selected' => $this->getData(['theme', 'menu', 'wide'])
                     ]); ?>
@@ -42,20 +42,20 @@
             </div>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('themeMenuRadius', $module::$menuRadius, [
+                    <?php echo template::select('themeMenuRadius', theme::$menuRadius, [
                         'label' => 'Bords arrondis',
                         'selected' => $this->getData(['theme', 'menu', 'radius']),
                         'help' => 'Autour de la page sélectionnée'
                     ]); ?>
                 </div>
                 <div class="col4">
-                    <?php echo template::select('themeMenuHeight', $module::$menuHeights, [
+                    <?php echo template::select('themeMenuHeight', theme::$menuHeights, [
                         'label' => 'Hauteur',
                         'selected' => $this->getData(['theme', 'menu', 'height'])
                     ]); ?>
                 </div>
                 <div class="col4">
-                    <?php echo template::select('themeMenuTextAlign', $module::$aligns, [
+                    <?php echo template::select('themeMenuTextAlign', theme::$aligns, [
                         'label' => 'Alignement',
                         'selected' => $this->getData(['theme', 'menu', 'textAlign'])
                     ]); ?>
@@ -81,6 +81,12 @@
                 <?php echo helper::translate('Contenu'); ?>
             </h4>
             <div class="row">
+                <div class="col3">
+                    <?php echo template::checkbox('themeMenuHidePages', true, 'Masquer toutes les pages', [
+                        'checked' => $this->getData(['theme', 'menu', 'hidePages']),
+                        'help' => 'Cette option est à utiliser lorsque les pages sont listées dans une barre latérale.'
+                    ]); ?>
+                </div>
                 <div class="col3">
                     <?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
                         'checked' => $this->getData(['theme', 'menu', 'loginLink'])
@@ -99,13 +105,13 @@
             </div>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('themeMenuBurgerContent', $module::$burgerContent, [
+                    <?php echo template::select('themeMenuBurgerContent',  theme::$burgerContent, [
                         'label' => 'Menu burger dans écran réduit',
                         'selected' => $this->getData(['theme', 'menu', 'burgerContent']),
                     ]); ?>
                 </div>
                 <div class="col6" id="themeMenuBurgerLogoId" class="<?php if ($this->getData(['theme', 'menu', 'burgerContent']) !== 'logo')
-                    echo 'displayNone'; ?>">
+                                                                        echo 'displayNone'; ?>">
                     <?php $imageFile = file_exists(self::FILE_DIR . 'source/' . $this->getData(['theme', 'menu', 'burgerLogo'])) ? $this->getData(['theme', 'menu', 'burgerLogo']) : ""; ?>
                     <?php echo template::file('themeMenuBurgerLogo', [
                         'help' => 'Sélectionner une image de dimensions adaptées',
@@ -188,27 +194,27 @@
             </h4>
             <div class="row">
                 <div class="col3">
-                    <?php echo template::select('themeMenuFont', $module::$fonts['name'], [
+                    <?php echo template::select('themeMenuFont', theme::$fonts['name'], [
                         'label' => 'Fonte',
                         'selected' => $this->getData(['theme', 'menu', 'font']),
-                        'font' => $module::$fonts['family']
+                        'font' => theme::$fonts['family']
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
+                    <?php echo template::select('themeMenuFontSize', theme::$menuFontSizes, [
                         'label' => 'Taille',
                         'help' => 'Proportionnelle à la taille définie dans le site.',
                         'selected' => $this->getData(['theme', 'menu', 'fontSize'])
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
+                    <?php echo template::select('themeMenuFontWeight', theme::$fontWeights, [
                         'label' => 'Style',
                         'selected' => $this->getData(['theme', 'menu', 'fontWeight'])
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
+                    <?php echo template::select('themeMenuTextTransform', theme::$textTransforms, [
                         'label' => 'Casse',
                         'selected' => $this->getData(['theme', 'menu', 'textTransform'])
                     ]); ?>
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index 746167e..6d48ee3 100644
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -27,19 +27,19 @@
 			</h4>
 			<div class="row">
 				<div class="col4">
-					<?php echo template::select('themeSiteWidth', $module::$siteWidths, [
+					<?php echo template::select('themeSiteWidth', theme::$siteWidths, [
 						'label' => 'Largeur',
 						'selected' => $this->getData(['theme', 'site', 'width'])
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('themeSiteRadius', $module::$radius, [
+					<?php echo template::select('themeSiteRadius', theme::$radius, [
 						'label' => 'Arrondi des angles',
 						'selected' => $this->getData(['theme', 'site', 'radius'])
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('themeSiteShadow', $module::$shadows, [
+					<?php echo template::select('themeSiteShadow', theme::$shadows, [
 						'label' => 'Ombre',
 						'selected' => $this->getData(['theme', 'site', 'shadow'])
 					]); ?>
@@ -138,14 +138,14 @@
 			<div class="row">
 				<div class="col6">
 					<?php
-					echo template::select('themeTextFont', $module::$fonts['name'], [
+					echo template::select('themeTextFont', theme::$fonts['name'], [
 						'label' => 'Fonte',
 						'selected' => $this->getData(['theme', 'text', 'font']),
-						'font' => $module::$fonts['family']
+						'font' => theme::$fonts['family']
 					]); ?>
 				</div>
 				<div class="col6">
-					<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
+					<?php echo template::select('themeTextFontSize', theme::$siteFontSizes, [
 						'label' => 'Taille',
 						'help' => 'Les tailles des polices de la bannière, de menu et de pied de page sont proportionnelles à cette taille.',
 						'selected' => $this->getData(['theme', 'text', 'fontSize'])
@@ -161,20 +161,20 @@
 			</h4>
 			<div class="row">
 				<div class="col4">
-					<?php echo template::select('themeTitleFont', $module::$fonts['name'], [
+					<?php echo template::select('themeTitleFont', theme::$fonts['name'], [
 						'label' => 'Fonte',
 						'selected' => $this->getData(['theme', 'title', 'font']),
-						'font' => $module::$fonts['family']
+						'font' => theme::$fonts['family']
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('themeTitleFontWeight', $module::$fontWeights, [
+					<?php echo template::select('themeTitleFontWeight', theme::$fontWeights, [
 						'label' => 'Style',
 						'selected' => $this->getData(['theme', 'title', 'fontWeight'])
 					]); ?>
 				</div>
 				<div class="col4">
-					<?php echo template::select('themeTitleTextTransform', $module::$textTransforms, [
+					<?php echo template::select('themeTitleTextTransform', theme::$textTransforms, [
 						'label' => 'Casse',
 						'selected' => $this->getData(['theme', 'title', 'textTransform'])
 					]); ?>
diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php
index 2734292..4baf88a 100644
--- a/core/module/user/view/add/add.php
+++ b/core/module/user/view/add/add.php
@@ -40,7 +40,7 @@
 					]); ?>
 				</div>
 				<div class="col6">
-					<?php echo template::select('userAddSignature', $module::$signature, [
+					<?php echo template::select('userAddSignature', user::$signature, [
 						'label' => 'Signature',
 						'selected' => 1
 					]); ?>
@@ -54,7 +54,7 @@
 					]); ?>
 				</div>
 				<div class="col6">
-					<?php echo template::select('userAddLanguage', $module::$languagesInstalled, [
+					<?php echo template::select('userAddLanguage', user::$languagesInstalled, [
 						'label' => 'Langues'
 					]); ?>
 				</div>
@@ -112,13 +112,13 @@
 				<div class="col6">
 					<div class="userAddGroupProfil displayNone"
 						id="userAddGroupProfil<?php echo self::GROUP_MEMBER; ?>">
-						<?php echo template::select('userAddProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
+						<?php echo template::select('userAddProfil' . self::GROUP_MEMBER, user::$userProfils[self::GROUP_MEMBER], [
 							'label' => 'Profil',
 						]); ?>
 					</div>
 					<div class="userAddGroupProfil displayNone"
 						id="userAddGroupProfil<?php echo self::GROUP_EDITOR; ?>">
-						<?php echo template::select('userAddProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
+						<?php echo template::select('userAddProfil' . self::GROUP_EDITOR, user::$userProfils[self::GROUP_EDITOR], [
 							'label' => 'Profil',
 						]); ?>
 					</div>
@@ -128,20 +128,20 @@
 				<div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>"
 					class="col12 displayNone userCommentProfil">
 					<?php echo template::textarea('useraddProfilComment' . self::GROUP_MEMBER, [
-						"value" => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER])
+						"value" => implode("\n", user::$userProfilsComments[self::GROUP_MEMBER])
 					]);
 					?>
 				</div>
 				<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>"
 					class="col12 displayNone userCommentProfil">
 					<?php echo template::textarea('useraddProfilComment2' . self::GROUP_EDITOR, [
-						"value" => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR])
+						"value" => implode("\n", user::$userProfilsComments[self::GROUP_EDITOR])
 					]);
 					?>
 				</div>
 				<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12 displayNone userCommentProfil">
 					<?php echo template::textarea('useraddProfilComment' . self::GROUP_ADMIN, [
-						"value" => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN])
+						"value" => implode("\n", user::$userProfilsComments[self::GROUP_ADMIN])
 					]);
 					?>
 				</div>
diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php
index 73317bf..2fafb5f 100644
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
@@ -52,7 +52,7 @@
 					]); ?>
 				</div>
 				<div class="col6">
-					<?php echo template::select('userEditSignature', $module::$signature, [
+					<?php echo template::select('userEditSignature', user::$signature, [
 						'label' => 'Signature',
 						'selected' => $this->getData(['user', $this->getUrl(2), 'signature'])
 					]); ?>
@@ -67,7 +67,7 @@
 					]); ?>
 				</div>
 				<div class="col6">
-					<?php echo template::select('userEditLanguage', $module::$languagesInstalled, [
+					<?php echo template::select('userEditLanguage', user::$languagesInstalled, [
 						'label' => 'Langue',
 						'selected' => $this->getData(['user', $this->getUrl(2), 'language'])
 					]); ?>
@@ -140,14 +140,14 @@
 				</div>
 				<div class="col12">
 					<div class="userEditGroupProfil" id="userEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
-						<?php echo template::select('userEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
+						<?php echo template::select('userEditProfil' . self::GROUP_MEMBER, user::$userProfils[self::GROUP_MEMBER], [
 							'label' => 'Profil',
 							'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
 							'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
 						]); ?>
 					</div>
 					<div class="userEditGroupProfil" id="userEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
-						<?php echo template::select('userEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
+						<?php echo template::select('userEditProfil' . self::GROUP_EDITOR, user::$userProfils[self::GROUP_EDITOR], [
 							'label' => 'Profil',
 							'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
 							'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
@@ -159,7 +159,7 @@
 				<div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" class="col12  userCommentProfil">
 					<?php echo template::textarea('userEditProfilComment' . self::GROUP_MEMBER, [
 						'label' => 'Commentaire',
-						'value' => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]),
+						'value' => implode("\n", user::$userProfilsComments[self::GROUP_MEMBER]),
 						'disabled' => true,
 
 					]);
@@ -168,7 +168,7 @@
 				<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>" class="col12  userCommentProfil">
 					<?php echo template::textarea('userEditProfilComment' . self::GROUP_EDITOR, [
 						'label' => 'Commentaire',
-						'value' => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]),
+						'value' => implode("\n", user::$userProfilsComments[self::GROUP_EDITOR]),
 						'disabled' => true,
 
 					]);
@@ -177,7 +177,7 @@
 				<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12  userCommentProfil">
 					<?php echo template::textarea('userEditProfilComment' . self::GROUP_ADMIN, [
 						'label' => 'Commentaire',
-						'value' => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]),
+						'value' => implode("\n", user::$userProfilsComments[self::GROUP_ADMIN]),
 						'disabled' => true,
 					]);
 					?>
diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php
index 062861d..26efad4 100644
--- a/core/module/user/view/import/import.php
+++ b/core/module/user/view/import/import.php
@@ -42,7 +42,7 @@
                     ]); ?>
                 </div>
                 <div class="col2">
-                    <?php echo template::select('userImportSeparator', $module::$separators, [
+                    <?php echo template::select('userImportSeparator', user::$separators, [
                         'label' => 'Séparateur'
                     ]); ?>
                 </div>
@@ -58,10 +58,10 @@
     </div>
 </div>
 <?php echo template::formClose(); ?>
-<?php if ($module::$users): ?>
+<?php if (user::$users): ?>
     <div class="row">
         <div class="col12 textAlignCenter">
-            <?php echo template::table([1, 2, 2, 1, 1, 1, 2, 1, 1], $module::$users, ['Id', 'Nom', 'Prénom', 'Groupe', 'Profil', 'Pseudo', 'eMail', 'Étiquettes', '']); ?>
+            <?php echo template::table([1, 2, 2, 1, 1, 1, 2, 1, 1], user::$users, ['Id', 'Nom', 'Prénom', 'Groupe', 'Profil', 'Pseudo', 'eMail', 'Étiquettes', '']); ?>
             <?php echo template::ico('check'); ?> Compte créé |
             <?php echo template::ico('mail'); ?> Compte créé et notifié |
             <?php echo template::ico('cancel'); ?> Erreur dans le fichier ou le compte existe.
diff --git a/core/module/user/view/index/index.php b/core/module/user/view/index/index.php
index cc09241..859a1b3 100644
--- a/core/module/user/view/index/index.php
+++ b/core/module/user/view/index/index.php
@@ -49,23 +49,23 @@
 <?php echo template::formOpen('userFilterUserForm'); ?>
 <div class="row">
 	<div class="col3">
-		<?php echo template::select('userFilterGroup', $module::$usersGroups, [
+		<?php echo template::select('userFilterGroup', user::$usersGroups, [
 			'label' => 'Groupes / Profils',
 			'selected' => isset($_POST['userFilterGroup']) ? $_POST['userFilterGroup'] : 'all',
 		]); ?>
 	</div>
 	<div class="col3">
-		<?php echo template::select('userFilterFirstName', $module::$alphabet, [
+		<?php echo template::select('userFilterFirstName', user::$alphabet, [
 			'label' => 'Prénom commence par',
 			'selected' => isset($_POST['userFilterFirstName']) ? $_POST['userFilterFirstName'] : 'all',
 		]); ?>
 	</div>
 	<div class="col3">
-		<?php echo template::select('userFilterLastName', $module::$alphabet, [
+		<?php echo template::select('userFilterLastName', user::$alphabet, [
 			'label' => 'Nom commence par',
 			'selected' => isset($_POST['userFilterLastName']) ? $_POST['userFilterLastName'] : 'all',
 		]); ?>
 	</div>
 </div>
 <?php echo template::formClose(); ?>
-<?php echo template::table([3, 2, 2, 2, 2, 1, 1], $module::$users, ['Nom', 'Groupe', 'Profil', 'Étiquettes', 'Date dernière vue', '', ''], ['id' => 'dataTables']); ?>
\ No newline at end of file
+<?php echo template::table([3, 2, 2, 2, 2, 1, 1], user::$users, ['Nom', 'Groupe', 'Profil', 'Étiquettes', 'Date dernière vue', '', ''], ['id' => 'dataTables']); ?>
\ No newline at end of file
diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php
index f247330..0dd914e 100644
--- a/core/module/user/view/login/login.php
+++ b/core/module/user/view/login/login.php
@@ -3,7 +3,7 @@
 	<div class="col6">
 		<?php echo template::text('userLoginId', [
 			'label' => 'Identifiant',
-			'value' => $module::$userId
+			'value' => user::$userId
 		]); ?>
 	</div>
 	<div class="col6">
@@ -31,7 +31,7 @@
 <div class="row">
 	<div class="col8">
 		<?php echo template::checkbox('userLoginLongTime', true, 'Rester connecté sur ce navigateur', [
-			'checked' => $module::$userLongtime
+			'checked' => user::$userLongtime
 		]);	?>
 	</div>
 	<div class="col4 textAlignRight">
diff --git a/core/module/user/view/profil/profil.php b/core/module/user/view/profil/profil.php
index fc84e6c..229aa22 100644
--- a/core/module/user/view/profil/profil.php
+++ b/core/module/user/view/profil/profil.php
@@ -15,4 +15,4 @@
 		]); ?>
 	</div>
 </div>
-<?php echo template::table([1, 4, 5, 1, 1], $module::$userGroups, ['#', 'Nom', 'Commentaire', '', '']); ?>
\ No newline at end of file
+<?php echo template::table([1, 4, 5, 1, 1], user::$userGroups, ['#', 'Nom', 'Commentaire', '', '']); ?>
\ No newline at end of file
diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php
index ccc6bbd..e061dd9 100644
--- a/core/module/user/view/profilAdd/profilAdd.php
+++ b/core/module/user/view/profilAdd/profilAdd.php
@@ -27,7 +27,7 @@
                             ]); ?>
                         </div>
                         <div class="col12">
-                            <?php echo template::select('profilAddGroup', $module::$groupProfils, [
+                            <?php echo template::select('profilAddGroup', user::$groupProfils, [
                                 'label' => 'Groupe associé',
                                 'selected' => $this->getUrl(2)
                             ]); ?>
@@ -69,13 +69,13 @@
                     <?php echo template::checkbox('profilAddFileManager', true, 'Autorisé'); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('profilAddCoursePath', $module::$sharePath, [
+                    <?php echo template::select('profilAddCoursePath', user::$sharePath, [
                         'label' => 'Dossier depuis un espace',
                         'class' => 'filemanager',
                     ]); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('profilAddHomePath', $module::$sharePath, [
+                    <?php echo template::select('profilAddHomePath', user::$sharePath, [
                         'label' => 'Dossier depuis l\'accueil',
                         'class' => 'filemanager',
                     ]); ?>
diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php
index cf687f9..3a71b91 100644
--- a/core/module/user/view/profilEdit/profilEdit.php
+++ b/core/module/user/view/profilEdit/profilEdit.php
@@ -29,7 +29,7 @@
                                     ]); ?>
                                 </div>
                                 <div class="col6">
-                                    <?php echo template::select('profilEditProfil', $module::$profils, [
+                                    <?php echo template::select('profilEditProfil', user::$profils, [
                                         'label' => 'Hiérarchie',
                                         'help' => 'Rang 9 > rang 1. Le profil de rang 1 n\'est pas modifiable.',
                                         'selected' => $this->getUrl(3),
@@ -93,7 +93,7 @@
                     ]); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('profilEditCoursePath', $module::$sharePath, [
+                    <?php echo template::select('profilEditCoursePath', user::$sharePath, [
                         'label' => 'Dossier depuis un espace',
                         'class' => 'filemanager',
                         /*
@@ -104,7 +104,7 @@
                     ]); ?>
                 </div>
                 <div class="col5">
-                    <?php echo template::select('profilEditHomePath', $module::$sharePath, [
+                    <?php echo template::select('profilEditHomePath', user::$sharePath, [
                         'label' => 'Dossier depuis l\'accueil',
                         'class' => 'filemanager',
                         // 'none' interdit l'accès au gestionnaire de fichier au niveau de l'accueil
diff --git a/core/module/user/view/tag/tag.php b/core/module/user/view/tag/tag.php
index 4ded2c3..6d47b62 100644
--- a/core/module/user/view/tag/tag.php
+++ b/core/module/user/view/tag/tag.php
@@ -27,19 +27,19 @@
 </div>
 <div class="row" id="Bfrtip">
     <div class="col3">
-        <?php echo template::select('usersFilterGroup', $module::$usersGroups, [
+        <?php echo template::select('usersFilterGroup', user::$usersGroups, [
             'label' => 'Groupes / Profils',
             'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('usersFilterFirstName', $module::$alphabet, [
+        <?php echo template::select('usersFilterFirstName', user::$alphabet, [
             'label' => 'Prénom commence par',
             'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('usersFilterLastName', $module::$alphabet, [
+        <?php echo template::select('usersFilterLastName', user::$alphabet, [
             'label' => 'Nom commence par',
             'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all',
         ]); ?>
@@ -57,8 +57,8 @@
         ]); ?>
     </div>
 </div>
-<?php if ($module::$users): ?>
-    <?php echo template::table([1, 2, 3, 3, 3], $module::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php if (user::$users): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], user::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>
diff --git a/core/module/user/view/usersDelete/usersDelete.php b/core/module/user/view/usersDelete/usersDelete.php
index dde0952..aa06408 100644
--- a/core/module/user/view/usersDelete/usersDelete.php
+++ b/core/module/user/view/usersDelete/usersDelete.php
@@ -17,19 +17,19 @@
 </div>
 <div class="row" id="Bfrtip">
     <div class="col3">
-        <?php echo template::select('usersFilterGroup', $module::$usersGroups, [
+        <?php echo template::select('usersFilterGroup', user::$usersGroups, [
             'label' => 'Groupes / Profils',
             'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('usersFilterFirstName', $module::$alphabet, [
+        <?php echo template::select('usersFilterFirstName', user::$alphabet, [
             'label' => 'Prénom commence par',
             'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all',
         ]); ?>
     </div>
     <div class="col3">
-        <?php echo template::select('usersFilterLastName', $module::$alphabet, [
+        <?php echo template::select('usersFilterLastName', user::$alphabet, [
             'label' => 'Nom commence par',
             'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all',
         ]); ?>
@@ -47,8 +47,8 @@
         ]); ?>
     </div>
 </div>
-<?php if ($module::$users): ?>
-    <?php echo template::table([1, 2, 3, 3, 3], $module::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
+<?php if (user::$users): ?>
+    <?php echo template::table([1, 2, 3, 3, 3], user::$users, ['', 'Id', 'Prénom', 'Nom', 'Étiquettes'], ['id' => 'dataTables']); ?>
 <?php else: ?>
     <?php echo template::speech('Aucun inscrit'); ?>
 <?php endif; ?>