diff --git a/test/HtmlEditor/HtmlEditor.xml b/test/HtmlEditor/HtmlEditorProj.xml
rename from test/HtmlEditor/HtmlEditor.xml
rename to test/HtmlEditor/HtmlEditorProj.xml
--- a/test/HtmlEditor/HtmlEditor.xml
+++ b/test/HtmlEditor/HtmlEditorProj.xml
@@ -1,156 +1,156 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project>
 	<Node Name="Source" Type="1" Platforms="7" Open="1" Id="1">
 		<Node File="./Rich.cpp" Type="2" Platforms="7" />
 		<Node Name="Rich Text Editor" Type="1" Platforms="15" Open="1" Id="2">
 			<Node Name="Emoji" Type="1" Platforms="15" Open="0" Id="3">
-				<Node File="../src/common/Text/Emoji/EmojiMap.cpp" Type="2" Platforms="15" />
-				<Node File="../src/common/Text/Emoji/EmojiTools.cpp" Type="2" Platforms="15" />
+				<Node File="../../src/common/Text/Emoji/EmojiMap.cpp" Type="2" Platforms="15" />
+				<Node File="../../src/common/Text/Emoji/EmojiTools.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Spelling" Type="1" Platforms="15" Open="1" Id="4">
-				<Node File="../include/lgi/common/SpellCheck.h" Type="3" Platforms="15" />
+				<Node File="../../include/lgi/common/SpellCheck.h" Type="3" Platforms="15" />
 			</Node>
-			<Node File="../src/common/Widgets/Editor/BlockCursor.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/RichTextEdit.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/RichTextEditPriv.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/RichTextEditPriv.h" Type="3" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/HorzRuleBlock.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/ImageBlock.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Widgets/Editor/TextBlock.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/BlockCursor.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/RichTextEdit.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/RichTextEditPriv.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/RichTextEditPriv.h" Type="3" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/HorzRuleBlock.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/ImageBlock.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Widgets/Editor/TextBlock.cpp" Type="2" Platforms="15" />
 		</Node>
 		<Node Name="Html" Type="1" Platforms="15" Open="1" Id="5">
-			<Node File="../src/common/Text/Html.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/HtmlCommon.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/HtmlParser.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/Html.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/HtmlCommon.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/HtmlParser.cpp" Type="2" Platforms="15" />
 		</Node>
 		<Node Name="Lgi" Type="1" Platforms="15" Id="1">
-			<Node File="../src/common/Gdc2/Tools/GdcTools.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Gdc2/Filters/Gif.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/Homoglyphs/Homoglyphs.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/Homoglyphs/HomoglyphsTable.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Net/Http.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Gdc2/Filters/Jpeg.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="7" />
-			<Node File="../src/common/Gdc2/Filters/Lzw.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Net/OpenSSLSocket.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Gdc2/Filters/Png.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Gdc2/Tools/GdcTools.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Gdc2/Filters/Gif.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/Homoglyphs/Homoglyphs.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/Homoglyphs/HomoglyphsTable.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Net/Http.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Gdc2/Filters/Jpeg.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="7" />
+			<Node File="../../src/common/Gdc2/Filters/Lzw.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Net/OpenSSLSocket.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Gdc2/Filters/Png.cpp" Type="2" Platforms="15" />
 		</Node>
 	</Node>
-	<Node File="../Lgi.xml" Type="4" Platforms="15" />
+	<Node File="../../Lgi.xml" Type="4" Platforms="15" />
 	<Node Name="Build" Type="1" Platforms="15" Id="1">
 		<Node File="./Makefile.linux" Type="9" Platforms="15" />
 	</Node>
 	<Settings>
 		<General>
 			<Makefile>
 				<Linux>./Makefile.linux</Linux>
 				<Windows>.\HtmlEdit.sln</Windows>
 			</Makefile>
 			<Executable>
 				<Linux>
 					<Debug>./htmleditor</Debug>
 					<Release>./htmleditor</Release>
 				</Linux>
 			</Executable>
 			<Compiler>
 				<Linux>gcc</Linux>
 			</Compiler>
 			<Arguments>
 				<All>
 					<Debug>./TestCases/test.html</Debug>
 					<Release>./TestCases/test.html</Release>
 				</All>
 			</Arguments>
 			<CCrossCompiler />
 			<CppCrossCompiler />
 		</General>
 		<Build>
 			<IncludePaths>
 				<All>
-					<Debug>../include
-../private/common</Debug>
-					<Release>../include
-../private/common</Release>
+					<Debug>../../include
+../../private/common</Debug>
+					<Release>../../include
+../../private/common</Release>
 				</All>
 				<Linux>
-					<Debug>../include/lgi/linux
-../include/lgi/linux/Gtk
-../../../../codelib/openssl/include</Debug>
-					<Release>../include/lgi/linux
-../include/lgi/linux/Gtk
-../../../../codelib/openssl/include</Release>
+					<Debug>../../include/lgi/linux
+../../include/lgi/linux/Gtk
+../../../../../codelib/openssl/include</Debug>
+					<Release>../../include/lgi/linux
+../../include/lgi/linux/Gtk
+../../../../../codelib/openssl/include</Release>
 				</Linux>
 				<Windows>
-					<Debug>../include/lgi/win</Debug>
-					<Release>../include/lgi/win</Release>
+					<Debug>../../include/lgi/win</Debug>
+					<Release>../../include/lgi/win</Release>
 				</Windows>
 			</IncludePaths>
 			<TargetType>
 				<All>Executable</All>
 			</TargetType>
 			<Libraries>
 				<Linux>
 					<Debug>pthread
 `pkg-config --libs gtk+-3.0`</Debug>
 					<Release>pthread
 `pkg-config --libs gtk+-3.0`</Release>
 				</Linux>
 				<All />
 			</Libraries>
 			<SystemIncludes>
 				<Linux>
 					<Debug>/usr/include/gstreamer-1.0
 /usr/include/libappindicator3-0.1
 `pkg-config --cflags gtk+-3.0`</Debug>
 					<Release>/usr/include/gstreamer-1.0
 /usr/include/libappindicator3-0.1
 `pkg-config --cflags gtk+-3.0`</Release>
 				</Linux>
 			</SystemIncludes>
 			<Defines>
 				<All />
 				<Linux />
 			</Defines>
 			<LibraryPaths>
 				<All />
 				<Linux />
 			</LibraryPaths>
 			<TargetName>
 				<Linux />
 			</TargetName>
 			<ApplicationIcon />
 		</Build>
 		<Editor>
 			<TabSize>
 				<All>4</All>
 			</TabSize>
 			<IndentSize>
 				<All>4</All>
 			</IndentSize>
 			<UseHardTabs>
 				<All>1</All>
 			</UseHardTabs>
 			<ShowWhiteSpace />
 			<CommentFile />
 			<CommentFunction />
 		</Editor>
 		<Advanced>
 			<PostBuildCommands>
 				<Linux />
 			</PostBuildCommands>
 			<OtherMakefileRules />
 		</Advanced>
 		<Debug>
 			<Arguments>
 				<All />
 			</Arguments>
 			<Environment />
 			<DebugAdmin />
 			<InitialDir />
 		</Debug>
 		<Remote>
 			<RemoteUri />
 			<RemotePass />
 		</Remote>
 	</Settings>
 </Project>
