diff --git a/Extensions/TextObject/Extension.cpp b/Extensions/TextObject/Extension.cpp
index 7cd8feba60..a8a1017409 100644
--- a/Extensions/TextObject/Extension.cpp
+++ b/Extensions/TextObject/Extension.cpp
@@ -47,6 +47,7 @@ class Extension : public ExtensionBase
                                   "Compil Games",
                                   "zlib/libpng License ( Open Source )")
 
+
             //Declaration of all objects available
             DECLARE_OBJECT("Text",
                            _("Texte"),
@@ -56,6 +57,8 @@ class Extension : public ExtensionBase
                            &DestroyTextObject,
                            "TextObject");
 
+                #if defined(GD_IDE_ONLY)
+
                 objInfos.SetIncludeFile("TextObject/TextObject.h");
 
                 DECLARE_OBJECT_ACTION("String",
@@ -244,8 +247,10 @@ class Extension : public ExtensionBase
                     instrInfo.cppCallingInformation.SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h");
                 DECLARE_END_OBJECT_STR_EXPRESSION()
 
+            #endif
             DECLARE_END_OBJECT()
 
+
             CompleteCompilationInformation();
         };
         virtual ~Extension() {};
diff --git a/Extensions/TextObject/TextExtension.cbp b/Extensions/TextObject/TextExtension.cbp
index 4def537cda..ba47f2e14e 100644
--- a/Extensions/TextObject/TextExtension.cbp
+++ b/Extensions/TextObject/TextExtension.cbp
@@ -320,8 +320,8 @@
 					<Add option="-DLINUX" />
 					<Add option="-DSFML_DYNAMIC" />
 					<Add option="-DBOOST_DISABLE_ASSERTS" />
-					<Add directory="\home\florian\Programmation\libs\boost_1_43_0" />
-					<Add directory="\home\florian\Programmation\libs\sfml\include" />
+					
+					
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -340,7 +340,7 @@
 					<Add option="-lGL" />
 					<Add option="-lpthread" />
 					<Add directory="..\..\Runtime\bin\release" />
-					<Add directory="\home\florian\Programmation\libs\sfml\lib" />
+					<Add directory="../../ExtLibs/SFML/lib" />
 				</Linker>
 			</Target>
 			<Target title="Linux - Release - Edittime">
@@ -364,8 +364,8 @@
 					<Add option="-DLINUX" />
 					<Add option="-DSFML_DYNAMIC" />
 					<Add option="-DBOOST_DISABLE_ASSERTS" />
-					<Add directory="\home\florian\Programmation\libs\boost_1_43_0" />
-					<Add directory="\home\florian\Programmation\libs\sfml\include" />
+					
+					
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -385,7 +385,7 @@
 					<Add option="-lGL" />
 					<Add option="-lpthread" />
 					<Add directory="..\..\IDE\bin\release" />
-					<Add directory="\home\florian\Programmation\libs\sfml\lib" />
+					<Add directory="../../ExtLibs/SFML/lib" />
 				</Linker>
 			</Target>
 			<Target title="Linux - Debug - Edittime">
@@ -408,8 +408,8 @@
 					<Add option="-DDEBUG" />
 					<Add option="-DLINUX" />
 					<Add option="-DSFML_DYNAMIC" />
-					<Add directory="\home\florian\Programmation\libs\boost_1_43_0" />
-					<Add directory="\home\florian\Programmation\libs\sfml\include" />
+					
+					
 				</Compiler>
 				<Linker>
 					<Add option="-lgdl" />
@@ -428,7 +428,7 @@
 					<Add option="-lGL" />
 					<Add option="-lpthread" />
 					<Add directory="..\..\IDE\bin\debug" />
-					<Add directory="\home\florian\Programmation\libs\sfml\lib" />
+					<Add directory="../../ExtLibs/SFML/lib" />
 				</Linker>
 			</Target>
 			<Target title="Linux - Debug">
