From 4f4f94e858117223567590b256fcb4e8d94ad42b Mon Sep 17 00:00:00 2001
From: brunoduc <54796327+brunoduc@users.noreply.github.com>
Date: Thu, 19 Mar 2020 18:07:00 +0100
Subject: [PATCH 1/5] add gpx and kml extention

For use with map.
---
 core/vendor/filemanager/config/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php
index 45693be4..fe78f75a 100755
--- a/core/vendor/filemanager/config/config.php
+++ b/core/vendor/filemanager/config/config.php
@@ -341,7 +341,7 @@ $config = array(
 	'download_files'						  => true, // allow download files or just preview
 
 	// you can preview these type of files if $preview_text_files is true
-	'previewable_text_file_exts'              => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl",'txt', 'log','' ),
+	'previewable_text_file_exts'              => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl",'txt', 'log', 'gpx', 'kml', '' ),
 
 	// you can edit these type of files if $edit_text_files is true (only text based files)
 	// you can create these type of files if $config['create_text_files'] is true (only text based files)
@@ -369,7 +369,7 @@ $config = array(
 	//Allowed extensions (lowercase insert)
 	//**********************
 	'ext_img'                                 => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico' ), //Images
-	'ext_file'                                => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', ''), //Files
+	'ext_file'                                => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'ics', 'gpx', 'kml', ''), //Files
 	'ext_video'                               => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video
 	'ext_music'                               => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio
 	'ext_misc'                                => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives

From bb48004701380a3db9d3dcde327bb1c149df7bb3 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 20 Mar 2020 15:04:54 +0100
Subject: [PATCH 2/5] [9.2.26] Fix 2 background image dans tinymce

---
 core/vendor/tinymce/content.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/vendor/tinymce/content.css b/core/vendor/tinymce/content.css
index 57c6cbb3..05a338fa 100755
--- a/core/vendor/tinymce/content.css
+++ b/core/vendor/tinymce/content.css
@@ -5,6 +5,7 @@
 /* Fix les problèmes de couleurs et de taille de police */
 .editorWysiwyg {	
 	font-size: 14px !important;
+	background-image: none;
 }
 
 

From 23aa89069ef51dd46ab5df77bd61973fbd0761bb Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 20 Mar 2020 15:08:10 +0100
Subject: [PATCH 3/5] [9.2.26] suppression ligne en trop

---
 core/vendor/tinymce/init.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index d1c60064..136522cd 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -191,13 +191,6 @@ tinymce.init({
 	]
 });
 
