diff --git a/yash/_admin.php b/_admin.php
similarity index 90%
rename from yash/_admin.php
rename to _admin.php
index 1ada22f..246b408 100644
--- a/yash/_admin.php
+++ b/_admin.php
@@ -25,10 +25,10 @@ if (!defined('DC_CONTEXT_ADMIN')) { return; }
 // dead but useful code, in order to have translations
 __('YASH').__('Yet Another Syntax Highlighter');
 
-$_menu['Blog']->addItem(__('YASH'),
-		'plugin.php?p=yash',
+$_menu['Blog']->addItem(__('YASH3'),
+		'plugin.php?p=yash3',
 		urldecode(dcPage::getPF('yash/icon.png')),
-		preg_match('/plugin.php\?p=yash(&.*)?$/',$_SERVER['REQUEST_URI']),
+		preg_match('/plugin.php\?p=yash3(&.*)?$/',$_SERVER['REQUEST_URI']),
 		$core->auth->check('contentadmin',$core->blog->id));
 
 $core->addBehavior('adminPostEditor',array('yashBehaviors','adminPostEditor'));
diff --git a/yash/_define.php b/_define.php
similarity index 89%
rename from yash/_define.php
rename to _define.php
index 46d84b6..c4f6ed9 100644
--- a/yash/_define.php
+++ b/_define.php
@@ -24,9 +24,9 @@ if (!defined('DC_RC_PATH')) { return; }
 
 $this->registerModule(
 	/* Name */			"YASH Fork",
-	/* Description*/	"Fork of Yet Another Syntax Highlighter",
+	/* Description*/	"Fork of Yet Another Syntax Highlighter. Modification: Juste one javascript call on public pages for yash",
 	/* Author */		"Forked and modified by Gnieark, origin Pep and contributors",
-	/* Version */		'1.6.3.1',
+	/* Version */		'1.6.3.2',
 	array(
 		/* Dependencies */	'requires' =>		array(array('core','2.9')),
 		/* Permissions */	'permissions' =>	'contentadmin',
diff --git a/yash/_prepend.php b/_prepend.php
similarity index 100%
rename from yash/_prepend.php
rename to _prepend.php
diff --git a/yash/_public.php b/_public.php
similarity index 72%
rename from yash/_public.php
rename to _public.php
index 398d982..f9014d0 100644
--- a/yash/_public.php
+++ b/_public.php
@@ -1,8 +1,10 @@
 <?php
 # ***** BEGIN LICENSE BLOCK *****
-# This file is part of YASH, a plugin for DotClear2.
-# Copyright (c) 2008 Pep and contributors. All rights
-# reserved.
+# This file is part of YASH3, a plugin for DotClear2.
+# Copyright (c) 2016 Gnieark https://blog-du-grouik.tinad.fr
+#
+# Forked and pimped from  Yash Copyright (c) 2008 Pep and contributors 
+# licensed under GNU/GPL license
 #
 # This plugin is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,13 +51,13 @@ class dcYASH
 			else {
 				$theme = (string)$core->blog->settings->yash->yash_theme;
 				if ($theme == '') {
-					$css = $core->blog->getPF('yash/syntaxhighlighter/css/shThemeDefault.css');
+					$css = $core->blog->getPF('yash3/syntaxhighlighter/css/shThemeDefault.css');
 				} else {
-					$css = $core->blog->getPF('yash/syntaxhighlighter/css/shTheme'.$theme.'.css');
+					$css = $core->blog->getPF('yash3/syntaxhighlighter/css/shTheme'.$theme.'.css');
 				}
 			}
 			echo
-				dcUtils::cssLoad($core->blog->getPF('yash/syntaxhighlighter/css/shCore.css')).
+				dcUtils::cssLoad($core->blog->getPF('yash3/syntaxhighlighter/css/shCore.css')).
 				dcUtils::cssLoad($css);
 		}
 	}
@@ -65,9 +67,9 @@ class dcYASH
 		global $core;
 
 		$core->blog->settings->addNamespace('yash');
-		if ($core->blog->settings->yash->yash_active)
-		{
-			echo dcUtils::jsLoad($core->blog->getPF('yash/syntaxhighlighter/js/shALLMinified.js'));
+		if ($core->blog->settings->yash->yash_active){
+			//to do differents files if  dotclear is path info or not
+			echo dcUtils::jsLoad($core->blog->getPF('yash3/syntaxhighlighter/js/shALLMinified.js'));
 		}
 	}
 }
