diff --git a/Demos3/AllBullet2Demos/premake4.lua b/Demos3/AllBullet2Demos/premake4.lua
index de38b356c..42ab43e35 100644
--- a/Demos3/AllBullet2Demos/premake4.lua
+++ b/Demos3/AllBullet2Demos/premake4.lua
@@ -14,7 +14,7 @@
                 }
 
 			
-		links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
+		links{"gwen", "OpenGL_Window","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
 		initOpenGL()
 		initGlew()
 
diff --git a/Demos3/CpuDemos/main_opengl3core.cpp b/Demos3/CpuDemos/main_opengl3core.cpp
index 5de834f00..ec9bbadc1 100644
--- a/Demos3/CpuDemos/main_opengl3core.cpp
+++ b/Demos3/CpuDemos/main_opengl3core.cpp
@@ -22,8 +22,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "OpenGLTrueTypeFont/fontstash.h"
-#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
+#include "OpenGLWindow/fontstash.h"
+#include "OpenGLWindow/opengl_fontstashcallbacks.h"
 #include "gwenUserInterface.h"
 
 #include "../btgui/Timing/b3Quickprof.h"
@@ -459,7 +459,7 @@ void myprintf(const char* msg)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "OpenGLTrueTypeFont/stb_image_write.h"
+#include "OpenGLWindow/stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName)
 {
 	int numComponents = 4;
diff --git a/Demos3/CpuDemos/premake4.lua b/Demos3/CpuDemos/premake4.lua
index 1345f64a1..4d0366bf6 100644
--- a/Demos3/CpuDemos/premake4.lua
+++ b/Demos3/CpuDemos/premake4.lua
@@ -43,11 +43,11 @@ files {
 	"../../btgui/OpenGLWindow/TwFonts.h",
 	"../../btgui/OpenGLWindow/GLRenderToTexture.cpp",
 	"../../btgui/OpenGLWindow/GLRenderToTexture.h",
-	"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
-	"../../btgui/OpenGLTrueTypeFont/fontstash.h",
-	"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
-	"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
-	"../../btgui/FontFiles/OpenSans.cpp",
+	"../../btgui/OpenGLWindow/fontstash.cpp",
+	"../../btgui/OpenGLWindow/fontstash.h",
+	"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
+	"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
+	"../../btgui/OpenGLWindow/OpenSans.cpp",
 	"../../btgui/stb_image/stb_image.cpp",
 	"../../btgui/stb_image/stb_image.h",
 	"../../btgui/Timing/b3Quickprof.cpp",
diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp
index a84d4d994..76eb8837a 100644
--- a/Demos3/GpuDemos/main_opengl3core.cpp
+++ b/Demos3/GpuDemos/main_opengl3core.cpp
@@ -24,8 +24,8 @@
 //#include "b3GpuDynamicsWorld.h"
 #include <assert.h>
 #include <string.h>
-#include "OpenGLTrueTypeFont/fontstash.h"
-#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
+#include "OpenGLWindow/fontstash.h"
+#include "OpenGLWindow/opengl_fontstashcallbacks.h"
 #include "gwenUserInterface.h"
 #include "ParticleDemo.h"
 #include "broadphase/PairBench.h"
@@ -543,7 +543,7 @@ void myprintf(const char* msg)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "OpenGLTrueTypeFont/stb_image_write.h"
+#include "OpenGLWindow/stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName)
 {
 	int numComponents = 4;
diff --git a/Demos3/GpuDemos/premake4.lua b/Demos3/GpuDemos/premake4.lua
index 38d6de21a..2ef0c17ac 100644
--- a/Demos3/GpuDemos/premake4.lua
+++ b/Demos3/GpuDemos/premake4.lua
@@ -52,11 +52,11 @@ function createProject(vendor)
 			"../../btgui/OpenGLWindow/TwFonts.h",
 			"../../btgui/OpenGLWindow/GLRenderToTexture.cpp",
 			"../../btgui/OpenGLWindow/GLRenderToTexture.h",
-			"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
-			"../../btgui/OpenGLTrueTypeFont/fontstash.h",
-			"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
-			"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
-			"../../btgui/FontFiles/OpenSans.cpp",
+			"../../btgui/OpenGLWindow/fontstash.cpp",
+			"../../btgui/OpenGLWindow/fontstash.h",
+			"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
+			"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
+			"../../btgui/OpenGLWindow/OpenSans.cpp",
 			"../../btgui/stb_image/stb_image.cpp",
 			"../../btgui/stb_image/stb_image.h",
 			"../../btgui/Timing/b3Quickprof.cpp",
diff --git a/Demos3/GpuGuiInitialize/main.cpp b/Demos3/GpuGuiInitialize/main.cpp
index 1283ffe57..386d6a563 100644
--- a/Demos3/GpuGuiInitialize/main.cpp
+++ b/Demos3/GpuGuiInitialize/main.cpp
@@ -14,8 +14,8 @@
 //#include "b3GpuDynamicsWorld.h"
 #include <assert.h>
 #include <string.h>
-#include "OpenGLTrueTypeFont/fontstash.h"
-#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
+#include "OpenGLWindow/fontstash.h"
+#include "OpenGLWindow/opengl_fontstashcallbacks.h"
 
 #include "OpenGLWindow/GwenOpenGL3CoreRenderer.h"
 #include "../btgui/Timing/b3Quickprof.h"
diff --git a/Demos3/GpuGuiInitialize/premake4.lua b/Demos3/GpuGuiInitialize/premake4.lua
index b36da7dd5..511a8e21a 100644
--- a/Demos3/GpuGuiInitialize/premake4.lua
+++ b/Demos3/GpuGuiInitialize/premake4.lua
@@ -42,11 +42,11 @@ function createProject(vendor)
 			"../../btgui/OpenGLWindow/TwFonts.cpp",
 			"../../btgui/OpenGLWindow/TwFonts.h",
       "../../btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h",
-      "../../btgui/FontFiles/OpenSans.cpp",
-			"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
-			"../../btgui/OpenGLTrueTypeFont/fontstash.h",
-			"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
- 			"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
+      "../../btgui/OpenGLWindow/OpenSans.cpp",
+			"../../btgui/OpenGLWindow/fontstash.cpp",
+			"../../btgui/OpenGLWindow/fontstash.h",
+			"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
+ 			"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
 			"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
 			"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
 			"../../src/Bullet3Common/b3AlignedAllocator.cpp",
diff --git a/Demos3/ImplicitCloth/premake4.lua b/Demos3/ImplicitCloth/premake4.lua
index beb20168d..6a1c8e254 100644
--- a/Demos3/ImplicitCloth/premake4.lua
+++ b/Demos3/ImplicitCloth/premake4.lua
@@ -35,11 +35,11 @@
 		"../../btgui/OpenGLWindow/GLRenderToTexture.h",
 		"../../btgui/OpenGLWindow/TwFonts.cpp",
 		"../../btgui/OpenGLWindow/TwFonts.h",
-		"../../btgui/FontFiles/OpenSans.cpp",
-		"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
-		"../../btgui/OpenGLTrueTypeFont/fontstash.h",
-		"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
- 		"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
+		"../../btgui/OpenGLWindow/OpenSans.cpp",
+		"../../btgui/OpenGLWindow/fontstash.cpp",
+		"../../btgui/OpenGLWindow/fontstash.h",
+		"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
+ 		"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
  		"../../src/Bullet3Common/**.cpp",
  		"../../src/Bullet3Common/**.h",
 		"../../btgui/Timing/b3Clock.cpp",
diff --git a/Demos3/SimpleOpenGL3/premake4.lua b/Demos3/SimpleOpenGL3/premake4.lua
index f473c429c..5f2c8ec57 100644
--- a/Demos3/SimpleOpenGL3/premake4.lua
+++ b/Demos3/SimpleOpenGL3/premake4.lua
@@ -12,18 +12,16 @@
                 "../../btgui"
                 }
 
-		initOpenGL()
-		initGlew()
 			
-		links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont"}
-		
+		links{ "OpenGL_Window"}
+		initOpenGL()	
+		initGlew()
+	
 		files {
 		"**.cpp",
 		"**.h",
 		"../../src/Bullet3Common/**.cpp",
  		"../../src/Bullet3Common/**.h",
-		"../../btgui/Timing/b3Clock.cpp",
-		"../../btgui/Timing/b3Clock.h"
 
 		}
 		
diff --git a/btgui/GwenOpenGLTest/Apple/premake4.lua b/btgui/GwenOpenGLTest/Apple/premake4.lua
deleted file mode 100644
index ea6081c49..000000000
--- a/btgui/GwenOpenGLTest/Apple/premake4.lua
+++ /dev/null
@@ -1,51 +0,0 @@
-	if os.is("macosx") then
-
-	project "Gwen_OpenGLTest_Apple"
-		
-	kind "ConsoleApp"
-	flags {"Unicode"}
-	
-	defines { "GWEN_COMPILE_STATIC" , "_HAS_EXCEPTIONS=0", "_STATIC_CPPLIB" }
-	
-	targetdir "../../../../bin"
-	
-	includedirs 
-	{
-	
-		"../..","..","../../../rendertest","../../../../bullet2"
-	}
-
-	initOpenGL()
-	initGlew()
-			
-	links {
-		"gwen","Cocoa.framework"
-	}
-	
-	
-	files {
-		"../../../rendertest/MacOpenGLWindow.mm",
-		"../../../rendertest/MacOpenGLWindow.h",
-		"../../../rendertest/TwFonts.cpp",
-		"../../../rendertest/TwFonts.h",
-		"../../../rendertest/LoadShader.cpp",
-		"../../../rendertest/LoadShader.h",
-		"../../../rendertest/GLPrimitiveRenderer.cpp",
-		"../../../rendertest/GLPrimitiveRenderer.h",				
-		"../../../rendertest/GwenOpenGL3CoreRenderer.h",
-		"../../../OpenGLTrueTypeFont/fontstash.cpp",
-		"../../../OpenGLTrueTypeFont/fontstash.h",
-		"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
- 		"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
-		"../../../../bullet2/LinearMath/b3ConvexHullComputer.cpp",
-		"../../../../bullet2/LinearMath/b3ConvexHullComputer.h",
-		"../../../../bullet2/LinearMath/btSerializer.cpp",
-		"../../../../bullet2/LinearMath/btSerializer.h",
-		"../../../../bullet2/LinearMath/b3AlignedAllocator.cpp",
-		"../../../../bullet2/LinearMath/b3Quickprof.cpp",
-		"../../../../bullet2/LinearMath/b3Quickprof.h",
-		"../**.cpp",
-		"../**.h",
-	}
-	end
-
diff --git a/btgui/GwenOpenGLTest/OpenGLSample.cpp b/btgui/GwenOpenGLTest/OpenGLSample.cpp
index 5a2ee8d4a..b231b0a2c 100644
--- a/btgui/GwenOpenGLTest/OpenGLSample.cpp
+++ b/btgui/GwenOpenGLTest/OpenGLSample.cpp
@@ -21,7 +21,7 @@ extern char OpenSansData[];
 #endif //_WIN32
 #endif//__APPLE__
 
-#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
+#include "OpenGLWindow/opengl_fontstashcallbacks.h"
 
 #include "OpenGLWindow/GwenOpenGL3CoreRenderer.h"
 #include "OpenGLWindow/GLPrimitiveRenderer.h"
diff --git a/btgui/GwenOpenGLTest/premake4.lua b/btgui/GwenOpenGLTest/premake4.lua
index 3b283b576..46dd6fe4d 100644
--- a/btgui/GwenOpenGLTest/premake4.lua
+++ b/btgui/GwenOpenGLTest/premake4.lua
@@ -25,7 +25,7 @@
 	
 	
 	files {
-		"../FontFiles/OpenSans.cpp",
+		"../OpenGLWindow/OpenSans.cpp",
 		"../OpenGLWindow/TwFonts.cpp",
 		"../OpenGLWindow/TwFonts.h",
 		"../OpenGLWindow/LoadShader.cpp",
@@ -33,10 +33,10 @@
 		"../OpenGLWindow/GLPrimitiveRenderer.cpp",
 		"../OpenGLWindow/GLPrimitiveRenderer.h",				
 		"../OpenGLWindow/GwenOpenGL3CoreRenderer.h",
-		"../OpenGLTrueTypeFont/fontstash.cpp",
-		"../OpenGLTrueTypeFont/fontstash.h",
-		"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
- 		"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
+		"../OpenGLWindow/fontstash.cpp",
+		"../OpenGLWindow/fontstash.h",
+		"../OpenGLWindow/opengl_fontstashcallbacks.cpp",
+ 		"../OpenGLWindow/opengl_fontstashcallbacks.h",
 		"../../btgui/Timing/b3Clock.cpp",
 		"../../btgui/Timing/b3Clock.h",
 		"**.cpp",
diff --git a/btgui/OpenGLTrueTypeFont/premake4.lua b/btgui/OpenGLTrueTypeFont/premake4.lua
deleted file mode 100644
index defbecddf..000000000
--- a/btgui/OpenGLTrueTypeFont/premake4.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-	
-
-		project "OpenGL_TrueTypeFont"
-
-		language "C++"
-				
-		kind "StaticLib"
-		
-
-		initOpenGL()
-		initGlew()
-
-		includedirs {
-		"../../src",
-		".."
-		}
-		if os.is("Linux") then
-			initX11()
-		end
-		
-		files 
-		{
-			"../FontFiles/OpenSans.cpp",
-			"fontstash.cpp",
-      "fontstash.h",
-      "opengl_fontstashcallbacks.cpp",
-      "opengl_fontstashcallbacks.h",
-      "stb_image_write.h",
-      "stb_truetype.h",
-		}
-
diff --git a/btgui/OpenGLWindow/CMakeLists.txt b/btgui/OpenGLWindow/CMakeLists.txt
index 8faf453c7..f222d1b21 100644
--- a/btgui/OpenGLWindow/CMakeLists.txt
+++ b/btgui/OpenGLWindow/CMakeLists.txt
@@ -4,13 +4,13 @@ INCLUDE_DIRECTORIES(
 	${BULLET_PHYSICS_SOURCE_DIR}/btgui
 )
 
-FILE(GLOB OpenGLWindow_HDRS "*.h" "../OpenGLTrueTypeFont/*.h")
+FILE(GLOB OpenGLWindow_HDRS "*.h" )
 
 FILE(GLOB OpenGLWindowMac_CPP "Mac*.mm")
 FILE(GLOB OpenGLWindowWin32_CPP "Win32*.cpp")
 FILE(GLOB OpenGLWindowLinux_CPP "X11*.cpp")
 
-FILE(GLOB OpenGLWindowCommon_CPP "*.cpp" "../OpenGLTrueTypeFont/*.cpp" "../FontFiles/OpenSans.cpp" )
+FILE(GLOB OpenGLWindowCommon_CPP "*.cpp" )
 
 LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowMac_CPP} )
 LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowWin32_CPP} )
diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.cpp b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
index dd1d8cf2d..d849e0f96 100644
--- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
@@ -1245,7 +1245,7 @@ void GLInstancingRenderer::getMouseDirection(float* dir, int x, int y)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "OpenGLTrueTypeFont/stb_image_write.h"
+#include "stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
 {
 
diff --git a/btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h b/btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h
index e4357bd7a..0e698aee4 100644
--- a/btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h
+++ b/btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h
@@ -6,7 +6,7 @@
 #include "Gwen/BaseRender.h"
 #include "GLPrimitiveRenderer.h"
 struct sth_stash;
-#include "../OpenGLTrueTypeFont/fontstash.h"
+#include "fontstash.h"
 #include "Gwen/Texture.h"
 
 #include "TwFonts.h"
diff --git a/btgui/FontFiles/OpenSans.cpp b/btgui/OpenGLWindow/OpenSans.cpp
similarity index 100%
rename from btgui/FontFiles/OpenSans.cpp
rename to btgui/OpenGLWindow/OpenSans.cpp
diff --git a/btgui/FontFiles/OpenSans.ttf b/btgui/OpenGLWindow/OpenSans.ttf
similarity index 100%
rename from btgui/FontFiles/OpenSans.ttf
rename to btgui/OpenGLWindow/OpenSans.ttf
diff --git a/btgui/OpenGLWindow/SimpleOpenGL3App.cpp b/btgui/OpenGLWindow/SimpleOpenGL3App.cpp
index e9c38d783..d360fd03f 100644
--- a/btgui/OpenGLWindow/SimpleOpenGL3App.cpp
+++ b/btgui/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -21,11 +21,11 @@
 #include "Bullet3Common/b3Vector3.h"
 #include "Bullet3Common/b3Logging.h"
 
-#include "OpenGLTrueTypeFont/fontstash.h"
+#include "OpenGLWindow/fontstash.h"
 #include "OpenGLWindow/TwFonts.h"
-#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
+#include "OpenGLWindow/opengl_fontstashcallbacks.h"
 #include <assert.h>
-#include "GLRenderToTexture.h"
+#include "OpenGLWindow/GLRenderToTexture.h"
 
 #ifdef _WIN32
     #define popen _popen
@@ -225,8 +225,6 @@ void SimpleOpenGL3App::drawText( const char* txt, int posX, int posY)
 			//r.w = g_DefaultNormalFont->m_CharWidth[c]+extraSpacing;
 			int endX = startX+g_DefaultNormalFont->m_CharWidth[c];
 			int endY = startY+g_DefaultNormalFont->m_CharHeight;
-			//Gwen::Rect rect = r;
-			//Translate( rect );
 
 
 			float currentColor[]={0.2f,0.2,0.2f,1.f};
@@ -425,7 +423,7 @@ SimpleOpenGL3App::~SimpleOpenGL3App()
 }
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "OpenGLTrueTypeFont/stb_image_write.h"
+#include "OpenGLWindow/stb_image_write.h"
 static void writeTextureToFile(int textureWidth, int textureHeight, const char* fileName, FILE* ffmpegVideo)
 {
 	int numComponents = 4;
diff --git a/btgui/OpenGLTrueTypeFont/fontstash.cpp b/btgui/OpenGLWindow/fontstash.cpp
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/fontstash.cpp
rename to btgui/OpenGLWindow/fontstash.cpp
diff --git a/btgui/OpenGLTrueTypeFont/fontstash.h b/btgui/OpenGLWindow/fontstash.h
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/fontstash.h
rename to btgui/OpenGLWindow/fontstash.h
diff --git a/btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp b/btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp
rename to btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp
diff --git a/btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h b/btgui/OpenGLWindow/opengl_fontstashcallbacks.h
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h
rename to btgui/OpenGLWindow/opengl_fontstashcallbacks.h
diff --git a/btgui/OpenGLTrueTypeFont/stb_image_write.h b/btgui/OpenGLWindow/stb_image_write.h
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/stb_image_write.h
rename to btgui/OpenGLWindow/stb_image_write.h
diff --git a/btgui/OpenGLTrueTypeFont/stb_truetype.h b/btgui/OpenGLWindow/stb_truetype.h
similarity index 100%
rename from btgui/OpenGLTrueTypeFont/stb_truetype.h
rename to btgui/OpenGLWindow/stb_truetype.h
diff --git a/build3/bin2cpp.bat b/build3/bin2cpp.bat
index 93ee1feb1..28c5bedc0 100644
--- a/build3/bin2cpp.bat
+++ b/build3/bin2cpp.bat
@@ -2,6 +2,6 @@
 rem @echo off
 
 
-premake4 --file=bin2cpp.lua --binfile="../btgui/FontFiles/OpenSans.ttf" --cppfile="../btgui/FontFiles/OpenSans.cpp" --stringname="OpenSansData" bin2cpp
+premake4 --file=bin2cpp.lua --binfile="../btgui/FontFiles/OpenSans.ttf" --cppfile="../btgui/OpenGLWindow/OpenSans.cpp" --stringname="OpenSansData" bin2cpp
 
-pause
\ No newline at end of file
+pause
diff --git a/build3/findOpenGLGlewGlut.lua b/build3/findOpenGLGlewGlut.lua
index e60a1d90d..e3e2581cd 100644
--- a/build3/findOpenGLGlewGlut.lua
+++ b/build3/findOpenGLGlewGlut.lua
@@ -78,6 +78,7 @@
 			configuration{"Linux"}
 			if not _OPTIONS["force_dlopen_opengl"] and (os.isdir("/usr/include") and os.isfile("/usr/include/GL/gl.h") and os.isfile("/usr/include/GL/glew.h"))  then
 				links {"GLEW"}
+				print ("linking against system GLEW")
 			else
 				print("Using static glew and dynamic loading of glx functions")
 			 	defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
diff --git a/build3/premake4.lua b/build3/premake4.lua
index 97c092c82..a9b4ec75d 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -124,7 +124,6 @@ if findOpenGL3() then
 	include "../Demos3/GpuDemos"
 	include"../Demos3/BasicDemoConsole"
 	include"../Demos3/BasicDemoCustomOpenGL2"
-	include "../btgui/OpenGLTrueTypeFont"	
 	
 --	include "../Demos3/CpuDemos"
 --	include "../Demos3/Wavefront"
@@ -175,7 +174,6 @@ end
 --		include "../demo/gpu_initialize"
 --		include "../opencl/lds_bank_conflict"
 --		include "../opencl/reduce"
---		include "../btgui/OpenGLTrueTypeFont"
 --		include "../btgui/OpenGLWindow"
 --		include "../demo/ObjLoader"
 --		include "../test/b3DynamicBvhBroadphase"
diff --git a/build3/stringify_linux.sh b/build3/stringify.sh
similarity index 100%
rename from build3/stringify_linux.sh
rename to build3/stringify.sh
diff --git a/build3/stringify_osx.sh b/build3/stringify_osx.sh
deleted file mode 100755
index 08b5bb3b8..000000000
--- a/build3/stringify_osx.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl" 	--headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h" --stringname="radixSort32KernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl" 	--headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h" --stringname="boundSearchKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl" 	--headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h" --stringname="prefixScanKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl" 				--headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h" --stringname="fillKernelsCL" stringify
-
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl" --headerfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h" --stringname="sapCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapFast.cl" --headerfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapFastKernels.h" --stringname="sapFastCL" stringify
-
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h" --stringname="satKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h" --stringname="satClipKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h" --stringname="primitiveContactsKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h" --stringname="bvhTraversalKernelCL" stringify
-
-
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/integrateKernel.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/integrateKernel.h" --stringname="integrateKernelCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/updateAabbsKernel.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/updateAabbsKernel.h" --stringname="updateAabbsKernelCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup.h" --stringname="solverSetupCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup2.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup2.h" --stringname="solverSetup2CL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernels.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernels.h" --stringname="batchingKernelsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernelsNew.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernelsNew.h" --stringname="batchingKernelsNewCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverUtils.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverUtils.h" --stringname="solverUtilsCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solveContact.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solveContact.h" --stringname="solveContactCL" stringify
-./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solveFriction.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solveFriction.h" --stringname="solveFrictionCL" stringify
-