diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index c82484fc056..adb2cec459a 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -574,16 +574,9 @@ function showWebsiteTemplates(Website $website)
 {
 	global $conf, $langs, $form, $user;
 
+	// We want only one directory for dir of website templates. If an external module need to provide a template, the template must be copied into this directory
+	// when module is enabled.
 	$dirthemes = array('/doctemplates/websites');
-	/*
-	if (!empty($conf->modules_parts['websitetemplates'])) {
-		foreach ($conf->modules_parts['websitetemplates'] as $reldir) {
-			$dirthemes = array_merge($dirthemes, (array) ($reldir.'doctemplates/websites'));
-		}
-	}
-	*/
-	$dirthemes = array_unique($dirthemes);
-	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
 	$colspan = 2;
 
@@ -612,49 +605,47 @@ function showWebsiteTemplates(Website $website)
 	if (count($dirthemes)) {
 		$i = 0;
 		foreach ($dirthemes as $dir) {
-			if (preg_match('/^\/doctemplates\//', $dir)) {
-				$dirtheme = DOL_DATA_ROOT.$dir; // This include loop on $conf->file->dol_document_root
-			} else {
-				$dirtheme = dol_buildpath($dir); // This include loop on $conf->file->dol_document_root
-			}
+			$dirtheme = DOL_DATA_ROOT.$dir;
+
 			if (is_dir($dirtheme)) {
 				$handle = opendir($dirtheme);
 				if (is_resource($handle)) {
 					while (($subdir = readdir($handle)) !== false) {
 						//var_dump($dirtheme.'/'.$subdir);
-						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.' && substr($subdir, 0, 3) != 'CVS' && preg_match('/\.zip$/i', $subdir)) {
+						if (dol_is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.' && substr($subdir, 0, 3) != 'CVS' && preg_match('/\.zip$/i', $subdir)) {
 							$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
+							$subdirwithoutzipwithoutver = preg_replace('/(_exp|_dev)$/i', '', $subdirwithoutzip);
 
 							// Disable not stable themes (dir ends with _exp or _dev)
-							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {
+							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdirwithoutzip)) {
 								continue;
 							}
-							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && preg_match('/_exp$/i', $subdir)) {
+							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && preg_match('/_exp$/i', $subdirwithoutzip)) {
 								continue;
 							}
 
 							print '<div class="inline-block center flex-item" style="min-width: 250px; max-width: 400px; margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
 							$templatedir = $dirtheme."/".$subdir;
-							$file = $dirtheme."/".$subdirwithoutzip.".jpg";
-							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+							$file = $dirtheme."/".$subdirwithoutzipwithoutver.".jpg";
+							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzipwithoutver.".jpg";
 
 							if (!file_exists($file)) {
 								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
 							}
 
-							$originalfile = basename($file);
+							$originalimgfile = basename($file);
 							$entity = $conf->entity;
 							$modulepart = 'doctemplateswebsite';
 							$cache = '';
 							$title = $file;
 
 							$ret = '';
-							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
+							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalimgfile, 1, '&entity='.$entity);
 							if (!empty($urladvanced)) {
 								$ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
 							} else {
-								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $entity).'&file='.urlencode($originalfile).'&cache='.((int) $cache).'">';
+								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $entity).'&file='.urlencode($originalimgfile).'&cache='.((int) $cache).'">';
 							}
 							print $ret;
 							print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/LICENSE b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/LICENSE
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/LICENSE
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/LICENSE
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/README.md b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/README.md
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/README.md
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/README.md
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/.dolibarr b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/.dolibarr
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/.dolibarr
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/.dolibarr
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/.htaccess b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/.htaccess
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/.htaccess
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/.htaccess
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/htmlheader.html b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/htmlheader.html
similarity index 99%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/htmlheader.html
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/htmlheader.html
index 0de0b36283f..6511ce086fd 100644
--- a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/htmlheader.html
+++ b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/htmlheader.html
@@ -3,4 +3,3 @@
 <link rel="stylesheet" id="font-wasesome-css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/javascript.js.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/javascript.js.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/javascript.js.php
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/javascript.js.php
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/manifest.json.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/manifest.json.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/manifest.json.php
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/manifest.json.php
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/robots.txt b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/robots.txt
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/robots.txt
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/robots.txt
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/styles.css.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/styles.css.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/styles.css.php
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/styles.css.php
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/wrapper.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/containers/wrapper.php
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/article.png b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/article.png
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/article.png
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/article.png
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/bg.png b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/bg.png
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/bg.png
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/bg.png
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/happy-man.png b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/happy-man.png
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/medias/image/websitekey/happy-man.png
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/medias/image/websitekey/happy-man.png
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/website_pages.sql
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-homesubmenu/website_pages.sql
rename to htdocs/install/doctemplates/websites/website_template-homesubmenu_dev/website_pages.sql
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/LICENSE b/htdocs/install/doctemplates/websites/website_template-noimg_dev/LICENSE
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/LICENSE
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/LICENSE
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/README.md b/htdocs/install/doctemplates/websites/website_template-noimg_dev/README.md
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/README.md
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/README.md
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/.dolibarr b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/.dolibarr
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/.dolibarr
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/.dolibarr
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/.htaccess b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/.htaccess
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/.htaccess
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/.htaccess
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/htmlheader.html b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/htmlheader.html
similarity index 99%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/htmlheader.html
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/htmlheader.html
index a58ea695524..719eb1ebc61 100644
--- a/htdocs/install/doctemplates/websites/website_template-noimg/containers/htmlheader.html
+++ b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/htmlheader.html
@@ -3,4 +3,3 @@
 <script src="/document.php?modulepart=medias&file=css/myfile.css"></script>
 <script src="/document.php?modulepart=medias&file=js/myfile.js"></script>
 -->
-
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/javascript.js.php b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/javascript.js.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/javascript.js.php
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/javascript.js.php
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/manifest.json.php b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/manifest.json.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/manifest.json.php
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/manifest.json.php
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/robots.txt b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/robots.txt
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/robots.txt
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/robots.txt
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/styles.css.php b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/styles.css.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/styles.css.php
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/styles.css.php
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/wrapper.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/containers/wrapper.php
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-noimg_dev/website_pages.sql
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-noimg/website_pages.sql
rename to htdocs/install/doctemplates/websites/website_template-noimg_dev/website_pages.sql
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/LICENSE b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/LICENSE
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/LICENSE
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/LICENSE
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/README.md b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/README.md
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/README.md
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/README.md
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/.dolibarr b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/.dolibarr
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/.dolibarr
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/.dolibarr
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/.htaccess b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/.htaccess
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/.htaccess
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/.htaccess
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/htmlheader.html
similarity index 99%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/htmlheader.html
index 41e782b5934..94c8271c490 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/htmlheader.html
@@ -3,4 +3,3 @@
 <link rel="stylesheet" id="font-wasesome-css" type="text/css" href="/dolibarr_dev/htdocs/theme/common/fontawesome-5/css/all.min.css?layout=classic&amp;version=17.0.0-beta">
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/javascript.js.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/javascript.js.php
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/manifest.json.php b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/manifest.json.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/manifest.json.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/manifest.json.php
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/robots.txt b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/robots.txt
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/robots.txt
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/robots.txt
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/styles.css.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/styles.css.php
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/wrapper.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/containers/wrapper.php
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/alex-haney-CAhjZmVk5H4-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/alex-haney-CAhjZmVk5H4-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/alex-haney-CAhjZmVk5H4-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/alex-haney-CAhjZmVk5H4-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/luisa-brimble-aFzg83dvnAI-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/luisa-brimble-aFzg83dvnAI-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/luisa-brimble-aFzg83dvnAI-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/luisa-brimble-aFzg83dvnAI-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/rod-long-I79Pgmhmy5M-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/rod-long-I79Pgmhmy5M-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/breakfast/rod-long-I79Pgmhmy5M-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/breakfast/rod-long-I79Pgmhmy5M-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/charles-deluvio-FdDkfYFHqe4-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/charles-deluvio-FdDkfYFHqe4-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/charles-deluvio-FdDkfYFHqe4-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/charles-deluvio-FdDkfYFHqe4-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/daan-evers-tKN1WXrzQ3s-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/daan-evers-tKN1WXrzQ3s-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/daan-evers-tKN1WXrzQ3s-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/daan-evers-tKN1WXrzQ3s-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/briana-tozour-V_Nkf1E-vYA-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/briana-tozour-V_Nkf1E-vYA-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/briana-tozour-V_Nkf1E-vYA-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/briana-tozour-V_Nkf1E-vYA-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/luisa-brimble-aFzg83dvnAI-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/luisa-brimble-aFzg83dvnAI-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/luisa-brimble-aFzg83dvnAI-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/luisa-brimble-aFzg83dvnAI-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/priscilla-du-preez-W3SEyZODn8U-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/rod-long-I79Pgmhmy5M-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/rod-long-I79Pgmhmy5M-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/header/rod-long-I79Pgmhmy5M-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/header/rod-long-I79Pgmhmy5M-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/jason-leung-O67LZfeyYBk-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/jason-leung-O67LZfeyYBk-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/jason-leung-O67LZfeyYBk-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/jason-leung-O67LZfeyYBk-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/medias/image/websitekey/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/medias/image/websitekey/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-restaurant_dev/website_pages.sql
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
rename to htdocs/install/doctemplates/websites/website_template-restaurant_dev/website_pages.sql
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 81dcb2f1dab..300ac8f0b83 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -4216,6 +4216,7 @@ if ($action == 'createsite') {
 	print '<br>';
 }
 
+// Page view to import a website template
 if ($action == 'importsite') {
 	print '<!-- action=importsite -->';
 	print '<div class="fiche">';