diff --git a/yash/icon-big.png b/icon-big.png
similarity index 100%
rename from yash/icon-big.png
rename to icon-big.png
diff --git a/yash/icon.png b/icon.png
similarity index 100%
rename from yash/icon.png
rename to icon.png
diff --git a/yash/inc/yash.behaviors.php b/inc/yash.behaviors.php
similarity index 100%
rename from yash/inc/yash.behaviors.php
rename to inc/yash.behaviors.php
diff --git a/yash/index.php b/index.php
similarity index 100%
rename from yash/index.php
rename to index.php
diff --git a/yash/js/popup.js b/js/popup.js
similarity index 100%
rename from yash/js/popup.js
rename to js/popup.js
diff --git a/yash/js/post.js b/js/post.js
similarity index 100%
rename from yash/js/post.js
rename to js/post.js
diff --git a/yash/js/public.js b/js/public.js
similarity index 100%
rename from yash/js/public.js
rename to js/public.js
diff --git a/yash/locales/_pot/main.pot b/locales/_pot/main.pot
similarity index 100%
rename from yash/locales/_pot/main.pot
rename to locales/_pot/main.pot
diff --git a/yash/locales/fr/main.po b/locales/fr/main.po
similarity index 100%
rename from yash/locales/fr/main.po
rename to locales/fr/main.po
diff --git a/yash/syntaxhighlighter/LGPL-LICENSE b/syntaxhighlighter/LGPL-LICENSE
similarity index 100%
rename from yash/syntaxhighlighter/LGPL-LICENSE
rename to syntaxhighlighter/LGPL-LICENSE
diff --git a/yash/syntaxhighlighter/MIT-LICENSE b/syntaxhighlighter/MIT-LICENSE
similarity index 100%
rename from yash/syntaxhighlighter/MIT-LICENSE
rename to syntaxhighlighter/MIT-LICENSE
diff --git a/yash/syntaxhighlighter/css/shCore.css b/syntaxhighlighter/css/shCore.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shCore.css
rename to syntaxhighlighter/css/shCore.css
diff --git a/yash/syntaxhighlighter/css/shThemeDefault.css b/syntaxhighlighter/css/shThemeDefault.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeDefault.css
rename to syntaxhighlighter/css/shThemeDefault.css
diff --git a/yash/syntaxhighlighter/css/shThemeDjango.css b/syntaxhighlighter/css/shThemeDjango.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeDjango.css
rename to syntaxhighlighter/css/shThemeDjango.css
diff --git a/yash/syntaxhighlighter/css/shThemeEclipse.css b/syntaxhighlighter/css/shThemeEclipse.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeEclipse.css
rename to syntaxhighlighter/css/shThemeEclipse.css
diff --git a/yash/syntaxhighlighter/css/shThemeEmacs.css b/syntaxhighlighter/css/shThemeEmacs.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeEmacs.css
rename to syntaxhighlighter/css/shThemeEmacs.css
diff --git a/yash/syntaxhighlighter/css/shThemeFadeToGrey.css b/syntaxhighlighter/css/shThemeFadeToGrey.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeFadeToGrey.css
rename to syntaxhighlighter/css/shThemeFadeToGrey.css
diff --git a/yash/syntaxhighlighter/css/shThemeMDUltra.css b/syntaxhighlighter/css/shThemeMDUltra.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeMDUltra.css
rename to syntaxhighlighter/css/shThemeMDUltra.css
diff --git a/yash/syntaxhighlighter/css/shThemeMaterial.css b/syntaxhighlighter/css/shThemeMaterial.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeMaterial.css
rename to syntaxhighlighter/css/shThemeMaterial.css
diff --git a/yash/syntaxhighlighter/css/shThemeMidnight.css b/syntaxhighlighter/css/shThemeMidnight.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeMidnight.css
rename to syntaxhighlighter/css/shThemeMidnight.css
diff --git a/yash/syntaxhighlighter/css/shThemeRDark.css b/syntaxhighlighter/css/shThemeRDark.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeRDark.css
rename to syntaxhighlighter/css/shThemeRDark.css
diff --git a/yash/syntaxhighlighter/css/shThemeSolarizedDark.css b/syntaxhighlighter/css/shThemeSolarizedDark.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeSolarizedDark.css
rename to syntaxhighlighter/css/shThemeSolarizedDark.css
diff --git a/yash/syntaxhighlighter/css/shThemeSolarizedLight.css b/syntaxhighlighter/css/shThemeSolarizedLight.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeSolarizedLight.css
rename to syntaxhighlighter/css/shThemeSolarizedLight.css
diff --git a/yash/syntaxhighlighter/css/shThemeTomorrowNight.css b/syntaxhighlighter/css/shThemeTomorrowNight.css
similarity index 100%
rename from yash/syntaxhighlighter/css/shThemeTomorrowNight.css
rename to syntaxhighlighter/css/shThemeTomorrowNight.css
diff --git a/yash/syntaxhighlighter/js/shALLMinified.js b/syntaxhighlighter/js/shALLMinified.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shALLMinified.js
rename to syntaxhighlighter/js/shALLMinified.js
diff --git a/yash/syntaxhighlighter/js/shAutoloader.js b/syntaxhighlighter/js/shAutoloader.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shAutoloader.js
rename to syntaxhighlighter/js/shAutoloader.js
diff --git a/yash/syntaxhighlighter/js/shBrushAS3.js b/syntaxhighlighter/js/shBrushAS3.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushAS3.js
rename to syntaxhighlighter/js/shBrushAS3.js
diff --git a/yash/syntaxhighlighter/js/shBrushAppleScript.js b/syntaxhighlighter/js/shBrushAppleScript.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushAppleScript.js
rename to syntaxhighlighter/js/shBrushAppleScript.js
diff --git a/yash/syntaxhighlighter/js/shBrushBash.js b/syntaxhighlighter/js/shBrushBash.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushBash.js
rename to syntaxhighlighter/js/shBrushBash.js
diff --git a/yash/syntaxhighlighter/js/shBrushCSharp.js b/syntaxhighlighter/js/shBrushCSharp.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushCSharp.js
rename to syntaxhighlighter/js/shBrushCSharp.js
diff --git a/yash/syntaxhighlighter/js/shBrushColdFusion.js b/syntaxhighlighter/js/shBrushColdFusion.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushColdFusion.js
rename to syntaxhighlighter/js/shBrushColdFusion.js
diff --git a/yash/syntaxhighlighter/js/shBrushCpp.js b/syntaxhighlighter/js/shBrushCpp.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushCpp.js
rename to syntaxhighlighter/js/shBrushCpp.js
diff --git a/yash/syntaxhighlighter/js/shBrushCss.js b/syntaxhighlighter/js/shBrushCss.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushCss.js
rename to syntaxhighlighter/js/shBrushCss.js
diff --git a/yash/syntaxhighlighter/js/shBrushDelphi.js b/syntaxhighlighter/js/shBrushDelphi.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushDelphi.js
rename to syntaxhighlighter/js/shBrushDelphi.js
diff --git a/yash/syntaxhighlighter/js/shBrushDiff.js b/syntaxhighlighter/js/shBrushDiff.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushDiff.js
rename to syntaxhighlighter/js/shBrushDiff.js
diff --git a/yash/syntaxhighlighter/js/shBrushErlang.js b/syntaxhighlighter/js/shBrushErlang.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushErlang.js
rename to syntaxhighlighter/js/shBrushErlang.js
diff --git a/yash/syntaxhighlighter/js/shBrushGroovy.js b/syntaxhighlighter/js/shBrushGroovy.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushGroovy.js
rename to syntaxhighlighter/js/shBrushGroovy.js
diff --git a/yash/syntaxhighlighter/js/shBrushHaxe.js b/syntaxhighlighter/js/shBrushHaxe.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushHaxe.js
rename to syntaxhighlighter/js/shBrushHaxe.js
diff --git a/yash/syntaxhighlighter/js/shBrushJScript.js b/syntaxhighlighter/js/shBrushJScript.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushJScript.js
rename to syntaxhighlighter/js/shBrushJScript.js
diff --git a/yash/syntaxhighlighter/js/shBrushJava.js b/syntaxhighlighter/js/shBrushJava.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushJava.js
rename to syntaxhighlighter/js/shBrushJava.js
diff --git a/yash/syntaxhighlighter/js/shBrushJavaFX.js b/syntaxhighlighter/js/shBrushJavaFX.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushJavaFX.js
rename to syntaxhighlighter/js/shBrushJavaFX.js
diff --git a/yash/syntaxhighlighter/js/shBrushPerl.js b/syntaxhighlighter/js/shBrushPerl.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushPerl.js
rename to syntaxhighlighter/js/shBrushPerl.js
diff --git a/yash/syntaxhighlighter/js/shBrushPhp.js b/syntaxhighlighter/js/shBrushPhp.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushPhp.js
rename to syntaxhighlighter/js/shBrushPhp.js
diff --git a/yash/syntaxhighlighter/js/shBrushPlain.js b/syntaxhighlighter/js/shBrushPlain.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushPlain.js
rename to syntaxhighlighter/js/shBrushPlain.js
diff --git a/yash/syntaxhighlighter/js/shBrushPowerShell.js b/syntaxhighlighter/js/shBrushPowerShell.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushPowerShell.js
rename to syntaxhighlighter/js/shBrushPowerShell.js
diff --git a/yash/syntaxhighlighter/js/shBrushPython.js b/syntaxhighlighter/js/shBrushPython.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushPython.js
rename to syntaxhighlighter/js/shBrushPython.js
diff --git a/yash/syntaxhighlighter/js/shBrushRuby.js b/syntaxhighlighter/js/shBrushRuby.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushRuby.js
rename to syntaxhighlighter/js/shBrushRuby.js
diff --git a/yash/syntaxhighlighter/js/shBrushSass.js b/syntaxhighlighter/js/shBrushSass.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushSass.js
rename to syntaxhighlighter/js/shBrushSass.js
diff --git a/yash/syntaxhighlighter/js/shBrushScala.js b/syntaxhighlighter/js/shBrushScala.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushScala.js
rename to syntaxhighlighter/js/shBrushScala.js
diff --git a/yash/syntaxhighlighter/js/shBrushSql.js b/syntaxhighlighter/js/shBrushSql.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushSql.js
rename to syntaxhighlighter/js/shBrushSql.js
diff --git a/yash/syntaxhighlighter/js/shBrushTAP.js b/syntaxhighlighter/js/shBrushTAP.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushTAP.js
rename to syntaxhighlighter/js/shBrushTAP.js
diff --git a/yash/syntaxhighlighter/js/shBrushTypeScript.js b/syntaxhighlighter/js/shBrushTypeScript.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushTypeScript.js
rename to syntaxhighlighter/js/shBrushTypeScript.js
diff --git a/yash/syntaxhighlighter/js/shBrushVb.js b/syntaxhighlighter/js/shBrushVb.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushVb.js
rename to syntaxhighlighter/js/shBrushVb.js
diff --git a/yash/syntaxhighlighter/js/shBrushXml.js b/syntaxhighlighter/js/shBrushXml.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushXml.js
rename to syntaxhighlighter/js/shBrushXml.js
diff --git a/yash/syntaxhighlighter/js/shBrushYaml.js b/syntaxhighlighter/js/shBrushYaml.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shBrushYaml.js
rename to syntaxhighlighter/js/shBrushYaml.js
diff --git a/yash/syntaxhighlighter/js/shCore.js b/syntaxhighlighter/js/shCore.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shCore.js
rename to syntaxhighlighter/js/shCore.js
diff --git a/yash/syntaxhighlighter/js/shLegacy.js b/syntaxhighlighter/js/shLegacy.js
similarity index 100%
rename from yash/syntaxhighlighter/js/shLegacy.js
rename to syntaxhighlighter/js/shLegacy.js