diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 74e6bc4d9e8..17021ab25db 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -592,7 +592,7 @@ function showWebsiteTemplates(Website $website)
 
 	print '<tr><td colspan="'.$colspan.'">';
 
-	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
+	print '<table class="nobordernopadding centpercent"><tr><td><div class="center">';
 
 	if (count($dirthemes)) {
 		$i = 0;
@@ -603,11 +603,10 @@ function showWebsiteTemplates(Website $website)
 				$handle = opendir($dirtheme);
 				if (is_resource($handle)) {
 					while (($subdir = readdir($handle)) !== false) {
-						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir)) {
-								$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
+						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir)) {
+							$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
 
-								// Disable not stable themes (dir ends with _exp or _dev)
+							// Disable not stable themes (dir ends with _exp or _dev)
 							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
 								continue;
 							}
@@ -615,38 +614,41 @@ function showWebsiteTemplates(Website $website)
 								continue;
 							}
 
-								print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+							print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
-								$file = $dirtheme."/".$subdirwithoutzip.".jpg";
-								$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+							$templatedir = $dirtheme."/".$subdir;
+							$file = $dirtheme."/".$subdirwithoutzip.".jpg";
+							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
 
 							if (!file_exists($file)) {
 								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
 							}
 
-								$originalfile = basename($file);
-								$entity = $conf->entity;
-								$modulepart = 'doctemplateswebsite';
-								$cache = '';
-								$title = $file;
+							$originalfile = basename($file);
+							$entity = $conf->entity;
+							$modulepart = 'doctemplateswebsite';
+							$cache = '';
+							$title = $file;
 
-								$ret = '';
-								$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
+							$ret = '';
+							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 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='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $entity).'&file='.urlencode($originalfile).'&cache='.((int) $cache).'">';
 							}
-								print $ret;
-								print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
-								print '</a>';
+							print $ret;
+							print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+							print '</a>';
 
-								print '<br>';
-								print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
-								print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&token='.newToken().'&website='.urlencode($website->ref).'&templateuserfile='.urlencode($subdir).'" class="button">'.$langs->trans("Load").'</a>';
-								print '</div>';
+							print '<br>';
+							print $subdir;
+							print '<br>';
+							print '<span class="opacitymedium">'.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).' - '.dol_print_date(dol_filemtime($templatedir), 'dayhour', 'tzuserrel').'</span>';
+							print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&token='.newToken().'&website='.urlencode($website->ref).'&templateuserfile='.urlencode($subdir).'" class="button">'.$langs->trans("Load").'</a>';
+							print '</div>';
 
-								$i++;
+							$i++;
 						}
 					}
 				}
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/LICENSE b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/LICENSE
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/LICENSE
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/LICENSE
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/README.md b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/README.md
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/README.md
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/README.md
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/.dolibarr b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/.dolibarr
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/.dolibarr
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/.dolibarr
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/.htaccess b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/.htaccess
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/.htaccess
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/.htaccess
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/README.md b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/README.md
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/README.md
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/README.md
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/htmlheader.html b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/htmlheader.html
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/htmlheader.html
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/htmlheader.html
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/index.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/index.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/index.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/index.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/javascript.js.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/javascript.js.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/javascript.js.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/javascript.js.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/manifest.json.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/manifest.json.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/manifest.json.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/manifest.json.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/master.inc.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/master.inc.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/master.inc.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/master.inc.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/page148.tpl.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/page148.tpl.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/page148.tpl.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/page148.tpl.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/robots.txt b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/robots.txt
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/robots.txt
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/robots.txt
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/styles.css.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/styles.css.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/styles.css.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/styles.css.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/containers/wrapper.php
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/medias/image/websitekey/bg.webp b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/medias/image/websitekey/bg.webp
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/medias/image/websitekey/bg.webp
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/medias/image/websitekey/bg.webp
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/medias/image/websitekey/icon.webp b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/medias/image/websitekey/icon.webp
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/medias/image/websitekey/icon.webp
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/medias/image/websitekey/icon.webp
diff --git a/htdocs/install/doctemplates/websites/website_template-onpageblackpurple/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/website_pages.sql
similarity index 100%
rename from htdocs/install/doctemplates/websites/website_template-onpageblackpurple/website_pages.sql
rename to htdocs/install/doctemplates/websites/website_template-onepageblackpurple/website_pages.sql