diff --git a/data/languages/java/highlight.xml b/data/languages/java/highlight.xml
index 3e27502..ff74927 100644
--- a/data/languages/java/highlight.xml
+++ b/data/languages/java/highlight.xml
@@ -2,33 +2,37 @@
 <EdnLang version="0.1" lang="Java">
 	<ext>.*\.java</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-		<rule name="my comment multiline doxygen">
+		<rule name="doxygen multiline">
 			<color>commentDoxygen</color>
-			<regex>/\*\*.*?\*/</regex>
+			<regex>/\*(\*|!)(.|\r|\n)*?\*/</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="my comment multiline">
+		<rule name="comment multiline">
 			<color>comment</color>
-			<regex>/\*.*?\*/</regex>
+			<regex>/\*(.|\r|\n)*?(\*/|\0)</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="my comment doxygen">
-			<color>commentDoxygen</color>
-			<regex>//!(.|\\[\\\n])*?$</regex>
-		</rule>
-		<rule name="my todo comment">
+		<rule name="comment multiline ERROR">
 			<color>SYNTAX_ERROR</color>
-			<regex>//[ \t]*TODO[ \t]*:(.|\\[\\\n])*?$</regex>
+			<regex>/\*(.|\r|\n)*</regex>
 		</rule>
-		<rule name="my comment">
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
 			<color>comment</color>
-			<regex>//(.|\\[\\\n])*?$</regex>
+			<regex>//.*</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="doubleQuteText">
+		<rule name="double quote text">
 			<color>doubleQuoteText</color>
-			<regex>&quot;(.|\\[\\&quot;])*?&quot;</regex>
+			<regex>(U|u|u8)?&quot;(.|\\[\\&quot;])*?&quot;</regex> <!-- " -->
 		</rule>
-		<rule name="simpleQuteText">
+		<rule name="simple quote text">
 			<color>doubleQuoteText</color>
-			<regex>&apos;(.|\\[\\&apos;])*?&apos;</regex>
+			<regex>&apos;\\?.&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
@@ -64,13 +68,41 @@
 			<color>macro</color>
 			<regex>\b[A-Z_][A-Z_0-9]{3,500}\b</regex>
 		</rule>
+		<rule name="java member">
+			<color>memberClass</color>
+			<regex>\bm_\w+\b</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\b_\w+\b</regex>
+		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<regex>\b(\w|_)+[ \t]*\(</regex>
+			<regex>\b((\w|_)+[ \t]*\()</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
 			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
+	<pass name="doxyparse">
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\b_\w+\b</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
 </EdnLang>
diff --git a/data/languages/python/highlight.xml b/data/languages/python/highlight.xml
index d406528..e017fe8 100644
--- a/data/languages/python/highlight.xml
+++ b/data/languages/python/highlight.xml
@@ -17,10 +17,12 @@
 		<rule name="my comment doxygen">
 			<color>commentDoxygen</color>
 			<regex>##.*</regex>
+			<sub>doxyparse</sub>
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
 			<regex>#.*</regex>
+			<sub>TODO</sub>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
@@ -73,4 +75,24 @@
 			<regex>&apos;|&quot;</regex>
 		</rule>
 	</pass2>
+	<pass name="doxyparse">
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\b_\w+\b</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
 </EdnLang>
diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp
index 38a17a4..1d4b4f5 100644
--- a/sources/appl/init.cpp
+++ b/sources/appl/init.cpp
@@ -45,7 +45,8 @@ class MainApplication : public ewol::context::Application {
 					exit(0);
 				} 
 			}
-			etk::theme::setName("COLOR", "color/black/");
+			//etk::theme::setName("COLOR", "color/black/");
+			etk::theme::setName("COLOR", "color/white/");
 			
 			// TODO : remove this : Move if in the windows properties
 			_context.setSize(vec2(800, 600));
diff --git a/sources/lutin_edn.py b/sources/lutin_edn.py
index 5d3938d..9eb4b03 100644
--- a/sources/lutin_edn.py
+++ b/sources/lutin_edn.py
@@ -123,6 +123,5 @@ def create(target):
 	myModule.pkg_add("RIGHT", "WRITE_EXTERNAL_STORAGE")
 	myModule.pkg_add("RIGHT", "SET_ORIENTATION")
 	
-	# add the currrent module at the 
 	return myModule