@@ -448,8 +448,8 @@
 					<Add option="-DDEBUG" />
 					<Add option="-DLINUX" />
 					<Add option="-DSFML_DYNAMIC" />
-					<Add directory="\home\florian\Programmation\libs\boost_1_43_0" />
-					<Add directory="\home\florian\Programmation\libs\sfml\include" />
+					
+					
 				</Compiler>
 				<Linker>
 					<Add option="-pg -lgmon" />
@@ -468,7 +468,7 @@
 					<Add option="-lGL" />
 					<Add option="-lpthread" />
 					<Add directory="..\..\Runtime\bin\debug" />
-					<Add directory="\home\florian\Programmation\libs\sfml\lib" />
+					<Add directory="../../ExtLibs/SFML/lib" />
 				</Linker>
 			</Target>
 			<Target title="Mac - Release">
diff --git a/Extensions/TextObject/TextExtension.depend b/Extensions/TextObject/TextExtension.depend
index fd910a0839..2192422f66 100644
--- a/Extensions/TextObject/TextExtension.depend
+++ b/Extensions/TextObject/TextExtension.depend
@@ -8870,16 +8870,17 @@
 1264364230 d:\florian\programmation\gamedevelop\gdl\gdl\btalignedallocator.h
 	"GDL/btScalar.h"
 
-1311366091 source:d:\florian\programmation\gamedevelop2\extensions\textobject\textobject.cpp
+1313697701 source:d:\florian\programmation\gamedevelop2\extensions\textobject\textobject.cpp
 	<SFML/Graphics.hpp>
 	"GDL/Object.h"
 	"GDL/ImageManager.h"
 	"GDL/tinyxml.h"
 	"GDL/FontManager.h"
 	"GDL/Position.h"
+	"GDL/RotatedRectangle.h"
+	"GDL/CommonTools.h"
 	"TextObject.h"
 	<wx/wx.h>
-	"GDL/CommonTools.h"
 	"GDL/ResourcesMergingHelper.h"
 	"GDL/MainEditorCommand.h"
 	"TextObjectEditor.h"
@@ -9150,19 +9151,15 @@
 	<SFML/Graphics/Rect.hpp>
 	<string>
 
-1311891521 d:\florian\programmation\gamedevelop2\gdl\gdl\object.h
-	<wx/wx.h>
+1312670601 d:\florian\programmation\gamedevelop2\gdl\gdl\object.h
 	"GDL/Force.h"
-	<SFML/System.hpp>
-	<SFML/Graphics.hpp>
-	<iostream>
 	<string>
 	<vector>
+	<map>
 	<boost/shared_ptr.hpp>
 	<boost/enable_shared_from_this.hpp>
 	"GDL/ListVariable.h"
 	"GDL/ObjectHelpers.h"
-	"GDL/RotatedRectangle.h"
 
 1307990306 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\wx.h
 	"wx/defs.h"
@@ -12213,16 +12210,9 @@
 1253308510 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\cocoa\mdi.h
 	"wx/frame.h"
 
-1297544852 d:\florian\programmation\gamedevelop2\gdl\gdl\force.h
-	"GDL/Event.h"
-	<iostream>
-	<vector>
-	<string>
-	<cmath>
-	"GDL/Log.h"
+1312668877 d:\florian\programmation\gamedevelop2\gdl\gdl\force.h
 
-1311454311 d:\florian\programmation\gamedevelop2\gdl\gdl\event.h
-	<wx/dcbuffer.h>
+1313855658 d:\florian\programmation\gamedevelop2\gdl\gdl\event.h
 	<boost/weak_ptr.hpp>
 	<iostream>
 	<vector>
@@ -15661,11 +15651,11 @@
 	<boost/type_traits/remove_volatile.hpp>
 	<boost/type_traits/remove_cv.hpp>
 
-1297523943 d:\florian\programmation\gamedevelop2\gdl\gdl\log.h
+1313672531 d:\florian\programmation\gamedevelop2\gdl\gdl\log.h
 	<string>
 	<vector>
 
