diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp
index 6946320..1d72838 100644
--- a/sources/appl/Gui/MainWindows.cpp
+++ b/sources/appl/Gui/MainWindows.cpp
@@ -237,8 +237,8 @@ MainWindows::MainWindows(void) {
 				(void)myMenu->add(idMenuCTags, "Back",      "", ednMsgGuiCtags, "Back");
 			*/
 			int32_t idMenugDisplay = myMenu->addTitle("Display");
-				(void)myMenu->add(idMenugDisplay, "Color Black",          "", appl::MsgNameGuiChangeColor, "colorBlack/");
-				(void)myMenu->add(idMenugDisplay, "Color White",          "", appl::MsgNameGuiChangeColor, "colorWhite/");
+				(void)myMenu->add(idMenugDisplay, "Color Black",          "", appl::MsgNameGuiChangeColor, "color/black/");
+				(void)myMenu->add(idMenugDisplay, "Color White",          "", appl::MsgNameGuiChangeColor, "color/white/");
 				(void)myMenu->addSpacer();
 				(void)myMenu->add(idMenugDisplay, "Reload openGl Shader", "", ednMsgGuiReloadShader);
 			
diff --git a/sources/appl/Gui/TextViewer.h b/sources/appl/Gui/TextViewer.h
index 0f6cd29..86771ea 100644
--- a/sources/appl/Gui/TextViewer.h
+++ b/sources/appl/Gui/TextViewer.h
@@ -49,7 +49,7 @@ namespace appl {
 				return m_buffer;
 			}
 		private:
-			ewol::compositing::Text m_displayText; //!< Text display properties.
+			ewol::compositing::TextDF m_displayText; //!< Text display properties.
 			ewol::compositing::Drawing m_displayDrawing; //!< Other diaplay requested.
 			std::vector<std::pair<appl::Buffer*, vec2>> m_drawingRemenber;
 		public:
diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp
index 909a59f..a3edcce 100644
--- a/sources/appl/init.cpp
+++ b/sources/appl/init.cpp
@@ -45,7 +45,7 @@ appl::BufferManager* bufferManager = NULL;
 bool APP_Init(ewol::Context& _context) {
 	APPL_INFO(" == > init APPL v" << APPL_VERSION << " (START) [" << ewol::getBoardType() << "] (" << ewol::getCompilationMode() << ")");
 	
-	etk::theme::setName("COLOR", "colorWhite/");
+	etk::theme::setName("COLOR", "color/black/");
 	
 	// 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 703e694..1fcb8b3 100755
--- a/sources/lutin_edn.py
+++ b/sources/lutin_edn.py
@@ -84,9 +84,9 @@ def create(target):
 	myModule.copy_folder('../data/languages/php/*.xml','languages/php/')
 	myModule.copy_folder('../data/languages/xml/*.xml','languages/xml/')
 	myModule.copy_folder('../data/languages/python/*.xml','languages/python/')
-	myModule.copy_folder('../data/theme/default/*.svg','theme/default/')
-	myModule.copy_folder('../data/theme/colorWhite/*.json','theme/colorWhite/')
-	myModule.copy_folder('../data/theme/colorBlack/*.json','theme/colorBlack/')
+	myModule.copy_folder('../data/theme/default/*.svg','theme/shape/square/')
+	myModule.copy_folder('../data/theme/colorWhite/*.json','theme/color/white/')
+	myModule.copy_folder('../data/theme/colorBlack/*.json','theme/color/black/')
 	myModule.copy_folder('../data/GUI-Search.xml','')
 	
 	myModule.add_path(tools.get_current_path(__file__))