diff --git a/test/HtmlEditor/Makefile b/test/HtmlEditor/Makefile
deleted file mode 100755
--- a/test/HtmlEditor/Makefile
+++ /dev/null
@@ -1,270 +0,0 @@
-#!/usr/bin/make
-#
-# This makefile generated by LgiIde
-# http://www.memecode.com/lgi.php
-#
-
-.SILENT :
-
-CC = gcc
-CPP = g++
-Target = htmleditor
-ifndef Build
-	Build = Debug
-endif
-Gui = X
-BuildDir = $(Build)$(Gui)
-
-Flags = -fPIC -w -fno-inline -fpermissive
-Defs = -DLINUX -D_REENTRANT -D$(Gui)WIN
-
-ifeq ($(Build),Debug)
-	Defs += -D_DEBUG
-	Flags += -g
-	Tag = d
-else
-	Flags += -s -Os
-endif
-
-# Libraries
-Libs = \
-			-static-libgcc \
-			-lgcc \
-			-lpthread \
-			-lstdc++ \
-			-llgi$(Tag) \
-			-L/home/matthew/Code/Lgi/$(BuildDir)
-
-# Includes
-Inc =		-I/usr/include/xcb\
-			-I/usr/include/glib-2.0\
-			-I/usr/lib/glib-2.0/include\
-			-I/usr/include/cairo\
-			-I/usr/include/pango-1.0 \
-			-I../include/common \
-			-I../include/linux/Xcb
-
-# Dependencies
-Depends =	LgiMain.o \
-			Rich.o \
-			GHtml2.o \
-			GHtmlStatic.o \
-			GHtmlEdit.o
-
-# Target
-# Executable target
-$(Target) : ../$(BuildDir)/liblgi$(Tag).so outputfolder $(Depends)
-	@echo Linking $(Target) [$(Gui)/$(Build)]...
-	$(CC) -Wl,-soname,$(TargetFile),-export-dynamic,-R. -f -o \
-		$(Target) $(addprefix $(BuildDir)/,$(Depends)) $(Libs)
-	@echo Done.
-
-../$(BuildDir)/liblgi$(Tag).so : FORCE
-	export Build=$(Build); \
-		export Gui=$(Gui); \
-		$(MAKE) -C .. -f Makefile.linux
-
-FORCE :
-
-# Create the output folder
-outputfolder :
-	-mkdir -p $(BuildDir) 2> /dev/null
-
-# Clean out targets
-clean :
-	rm -f $(BuildDir)/*.o $(Target).
-	@echo Cleaned $(BuildDir)
-
-LgiMain.o : ../src/common/Lgi/LgiMain.cpp ../include/common/Lgi.h
-	@echo $(<F) [$(Gui)]
-	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $(BuildDir)/$(@F)
-
-Rich.o : ./Rich.cpp ../include/common/Lgi.h \
-	../include/common/GHtmlEdit.h \
-	../include/common/GTextView3.h
-	@echo $(<F) [$(Gui)]
-	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $(BuildDir)/$(@F)
-
-GHtml2.o : ../src/common/Text/GHtml2.cpp ../include/common/Lgi.h \
-	../include/common/GHtml2.h \
-	../include/common/GHtmlPriv2.h \
-	../include/common/GToken.h \
-	../include/common/GScrollBar.h \
-	../include/common/GVariant.h \
-	../include/common/GFindReplaceDlg.h
-	@echo $(<F) [$(Gui)]
-	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $(BuildDir)/$(@F)
-
-GHtmlStatic.o : ../src/common/Text/GHtmlStatic.cpp ../include/common/Lgi.h \
-	../include/common/GHtml.h
-	@echo $(<F) [$(Gui)]
-	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $(BuildDir)/$(@F)
-
-GHtmlEdit.o : ../src/common/Widgets/GHtmlEdit.cpp ../include/common/Lgi.h \
-	../include/common/GHtmlEdit.h \
-	../include/common/GHtmlPriv2.h \
-	../include/common/GSkinEngine.h \
-	../include/common/GCombo.h
-	@echo $(<F) [$(Gui)]
-	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $(BuildDir)/$(@F)
-
-Lgi.h : ../include/common/LgiInc.h \
-	../include/common/LgiMsgs.h \
-	../include/common/LgiDefs.h \
-	../include/common/GMem.h \
-	../include/common/GString.h \
-	../include/common/LgiClass.h \
-	../include/linux/Xcb/LgiOsDefs.h \
-	../include/common/Progress.h \
-	../include/common/GFile.h \
-	../include/common/Gdc2.h \
-	../include/common/LgiRes.h \
-	../include/common/LgiClasses.h \
-	../include/common/LgiCommon.h
-
-LgiRes.h : ../include/common/Res.h \
-	../include/common/GContainers.h
-
-GHtml.h : ../include/common/GMap.h \
-	../include/common/GDocView.h \
-	../include/common/GHtmlStatic.h
-
-GString.h : ../include/common/LgiInc.h \
-	../include/common/LgiDefs.h
-
-GToken.h : ../include/common/GArray.h
-
-GMem.h : ../include/common/LgiDefs.h \
-	../include/common/LgiInc.h
-
-LgiDefs.h : ../include/common/GAutoPtr.h
-
-GAutoPtr.h : ../include/common/GMem.h
-
-GHtmlPriv2.h : ../include/common/GCss.h
-
-GContainers.h : ../include/common/LgiInc.h \
-	../include/linux/Xcb/LgiOsDefs.h \
-	../include/common/GStream.h
-
-GStream.h : ../include/common/GDom.h
-
-GDom.h : ../include/common/LgiInterfaces.h \
-	../include/common/GArray.h
-
-GVariant.h : ../include/common/GDom.h \
-	../include/common/GDateTime.h \
-	../include/common/GContainers.h \
-	../include/common/GHashTable.h
-
-GArray.h : ../include/common/LgiDefs.h \
-	../include/common/GMem.h
-
-GHtmlStatic.h : ../include/common/GHashTable.h
-
-GHtml2.h : ../include/common/GDocView.h \
-	../include/common/GHtmlStatic.h
-
-Gdc2.h : ../include/common/LgiDefs.h \
-	../include/common/LgiClass.h \
-	../include/linux/Xcb/LgiOsDefs.h \
-	../include/common/Progress.h \
-	../include/common/GFile.h \
-	../include/common/GMem.h \
-	../include/linux/Xcb/Core.h \
-	../include/common/GContainers.h \
-	../include/common/GLibrary.h \
-	../include/common/GRect.h \
-	../include/common/GFont.h \
-	../include/common/GFilter.h
-
-GFont.h : ../include/common/GRect.h \
-	../include/common/GProperties.h \
-	../include/linux/Xcb/LgiOsClasses.h \
-	../include/common/GLibrary.h \
-	../include/common/GFilterUtils.h \
-	../include/common/GDisplayString.h \
-	/usr/include/iconv.h
-
-GFilter.h : ../include/common/GContainers.h \
-	../include/common/GProperties.h
-
-GHtmlEdit.h : ../include/common/GHtml2.h
-
-GTextView3.h : ../include/common/GDocView.h \
-	../include/common/GUndo.h
-
-Progress.h : ../include/common/GSemaphore.h
-
-LgiClasses.h : ../include/common/GSemaphore.h \
-	../include/common/GLibrary.h \
-	../include/linux/Xcb/LgiOsClasses.h \
-	../include/common/GArray.h \
-	../include/common/LgiCommon.h \
-	../include/common/GXmlTree.h \
-	../include/common/GDragAndDrop.h \
-	../include/common/GMenu.h \
-	../include/common/LgiWidgets.h \
-	../include/common/Progress.h \
-	../include/common/GProgress.h \
-	../include/common/GFileSelect.h \
-	../include/common/GFindReplaceDlg.h \
-	../include/common/GToolBar.h \
-	../include/common/GThread.h \
-	../include/common/GClipBoard.h \
-	../include/common/GInput.h \
-	../include/common/GPrinter.h
-
-GDragAndDrop.h : ../include/common/GVariant.h
-
-GThread.h : ../include/common/GSemaphore.h
-
-GXmlTree.h : ../include/common/GHashTable.h \
-	../include/common/GRefCount.h \
-	../include/common/GDom.h
-
-GMenu.h : ../include/common/GMenuImpl.h \
-	../include/common/GXmlTree.h \
-	../include/common/Res.h
-
-GMenuImpl.h : ../include/common/GPopup.h
-
-GCss.h : ../include/common/LgiDefs.h \
-	../include/common/GMem.h \
-	../include/common/Gdc2.h \
-	../include/common/GAutoPtr.h \
-	../include/common/GString.h \
-	../include/common/GHashTable.h
-
-LgiInterfaces.h : ../include/common/GArray.h
-
-LgiClass.h : ../include/common/LgiInc.h
-
-GSkinEngine.h : ../include/common/GList.h
-
-GList.h : ../include/common/GPopup.h \
-	../include/common/GArray.h
-
-GProperties.h : ../include/common/GContainers.h \
-	../include/common/LgiClass.h
-
-GHashTable.h : ../include/common/GArray.h \
-	../include/common/GString.h
-
-LgiCommon.h : ../include/common/GArray.h \
-	../include/common/LgiClass.h
-
-Res.h : ../include/common/GXmlTree.h \
-	../include/common/GProperties.h
-
-LgiOsDefs.h : ../include/common/LgiDefs.h \
-	../include/common/LgiInc.h
-
-GFile.h : ../include/linux/Xcb/LgiOsDefs.h \
-	../include/common/GMem.h \
-	../include/common/GStream.h \
-	../include/common/GArray.h
-
-VPATH=%.cpp \
-	$(BuildDir)
-
diff --git a/test/HtmlEditor/Makefile.linux b/test/HtmlEditor/Makefile.linux
new file mode 100644
--- /dev/null
+++ b/test/HtmlEditor/Makefile.linux
@@ -0,0 +1,403 @@
+#!/usr/bin/make
+#
+# This makefile generated by LgiIde
+# http://www.memecode.com/lgi.php
+#
+
+.SILENT :
+
+CC = gcc
+CPP = g++
+Target = ./htmleditor
+ifndef Build
+	Build = Debug
+endif
+MakeDir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+BuildDir = $(Build)
+
+Flags = -fPIC -w -fno-inline -fpermissive
+
+ifeq ($(Build),Debug)
+	Flags += -MMD -MP -g -std=c++14
+	Tag = d
+	Defs = -D_DEBUG -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DPOSIX
+	Libs =  \
+		-lpthread \
+		`pkg-config --libs gtk+-3.0` \
+		-llgi-gtk3$(Tag) \
+		-L../../$(BuildDir)
+	Inc =  \
+		`pkg-config --cflags gtk+-3.0` \
+		-I../../../../../../../usr/include/libappindicator3-0.1 \
+		-I../../../../../../../usr/include/gstreamer-1.0 \
+		-I../../private/common \
+		-I../../include/lgi/linux/Gtk \
+		-I../../include/lgi/linux \
+		-I../../include \
+		-I../../../../../codelib/openssl/include
+else
+	Flags += -MMD -MP -s -Os -std=c++14
+	Defs = -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DPOSIX
+	Libs =  \
+		-lpthread \
+		`pkg-config --libs gtk+-3.0` \
+		-llgi-gtk3$(Tag) \
+		-L../../$(BuildDir)
+	Inc =  \
+		`pkg-config --cflags gtk+-3.0` \
+		-I../../../../../../../usr/include/libappindicator3-0.1 \
+		-I../../../../../../../usr/include/gstreamer-1.0 \
+		-I../../private/common \
+		-I../../include/lgi/linux/Gtk \
+		-I../../include/lgi/linux \
+		-I../../include \
+		-I../../../../../codelib/openssl/include
+endif
+
+# Dependencies
+Source =	Rich.cpp \
+			../../src/common/Widgets/Editor/TextBlock.cpp \
+			../../src/common/Widgets/Editor/RichTextEditPriv.cpp \
+			../../src/common/Widgets/Editor/RichTextEdit.cpp \
+			../../src/common/Widgets/Editor/ImageBlock.cpp \
+			../../src/common/Widgets/Editor/HorzRuleBlock.cpp \
+			../../src/common/Widgets/Editor/BlockCursor.cpp \
+			../../src/common/Text/HtmlParser.cpp \
+			../../src/common/Text/HtmlCommon.cpp \
+			../../src/common/Text/Html.cpp \
+			../../src/common/Text/Homoglyphs/HomoglyphsTable.cpp \
+			../../src/common/Text/Homoglyphs/Homoglyphs.cpp \
+			../../src/common/Text/Emoji/EmojiTools.cpp \
+			../../src/common/Text/Emoji/EmojiMap.cpp \
+			../../src/common/Net/OpenSSLSocket.cpp \
+			../../src/common/Net/Http.cpp \
+			../../src/common/Lgi/LgiMain.cpp \
+			../../src/common/Gdc2/Tools/GdcTools.cpp \
+			../../src/common/Gdc2/Filters/Png.cpp \
+			../../src/common/Gdc2/Filters/Lzw.cpp \
+			../../src/common/Gdc2/Filters/Jpeg.cpp \
+			../../src/common/Gdc2/Filters/Gif.cpp
+
+SourceC    := $(filter %.c,$(Source))
+ObjectsC   := $(SourceC:.c=.o)
+SourceCpp  := $(filter %.cpp,$(Source))
+ObjectsCpp := $(SourceCpp:.cpp=.o)
+Objects    := $(notdir $(ObjectsC) $(ObjectsCpp))
+Objects    := $(addprefix $(BuildDir)/,$(Objects))
+Deps       := $(patsubst %.o,%.d,$(Objects))
+
+$(BuildDir)/%.o: %.c
+	mkdir -p $(@D)
+	echo $(notdir $<) [$(Build)]
+	$(CC) $(Inc) $(Flags) $(Defs) -c $< -o $@
+
+$(BuildDir)/%.o: %.cpp
+	mkdir -p $(@D)
+	echo $(notdir $<) [$(Build)]
+	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $@
+
+# Target
+# Executable target
+$(Target) : ../../$(BuildDir)/liblgi-gtk3$(Tag).so $(Objects)
+	mkdir -p $(BuildDir)
+	@echo Linking $(Target) [$(Build)]...
+	$(CPP) -Wl,-export-dynamic,-R. -o \
+		$(Target) $(Objects) $(Libs)
+	@echo Done.
+
+../../$(BuildDir)/liblgi-gtk3$(Tag).so : ../../include/lgi/common/App.h \
+	../../include/lgi/common/Array.h \
+	../../include/lgi/common/AutoPtr.h \
+	../../include/lgi/common/Base64.h \
+	../../include/lgi/common/Bitmap.h \
+	../../include/lgi/common/Box.h \
+	../../include/lgi/common/Button.h \
+	../../include/lgi/common/CairoSurface.h \
+	../../include/lgi/common/Cancel.h \
+	../../include/lgi/common/Capabilities.h \
+	../../include/lgi/common/Charset.h \
+	../../include/lgi/common/CheckBox.h \
+	../../include/lgi/common/ClipBoard.h \
+	../../include/lgi/common/Colour.h \
+	../../include/lgi/common/ColourSpace.h \
+	../../include/lgi/common/Com.h \
+	../../include/lgi/common/Combo.h \
+	../../include/lgi/common/Containers.h \
+	../../include/lgi/common/Core.h \
+	../../include/lgi/common/Css.h \
+	../../include/lgi/common/CssTools.h \
+	../../include/lgi/common/CurrentTime.h \
+	../../include/lgi/common/DataDlg.h \
+	../../include/lgi/common/DateTime.h \
+	../../include/lgi/common/Dialog.h \
+	../../include/lgi/common/DisplayString.h \
+	../../include/lgi/common/DocView.h \
+	../../include/lgi/common/Dom.h \
+	../../include/lgi/common/DomFields.h \
+	../../include/lgi/common/DragAndDrop.h \
+	../../include/lgi/common/DropFiles.h \
+	../../include/lgi/common/Edit.h \
+	../../include/lgi/common/Error.h \
+	../../include/lgi/common/EventTargetThread.h \
+	../../include/lgi/common/File.h \
+	../../include/lgi/common/FileSelect.h \
+	../../include/lgi/common/Filter.h \
+	../../include/lgi/common/FindReplaceDlg.h \
+	../../include/lgi/common/Font.h \
+	../../include/lgi/common/FontCache.h \
+	../../include/lgi/common/FontSelect.h \
+	../../include/lgi/common/Gdc2.h \
+	../../include/lgi/common/GdcTools.h \
+	../../include/lgi/common/GdiLeak.h \
+	../../include/lgi/common/HashTable.h \
+	../../include/lgi/common/ImageList.h \
+	../../include/lgi/common/Input.h \
+	../../include/lgi/common/ItemContainer.h \
+	../../include/lgi/common/Json.h \
+	../../include/lgi/common/Layout.h \
+	../../include/lgi/common/Lgi.h \
+	../../include/lgi/common/LgiClasses.h \
+	../../include/lgi/common/LgiCommon.h \
+	../../include/lgi/common/LgiDefs.h \
+	../../include/lgi/common/LgiInc.h \
+	../../include/lgi/common/LgiInterfaces.h \
+	../../include/lgi/common/LgiMsgs.h \
+	../../include/lgi/common/LgiNetInc.h \
+	../../include/lgi/common/LgiRes.h \
+	../../include/lgi/common/LgiString.h \
+	../../include/lgi/common/LgiUiBase.h \
+	../../include/lgi/common/Library.h \
+	../../include/lgi/common/LibraryUtils.h \
+	../../include/lgi/common/List.h \
+	../../include/lgi/common/ListItemCheckBox.h \
+	../../include/lgi/common/ListItemRadioBtn.h \
+	../../include/lgi/common/LMallocArray.h \
+	../../include/lgi/common/Mail.h \
+	../../include/lgi/common/Matrix.h \
+	../../include/lgi/common/Mem.h \
+	../../include/lgi/common/Menu.h \
+	../../include/lgi/common/Message.h \
+	../../include/lgi/common/Mime.h \
+	../../include/lgi/common/Mru.h \
+	../../include/lgi/common/Mutex.h \
+	../../include/lgi/common/Net.h \
+	../../include/lgi/common/NetTools.h \
+	../../include/lgi/common/Notifications.h \
+	../../include/lgi/common/OAuth2.h \
+	../../include/lgi/common/OptionsFile.h \
+	../../include/lgi/common/Palette.h \
+	../../include/lgi/common/Panel.h \
+	../../include/lgi/common/Password.h \
+	../../include/lgi/common/Path.h \
+	../../include/lgi/common/PixelRops.h \
+	../../include/lgi/common/Point.h \
+	../../include/lgi/common/Popup.h \
+	../../include/lgi/common/PopupList.h \
+	../../include/lgi/common/PopupNotification.h \
+	../../include/lgi/common/Printer.h \
+	../../include/lgi/common/Profile.h \
+	../../include/lgi/common/Progress.h \
+	../../include/lgi/common/ProgressDlg.h \
+	../../include/lgi/common/ProgressView.h \
+	../../include/lgi/common/Properties.h \
+	../../include/lgi/common/RadioGroup.h \
+	../../include/lgi/common/Range.h \
+	../../include/lgi/common/Rect.h \
+	../../include/lgi/common/RectF.h \
+	../../include/lgi/common/RefCount.h \
+	../../include/lgi/common/RegKey.h \
+	../../include/lgi/common/Res.h \
+	../../include/lgi/common/Rops.h \
+	../../include/lgi/common/ScrollBar.h \
+	../../include/lgi/common/SkinEngine.h \
+	../../include/lgi/common/Slider.h \
+	../../include/lgi/common/Splitter.h \
+	../../include/lgi/common/StatusBar.h \
+	../../include/lgi/common/Store3Defs.h \
+	../../include/lgi/common/Stream.h \
+	../../include/lgi/common/StringClass.h \
+	../../include/lgi/common/StringLayout.h \
+	../../include/lgi/common/StructuredIo.h \
+	../../include/lgi/common/StructuredLog.h \
+	../../include/lgi/common/SubProcess.h \
+	../../include/lgi/common/TableLayout.h \
+	../../include/lgi/common/TabView.h \
+	../../include/lgi/common/TextFile.h \
+	../../include/lgi/common/TextLabel.h \
+	../../include/lgi/common/TextLog.h \
+	../../include/lgi/common/TextView3.h \
+	../../include/lgi/common/Thread.h \
+	../../include/lgi/common/ThreadEvent.h \
+	../../include/lgi/common/Token.h \
+	../../include/lgi/common/ToolBar.h \
+	../../include/lgi/common/ToolTip.h \
+	../../include/lgi/common/TrayIcon.h \
+	../../include/lgi/common/Tree.h \
+	../../include/lgi/common/Undo.h \
+	../../include/lgi/common/Unicode.h \
+	../../include/lgi/common/UnicodeString.h \
+	../../include/lgi/common/UnrolledList.h \
+	../../include/lgi/common/Variant.h \
+	../../include/lgi/common/View.h \
+	../../include/lgi/common/Widgets.h \
+	../../include/lgi/common/Window.h \
+	../../include/lgi/common/XmlTree.h \
+	../../include/lgi/linux/Gtk/LgiOsClasses.h \
+	../../include/lgi/linux/Gtk/LgiOsDefs.h \
+	../../include/lgi/linux/Gtk/LgiWidget.h \
+	../../include/lgi/linux/Gtk/LgiWinManGlue.h \
+	../../include/lgi/linux/SymLookup.h \
+	../../include/lgi/mac/cocoa/LCocoaView.h \
+	../../include/lgi/mac/cocoa/LgiMac.h \
+	../../include/lgi/mac/cocoa/LgiOs.h \
+	../../include/lgi/mac/cocoa/LgiOsClasses.h \
+	../../include/lgi/mac/cocoa/LgiOsDefs.h \
+	../../include/lgi/mac/cocoa/ObjCWrapper.h \
+	../../include/lgi/mac/cocoa/SymLookup.h \
+	../../private/common/FontPriv.h \
+	../../private/common/ViewPriv.h \
+	../../private/linux/AppPriv.h \
+	../../src/common/Gdc2/15Bit.cpp \
+	../../src/common/Gdc2/16Bit.cpp \
+	../../src/common/Gdc2/24Bit.cpp \
+	../../src/common/Gdc2/32Bit.cpp \
+	../../src/common/Gdc2/8Bit.cpp \
+	../../src/common/Gdc2/Alpha.cpp \
+	../../src/common/Gdc2/Colour.cpp \
+	../../src/common/Gdc2/Filters/Filter.cpp \
+	../../src/common/Gdc2/Font/Charset.cpp \
+	../../src/common/Gdc2/Font/DisplayString.cpp \
+	../../src/common/Gdc2/Font/Font.cpp \
+	../../src/common/Gdc2/Font/FontSystem.cpp \
+	../../src/common/Gdc2/Font/FontType.cpp \
+	../../src/common/Gdc2/Font/StringLayout.cpp \
+	../../src/common/Gdc2/Font/TypeFace.cpp \
+	../../src/common/Gdc2/GdcCommon.cpp \
+	../../src/common/Gdc2/Path/Path.cpp \
+	../../src/common/Gdc2/Rect.cpp \
+	../../src/common/Gdc2/RopsCases.cpp \
+	../../src/common/Gdc2/Surface.cpp \
+	../../src/common/Gdc2/Tools/ColourReduce.cpp \
+	../../src/common/Gdc2/Tools/GdcTools.cpp \
+	../../src/common/General/Containers.cpp \
+	../../src/common/General/DateTime.cpp \
+	../../src/common/General/ExeCheck.cpp \
+	../../src/common/General/FileCommon.cpp \
+	../../src/common/General/Password.cpp \
+	../../src/common/General/Properties.cpp \
+	../../src/common/Hash/md5/md5.c \
+	../../src/common/Hash/md5/md5.h \
+	../../src/common/Hash/sha1/sha1.c \
+	../../src/common/Hash/sha1/sha1.h \
+	../../src/common/Lgi/Alert.cpp \
+	../../src/common/Lgi/AppCommon.cpp \
+	../../src/common/Lgi/Css.cpp \
+	../../src/common/Lgi/CssTools.cpp \
+	../../src/common/Lgi/DataDlg.cpp \
+	../../src/common/Lgi/DragAndDropCommon.cpp \
+	../../src/common/Lgi/FileSelect.cpp \
+	../../src/common/Lgi/FindReplace.cpp \
+	../../src/common/Lgi/FontSelect.cpp \
+	../../src/common/Lgi/GuiUtils.cpp \
+	../../src/common/Lgi/Input.cpp \
+	../../src/common/Lgi/LgiCommon.cpp \
+	../../src/common/Lgi/Library.cpp \
+	../../src/common/Lgi/LMsg.cpp \
+	../../src/common/Lgi/MemStream.cpp \
+	../../src/common/Lgi/MenuCommon.cpp \
+	../../src/common/Lgi/Mru.cpp \
+	../../src/common/Lgi/Mutex.cpp \
+	../../src/common/Lgi/Object.cpp \
+	../../src/common/Lgi/OptionsFile.cpp \
+	../../src/common/Lgi/Rand.cpp \
+	../../src/common/Lgi/Stream.cpp \
+	../../src/common/Lgi/SubProcess.cpp \
+	../../src/common/Lgi/ThreadCommon.cpp \
+	../../src/common/Lgi/ThreadEvent.cpp \
+	../../src/common/Lgi/ToolTip.cpp \
+	../../src/common/Lgi/TrayIcon.cpp \
+	../../src/common/Lgi/Variant.cpp \
+	../../src/common/Lgi/ViewCommon.cpp \
+	../../src/common/Lgi/WindowCommon.cpp \
+	../../src/common/Net/Base64.cpp \
+	../../src/common/Net/MDStringToDigest.cpp \
+	../../src/common/Net/Net.cpp \
+	../../src/common/Net/NetTools.cpp \
+	../../src/common/Net/Uri.cpp \
+	../../src/common/Resource/LgiRes.cpp \
+	../../src/common/Resource/Res.cpp \
+	../../src/common/Skins/Gel/Gel.cpp \
+	../../src/common/Text/DocView.cpp \
+	../../src/common/Text/String.cpp \
+	../../src/common/Text/TextView3.cpp \
+	../../src/common/Text/Token.cpp \
+	../../src/common/Text/Unicode.cpp \
+	../../src/common/Text/Utf8.cpp \
+	../../src/common/Text/XmlTree.cpp \
+	../../src/common/Widgets/Bitmap.cpp \
+	../../src/common/Widgets/Box.cpp \
+	../../src/common/Widgets/Button.cpp \
+	../../src/common/Widgets/CheckBox.cpp \
+	../../src/common/Widgets/Combo.cpp \
+	../../src/common/Widgets/Edit.cpp \
+	../../src/common/Widgets/ItemContainer.cpp \
+	../../src/common/Widgets/List.cpp \
+	../../src/common/Widgets/Panel.cpp \
+	../../src/common/Widgets/Popup.cpp \
+	../../src/common/Widgets/Progress.cpp \
+	../../src/common/Widgets/ProgressDlg.cpp \
+	../../src/common/Widgets/RadioGroup.cpp \
+	../../src/common/Widgets/ScrollBar.cpp \
+	../../src/common/Widgets/Slider.cpp \
+	../../src/common/Widgets/Splitter.cpp \
+	../../src/common/Widgets/StatusBar.cpp \
+	../../src/common/Widgets/TableLayout.cpp \
+	../../src/common/Widgets/TabView.cpp \
+	../../src/common/Widgets/TextLabel.cpp \
+	../../src/common/Widgets/ToolBar.cpp \
+	../../src/common/Widgets/Tree.cpp \
+	../../src/linux/General/File.cpp \
+	../../src/linux/General/Mem.cpp \
+	../../src/linux/General/ShowFileProp_Linux.cpp \
+	../../src/linux/Gtk/Gdc2.cpp \
+	../../src/linux/Gtk/LgiWidget.cpp \
+	../../src/linux/Gtk/MemDC.cpp \
+	../../src/linux/Gtk/PrintDC.cpp \
+	../../src/linux/Gtk/ScreenDC.cpp \
+	../../src/linux/Lgi/App.cpp \
+	../../src/linux/Lgi/ClipBoard.cpp \
+	../../src/linux/Lgi/DragAndDrop.cpp \
+	../../src/linux/Lgi/General.cpp \
+	../../src/linux/Lgi/Layout.cpp \
+	../../src/linux/Lgi/Menu.cpp \
+	../../src/linux/Lgi/Printer.cpp \
+	../../src/linux/Lgi/Thread.cpp \
+	../../src/linux/Lgi/View.cpp \
+	../../src/linux/Lgi/Widgets.cpp \
+	../../src/linux/Lgi/Window.cpp
+	export Build=$(Build); \
+	$(MAKE) -C ../../ -f Makefile.linux
+
+-include $(Objects:.o=.d)
+
+# Clean just this target
+clean :
+	rm -rf $(BuildDir) $(Target)
+	@echo Cleaned $(BuildDir) $(Target)
+
+# Clean all targets
+cleanall :
+	rm -rf $(BuildDir) $(Target)
+	@echo Cleaned $(BuildDir) $(Target)
+	+make -C "../../" -f "Makefile.linux" clean
+
+VPATH=$(BuildDir) \
+	./ \
+	../../src/common/Widgets/Editor \
+	../../src/common/Text/Homoglyphs \
+	../../src/common/Text/Emoji \
+	../../src/common/Text \
+	../../src/common/Net \
+	../../src/common/Lgi \
+	../../src/common/Gdc2/Tools \
+	../../src/common/Gdc2/Filters
diff --git a/test/HtmlViewer/TestSuite.xml b/test/HtmlViewer/HtmlViewerProj.xml
rename from test/HtmlViewer/TestSuite.xml
rename to test/HtmlViewer/HtmlViewerProj.xml
--- a/test/HtmlViewer/TestSuite.xml
+++ b/test/HtmlViewer/HtmlViewerProj.xml
@@ -1,137 +1,137 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project TargetType="0" TabSize="4" IndentSize="4" UseTabs="1" ShowWhitespace="0" Makefile="./Makefile" TargetName="test-suite" IncludePaths="../../../../Lgi/include/common&#10;../../../../Lgi/include/linux/Xcb&#10;" Exe="./test-suite" Compiler="0">
 	<Node Name="Lgi" Type="1" Open="1" Platforms="7" Id="4">
 		<Node Name="Html" Type="1" Platforms="7" Open="1" Id="2">
-			<Node File="../src/common/Text/Html.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/HtmlCommon.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Text/HtmlParser.cpp" Type="2" Platforms="15" />
-			<Node File="../include/lgi/common/HtmlPriv.h" Type="3" Platforms="7" />
-			<Node File="../include/lgi/common/Http.h" Type="3" Platforms="7" />
+			<Node File="../../src/common/Text/Html.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/HtmlCommon.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/HtmlParser.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Text/HtmlPriv.h" Type="3" Platforms="7" />
+			<Node File="../../include/lgi/common/Http.h" Type="3" Platforms="7" />
 		</Node>
 		<Node Name="Scripting" Type="1" Platforms="15" Id="1">
-			<Node File="../src/common/Coding/ScriptLibrary.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Coding/ScriptVM.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Coding/ScriptCompiler.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Coding/LexCpp.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Coding/ScriptLibrary.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Coding/ScriptVM.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Coding/ScriptCompiler.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Coding/LexCpp.cpp" Type="2" Platforms="15" />
 		</Node>
-		<Node File="../src/common/Gdc2/Font/EmojiFont.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Text/Emoji/EmojiMap.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Text/Emoji/EmojiTools.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Text/Homoglyphs/Homoglyphs.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Text/Homoglyphs/HomoglyphsTable.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Net/Http.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Images/Compare/ImageComparison.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="7" />
-		<Node File="../src/common/Net/OpenSSLSocket.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Gdc2/Filters/Png.cpp" Type="2" Platforms="15" />
-		<Node File="../src/common/Widgets/ZoomView.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Gdc2/Font/EmojiFont.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Text/Emoji/EmojiMap.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Text/Emoji/EmojiTools.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Text/Homoglyphs/Homoglyphs.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Text/Homoglyphs/HomoglyphsTable.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Net/Http.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Images/Compare/ImageComparison.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="7" />
+		<Node File="../../src/common/Net/OpenSSLSocket.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Gdc2/Filters/Png.cpp" Type="2" Platforms="15" />
+		<Node File="../../src/common/Widgets/ZoomView.cpp" Type="2" Platforms="15" />
 	</Node>
 	<Node Name="Resources" Type="1" Platforms="15" Id="1">
 		<Node File="./HtmlTestSuite.lr8" Type="5" Platforms="15" />
 	</Node>
 	<Node Name="Source" Type="1" Open="1" Platforms="7" Id="1">
 		<Node File="./TestSuite.cpp" Type="2" Platforms="7" />
 	</Node>
 	<Node Name="Tests" Type="1" Platforms="15" Id="1" />
-	<Node File="../Lgi.xml" Type="4" Platforms="15" />
+	<Node File="../../Lgi.xml" Type="4" Platforms="15" LinkAgainst="1" />
 	<Settings>
 		<Build>
 			<IncludePaths>
 				<All>
-					<Debug>../include
-../private/common</Debug>
-					<Release>../include
-../private/common</Release>
+					<Debug>../../include
+../../private/common</Debug>
+					<Release>../../include
+../../private/common</Release>
 				</All>
 				<Linux>
-					<Debug>../include/lgi/linux
-../include/lgi/linux/Gtk
-../../../../codelib/openssl/include</Debug>
-					<Release>../include/lgi/linux
-../include/lgi/linux/Gtk
-../../../../codelib/openssl/include</Release>
+					<Debug>../../include/lgi/linux
+../../include/lgi/linux/Gtk
+../../../../../codelib/openssl/include</Debug>
+					<Release>../../include/lgi/linux
+../../include/lgi/linux/Gtk
+../../../../../codelib/openssl/include</Release>
 				</Linux>
 				<Windows>
-					<Debug>../include/lgi/win</Debug>
-					<Release>../include/lgi/win</Release>
+					<Debug>../../include/lgi/win</Debug>
+					<Release>../../include/lgi/win</Release>
 				</Windows>
 			</IncludePaths>
 			<SystemIncludes>
 				<Linux>
 					<Debug>/usr/include/gstreamer-1.0
 `pkg-config --cflags gtk+-3.0`</Debug>
 					<Release>/usr/include/gstreamer-1.0
 `pkg-config --cflags gtk+-3.0`</Release>
 				</Linux>
 			</SystemIncludes>
 			<TargetType>
 				<All>Executable</All>
 			</TargetType>
 			<Libraries>
 				<Linux>
 					<Debug>-static-libgcc 
 `pkg-config --libs gtk+-3.0`</Debug>
 					<Release>-static-libgcc 
 `pkg-config --libs gtk+-3.0`</Release>
 				</Linux>
 				<All />
 			</Libraries>
 			<TargetName>
 				<Linux>
 					<Debug>lgi-html-test-suite</Debug>
 					<Release>lgi-html-test-suite</Release>
 				</Linux>
 			</TargetName>
 			<Defines>
 				<All />
 				<Linux />
 			</Defines>
 			<LibraryPaths>
 				<All />
 				<Linux />
 			</LibraryPaths>
 			<ApplicationIcon />
 		</Build>
 		<General>
 			<Makefile>
 				<Linux>Makefile.linux</Linux>
 				<Windows>.\HtmlTest.sln</Windows>
 			</Makefile>
 			<Executable>
 				<Linux>
 					<Debug>./HtmlTestSuite</Debug>
 					<Release>./HtmlTestSuite</Release>
 				</Linux>
 			</Executable>
 			<Compiler />
 			<CCrossCompiler />
 			<CppCrossCompiler />
 		</General>
 		<Remote>
 			<RemoteUri />
 			<RemotePass />
 		</Remote>
 		<Debug>
 			<Environment />
 			<Arguments>
 				<All />
 			</Arguments>
 			<DebugAdmin />
 			<InitialDir />
 		</Debug>
 		<Editor>
 			<TabSize />
 			<IndentSize />
 			<ShowWhiteSpace />
 			<UseHardTabs />
 			<CommentFile />
 			<CommentFunction />
 		</Editor>
 		<Advanced>
 			<OtherMakefileRules />
 			<PostBuildCommands>
 				<Linux />
 			</PostBuildCommands>
 		</Advanced>
 	</Settings>
 </Project>
diff --git a/utils/SlogViewer/Makefile.linux b/utils/SlogViewer/Makefile.linux
--- a/utils/SlogViewer/Makefile.linux
+++ b/utils/SlogViewer/Makefile.linux
@@ -1,370 +1,373 @@
 #!/usr/bin/make
 #
 # This makefile generated by LgiIde
 # http://www.memecode.com/lgi.php
 #
 
 .SILENT :
 
 CC = gcc
 CPP = g++
 Target = ./slogviewer
 ifndef Build
 	Build = Debug
 endif
+MakeDir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 BuildDir = $(Build)
 
 Flags = -fPIC -w -fno-inline -fpermissive
 
 ifeq ($(Build),Debug)
-	Flags += -g -std=c++14
+	Flags += -MMD -MP -g -std=c++14
 	Tag = d
 	Defs = -D_DEBUG -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DPOSIX
 	Libs =  \
 		-lpthread \
 		`pkg-config --libs gtk+-3.0` \
 		-static-libgcc \
 		-llgi-gtk3$(Tag) \
-		-L../$(BuildDir)
+		-L../../$(BuildDir)
 	Inc =  \
 		`pkg-config --cflags gtk+-3.0` \
 		-I./resources \
-		-I../include/lgi/linux/Gtk \
-		-I../include/lgi/linux \
-		-I../include
+		-I../../include/lgi/linux/Gtk \
+		-I../../include/lgi/linux \
+		-I../../include
 else
-	Flags += -s -Os -std=c++14
+	Flags += -MMD -MP -s -Os -std=c++14
 	Defs = -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DPOSIX
 	Libs =  \
 		-lpthread \
 		`pkg-config --libs gtk+-3.0` \
 		-static-libgcc \
 		-llgi-gtk3$(Tag) \
-		-L../$(BuildDir)
+		-L../../$(BuildDir)
 	Inc =  \
 		`pkg-config --cflags gtk+-3.0` \
 		-I./resources \
-		-I../include/lgi/linux/Gtk \
-		-I../include/lgi/linux \
-		-I../include
+		-I../../include/lgi/linux/Gtk \
+		-I../../include/lgi/linux \
+		-I../../include
 endif
 
 # Dependencies
 Source =	src/SlogViewerMain.cpp \
-			../src/common/Lgi/LgiMain.cpp \
-			../src/common/Lgi/DocApp.cpp
+			../../src/common/Lgi/LgiMain.cpp \
+			../../src/common/Lgi/DocApp.cpp
 
-SourceLst := $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(Source)))
+SourceC    := $(filter %.c,$(Source))
+ObjectsC   := $(SourceC:.c=.o)
+SourceCpp  := $(filter %.cpp,$(Source))
+ObjectsCpp := $(SourceCpp:.cpp=.o)
+Objects    := $(notdir $(ObjectsC) $(ObjectsCpp))
+Objects    := $(addprefix $(BuildDir)/,$(Objects))
+Deps       := $(patsubst %.o,%.d,$(Objects))
 
-Objects := $(addprefix $(BuildDir)/,$(SourceLst))
+$(BuildDir)/%.o: %.c
+	mkdir -p $(@D)
+	echo $(notdir $<) [$(Build)]
+	$(CC) $(Inc) $(Flags) $(Defs) -c $< -o $@
+
+$(BuildDir)/%.o: %.cpp
+	mkdir -p $(@D)
+	echo $(notdir $<) [$(Build)]
+	$(CPP) $(Inc) $(Flags) $(Defs) -c $< -o $@
 
 # Target
 # Executable target
-$(Target) : ../$(BuildDir)/liblgi-gtk3$(Tag).so $(Objects)
+$(Target) : ../../$(BuildDir)/liblgi-gtk3$(Tag).so $(Objects)
 	mkdir -p $(BuildDir)
 	@echo Linking $(Target) [$(Build)]...
 	$(CPP) -Wl,-export-dynamic,-R. -o \
 		$(Target) $(Objects) $(Libs)
 	@echo Done.
 
-../$(BuildDir)/liblgi-gtk3$(Tag).so : ../include/lgi/common/App.h \
-	../include/lgi/common/Array.h \
-	../include/lgi/common/AutoPtr.h \
-	../include/lgi/common/Base64.h \
-	../include/lgi/common/Bitmap.h \
-	../include/lgi/common/Box.h \
-	../include/lgi/common/Button.h \
-	../include/lgi/common/CairoSurface.h \
-	../include/lgi/common/Cancel.h \
-	../include/lgi/common/Capabilities.h \
-	../include/lgi/common/Charset.h \
-	../include/lgi/common/CheckBox.h \
-	../include/lgi/common/ClipBoard.h \
-	../include/lgi/common/Colour.h \
-	../include/lgi/common/ColourSpace.h \
-	../include/lgi/common/Com.h \
-	../include/lgi/common/Combo.h \
-	../include/lgi/common/Containers.h \
-	../include/lgi/common/Core.h \
-	../include/lgi/common/Css.h \
-	../include/lgi/common/CssTools.h \
-	../include/lgi/common/CurrentTime.h \
-	../include/lgi/common/DataDlg.h \
-	../include/lgi/common/DateTime.h \
-	../include/lgi/common/Dialog.h \
-	../include/lgi/common/DisplayString.h \
-	../include/lgi/common/DocView.h \
-	../include/lgi/common/Dom.h \
-	../include/lgi/common/DomFields.h \
-	../include/lgi/common/DragAndDrop.h \
-	../include/lgi/common/DropFiles.h \
-	../include/lgi/common/Edit.h \
-	../include/lgi/common/Error.h \
-	../include/lgi/common/EventTargetThread.h \
-	../include/lgi/common/File.h \
-	../include/lgi/common/FileSelect.h \
-	../include/lgi/common/Filter.h \
-	../include/lgi/common/FindReplaceDlg.h \
-	../include/lgi/common/Font.h \
-	../include/lgi/common/FontCache.h \
-	../include/lgi/common/FontSelect.h \
-	../include/lgi/common/Gdc2.h \
-	../include/lgi/common/GdcTools.h \
-	../include/lgi/common/GdiLeak.h \
-	../include/lgi/common/HashTable.h \
-	../include/lgi/common/ImageList.h \
-	../include/lgi/common/Input.h \
-	../include/lgi/common/ItemContainer.h \
-	../include/lgi/common/Json.h \
-	../include/lgi/common/Layout.h \
-	../include/lgi/common/Lgi.h \
-	../include/lgi/common/LgiClasses.h \
-	../include/lgi/common/LgiCommon.h \
-	../include/lgi/common/LgiDefs.h \
-	../include/lgi/common/LgiInc.h \
-	../include/lgi/common/LgiInterfaces.h \
-	../include/lgi/common/LgiMsgs.h \
-	../include/lgi/common/LgiNetInc.h \
-	../include/lgi/common/LgiRes.h \
-	../include/lgi/common/LgiString.h \
-	../include/lgi/common/LgiUiBase.h \
-	../include/lgi/common/Library.h \
-	../include/lgi/common/LibraryUtils.h \
-	../include/lgi/common/List.h \
-	../include/lgi/common/ListItemCheckBox.h \
-	../include/lgi/common/ListItemRadioBtn.h \
-	../include/lgi/common/Mail.h \
-	../include/lgi/common/Matrix.h \
-	../include/lgi/common/Mem.h \
-	../include/lgi/common/Menu.h \
-	../include/lgi/common/Message.h \
-	../include/lgi/common/Mime.h \
-	../include/lgi/common/Mru.h \
-	../include/lgi/common/Mutex.h \
-	../include/lgi/common/Net.h \
-	../include/lgi/common/NetTools.h \
-	../include/lgi/common/Notifications.h \
-	../include/lgi/common/OAuth2.h \
-	../include/lgi/common/OptionsFile.h \
-	../include/lgi/common/Palette.h \
-	../include/lgi/common/Panel.h \
-	../include/lgi/common/Password.h \
-	../include/lgi/common/Path.h \
-	../include/lgi/common/PixelRops.h \
-	../include/lgi/common/Point.h \
-	../include/lgi/common/Popup.h \
-	../include/lgi/common/PopupList.h \
-	../include/lgi/common/Printer.h \
-	../include/lgi/common/Profile.h \
-	../include/lgi/common/Progress.h \
-	../include/lgi/common/ProgressDlg.h \
-	../include/lgi/common/ProgressView.h \
-	../include/lgi/common/Properties.h \
-	../include/lgi/common/RadioGroup.h \
-	../include/lgi/common/Range.h \
-	../include/lgi/common/Rect.h \
-	../include/lgi/common/RectF.h \
-	../include/lgi/common/RefCount.h \
-	../include/lgi/common/RegKey.h \
-	../include/lgi/common/Res.h \
-	../include/lgi/common/Rops.h \
-	../include/lgi/common/ScrollBar.h \
-	../include/lgi/common/SkinEngine.h \
-	../include/lgi/common/Slider.h \
-	../include/lgi/common/Splitter.h \
-	../include/lgi/common/StatusBar.h \
-	../include/lgi/common/Store3Defs.h \
-	../include/lgi/common/Stream.h \
-	../include/lgi/common/StringClass.h \
-	../include/lgi/common/StringLayout.h \
-	../include/lgi/common/StructuredIo.h \
-	../include/lgi/common/StructuredLog.h \
-	../include/lgi/common/SubProcess.h \
-	../include/lgi/common/TableLayout.h \
-	../include/lgi/common/TabView.h \
-	../include/lgi/common/TextFile.h \
-	../include/lgi/common/TextLabel.h \
-	../include/lgi/common/TextLog.h \
-	../include/lgi/common/TextView3.h \
-	../include/lgi/common/Thread.h \
-	../include/lgi/common/ThreadEvent.h \
-	../include/lgi/common/Token.h \
-	../include/lgi/common/ToolBar.h \
-	../include/lgi/common/ToolTip.h \
-	../include/lgi/common/TrayIcon.h \
-	../include/lgi/common/Tree.h \
-	../include/lgi/common/Undo.h \
-	../include/lgi/common/Unicode.h \
-	../include/lgi/common/UnicodeString.h \
-	../include/lgi/common/UnrolledList.h \
-	../include/lgi/common/Variant.h \
-	../include/lgi/common/View.h \
-	../include/lgi/common/Widgets.h \
-	../include/lgi/common/Window.h \
-	../include/lgi/common/XmlTree.h \
-	../include/lgi/linux/Gtk/LgiOsClasses.h \
-	../include/lgi/linux/Gtk/LgiOsDefs.h \
-	../include/lgi/linux/Gtk/LgiWidget.h \
-	../include/lgi/linux/Gtk/LgiWinManGlue.h \
-	../include/lgi/linux/SymLookup.h \
-	../include/lgi/mac/cocoa/LCocoaView.h \
-	../include/lgi/mac/cocoa/LgiMac.h \
-	../include/lgi/mac/cocoa/LgiOs.h \
-	../include/lgi/mac/cocoa/LgiOsClasses.h \
-	../include/lgi/mac/cocoa/LgiOsDefs.h \
-	../include/lgi/mac/cocoa/ObjCWrapper.h \
-	../include/lgi/mac/cocoa/SymLookup.h \
-	../private/common/FontPriv.h \
-	../private/common/ViewPriv.h \
-	../private/linux/AppPriv.h \
-	../src/common/Gdc2/15Bit.cpp \
-	../src/common/Gdc2/16Bit.cpp \
-	../src/common/Gdc2/24Bit.cpp \
-	../src/common/Gdc2/32Bit.cpp \
-	../src/common/Gdc2/8Bit.cpp \
-	../src/common/Gdc2/Alpha.cpp \
-	../src/common/Gdc2/Colour.cpp \
-	../src/common/Gdc2/Filters/Filter.cpp \
-	../src/common/Gdc2/Font/Charset.cpp \
-	../src/common/Gdc2/Font/DisplayString.cpp \
-	../src/common/Gdc2/Font/Font.cpp \
-	../src/common/Gdc2/Font/FontSystem.cpp \
-	../src/common/Gdc2/Font/FontType.cpp \
-	../src/common/Gdc2/Font/StringLayout.cpp \
-	../src/common/Gdc2/Font/TypeFace.cpp \
-	../src/common/Gdc2/GdcCommon.cpp \
-	../src/common/Gdc2/Path/Path.cpp \
-	../src/common/Gdc2/Rect.cpp \
-	../src/common/Gdc2/RopsCases.cpp \
-	../src/common/Gdc2/Surface.cpp \
-	../src/common/Gdc2/Tools/ColourReduce.cpp \
-	../src/common/Gdc2/Tools/GdcTools.cpp \
-	../src/common/General/Containers.cpp \
-	../src/common/General/DateTime.cpp \
-	../src/common/General/ExeCheck.cpp \
-	../src/common/General/FileCommon.cpp \
-	../src/common/General/Password.cpp \
-	../src/common/General/Properties.cpp \
-	../src/common/Hash/md5/md5.c \
-	../src/common/Hash/md5/md5.h \
-	../src/common/Hash/sha1/sha1.c \
-	../src/common/Hash/sha1/sha1.h \
-	../src/common/Lgi/Alert.cpp \
-	../src/common/Lgi/AppCommon.cpp \
-	../src/common/Lgi/Css.cpp \
-	../src/common/Lgi/CssTools.cpp \
-	../src/common/Lgi/DataDlg.cpp \
-	../src/common/Lgi/DragAndDropCommon.cpp \
-	../src/common/Lgi/FileSelect.cpp \
-	../src/common/Lgi/FindReplace.cpp \
-	../src/common/Lgi/FontSelect.cpp \
-	../src/common/Lgi/GuiUtils.cpp \
-	../src/common/Lgi/Input.cpp \
-	../src/common/Lgi/LgiCommon.cpp \
-	../src/common/Lgi/Library.cpp \
-	../src/common/Lgi/LMsg.cpp \
-	../src/common/Lgi/MemStream.cpp \
-	../src/common/Lgi/MenuCommon.cpp \
-	../src/common/Lgi/Mru.cpp \
-	../src/common/Lgi/Mutex.cpp \
-	../src/common/Lgi/Object.cpp \
-	../src/common/Lgi/OptionsFile.cpp \
-	../src/common/Lgi/Rand.cpp \
-	../src/common/Lgi/Stream.cpp \
-	../src/common/Lgi/SubProcess.cpp \
-	../src/common/Lgi/ThreadCommon.cpp \
-	../src/common/Lgi/ThreadEvent.cpp \
-	../src/common/Lgi/ToolTip.cpp \
-	../src/common/Lgi/TrayIcon.cpp \
-	../src/common/Lgi/Variant.cpp \
-	../src/common/Lgi/ViewCommon.cpp \
-	../src/common/Lgi/WindowCommon.cpp \
-	../src/common/Net/Base64.cpp \
-	../src/common/Net/MDStringToDigest.cpp \
-	../src/common/Net/Net.cpp \
-	../src/common/Net/NetTools.cpp \
-	../src/common/Net/Uri.cpp \
-	../src/common/Resource/LgiRes.cpp \
-	../src/common/Resource/Res.cpp \
-	../src/common/Skins/Gel/Gel.cpp \
-	../src/common/Text/DocView.cpp \
-	../src/common/Text/String.cpp \
-	../src/common/Text/TextView3.cpp \
-	../src/common/Text/Token.cpp \
-	../src/common/Text/Unicode.cpp \
-	../src/common/Text/Utf8.cpp \
-	../src/common/Text/XmlTree.cpp \
-	../src/common/Widgets/Bitmap.cpp \
-	../src/common/Widgets/Box.cpp \
-	../src/common/Widgets/Button.cpp \
-	../src/common/Widgets/CheckBox.cpp \
-	../src/common/Widgets/Combo.cpp \
-	../src/common/Widgets/Edit.cpp \
-	../src/common/Widgets/ItemContainer.cpp \
-	../src/common/Widgets/List.cpp \
-	../src/common/Widgets/Panel.cpp \
-	../src/common/Widgets/Popup.cpp \
-	../src/common/Widgets/Progress.cpp \
-	../src/common/Widgets/ProgressDlg.cpp \
-	../src/common/Widgets/RadioGroup.cpp \
-	../src/common/Widgets/ScrollBar.cpp \
-	../src/common/Widgets/Slider.cpp \
-	../src/common/Widgets/Splitter.cpp \
-	../src/common/Widgets/StatusBar.cpp \
-	../src/common/Widgets/TableLayout.cpp \
-	../src/common/Widgets/TabView.cpp \
-	../src/common/Widgets/TextLabel.cpp \
-	../src/common/Widgets/ToolBar.cpp \
-	../src/common/Widgets/Tree.cpp \
-	../src/linux/General/File.cpp \
-	../src/linux/General/Mem.cpp \
-	../src/linux/General/ShowFileProp_Linux.cpp \
-	../src/linux/Gtk/Gdc2.cpp \
-	../src/linux/Gtk/LgiWidget.cpp \
-	../src/linux/Gtk/MemDC.cpp \
-	../src/linux/Gtk/PrintDC.cpp \
-	../src/linux/Gtk/ScreenDC.cpp \
-	../src/linux/Lgi/App.cpp \
-	../src/linux/Lgi/ClipBoard.cpp \
-	../src/linux/Lgi/DragAndDrop.cpp \
-	../src/linux/Lgi/General.cpp \
-	../src/linux/Lgi/Layout.cpp \
-	../src/linux/Lgi/Menu.cpp \
-	../src/linux/Lgi/Printer.cpp \
-	../src/linux/Lgi/Thread.cpp \
-	../src/linux/Lgi/View.cpp \
-	../src/linux/Lgi/Widgets.cpp \
-	../src/linux/Lgi/Window.cpp
+../../$(BuildDir)/liblgi-gtk3$(Tag).so : ../../include/lgi/common/App.h \
+	../../include/lgi/common/Array.h \
+	../../include/lgi/common/AutoPtr.h \
+	../../include/lgi/common/Base64.h \
+	../../include/lgi/common/Bitmap.h \
+	../../include/lgi/common/Box.h \
+	../../include/lgi/common/Button.h \
+	../../include/lgi/common/CairoSurface.h \
+	../../include/lgi/common/Cancel.h \
+	../../include/lgi/common/Capabilities.h \
+	../../include/lgi/common/Charset.h \
+	../../include/lgi/common/CheckBox.h \
+	../../include/lgi/common/ClipBoard.h \
+	../../include/lgi/common/Colour.h \
+	../../include/lgi/common/ColourSpace.h \
+	../../include/lgi/common/Com.h \
+	../../include/lgi/common/Combo.h \
+	../../include/lgi/common/Containers.h \
+	../../include/lgi/common/Core.h \
+	../../include/lgi/common/Css.h \
+	../../include/lgi/common/CssTools.h \
+	../../include/lgi/common/CurrentTime.h \
+	../../include/lgi/common/DataDlg.h \
+	../../include/lgi/common/DateTime.h \
+	../../include/lgi/common/Dialog.h \
+	../../include/lgi/common/DisplayString.h \
+	../../include/lgi/common/DocView.h \
+	../../include/lgi/common/Dom.h \
+	../../include/lgi/common/DomFields.h \
+	../../include/lgi/common/DragAndDrop.h \
+	../../include/lgi/common/DropFiles.h \
+	../../include/lgi/common/Edit.h \
+	../../include/lgi/common/Error.h \
+	../../include/lgi/common/EventTargetThread.h \
+	../../include/lgi/common/File.h \
+	../../include/lgi/common/FileSelect.h \
+	../../include/lgi/common/Filter.h \
+	../../include/lgi/common/FindReplaceDlg.h \
+	../../include/lgi/common/Font.h \
+	../../include/lgi/common/FontCache.h \
+	../../include/lgi/common/FontSelect.h \
+	../../include/lgi/common/Gdc2.h \
+	../../include/lgi/common/GdcTools.h \
+	../../include/lgi/common/GdiLeak.h \
+	../../include/lgi/common/HashTable.h \
+	../../include/lgi/common/ImageList.h \
+	../../include/lgi/common/Input.h \
+	../../include/lgi/common/ItemContainer.h \
+	../../include/lgi/common/Json.h \
+	../../include/lgi/common/Layout.h \
+	../../include/lgi/common/Lgi.h \
+	../../include/lgi/common/LgiClasses.h \
+	../../include/lgi/common/LgiCommon.h \
+	../../include/lgi/common/LgiDefs.h \
+	../../include/lgi/common/LgiInc.h \
+	../../include/lgi/common/LgiInterfaces.h \
+	../../include/lgi/common/LgiMsgs.h \
+	../../include/lgi/common/LgiNetInc.h \
+	../../include/lgi/common/LgiRes.h \
+	../../include/lgi/common/LgiString.h \
+	../../include/lgi/common/LgiUiBase.h \
+	../../include/lgi/common/Library.h \
+	../../include/lgi/common/LibraryUtils.h \
+	../../include/lgi/common/List.h \
+	../../include/lgi/common/ListItemCheckBox.h \
+	../../include/lgi/common/ListItemRadioBtn.h \
+	../../include/lgi/common/LMallocArray.h \
+	../../include/lgi/common/Mail.h \
+	../../include/lgi/common/Matrix.h \
+	../../include/lgi/common/Mem.h \
+	../../include/lgi/common/Menu.h \
+	../../include/lgi/common/Message.h \
+	../../include/lgi/common/Mime.h \
+	../../include/lgi/common/Mru.h \
+	../../include/lgi/common/Mutex.h \
+	../../include/lgi/common/Net.h \
+	../../include/lgi/common/NetTools.h \
+	../../include/lgi/common/Notifications.h \
+	../../include/lgi/common/OAuth2.h \
+	../../include/lgi/common/OptionsFile.h \
+	../../include/lgi/common/Palette.h \
+	../../include/lgi/common/Panel.h \
+	../../include/lgi/common/Password.h \
+	../../include/lgi/common/Path.h \
+	../../include/lgi/common/PixelRops.h \
+	../../include/lgi/common/Point.h \
+	../../include/lgi/common/Popup.h \
+	../../include/lgi/common/PopupList.h \
+	../../include/lgi/common/PopupNotification.h \
+	../../include/lgi/common/Printer.h \
+	../../include/lgi/common/Profile.h \
+	../../include/lgi/common/Progress.h \
+	../../include/lgi/common/ProgressDlg.h \
+	../../include/lgi/common/ProgressView.h \
+	../../include/lgi/common/Properties.h \
+	../../include/lgi/common/RadioGroup.h \
+	../../include/lgi/common/Range.h \
+	../../include/lgi/common/Rect.h \
+	../../include/lgi/common/RectF.h \
+	../../include/lgi/common/RefCount.h \
+	../../include/lgi/common/RegKey.h \
+	../../include/lgi/common/Res.h \
+	../../include/lgi/common/Rops.h \
+	../../include/lgi/common/ScrollBar.h \
+	../../include/lgi/common/SkinEngine.h \
+	../../include/lgi/common/Slider.h \
+	../../include/lgi/common/Splitter.h \
+	../../include/lgi/common/StatusBar.h \
+	../../include/lgi/common/Store3Defs.h \
+	../../include/lgi/common/Stream.h \
+	../../include/lgi/common/StringClass.h \
+	../../include/lgi/common/StringLayout.h \
+	../../include/lgi/common/StructuredIo.h \
+	../../include/lgi/common/StructuredLog.h \
+	../../include/lgi/common/SubProcess.h \
+	../../include/lgi/common/TableLayout.h \
+	../../include/lgi/common/TabView.h \
+	../../include/lgi/common/TextFile.h \
+	../../include/lgi/common/TextLabel.h \
+	../../include/lgi/common/TextLog.h \
+	../../include/lgi/common/TextView3.h \
+	../../include/lgi/common/Thread.h \
+	../../include/lgi/common/ThreadEvent.h \
+	../../include/lgi/common/Token.h \
+	../../include/lgi/common/ToolBar.h \
+	../../include/lgi/common/ToolTip.h \
+	../../include/lgi/common/TrayIcon.h \
+	../../include/lgi/common/Tree.h \
+	../../include/lgi/common/Undo.h \
+	../../include/lgi/common/Unicode.h \
+	../../include/lgi/common/UnicodeString.h \
+	../../include/lgi/common/UnrolledList.h \
+	../../include/lgi/common/Variant.h \
+	../../include/lgi/common/View.h \
+	../../include/lgi/common/Widgets.h \
+	../../include/lgi/common/Window.h \
+	../../include/lgi/common/XmlTree.h \
+	../../include/lgi/linux/Gtk/LgiOsClasses.h \
+	../../include/lgi/linux/Gtk/LgiOsDefs.h \
+	../../include/lgi/linux/Gtk/LgiWidget.h \
+	../../include/lgi/linux/Gtk/LgiWinManGlue.h \
+	../../include/lgi/linux/SymLookup.h \
+	../../include/lgi/mac/cocoa/LCocoaView.h \
+	../../include/lgi/mac/cocoa/LgiMac.h \
+	../../include/lgi/mac/cocoa/LgiOs.h \
+	../../include/lgi/mac/cocoa/LgiOsClasses.h \
+	../../include/lgi/mac/cocoa/LgiOsDefs.h \
+	../../include/lgi/mac/cocoa/ObjCWrapper.h \
+	../../include/lgi/mac/cocoa/SymLookup.h \
+	../../private/common/FontPriv.h \
+	../../private/common/ViewPriv.h \
+	../../private/linux/AppPriv.h \
+	../../src/common/Gdc2/15Bit.cpp \
+	../../src/common/Gdc2/16Bit.cpp \
+	../../src/common/Gdc2/24Bit.cpp \
+	../../src/common/Gdc2/32Bit.cpp \
+	../../src/common/Gdc2/8Bit.cpp \
+	../../src/common/Gdc2/Alpha.cpp \
+	../../src/common/Gdc2/Colour.cpp \
+	../../src/common/Gdc2/Filters/Filter.cpp \
+	../../src/common/Gdc2/Font/Charset.cpp \
+	../../src/common/Gdc2/Font/DisplayString.cpp \
+	../../src/common/Gdc2/Font/Font.cpp \
+	../../src/common/Gdc2/Font/FontSystem.cpp \
+	../../src/common/Gdc2/Font/FontType.cpp \
+	../../src/common/Gdc2/Font/StringLayout.cpp \
+	../../src/common/Gdc2/Font/TypeFace.cpp \
+	../../src/common/Gdc2/GdcCommon.cpp \
+	../../src/common/Gdc2/Path/Path.cpp \
+	../../src/common/Gdc2/Rect.cpp \
+	../../src/common/Gdc2/RopsCases.cpp \
+	../../src/common/Gdc2/Surface.cpp \
+	../../src/common/Gdc2/Tools/ColourReduce.cpp \
+	../../src/common/Gdc2/Tools/GdcTools.cpp \
+	../../src/common/General/Containers.cpp \
+	../../src/common/General/DateTime.cpp \
+	../../src/common/General/ExeCheck.cpp \
+	../../src/common/General/FileCommon.cpp \
+	../../src/common/General/Password.cpp \
+	../../src/common/General/Properties.cpp \
+	../../src/common/Hash/md5/md5.c \
+	../../src/common/Hash/md5/md5.h \
+	../../src/common/Hash/sha1/sha1.c \
+	../../src/common/Hash/sha1/sha1.h \
+	../../src/common/Lgi/Alert.cpp \
+	../../src/common/Lgi/AppCommon.cpp \
+	../../src/common/Lgi/Css.cpp \
+	../../src/common/Lgi/CssTools.cpp \
+	../../src/common/Lgi/DataDlg.cpp \
+	../../src/common/Lgi/DragAndDropCommon.cpp \
+	../../src/common/Lgi/FileSelect.cpp \
+	../../src/common/Lgi/FindReplace.cpp \
+	../../src/common/Lgi/FontSelect.cpp \
+	../../src/common/Lgi/GuiUtils.cpp \
+	../../src/common/Lgi/Input.cpp \
+	../../src/common/Lgi/LgiCommon.cpp \
+	../../src/common/Lgi/Library.cpp \
+	../../src/common/Lgi/LMsg.cpp \
+	../../src/common/Lgi/MemStream.cpp \
+	../../src/common/Lgi/MenuCommon.cpp \
+	../../src/common/Lgi/Mru.cpp \
+	../../src/common/Lgi/Mutex.cpp \
+	../../src/common/Lgi/Object.cpp \
+	../../src/common/Lgi/OptionsFile.cpp \
+	../../src/common/Lgi/Rand.cpp \
+	../../src/common/Lgi/Stream.cpp \
+	../../src/common/Lgi/SubProcess.cpp \
+	../../src/common/Lgi/ThreadCommon.cpp \
+	../../src/common/Lgi/ThreadEvent.cpp \
+	../../src/common/Lgi/ToolTip.cpp \
+	../../src/common/Lgi/TrayIcon.cpp \
+	../../src/common/Lgi/Variant.cpp \
+	../../src/common/Lgi/ViewCommon.cpp \
+	../../src/common/Lgi/WindowCommon.cpp \
+	../../src/common/Net/Base64.cpp \
+	../../src/common/Net/MDStringToDigest.cpp \
+	../../src/common/Net/Net.cpp \
+	../../src/common/Net/NetTools.cpp \
+	../../src/common/Net/Uri.cpp \
+	../../src/common/Resource/LgiRes.cpp \
+	../../src/common/Resource/Res.cpp \
+	../../src/common/Skins/Gel/Gel.cpp \
+	../../src/common/Text/DocView.cpp \
+	../../src/common/Text/String.cpp \
+	../../src/common/Text/TextView3.cpp \
+	../../src/common/Text/Token.cpp \
+	../../src/common/Text/Unicode.cpp \
+	../../src/common/Text/Utf8.cpp \
+	../../src/common/Text/XmlTree.cpp \
+	../../src/common/Widgets/Bitmap.cpp \
+	../../src/common/Widgets/Box.cpp \
+	../../src/common/Widgets/Button.cpp \
+	../../src/common/Widgets/CheckBox.cpp \
+	../../src/common/Widgets/Combo.cpp \
+	../../src/common/Widgets/Edit.cpp \
+	../../src/common/Widgets/ItemContainer.cpp \
+	../../src/common/Widgets/List.cpp \
+	../../src/common/Widgets/Panel.cpp \
+	../../src/common/Widgets/Popup.cpp \
+	../../src/common/Widgets/Progress.cpp \
+	../../src/common/Widgets/ProgressDlg.cpp \
+	../../src/common/Widgets/RadioGroup.cpp \
+	../../src/common/Widgets/ScrollBar.cpp \
+	../../src/common/Widgets/Slider.cpp \
+	../../src/common/Widgets/Splitter.cpp \
+	../../src/common/Widgets/StatusBar.cpp \
+	../../src/common/Widgets/TableLayout.cpp \
+	../../src/common/Widgets/TabView.cpp \
+	../../src/common/Widgets/TextLabel.cpp \
+	../../src/common/Widgets/ToolBar.cpp \
+	../../src/common/Widgets/Tree.cpp \
+	../../src/linux/General/File.cpp \
+	../../src/linux/General/Mem.cpp \
+	../../src/linux/General/ShowFileProp_Linux.cpp \
+	../../src/linux/Gtk/Gdc2.cpp \
+	../../src/linux/Gtk/LgiWidget.cpp \
+	../../src/linux/Gtk/MemDC.cpp \
+	../../src/linux/Gtk/PrintDC.cpp \
+	../../src/linux/Gtk/ScreenDC.cpp \
+	../../src/linux/Lgi/App.cpp \
+	../../src/linux/Lgi/ClipBoard.cpp \
+	../../src/linux/Lgi/DragAndDrop.cpp \
+	../../src/linux/Lgi/General.cpp \
+	../../src/linux/Lgi/Layout.cpp \
+	../../src/linux/Lgi/Menu.cpp \
+	../../src/linux/Lgi/Printer.cpp \
+	../../src/linux/Lgi/Thread.cpp \
+	../../src/linux/Lgi/View.cpp \
+	../../src/linux/Lgi/Widgets.cpp \
+	../../src/linux/Lgi/Window.cpp
 	export Build=$(Build); \
-	$(MAKE) -C .. -f Makefile.linux
-
-.SECONDEXPANSION:
-$(Objects): $(BuildDir)/%.o: $$(wildcard %.c*)
-	mkdir -p $(@D)
-	@echo $(<F) [$(Build)]
-ifeq "$(suffix $<)" ".cpp"
-	$(CPP) -MMD -MP $(Inc) $(Flags) $(Defs) -c $< -o $@
-else
-	$(CC) -MMD -MP $(Inc) $(Flags) $(Defs) -c $< -o $@
-endif
+	$(MAKE) -C ../../ -f Makefile.linux
 
 -include $(Objects:.o=.d)
 
 # Clean just this target
 clean :
-	rm -rf $(BuildDir)/* $(Target)
-	@echo Cleaned $(BuildDir)
+	rm -rf $(BuildDir) $(Target)
+	@echo Cleaned $(BuildDir) $(Target)
 
 # Clean all targets
 cleanall :
-	rm -rf $(BuildDir)/* $(Target)
-	@echo Cleaned $(BuildDir)
-	+make -C "../" -f "Makefile.linux" clean
+	rm -rf $(BuildDir) $(Target)
+	@echo Cleaned $(BuildDir) $(Target)
+	+make -C "../../" -f "Makefile.linux" clean
 
-VPATH=%.cpp \
-	./resources \
-	../include/lgi/linux/Gtk \
-	../include/lgi/linux \
-	../include \
-	$(BuildDir)
-
+VPATH=$(BuildDir) \
+	./src \
+	../../src/common/Lgi
diff --git a/utils/SlogViewer/SlogViewerProj.xml b/utils/SlogViewer/SlogViewerProj.xml
--- a/utils/SlogViewer/SlogViewerProj.xml
+++ b/utils/SlogViewer/SlogViewerProj.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project>
 	<Node Name="Source" Type="1" Platforms="15" Id="1">
 		<Node Name="Lgi" Type="1" Platforms="15" Id="1">
-			<Node File="../src/common/Lgi/DocApp.cpp" Type="2" Platforms="15" />
-			<Node File="../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Lgi/DocApp.cpp" Type="2" Platforms="15" />
+			<Node File="../../src/common/Lgi/LgiMain.cpp" Type="2" Platforms="15" />
 		</Node>
 		<Node File="./src/SlogViewerMain.cpp" Type="2" Platforms="15" />
 	</Node>
 	<Node Name="Headers" Type="1" Platforms="15" Id="2" />
-	<Node File="../Lgi.xml" Type="4" Platforms="15" />
+	<Node File="../../Lgi.xml" Type="4" Platforms="15" />
 	<Settings>
 		<Advanced />
 		<General>
 			<Makefile>
 				<Linux>Makefile.linux</Linux>
 			</Makefile>
 			<Executable>
 				<Linux>
 					<Debug>slogviewer</Debug>
 					<Release>slogviewer</Release>
 				</Linux>
 			</Executable>
 			<Compiler>
 				<Linux>gcc</Linux>
 			</Compiler>
 		</General>
 		<Debug />
 		<Build>
 			<TargetType>
 				<All>Executable</All>
 			</TargetType>
 			<IncludePaths>
 				<All>
-					<Debug>../include
+					<Debug>../../include
 ./resources</Debug>
-					<Release>../include
+					<Release>../../include
 ./resources</Release>
 				</All>
 				<Linux>
-					<Debug>../include/lgi/linux
-../include/lgi/linux/Gtk</Debug>
-					<Release>../include/lgi/linux
-../include/lgi/linux/Gtk</Release>
+					<Debug>../../include/lgi/linux
+../../include/lgi/linux/Gtk</Debug>
+					<Release>../../include/lgi/linux
+../../include/lgi/linux/Gtk</Release>
 				</Linux>
 			</IncludePaths>
 			<Libraries>
 				<Linux>
 					<Debug>pthread
 `pkg-config --libs gtk+-3.0`
 -static-libgcc</Debug>
 					<Release>pthread
 `pkg-config --libs gtk+-3.0`
 -static-libgcc</Release>
 				</Linux>
 			</Libraries>
 			<SystemIncludes>
 				<Linux>
 					<Debug>`pkg-config --cflags gtk+-3.0`</Debug>
 					<Release>`pkg-config --cflags gtk+-3.0`</Release>
 				</Linux>
 			</SystemIncludes>
 		</Build>
 		<Editor>
 			<TabSize>
 				<All>4</All>
 			</TabSize>
 			<IndentSize>
 				<All>4</All>
 			</IndentSize>
 			<UseHardTabs>
 				<All>1</All>
 			</UseHardTabs>
 		</Editor>
 	</Settings>
 </Project>