-1309204429 d:\florian\programmation\gamedevelop2\gdl\gdl\instruction.h
+1312827069 d:\florian\programmation\gamedevelop2\gdl\gdl\instruction.h
 	<string>
 	<vector>
 	<iostream>
@@ -15689,10 +15679,8 @@
 	<string>
 	"GDL/Variable.h"
 
-1312475842 d:\florian\programmation\gamedevelop2\gdl\gdl\variable.h
+1312668877 d:\florian\programmation\gamedevelop2\gdl\gdl\variable.h
 	<string>
-	<iostream>
-	<functional>
 
 1297523943 d:\florian\programmation\gamedevelop2\gdl\gdl\objecthelpers.h
 	<boost/shared_ptr.hpp>
@@ -15711,7 +15699,7 @@
 	<vector>
 	<string>
 
-1307193655 d:\florian\programmation\gamedevelop2\gdl\gdl\game.h
+1313670759 d:\florian\programmation\gamedevelop2\gdl\gdl\game.h
 	<string>
 	<vector>
 	"GDL/Object.h"
@@ -15721,7 +15709,7 @@
 	"GDL/Image.h"
 	"GDL/LoadingScreen.h"
 
-1310075239 d:\florian\programmation\gamedevelop2\gdl\gdl\scene.h
+1313668638 d:\florian\programmation\gamedevelop2\gdl\gdl\scene.h
 	"GDL/Event.h"
 	<vector>
 	<map>
@@ -15794,18 +15782,17 @@
 	<string>
 	<vector>
 
-1311366091 d:\florian\programmation\gamedevelop2\extensions\textobject\textobject.h
+1312720598 d:\florian\programmation\gamedevelop2\extensions\textobject\textobject.h
 	"GDL/Object.h"
-	<SFML/Graphics.hpp>
+	<SFML/Graphics/Text.hpp>
 
-1308418294 d:\florian\programmation\gamedevelop2\gdl\gdl\commontools.h
+1313672614 d:\florian\programmation\gamedevelop2\gdl\gdl\commontools.h
 	<string>
 	<sstream>
 	<iostream>
 	<vector>
-	"GDL/Image.h"
 	<cmath>
-	<wx/string.h>
+	"GDL/LightweightCommonTools.h"
 
 1297523943 d:\florian\programmation\gamedevelop2\gdl\gdl\resourcesmerginghelper.h
 	<string>
@@ -15856,7 +15843,7 @@
 	"wx/pen.h"
 	"wx/bitmap.h"
 
-1294511660 d:\florian\programmation\gamedevelop2\extensions\textobject\textobjecteditor.h
+1312638095 d:\florian\programmation\gamedevelop2\extensions\textobject\textobjecteditor.h
 	<wx/sizer.h>
 	<wx/stattext.h>
 	<wx/textctrl.h>
@@ -15966,7 +15953,7 @@
 
 1307990301 d:\florian\programmation\gamedevelop2\extlibs\wxwidgets\include\wx\generic\statline.h
 
-1306594475 source:d:\florian\programmation\gamedevelop2\extensions\textobject\textobjecteditor.cpp
+1312638121 source:d:\florian\programmation\gamedevelop2\extensions\textobject\textobjecteditor.cpp
 	"TextObjectEditor.h"
 	<wx/intl.h>
 	<wx/string.h>
@@ -16005,13 +15992,13 @@
 	"wx/gdicmn.h"
 	"wx/dialog.h"
 
-1312376915 source:d:\florian\programmation\gamedevelop2\extensions\textobject\extension.cpp
+1313706188 source:d:\florian\programmation\gamedevelop2\extensions\textobject\extension.cpp
 	"GDL/ExtensionBase.h"
 	"GDL/Version.h"
 	"TextObject.h"
 	<boost/version.hpp>
 
-1312580948 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionbase.h
+1313695175 d:\florian\programmation\gamedevelop2\gdl\gdl\extensionbase.h
 	<wx/bitmap.h>
 	<wx/file.h>
 	<wx/wx.h>