-/**
-  * Suppression du back ground TinyMCE
-  * 
-  */
- $(body).removeAttr("background-image");
-
-
 tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
 	editor.on('init', function() {
 	  setSticky();

From 6de8c27ce0d239e22279d430f72580bfe81be527 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 20 Mar 2020 15:59:52 +0100
Subject: [PATCH 4/5] =?UTF-8?q?[9.2.26]=20th=C3=A8me=20des=20modules=20+?=
 =?UTF-8?q?=20oprimisation=20js=20edition=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/config/view/index/index.css      |   4 +-
 core/module/install/view/update/update.css   |   4 +-
 core/module/page/view/edit/edit.css          |   2 +-
 core/module/theme/view/advanced/advanced.css |   4 +-
 core/module/theme/view/body/body.css         |   4 +-
 core/module/theme/view/footer/footer.css     |   4 +-
 core/module/theme/view/header/header.css     |   4 +-
 core/module/theme/view/index/index.css       |   4 +-
 core/module/theme/view/manage/manage.css     |   4 +-
 core/module/theme/view/menu/menu.css         |   4 +-
 core/module/theme/view/site/site.css         |   4 +-
 core/module/theme/view/site/site.js.php      | 154 ++++++++-----------
 core/module/user/view/add/add.css            |   4 +-
 core/module/user/view/edit/edit.css          |   4 +-
 core/module/user/view/index/index.css        |   4 +-
 core/module/user/view/reset/reset.css        |   4 +-
 module/blog/view/add/add.css                 |  39 +++++
 module/blog/view/comment/comment.css         |  39 +++++
 module/blog/view/config/config.css           |  39 +++++
 module/blog/view/edit/edit.css               |  39 +++++
 module/blog/view/index/index.css             |   2 +-
 module/form/view/config/config.css           |  29 +++-
 module/form/view/data/data.css               |  39 +++++
 module/gallery/view/config/config.css        |  40 +++++
 module/gallery/view/edit/edit.css            |  39 +++++
 module/news/view/add/add.css                 |  39 +++++
 module/news/view/config/config.css           |  39 +++++
 module/news/view/index/index.css             |   1 -
 module/redirection/view/config/config.css    |  39 +++++
 module/redirection/view/index/index.css      |  39 +++++
 30 files changed, 554 insertions(+), 120 deletions(-)
 create mode 100644 module/blog/view/add/add.css
 create mode 100644 module/blog/view/comment/comment.css
 create mode 100644 module/blog/view/config/config.css
 create mode 100644 module/blog/view/edit/edit.css
 create mode 100644 module/form/view/data/data.css
 create mode 100644 module/gallery/view/edit/edit.css
 create mode 100644 module/news/view/add/add.css
 create mode 100644 module/news/view/config/config.css
 delete mode 100644 module/news/view/index/index.css
 create mode 100644 module/redirection/view/config/config.css
 create mode 100644 module/redirection/view/index/index.css

diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css
index 0d42a8df..8aefd17a 100644
--- a/core/module/config/view/index/index.css
+++ b/core/module/config/view/index/index.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css
index 94be3bfa..ef597423 100644
--- a/core/module/install/view/update/update.css
+++ b/core/module/install/view/update/update.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css
index cb22eb5e..029db4f8 100644
--- a/core/module/page/view/edit/edit.css
+++ b/core/module/page/view/edit/edit.css
@@ -17,7 +17,7 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
+body:not(.editorWysiwyg), 
 .block h4, 
 input[type="email"], 
 input[type="text"], 
diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/theme/view/advanced/advanced.css
+++ b/core/module/theme/view/advanced/advanced.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css
index 1ca1fa38..3f764b8d 100644
--- a/core/module/theme/view/body/body.css
+++ b/core/module/theme/view/body/body.css
@@ -20,8 +20,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/theme/view/footer/footer.css
+++ b/core/module/theme/view/footer/footer.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/theme/view/header/header.css
+++ b/core/module/theme/view/header/header.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css
index 75163439..7a7607d3 100755
--- a/core/module/theme/view/index/index.css
+++ b/core/module/theme/view/index/index.css
@@ -62,8 +62,8 @@ nav li ul {
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/theme/view/manage/manage.css
+++ b/core/module/theme/view/manage/manage.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/theme/view/menu/menu.css
+++ b/core/module/theme/view/menu/menu.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css
index 69ed098d..29fe0414 100644
--- a/core/module/theme/view/site/site.css
+++ b/core/module/theme/view/site/site.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php
index 726d6a93..febdd146 100755
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
@@ -13,96 +13,74 @@
  /*
  * Chargement de l'aperçu
  */
-$( document ).ready(function() {
-	
-
-	// Import des polices de caractères
-	var titleFont = $("#themeTitleFont").val();
-	var textFont = $("#themeTextFont").val();
-	
-	var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
-	var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
-		
-	// Texte
-	css += "p.preview {color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-	// Titres
-	css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
-	// Fond
-	css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";	
-
-	// Couleurs des liens
-	colors = core.colorVariants($("#themeLinkTextColor").val());
-	css += "a.preview,.buttonPreview{color:" + colors.normal + "}";
-	css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}";
-	css += "a.preview,.buttonPreview {font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-
-	// Paramètrage du DOM
-	$("#themePreview").remove();
-	$("<style>")
-		.attr("type", "text/css")
-		.attr("id", "themePreview")
-		.text(css)
-		.appendTo("head");
+$( document).ready(function() {	
+	updateDOM();
 });
 
 /**
  * Aperçu en direct
  */
-$("input, select").on("change", function() {
-	// Import des polices de caractères
-	var titleFont = $("#themeTitleFont").val();
-	var textFont = $("#themeTextFont").val();
-	var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
-	// Couleurs des boutons
-	var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
-	css += ".speechBubble,.button,.button:hover,.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,.helpContent{background-color:" + colors.normal + ";color:" + colors.text + "}";
-	//css += ".helpButton span{color:" + colors.normal + "}";
-	//css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}";
-	//css += ".speechBubble:before{border-color:" + colors.normal + " transparent transparent transparent}";
-	//css += ".button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before{background-color:" + colors.darken + "}";
-	//css += ".helpButton span:hover{color:" + colors.darken + "}";
-	//css += ".button:active,button[type='submit']:active,.pagination a:active{background-color:" + colors.veryDarken + "}";
-	if ($("#themeSiteWidth").val() === "750px") {
-		css += ".button, button{font-size:0.8em;}";
-	} else {
-		css += ".button, button{font-size:1em;}";
-	}
-	// Couleurs des liens
-	colors = core.colorVariants($("#themeLinkTextColor").val());
-	//css += "a{color:" + colors.normal + "}";
-	//css += "a:hover{color:" + colors.darken + "}";
-	css += "a.preview,.buttonPreview{color:" + colors.normal + "}";
-	css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}";
-	// Couleur, polices, épaisseur et capitalisation de caractères des titres
-	//css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
-	css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
-	// Police de caractères
-	//css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-	// Police + couleur
-	css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-	css += "a.preview,.buttonPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-	// Taille du texte
-	//css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
-	// Couleur du texte
-	//css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
-	css += "p.preview,.buttonPreview{color:" + $("#themeTextTextColor").val() + "}";
-	// Largeur du site
-	css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
-	if ($("#themeSiteWidth").val() === "100%") {
-		css += "#site{margin:0 auto;} body{margin:0 auto;}  #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}";
-	} else {
-		css += "#site{margin:20px auto !important;} body{margin:0px 10px;}  #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
-		
-	}
-	// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
-	//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
-	css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
-	css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
-	// Ajout du css au DOM
-	$("#themePreview").remove();
-	$("<style>")
-		.attr("type", "text/css")
-		.attr("id", "themePreview")
-		.text(css)
-		.appendTo("head");
-});
\ No newline at end of file
+$("input, select").on("change",function() {	
+	updateDOM();
+});
+
+
+function updateDOM() {
+		// Import des polices de caractères
+		var titleFont = $("#themeTitleFont").val();
+		var textFont = $("#themeTextFont").val();
+		var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
+		// Couleurs des boutons
+		var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
+		css += ".speechBubble,.button,.button:hover,.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,.helpContent{background-color:" + colors.normal + ";color:" + colors.text + "}";
+		//css += ".helpButton span{color:" + colors.normal + "}";
+		//css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}";
+		//css += ".speechBubble:before{border-color:" + colors.normal + " transparent transparent transparent}";
+		//css += ".button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before{background-color:" + colors.darken + "}";
+		//css += ".helpButton span:hover{color:" + colors.darken + "}";
+		//css += ".button:active,button[type='submit']:active,.pagination a:active{background-color:" + colors.veryDarken + "}";
+		if ($("#themeSiteWidth").val() === "750px") {
+			css += ".button, button{font-size:0.8em;}";
+		} else {
+			css += ".button, button{font-size:1em;}";
+		}
+		// Couleurs des liens
+		colors = core.colorVariants($("#themeLinkTextColor").val());
+		css += "a{color:" + colors.normal + "}";
+		css += "a:hover{color:" + colors.darken + "}";
+		css += "a.preview,.buttonPreview{color:" + colors.normal + "}";
+		css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}";
+		// Couleur, polices, épaisseur et capitalisation de caractères des titres
+		//css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
+		css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
+		// Police de caractères
+		//css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
+		// Police + couleur
+		css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
+		css += "a.preview,.buttonPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
+		// Taille du texte
+		//css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
+		// Couleur du texte
+		//css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
+		css += "p.preview,.buttonPreview{color:" + $("#themeTextTextColor").val() + "}";
+		// Largeur du site
+		css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
+		if ($("#themeSiteWidth").val() === "100%") {
+			css += "#site{margin:0 auto;} body{margin:0 auto;}  #bar{margin:0 auto;} body > header{margin:0 auto;} body > nav {margin: 0 auto;} body > footer {margin:0 auto;}";
+		} else {
+			css += "#site{margin:20px auto !important;} body{margin:0px 10px;}  #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
+			
+		}
+		// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
+		//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
+		css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
+		css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
+		// Ajout du css au DOM
+		$("#themePreview").remove();
+		$("<style>")
+			.attr("type", "text/css")
+			.attr("id", "themePreview")
+			.text(css)
+			.appendTo("head");
+
+}
diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/user/view/add/add.css
+++ b/core/module/user/view/add/add.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/user/view/edit/edit.css
+++ b/core/module/user/view/edit/edit.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/user/view/index/index.css
+++ b/core/module/user/view/index/index.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css
index cb22eb5e..ede2b1d7 100644
--- a/core/module/user/view/reset/reset.css
+++ b/core/module/user/view/reset/reset.css
@@ -17,8 +17,8 @@
     background-color: rgba(255, 255, 255, 1);
 }
 
-body, 
-.block h4, 
+body:not(.editorWysiwyg), 
+.block h4,
 input[type="email"], 
 input[type="text"], 
 input[type="password"], 
diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/blog/view/add/add.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/blog/view/comment/comment.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/blog/view/config/config.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/blog/view/edit/edit.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/blog/view/index/index.css b/module/blog/view/index/index.css
index b43eecdd..74014f6f 100644
--- a/module/blog/view/index/index.css
+++ b/module/blog/view/index/index.css
@@ -18,7 +18,7 @@
 	float: right;
 }
 .blogTitle {
-	background-color: #ECEFF1;
+	/*background-color: #ECEFF1;*/
 	padding: 5px;
 }
 .blogContent {
diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css
index 47859039..a6b477ed 100644
--- a/module/form/view/config/config.css
+++ b/module/form/view/config/config.css
@@ -1,3 +1,30 @@
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
+
+/*
 .formConfigInput {
 	background: #FFF;
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/form/view/data/data.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/gallery/view/config/config.css b/module/gallery/view/config/config.css
index 8772654f..a5e85e2a 100644
--- a/module/gallery/view/config/config.css
+++ b/module/gallery/view/config/config.css
@@ -1,3 +1,43 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
+
 .galleryConfigError {
 	color: #F3674A;
 	font-weight: bold;
diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/gallery/view/edit/edit.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/news/view/add/add.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/news/view/config/config.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css
deleted file mode 100644
index 92caffc5..00000000
--- a/module/news/view/index/index.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Volontairement vide */
\ No newline at end of file
diff --git a/module/redirection/view/config/config.css b/module/redirection/view/config/config.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/redirection/view/config/config.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file
diff --git a/module/redirection/view/index/index.css b/module/redirection/view/index/index.css
new file mode 100644
index 00000000..029db4f8
--- /dev/null
+++ b/module/redirection/view/index/index.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4, 
+input[type="email"], 
+input[type="text"], 
+input[type="password"], 
+.inputFile, 
+select,
+textarea, 
+.inputFile, 
+.button.buttonGrey, 
+.button.buttonGrey:hover {
+    color: rgba(33, 34, 35, 1);
+}
+body {
+    font-family: "Open+Sans";
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
\ No newline at end of file

From 5adf44aeff474f1dd1e70771016a45a9b96d938d Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Sat, 21 Mar 2020 18:08:04 +0100
Subject: [PATCH 5/5] =?UTF-8?q?[9.2.26]=20Th=C3=A8me=20admin=20+=20arri?=
 =?UTF-8?q?=C3=A8replan=20TinyMCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                |  5 +-
 core/layout/admin.css                        | 56 ++++++++++++++++++
 core/module/config/view/index/index.css      | 27 +--------
 core/module/install/view/update/update.css   | 17 +-----
 core/module/page/view/edit/edit.css          | 25 +-------
 core/module/theme/view/advanced/advanced.css | 27 +--------
 core/module/theme/view/body/body.css         | 27 +--------
 core/module/theme/view/footer/footer.css     | 27 +--------
 core/module/theme/view/header/header.css     | 26 +-------
 core/module/theme/view/index/index.css       | 32 ++--------
 core/module/theme/view/index/index.php       |  7 ++-
 core/module/theme/view/manage/manage.css     | 27 +--------
 core/module/theme/view/menu/menu.css         | 26 +-------
 core/module/theme/view/site/site.css         | 31 +---------
 core/module/theme/view/site/site.js.php      | 62 +++++++++++---------
 core/module/theme/view/site/site.php         | 38 ++++++------
 core/module/user/view/add/add.css            | 26 +-------
 core/module/user/view/edit/edit.css          | 25 +-------
 core/module/user/view/index/index.css        | 25 +-------
 core/module/user/view/reset/reset.css        | 26 +-------
 module/blog/view/add/add.css                 | 25 +-------
 module/blog/view/article/article.php         |  2 -
 module/blog/view/comment/comment.css         | 25 +-------
 module/blog/view/config/config.css           | 25 +-------
 module/blog/view/edit/edit.css               | 25 +-------
 module/form/view/config/config.css           | 25 +-------
 module/form/view/data/data.css               | 25 +-------
 module/form/view/data/data.php               |  1 -
 module/gallery/view/config/config.css        | 25 +-------
 module/gallery/view/edit/edit.css            | 25 +-------
 module/news/view/add/add.css                 | 25 +-------
 module/news/view/config/config.css           | 25 +-------
 module/redirection/view/config/config.css    | 25 +-------
 module/redirection/view/index/index.css      | 25 +-------
 34 files changed, 153 insertions(+), 712 deletions(-)
 create mode 100644 core/layout/admin.css

diff --git a/core/core.php b/core/core.php
index dd836e32..eb67fe0c 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1179,7 +1179,8 @@ class core extends common {
 			$css .= 'a{color:' . $colors['normal'] . '}';
 			$css .= 'a:hover{color:' . $colors['darken'] . '}';
 			$css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}';
-			$css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
+			$css .= 'body,.block h4,input[type=\'email\'],input[type=\'text\'],input[type=\'password\'],.inputFile,select,textarea,.inputFile{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
+			$css .= '.button.buttonGrey,.button.buttonGrey:hover{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
 			$css .= '.container{max-width:' . $this->getData(['theme', 'site', 'width']) . '}';
 			$css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site{margin:0 auto !important;} body{margin:0 auto !important;}  #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': '';
 			$css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : '';
@@ -1192,7 +1193,7 @@ class core extends common {
 			$css .= '.speechBubble:before{border-color:' . $colors['normal'] . ' transparent transparent transparent}';
 			$css .= '.button:hover,button[type=\'submit\']:hover,.pagination a:hover,input[type=\'checkbox\']:not(:active):checked:hover + label:before,input[type=\'checkbox\']:active + label:before,input[type=\'radio\']:checked:hover + label:before,input[type=\'radio\']:not(:checked):active + label:before{background-color:' . $colors['darken'] . '}';
 			$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
-			$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';
+			$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';					
 			$colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor']));
 			$css .= 'h1,h2,h3,h4,h5,h6{color:' . $colors['normal'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'title', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
 			// Bannière
diff --git a/core/layout/admin.css b/core/layout/admin.css
new file mode 100644
index 00000000..3e4f8a3a
--- /dev/null
+++ b/core/layout/admin.css
@@ -0,0 +1,56 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.com/
+ */
+
+
+#site {
+    background-color: rgba(255, 255, 255, 1);
+}
+
+body:not(.editorWysiwyg), 
+.block h4,
+input[type=email], 
+input[type=text], 
+input[type=password], 
+.inputFile, 
+select,
+textarea, 
+.inputFile,
+span .zwiico-help {
+    color: rgba(33, 34, 35, 1);    
+}
+
+.button,
+button[type=submit],
+.button:hover, 
+button[type=submit]:hover,
+input[type="checkbox"]:checked  + label::before,
+.speechBubble  {
+    background-color: rgba(32, 59, 82, 1);
+    color: white;
+}
+
+.speechBubble::before {
+    border-color:  rgba(32, 59, 82, 1) transparent transparent transparent;
+}
+
+body, .row > div {
+    font: "Open+Sans", sans-serif;
+    font-size: 13px;
+}
+body h1, h2, h3, h4, h5, h6 {
+    font-family: "Oswald";
+    color: rgba(74, 105, 189, 1);
+}
+
+
diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css
index 8aefd17a..191d1c13 100644
--- a/core/module/config/view/index/index.css
+++ b/core/module/config/view/index/index.css
@@ -11,29 +11,4 @@
  * @license GNU General Public License, version 3
  * @link http://zwiicms.com/
  */
-
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);    
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css
index ef597423..af663d8c 100644
--- a/core/module/install/view/update/update.css
+++ b/core/module/install/view/update/update.css
@@ -13,20 +13,5 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
 
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css
index 029db4f8..92452732 100644
--- a/core/module/page/view/edit/edit.css
+++ b/core/module/page/view/edit/edit.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css
index ede2b1d7..7ae5b983 100644
--- a/core/module/theme/view/advanced/advanced.css
+++ b/core/module/theme/view/advanced/advanced.css
@@ -12,28 +12,5 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+/* Thème administration */
+@import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css
index 3f764b8d..09788d08 100644
--- a/core/module/theme/view/body/body.css
+++ b/core/module/theme/view/body/body.css
@@ -11,32 +11,9 @@
  * @link http://zwiicms.com/
  */
 
+@import url("core/layout/admin.css");
+
 #backToTop {
     display: block;
 }
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css
index ede2b1d7..7ae5b983 100644
--- a/core/module/theme/view/footer/footer.css
+++ b/core/module/theme/view/footer/footer.css
@@ -12,28 +12,5 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+/* Thème administration */
+@import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css
index ede2b1d7..dcedae12 100644
--- a/core/module/theme/view/header/header.css
+++ b/core/module/theme/view/header/header.css
@@ -12,28 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css
index 7a7607d3..451894c3 100755
--- a/core/module/theme/view/index/index.css
+++ b/core/module/theme/view/index/index.css
@@ -10,6 +10,10 @@
  * @link http://zwiicms.com/
  */
 
+
+/* Thème administration */
+@import url("core/layout/admin.css");
+
 #bar,
 #site,
 header,
@@ -54,31 +58,3 @@ nav li ul {
 #themeOverlayBody {
 	position: fixed; /* Sinon l'overlay s'arrête à la hauteur de la fenêtre et non de la page*/
 }
-
-/* Contrastes */
-
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
diff --git a/core/module/theme/view/index/index.php b/core/module/theme/view/index/index.php
index b92fc11d..18b43f12 100755
--- a/core/module/theme/view/index/index.php
+++ b/core/module/theme/view/index/index.php
@@ -15,6 +15,7 @@
 		</div>
 		<div class="col2">
 			<?php echo template::button('themeManage', [				
+				'class' => 'buttonBlue',
 				'ico' => 'upload',
 				'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
 				'value' => 'Thèmes'
@@ -22,13 +23,15 @@
 		</div>	
 		<div class="col2">
 			<?php echo template::button('themeAdvanced', [
+				'class' => 'buttonBlue',
+				'ico' => 'code',
 				'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
-				'value' => 'Éditeur CSS',
-				'ico' => 'code'
+				'value' => 'Éditeur CSS'
 			]); ?>
 		</div>
 		<div class="col2">
 			<?php echo template::button('themeShowAll', [
+				'class' => 'buttonBlue',
 				'ico' => 'eye',
 				'value' => 'Zones cachées'
 			]); ?>
diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css
index ede2b1d7..7ae5b983 100644
--- a/core/module/theme/view/manage/manage.css
+++ b/core/module/theme/view/manage/manage.css
@@ -12,28 +12,5 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+/* Thème administration */
+@import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css
index ede2b1d7..9774521b 100644
--- a/core/module/theme/view/menu/menu.css
+++ b/core/module/theme/view/menu/menu.css
@@ -12,28 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+@import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css
index 29fe0414..92452732 100644
--- a/core/module/theme/view/site/site.css
+++ b/core/module/theme/view/site/site.css
@@ -13,33 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans",sans-serif;
-}
-h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
-div.preview {
-    border-radius: 2%;
-    -webkit-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
-    -moz-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
-    box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php
index febdd146..a42ed46c 100755
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
@@ -26,43 +26,45 @@ $("input, select").on("change",function() {
 
 
 function updateDOM() {
+
+		/**
+		 * Aperçu dans la boîte
+		 */
+
 		// Import des polices de caractères
 		var titleFont = $("#themeTitleFont").val();
 		var textFont = $("#themeTextFont").val();
 		var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
-		// Couleurs des boutons
+		// Couleurs des boutons		
 		var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
-		css += ".speechBubble,.button,.button:hover,.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,.helpContent{background-color:" + colors.normal + ";color:" + colors.text + "}";
-		//css += ".helpButton span{color:" + colors.normal + "}";
-		//css += "input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:" + colors.normal + "}";
-		//css += ".speechBubble:before{border-color:" + colors.normal + " transparent transparent transparent}";
-		//css += ".button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before{background-color:" + colors.darken + "}";
-		//css += ".helpButton span:hover{color:" + colors.darken + "}";
-		//css += ".button:active,button[type='submit']:active,.pagination a:active{background-color:" + colors.veryDarken + "}";
+		css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}";
+		css += ".button.buttonSubmitPreview:hover{background-color:" + colors.darken + "}";
+		// Couleurs des liens
+		colors = core.colorVariants($("#themeLinkTextColor").val());
+		css += "a.urlPreview{color:" + colors.normal + "}";
+		css += "a.urlPreview:hover{color:" + colors.darken + "}";
+		// Couleur, polices, épaisseur et capitalisation de caractères des titres
+		css += ".headerPreview,.headerPreview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
+		// Police de caractères
+		// Police + couleur
+		css += ".textPreview,.urlPreview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif; font-size:" + $("#themeTextFontSize").val() + ";}";
+		// Couleur des liens
+		//css += "a.preview,.buttonSubmitPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
+
+		// Taille du texte
+		// Couleur du texte
+		css += "p.preview,.buttonSubmitPreview{color:" + $("#themeTextTextColor").val() + "}";
+
+		/**
+		 * Aperçu réel
+		 */
+
+		// Taille du site
 		if ($("#themeSiteWidth").val() === "750px") {
 			css += ".button, button{font-size:0.8em;}";
 		} else {
 			css += ".button, button{font-size:1em;}";
 		}
-		// Couleurs des liens
-		colors = core.colorVariants($("#themeLinkTextColor").val());
-		css += "a{color:" + colors.normal + "}";
-		css += "a:hover{color:" + colors.darken + "}";
-		css += "a.preview,.buttonPreview{color:" + colors.normal + "}";
-		css += "a.preview:hover,.buttonPreview{color:" + colors.darken + "}";
-		// Couleur, polices, épaisseur et capitalisation de caractères des titres
-		//css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
-		css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
-		// Police de caractères
-		//css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-		// Police + couleur
-		css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-		css += "a.preview,.buttonPreview{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
-		// Taille du texte
-		//css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
-		// Couleur du texte
-		//css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
-		css += "p.preview,.buttonPreview{color:" + $("#themeTextTextColor").val() + "}";
 		// Largeur du site
 		css += ".container{max-width:" + $("#themeSiteWidth").val() + "}";
 		if ($("#themeSiteWidth").val() === "100%") {
@@ -74,7 +76,11 @@ function updateDOM() {
 		// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
 		//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
 		css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
-		css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
+		css += "div.bgPreview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
+
+		/**
+		 * Injection dans le DOM
+		 */
 		// Ajout du css au DOM
 		$("#themePreview").remove();
 		$("<style>")
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index e1af5c5f..4dd8460a 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -54,27 +54,31 @@
 								]); ?>
 							</div>					
 						</div>
-						<div class="col6 offset3">
-							<?php echo template::text('themeButtonBackgroundColor', [
-								'class' => 'colorPicker',
-								'help' => 'Le curseur horizontal règle le niveau de transparence.',							
-								'label' => 'Boutons',
-								'value' => $this->getData(['theme', 'button', 'backgroundColor'])
-							]); ?>
+						<div class="row">
+							<div class="col6 offset3">
+								<?php echo template::text('themeButtonBackgroundColor', [
+									'class' => 'colorPicker',
+									'help' => 'Le curseur horizontal règle le niveau de transparence.',							
+									'label' => 'Boutons',
+									'value' => $this->getData(['theme', 'button', 'backgroundColor'])
+								]); ?>
+							</div>							
 						</div>
 					</div>
-					<div class="col4 preview">
-						<h1>Aperçu</h1>
+					<div class="col4 bgPreview">
 						<div class="row">
-							<div class="col8">
-								<h3 class="preview">Titre 3 </h3>
-								<p class="preview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+							<div class="col12">
+								<h1 class="headerPreview">Titre </h1>
+								<h3 class="headerPreview">Sous-Titre </h3>
+								<p class="textPreview">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+								<p><a href="#" class="urlPreview">Lorem ipsum dolor sit amet.</a></p>
 							</div>
-							<div class="col4">
-								<p><a href="#" class="preview">Hyperlien</a></p>
-								<?php echo template::button('themeSiteTest', [
-									'class' => 'buttonPreview',						
-									'value' => 'Test'
+						</div>
+						<div class="row">
+							<div class="col4 offset8">
+								<?php echo template::button('themeSiteSubmitButtonPreview', [
+									'class' => 'buttonSubmitPreview',						
+									'value' => 'Valider'
 								]); ?>
 							</div>
 						</div>
diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css
index ede2b1d7..dcedae12 100644
--- a/core/module/user/view/add/add.css
+++ b/core/module/user/view/add/add.css
@@ -12,28 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css
index ede2b1d7..92452732 100644
--- a/core/module/user/view/edit/edit.css
+++ b/core/module/user/view/edit/edit.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css
index ede2b1d7..92452732 100644
--- a/core/module/user/view/index/index.css
+++ b/core/module/user/view/index/index.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css
index ede2b1d7..dcedae12 100644
--- a/core/module/user/view/reset/reset.css
+++ b/core/module/user/view/reset/reset.css
@@ -12,28 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4,
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css
index 029db4f8..92452732 100644
--- a/module/blog/view/add/add.css
+++ b/module/blog/view/add/add.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index fab1b5c2..8de5f2f1 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -19,7 +19,6 @@
 <div class="row">
     <div class="col3">
 		<?php echo template::button('blogBack', [
-					'class' => 'buttonGrey',
 					'href' => helper::baseUrl() . $this->getUrl(0),
 					'ico' => 'left',
 					'value' => 'Retour'
@@ -27,7 +26,6 @@
     </div>
     <div class="col3 offset6">
  		<?php echo template::button('blogEdit', [
-					'class' => 'buttonBlue',
 					'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
 					'value' => 'Editer'
 		]); ?>
diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css
index 029db4f8..92452732 100644
--- a/module/blog/view/comment/comment.css
+++ b/module/blog/view/comment/comment.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css
index 029db4f8..92452732 100644
--- a/module/blog/view/config/config.css
+++ b/module/blog/view/config/config.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css
index 029db4f8..92452732 100644
--- a/module/blog/view/edit/edit.css
+++ b/module/blog/view/edit/edit.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css
index a6b477ed..580c8cff 100644
--- a/module/form/view/config/config.css
+++ b/module/form/view/config/config.css
@@ -1,27 +1,4 @@
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
+ @import url("core/layout/admin.css");
 
 /*
 .formConfigInput {
diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css
index 029db4f8..92452732 100644
--- a/module/form/view/data/data.css
+++ b/module/form/view/data/data.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/form/view/data/data.php b/module/form/view/data/data.php
index 3ed552b3..c60511b4 100644
--- a/module/form/view/data/data.php
+++ b/module/form/view/data/data.php
@@ -17,7 +17,6 @@
 	</div>
 	<div class="col2">
 	<?php echo template::button('formDataBack', [
-			'class' => 'buttonBlue',
 			'href' => helper::baseUrl() . $this->getUrl(0) . '/export2csv' . '/' . $_SESSION['csrf'],
 			'ico' => 'download',			
 			'value' => 'Export CSV'
diff --git a/module/gallery/view/config/config.css b/module/gallery/view/config/config.css
index a5e85e2a..e71b9e57 100644
--- a/module/gallery/view/config/config.css
+++ b/module/gallery/view/config/config.css
@@ -13,30 +13,7 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
+ @import url("core/layout/admin.css");
 
 .galleryConfigError {
 	color: #F3674A;
diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css
index 029db4f8..92452732 100644
--- a/module/gallery/view/edit/edit.css
+++ b/module/gallery/view/edit/edit.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css
index 029db4f8..92452732 100644
--- a/module/news/view/add/add.css
+++ b/module/news/view/add/add.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css
index 029db4f8..92452732 100644
--- a/module/news/view/config/config.css
+++ b/module/news/view/config/config.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/redirection/view/config/config.css b/module/redirection/view/config/config.css
index 029db4f8..92452732 100644
--- a/module/redirection/view/config/config.css
+++ b/module/redirection/view/config/config.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file
diff --git a/module/redirection/view/index/index.css b/module/redirection/view/index/index.css
index 029db4f8..92452732 100644
--- a/module/redirection/view/index/index.css
+++ b/module/redirection/view/index/index.css
@@ -13,27 +13,4 @@
  */
 
 
-#site {
-    background-color: rgba(255, 255, 255, 1);
-}
-
-body:not(.editorWysiwyg), 
-.block h4, 
-input[type="email"], 
-input[type="text"], 
-input[type="password"], 
-.inputFile, 
-select,
-textarea, 
-.inputFile, 
-.button.buttonGrey, 
-.button.buttonGrey:hover {
-    color: rgba(33, 34, 35, 1);
-}
-body {
-    font-family: "Open+Sans";
-}
-body h1, h2, h3, h4, h5, h6 {
-    font-family: "Oswald";
-    color: rgba(74, 105, 189, 1);
-}
\ No newline at end of file
+ @import url("core/layout/admin.css");
\ No newline at end of file