@@ -16021,7 +16008,11 @@
 	<map>
 	<boost/shared_ptr.hpp>
 
-1312582381 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h
+1313841848 d:\florian\programmation\gamedevelop2\gdl\gdl\version.h
 
 1299115781 d:\florian\programmation\gamedevelop2\extlibs\boost\boost\version.hpp
 
+1312714221 d:\florian\programmation\gamedevelop2\gdl\gdl\lightweightcommontools.h
+	<sstream>
+	<cmath>
+
diff --git a/Extensions/TextObject/TextExtension.layout b/Extensions/TextObject/TextExtension.layout
index fe10ffb987..58c5f5377e 100644
--- a/Extensions/TextObject/TextExtension.layout
+++ b/Extensions/TextObject/TextExtension.layout
@@ -2,13 +2,13 @@
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Development - Edittime" />
 	<File name="Extension.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor1 position="11254" topLine="204" />
+		<Cursor1 position="739" topLine="48" />
 	</File>
 	<File name="TextObject.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor1 position="4820" topLine="60" />
+		<Cursor1 position="1064" topLine="15" />
 	</File>
 	<File name="TextObject.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor1 position="4527" topLine="38" />
+		<Cursor1 position="1139" topLine="21" />
 	</File>
 	<File name="TextObjectEditor.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor1 position="7565" topLine="137" />
diff --git a/Extensions/TextObject/TextObject.cpp b/Extensions/TextObject/TextObject.cpp
index cc5a89ce36..4f703a84e4 100644
--- a/Extensions/TextObject/TextObject.cpp
+++ b/Extensions/TextObject/TextObject.cpp
@@ -31,11 +31,12 @@ freely, subject to the following restrictions:
 #include "GDL/tinyxml.h"
 #include "GDL/FontManager.h"
 #include "GDL/Position.h"
+#include "GDL/RotatedRectangle.h"
+#include "GDL/CommonTools.h"
 #include "TextObject.h"
 
 #if defined(GD_IDE_ONLY)
 #include <wx/wx.h>
-#include "GDL/CommonTools.h"
 #include "GDL/ResourcesMergingHelper.h"
 #include "GDL/MainEditorCommand.h"
 #include "TextObjectEditor.h"
@@ -337,7 +338,7 @@ void TextObject::SetColor( unsigned int r, unsigned int g, unsigned int b )
 
 void TextObject::SetColor(const std::string & colorStr)
 {
-    vector < string > colors = SpliterStringToVector<string>(colorStr, ';');
+    vector < string > colors = SplitString<string>(colorStr, ';');
 
     if ( colors.size() < 3 ) return; //La couleur est incorrecte
 
diff --git a/Extensions/TextObject/TextObject.h b/Extensions/TextObject/TextObject.h
index cbd72ad8ac..7dcbac8927 100644
--- a/Extensions/TextObject/TextObject.h
+++ b/Extensions/TextObject/TextObject.h
@@ -28,7 +28,7 @@ freely, subject to the following restrictions:
 #define TEXTOBJECT_H
 
 #include "GDL/Object.h"
-#include <SFML/Graphics.hpp>
+#include <SFML/Graphics/Text.hpp>
 class ImageManager;
 class RuntimeScene;
 class Object;
@@ -67,8 +67,8 @@ class GD_EXTENSION_API TextObject : public Object
         virtual wxPanel * CreateInitialPositionPanel( wxWindow* parent, const Game & game_, const Scene & scene_, const InitialPosition & position );
         virtual void UpdateInitialPositionFromPanel(wxPanel * panel, InitialPosition & position);
 
-        virtual void GetPropertyForDebugger (unsigned int propertyNb, string & name, string & value) const;
-        virtual bool ChangeProperty(unsigned int propertyNb, string newValue);
+        virtual void GetPropertyForDebugger (unsigned int propertyNb, std::string & name, std::string & value) const;
+        virtual bool ChangeProperty(unsigned int propertyNb, std::string newValue);
         virtual unsigned int GetNumberOfProperties() const;
         #endif