diff --git a/Ide/Code/IdeDoc.cpp b/Ide/Code/IdeDoc.cpp
--- a/Ide/Code/IdeDoc.cpp
+++ b/Ide/Code/IdeDoc.cpp
@@ -1,2128 +1,2130 @@
 #include <stdio.h>
 #include <ctype.h>
 
 #include "lgi/common/Lgi.h"
 #include "lgi/common/Token.h"
 #include "lgi/common/Net.h"
 #include "lgi/common/ClipBoard.h"
 #include "lgi/common/DisplayString.h"
 #include "lgi/common/ScrollBar.h"
 #include "lgi/common/LgiRes.h"
 #include "lgi/common/Edit.h"
 #include "lgi/common/List.h"
 #include "lgi/common/PopupList.h"
 #include "lgi/common/TableLayout.h"
 #include "lgi/common/EventTargetThread.h"
 #include "lgi/common/CheckBox.h"
 #include "lgi/common/Http.h"
 #include "lgi/common/Menu.h"
 #include "lgi/common/FileSelect.h"
 #include "lgi/common/PopupNotification.h"
 
 #include "LgiIde.h"
 #include "ProjectNode.h"
 #include "SpaceTabConv.h"
 #include "DocEdit.h"
 #include "IdeDocPrivate.h"
 
 const char *Untitled = "[untitled]";
 // static const char *White = " \r\t\n";
 
 #define USE_OLD_FIND_DEFN	1
 #define POPUP_WIDTH			700 // px
 #define POPUP_HEIGHT		350 // px
 
 enum
 {
 	IDM_COPY_FILE = 1100,
 	IDM_COPY_PATH,
 	IDM_BROWSE
 };
 
 int FileNameSorter(char **a, char **b)
 {
 	char *A = strrchr(*a, DIR_CHAR);
 	char *B = strrchr(*b, DIR_CHAR);
 	return stricmp(A?A:*a, B?B:*b);
 }
 
 EditTray::EditTray(LTextView3 *ctrl, IdeDoc *doc)
 {
 	Ctrl = ctrl;
 	Doc = doc;
 	Line = Col = 0;
 	FuncBtn.ZOff(-1, -1);
 	SymBtn.ZOff(-1, -1);
 		
 	int Ht = LSysFont->GetHeight() + 6;
 	AddView(FileSearch   = new LEdit(IDC_FILE_SEARCH,   0, 0, EDIT_CTRL_WIDTH, Ht));
 	AddView(FuncSearch   = new LEdit(IDC_METHOD_SEARCH, 0, 0, EDIT_CTRL_WIDTH, Ht));
 	AddView(SymSearch    = new LEdit(IDC_SYMBOL_SEARCH, 0, 0, EDIT_CTRL_WIDTH, Ht));
 }
 	
 EditTray::~EditTray()
 {
 }
 	
 void EditTray::GotoSearch(int CtrlId, char *InitialText)
 {
 	if (FileSearch && FileSearch->GetId() == CtrlId)
 	{
 		FileSearch->Name(InitialText);
 		FileSearch->Focus(true);
 		if (InitialText)
 			FileSearch->SendNotify(LNotifyDocChanged);
 	}
 		
 	if (FuncSearch && FuncSearch->GetId() == CtrlId)
 	{
 		FuncSearch->Name(InitialText);
 		FuncSearch->Focus(true);
 		if (InitialText)
 			FuncSearch->SendNotify(LNotifyDocChanged);
 	}
 
 	if (SymSearch && SymSearch->GetId() == CtrlId)
 	{
 		SymSearch->Name(InitialText);
 		SymSearch->Focus(true);
 		if (InitialText)
 			SymSearch->SendNotify(LNotifyDocChanged);
 	}
 }
 	
 void EditTray::OnCreate()
 {
 	AttachChildren();
 }
 
 int MeasureText(const char *s)
 {
 	LDisplayString Ds(LSysFont, s);
 	return Ds.X();
 }
 
 #define HEADER_BTN_LABEL	"h"
 #define FUNCTION_BTN_LABEL	"{ }"
 #define SYMBOL_BTN_LABEL	"s"
 	
 void EditTray::OnPosChange()
 {
 	LLayoutRect c(this, 2);
 
 	c.Left(FileBtn, MeasureText(HEADER_BTN_LABEL)+10);
 	if (FileSearch)
 		c.Left(FileSearch, EDIT_CTRL_WIDTH);
 	c.x1 += 8;
 
 	c.Left(FuncBtn, MeasureText(FUNCTION_BTN_LABEL)+10);
 	if (FuncSearch)
 		c.Left(FuncSearch, EDIT_CTRL_WIDTH);
 	c.x1 += 8;
 
 	c.Left(SymBtn, MeasureText(SYMBOL_BTN_LABEL)+10);
 	if (SymSearch)
 		c.Left(SymSearch, EDIT_CTRL_WIDTH);
 	c.x1 += 8;
 
 	c.Remaining(TextMsg);
 }
 	
 void EditTray::OnPaint(LSurface *pDC)
 {
 	LRect c = GetClient();
 	pDC->Colour(L_MED);
 	pDC->Rectangle();
 	LSysFont->Colour(L_TEXT, L_MED);
 	LSysFont->Transparent(true);
 		
 	LString s;
 	s.Printf("Cursor: %i,%i", Col, Line + 1);
 	{
 		LDisplayString ds(LSysFont, s);
 		ds.Draw(pDC, TextMsg.x1, TextMsg.y1 + ((c.Y()-TextMsg.Y())/2), &TextMsg);
 	}
 
 	LRect f = FileBtn;
 	LThinBorder(pDC, f, DefaultRaisedEdge);
 	{
 		LDisplayString ds(LSysFont, HEADER_BTN_LABEL);
 		ds.Draw(pDC, f.x1 + 4, f.y1);
 	}
 
 	f = FuncBtn;
 	LThinBorder(pDC, f, DefaultRaisedEdge);
 	{
 		LDisplayString ds(LSysFont, FUNCTION_BTN_LABEL);
 		ds.Draw(pDC, f.x1 + 4, f.y1);
 	}
 
 	f = SymBtn;
 	LThinBorder(pDC, f, DefaultRaisedEdge);
 	{
 		LDisplayString ds(LSysFont, SYMBOL_BTN_LABEL);
 		ds.Draw(pDC, f.x1 + 4, f.y1);
 	}
 }
 
 bool EditTray::Pour(LRegion &r)
 {
 	LRect *c = FindLargest(r);
 	if (c)
 	{
 		LRect n = *c;
 		SetPos(n);		
 		return true;
 	}
 	return false;
 }
 
 void EditTray::OnHeaderList(LMouse &m)
 {
 	// Header list button
 	LArray<LString> Paths;
 	if (Doc->BuildIncludePaths(Paths, PlatformCurrent, false))
 	{
 		LArray<char*> Headers;
 		if (Doc->BuildHeaderList(Ctrl->NameW(), Headers, Paths))
 		{
 			// Sort them..
 			Headers.Sort(FileNameSorter);
 			
 			LSubMenu *s = new LSubMenu;
 			if (s)
 			{
 				// Construct the menu
 				LHashTbl<StrKey<char>, int> Map;
 				int DisplayLines = GdcD->Y() / LSysFont->GetHeight();
 				if (Headers.Length() > (0.9 * DisplayLines))
 				{
 					LArray<char*> Letters[26];
 					LArray<char*> Other;
 					
 					for (int i=0; i<Headers.Length(); i++)
 					{
 						char *h = Headers[i];
 						char *f = LGetLeaf(h);
 						
 						Map.Add(h, i + 1);
 						
 						if (IsAlpha(*f))
 						{
 							int Idx = tolower(*f) - 'a';
 							Letters[Idx].Add(h);
 						}
 						else
 						{
 							Other.Add(h);
 						}
 					}
 					
 					for (int i=0; i<CountOf(Letters); i++)
 					{
 						if (Letters[i].Length() > 1)
 						{
 							char *First = LGetLeaf(Letters[i][0]);
 							char *Last = LGetLeaf(Letters[i].Last());
 
 							char Title[256];
 							sprintf_s(Title, sizeof(Title), "%s - %s", First, Last);
 							LSubMenu *sub = s->AppendSub(Title);
 							if (sub)
 							{
 								for (int n=0; n<Letters[i].Length(); n++)
 								{
 									char *h = Letters[i][n];
 									int Id = Map.Find(h);
 									LAssert(Id > 0);
 									sub->AppendItem(LGetLeaf(h), Id, true);
 								}
 							}
 						}
 						else if (Letters[i].Length() == 1)
 						{
 							char *h = Letters[i][0];
 							int Id = Map.Find(h);
 							LAssert(Id > 0);
 							s->AppendItem(LGetLeaf(h), Id, true);
 						}
 					}
 
 					if (Other.Length() > 0)
 					{
 						for (int n=0; n<Other.Length(); n++)
 						{
 							char *h = Other[n];
 							int Id = Map.Find(h);
 							LAssert(Id > 0);
 							s->AppendItem(LGetLeaf(h), Id, true);
 						}
 					}
 				}
 				else
 				{
 					for (int i=0; i<Headers.Length(); i++)
 					{
 						char *h = Headers[i];
 						// char *f = LGetLeaf(h);
 						
 						Map.Add(h, i + 1);
 					}
 
 					for (int i=0; i<Headers.Length(); i++)
 					{
 						char *h = Headers[i];
 						int Id = Map.Find(h);
 						if (Id > 0)
 							s->AppendItem(LGetLeaf(h), Id, true);
 						else
 							LgiTrace("%s:%i - Failed to get id for '%s' (map.len=%i)\n", _FL, h, Map.Length());
 					}
 
 					if (!Headers.Length())
 					{
 						s->AppendItem("(none)", 0, false);
 					}
 				}
 				
 				// Show the menu
 				LPoint p(m.x, m.y);
 				PointToScreen(p);
 				int Goto = s->Float(this, p.x, p.y, true);
 				if (Goto > 0)
 				{
 					char *File = Headers[Goto-1];
 					if (File)
 					{
 						// Open the selected file
 						Doc->GetProject()->GetApp()->OpenFile(File);
 					}
 				}
 				
 				DeleteObj(s);
 			}
 		}
 		
 		// Clean up memory
 		Headers.DeleteArrays();
 	}
 	else
 	{
 		LgiTrace("%s:%i - No include paths set.\n", _FL);
 	}
 }
 
 void EditTray::OnFunctionList(LMouse &m)
 {
 	LArray<DefnInfo> Funcs;
 
 	if (BuildDefnList(Doc->GetFileName(), (char16*)Ctrl->NameW(), Funcs, DefnNone /*DefnFunc | DefnClass*/))
 	{
 		LSubMenu s;
 		LArray<DefnInfo*> a;					
 		
 		int ScreenHt = GdcD->Y();
 		int ScreenLines = ScreenHt / LSysFont->GetHeight();
 		float Ratio = ScreenHt ? (float)(LSysFont->GetHeight() * Funcs.Length()) / ScreenHt : 0.0f;
 		bool UseSubMenus = Ratio > 0.9f;
 		int Buckets = UseSubMenus ? (int)(ScreenLines * 0.9) : 1;
 		int BucketSize = MAX(2, (int)Funcs.Length() / Buckets);
 		LSubMenu *Cur = NULL;
 		
 		for (unsigned n=0; n<Funcs.Length(); n++)
 		{
 			DefnInfo *i = &Funcs[n];
 			char Buf[256], *o = Buf;
 			
 			if (i->Type != DefnEnumValue)
 			{
 				for (char *k = i->Name; *k && o < Buf+sizeof(Buf)-8; k++)
 				{
 					if (*k == '&')
 					{
 						*o++ = '&';
 						*o++ = '&';
 					}
 					else if (*k == '\t')
 					{
 						*o++ = ' ';
 					}
 					else
 					{
 						*o++ = *k;
 					}
 				}
 				*o++ = 0;
 				
 				a[n] = i;
 
 				if (UseSubMenus)
 				{
 					if (!Cur || n % BucketSize == 0)
 					{
 						LString SubMsg;
 						SubMsg.Printf("%s...", Buf);
 						Cur = s.AppendSub(SubMsg);
 					}
 					if (Cur)
 						Cur->AppendItem(Buf, n+1, true);
 				}
 				else
 				{
 					s.AppendItem(Buf, n+1, true);
 				}
 			}
 		}
 		
 		LPoint p(m.x, m.y);
 		PointToScreen(p);
 		int Goto = s.Float(this, p.x, p.y, true);
 		if (Goto)
 		{
 			DefnInfo *Info = a[Goto-1];
 			if (Info)
 			{
 				Ctrl->SetLine(Info->Line);
 			}
 		}
 	}
 	else
 	{
 		LgiTrace("%s:%i - No functions in input.\n", _FL);
 	}
 }
 
 void EditTray::OnSymbolList(LMouse &m)
 {
 	LAutoString s(Ctrl->GetSelection());
 	if (s)
 	{
 		LAutoWString sw(Utf8ToWide(s));
 		if (sw)
 		{
 			#if USE_OLD_FIND_DEFN
 			List<DefnInfo> Matches;
 			Doc->FindDefn(sw, Ctrl->NameW(), Matches);
 			#else
 			LArray<FindSymResult> Matches;
 			Doc->GetApp()->FindSymbol(s, Matches);
 			#endif
 
 			LSubMenu *s = new LSubMenu;
 			if (s)
 			{
 				// Construct the menu
 				int n=1;
 				
 				#if USE_OLD_FIND_DEFN
 				for (auto Def: Matches)
 				{
 					char m[512];
 					char *d = strrchr(Def->File, DIR_CHAR);
 					sprintf(m, "%s (%s:%i)", Def->Name.Get(), d ? d + 1 : Def->File.Get(), Def->Line);
 					s->AppendItem(m, n++, true);
 				}
 				#else
 				for (int i=0; i<Matches.Length(); i++)
 				{
 					FindSymResult &Res = Matches[i];
 					char m[512];
 					char *d = strrchr(Res.File, DIR_CHAR);
 					sprintf(m, "%s (%s:%i)", Res.Symbol.Get(), d ? d + 1 : Res.File.Get(), Res.Line);
 					s->AppendItem(m, n++, true);
 				}
 				#endif
 
 				if (!Matches.Length())
 				{
 					s->AppendItem("(none)", 0, false);
 				}
 				
 				// Show the menu
 				LPoint p(m.x, m.y);
 				PointToScreen(p);
 				int Goto = s->Float(this, p.x, p.y, true);
 				if (Goto)
 				{
 					#if USE_OLD_FIND_DEFN
 					DefnInfo *Def = Matches[Goto-1];
 					#else
 					FindSymResult *Def = &Matches[Goto-1];
 					#endif
 					{
 						// Open the selected symbol
 						if (Doc->GetProject() &&
 							Doc->GetProject()->GetApp())
 						{
 							AppWnd *App = Doc->GetProject()->GetApp();
 							IdeDoc *Doc = App->OpenFile(Def->File);
 
 							if (Doc)
 							{
 								Doc->SetLine(Def->Line, false);
 							}
 							else
 							{
 								char *f = Def->File;
 								LgiTrace("%s:%i - Couldn't open doc '%s'\n", _FL, f);
 							}
 						}
 						else
 						{
 							LgiTrace("%s:%i - No project / app ptr.\n", _FL);
 						}
 					}
 				}
 				
 				DeleteObj(s);
 			}
 		}
 	}
 	else
 	{
 		LSubMenu *s = new LSubMenu;
 		if (s)
 		{
 			s->AppendItem("(No symbol currently selected)", 0, false);
 			LPoint p(m.x, m.y);
 			PointToScreen(p);
 			s->Float(this, p.x, p.y, true);
 			DeleteObj(s);
 		}
 	}
 }
 
 void EditTray::OnMouseClick(LMouse &m)
 {
 	if (m.Left() && m.Down())
 	{
 		if (FileBtn.Overlap(m.x, m.y))
 		{
 			OnHeaderList(m);
 		}
 		else if (FuncBtn.Overlap(m.x, m.y))
 		{
 			OnFunctionList(m);
 		}
 		else if (SymBtn.Overlap(m.x, m.y))
 		{
 			OnSymbolList(m);
 		}
 	}
 }
 
 class ProjMethodPopup : public LPopupList<DefnInfo>
 {
 	AppWnd *App;
 
 public:
 	LArray<DefnInfo> All;
 
 	ProjMethodPopup(AppWnd *app, LViewI *target) : LPopupList(target, PopupAbove, POPUP_WIDTH)
 	{
 		App = app;
 	}
 
 	LString ToString(DefnInfo *Obj)
 	{
 		return Obj->Name;
 	}
 	
 	void OnSelect(DefnInfo *Obj)
 	{
 		App->GotoReference(Obj->File, Obj->Line, false);
 	}
 	
 	bool Name(const char *s)
 	{
 		LString InputStr = s;
 		LString::Array p = InputStr.SplitDelimit(" \t");
 		
 		LArray<DefnInfo*> Matching;
 		for (unsigned i=0; i<All.Length(); i++)
 		{
 			DefnInfo *Def = &All[i];
 			
 			bool Match = true;
 			for (unsigned n=0; n<p.Length(); n++)
 			{
 				if (!stristr(Def->Name, p[n]))
 				{
 					Match = false;
 					break;
 				}
 			}
 			
 			if (Match)
 				Matching.Add(Def);
 		}
 		
 		return SetItems(Matching);
 	}
 	
 	int OnNotify(LViewI *Ctrl, LNotification n)
 	{
 		if (Lst &&
 			Ctrl == Edit &&
 			(n.Type == LNotifyValueChanged || n.Type == LNotifyDocChanged))
 		{
 			Name(Edit->Name());
 		}
 		
 		return LPopupList<DefnInfo>::OnNotify(Ctrl, n);
 	}
 };
 
 class ProjSymPopup : public LPopupList<FindSymResult>
 {
 	AppWnd *App;
 	IdeDoc *Doc;
 	int CommonPathLen;
 
 public:
 	LArray<FindSymResult*> All;
 
 	ProjSymPopup(AppWnd *app, IdeDoc *doc, LViewI *target) : LPopupList(target, PopupAbove, POPUP_WIDTH)
 	{
 		App = app;
 		Doc = doc;
 		CommonPathLen = 0;
 	}
 	
 	void FindCommonPathLength()
 	{
 		LString s;
 		
 		for (unsigned i=0; i<All.Length(); i++)
 		{
 			if (i)
 			{
 				char *a = s.Get();
 				char *a_end = strrchr(a, DIR_CHAR);
 
 				char *b = All[i]->File.Get();
 				char *b_end = strrchr(b, DIR_CHAR);
 
 				int Common = 0;
 				while (	*a && a <= a_end
 						&& 
 						*b && b <= b_end
 						&&
 						ToLower(*a) == ToLower(*b))
 				{
 					Common++;
 					a++;
 					b++;
 				}
 				if (i == 1)
 					CommonPathLen = Common;
 				else
 					CommonPathLen = MIN(CommonPathLen, Common);
 			}
 			else s = All[i]->File;
 		}
 	}
 
 	LString ToString(FindSymResult *Obj)
 	{
 		LString s;
 		s.Printf("%s:%i - %s",
 				CommonPathLen < Obj->File.Length()
 				?
 				Obj->File.Get() + CommonPathLen
 				:
 				Obj->File.Get(),
 				Obj->Line,
 				Obj->Symbol.Get());
 		return s;
 	}
 	
 	void OnSelect(FindSymResult *Obj)
 	{
 		App->GotoReference(Obj->File, Obj->Line, false);
 	}
 	
 	int OnNotify(LViewI *Ctrl, LNotification n)
 	{
 		if (Lst &&
 			Ctrl == Edit &&
 			(n.Type == LNotifyValueChanged || n.Type == LNotifyDocChanged))
 		{
 			// Kick off search...
 			LString s = Ctrl->Name();
 			s = s.Strip();
 			if (s.Length() > 2)
 				App->FindSymbol(Doc->AddDispatch(), s);
 		}
 		
 		return LPopupList<FindSymResult>::OnNotify(Ctrl, n);
 	}
 };
 
 void FilterFiles(LArray<ProjectNode*> &Perfect, LArray<ProjectNode*> &Nodes, LString InputStr, int Platforms)
 {
 	LString::Array p = InputStr.SplitDelimit(" \t");
 		
 	auto InputLen = InputStr.RFind(".");
 	if (InputLen < 0)
 		InputLen = InputStr.Length();
 
 	LArray<ProjectNode*> Partial;
 	auto Start = LCurrentTime();
 	for (unsigned i=0; i<Nodes.Length(); i++)
 	{
 		if (i % 100 == 0 && LCurrentTime() - Start > 400)
 		{
 			break;
 		}
 
 		ProjectNode *Pn = Nodes[i];
 		if (! (Pn->GetPlatforms() & Platforms) )
 			continue;
 
 		auto Fn = Pn->GetFileName();
 		if (Fn)
 		{
 			char *Dir = strchr(Fn, '/');
 			if (!Dir) Dir = strchr(Fn, '\\');
 			auto Leaf = Dir ? strrchr(Fn, *Dir) : Fn;
 				
 			bool Match = true;
 			for (unsigned n=0; n<p.Length(); n++)
 			{
 				if (!stristr(Leaf, p[n]))
 				{
 					Match = false;
 					break;
 				}
 			}
 			if (Match)
 			{
 				bool PerfectMatch = false;
 				auto Leaf = LGetLeaf(Fn);
 				if (Leaf)
 				{
 					auto Dot = strrchr(Leaf, '.');
 					if (Dot)
 					{
 						auto Len = Dot - Leaf;
 						PerfectMatch =	Len == InputLen &&
 										strncmp(InputStr, Leaf, Len) == 0;
 					}
 					else
 					{
 						PerfectMatch = stricmp(InputStr, Leaf);
 					}
 				}
 
 				if (PerfectMatch)
 					Perfect.Add(Pn);
 				else
 					Partial.Add(Pn);
 			}
 		}
 	}
 
 	Perfect.Add(Partial);
 }
 
 class ProjFilePopup : public LPopupList<ProjectNode>
 {
 	AppWnd *App;
 
 public:
 	LArray<ProjectNode*> Nodes;
 
 	ProjFilePopup(AppWnd *app, LViewI *target) : LPopupList(target, PopupAbove, POPUP_WIDTH)
 	{
 		App = app;
 	}
 
 	LString ToString(ProjectNode *Obj)
 	{
 		return LString(Obj->GetFileName());
 	}
 	
 	void OnSelect(ProjectNode *Obj)
 	{
 		auto Fn = Obj->GetFileName();
 		if (LIsRelativePath(Fn))
 		{
 			IdeProject *Proj = Obj->GetProject();
 			LAutoString Base = Proj->GetBasePath();
 			LFile::Path p(Base);
 			p += Fn;
 			App->GotoReference(p, 1, false);			
 		}
 		else
 		{
 			App->GotoReference(Fn, 1, false);
 		}
 	}
 	
 	void Update(LString InputStr)
 	{
 		LArray<ProjectNode*> Matches;
 		FilterFiles(Matches, Nodes, InputStr, App->GetPlatform());
 		SetItems(Matches);
 	}
 	
 	int OnNotify(LViewI *Ctrl, LNotification n)
 	{
 		if (Lst &&
 			Ctrl == Edit &&
 			(n.Type == LNotifyValueChanged || n.Type == LNotifyDocChanged))
 		{
 			auto s = Ctrl->Name();
 			if (ValidStr(s))
 				Update(s);
 		}
 		
 		return LPopupList<ProjectNode>::OnNotify(Ctrl, n);
 	}
 };
 
 class LStyleThread : public LEventTargetThread
 {
 public:
 	LStyleThread() : LEventTargetThread("StyleThread")
 	{
 	}
 	
 	LMessage::Result OnEvent(LMessage *Msg)
 	{
 		switch (Msg->Msg())
 		{
 		}
 		
 		return 0;
 	}
 	
 }	StyleThread;
 
 ////////////////////////////////////////////////////////////////////////////////////////////
 IdeDocPrivate::IdeDocPrivate(IdeDoc *d, AppWnd *a, NodeSource *src, const char *file) : NodeView(src), LMutex("IdeDocPrivate.Lock")
 {
 	FilePopup = NULL;
 	MethodPopup = NULL;
 	SymPopup = NULL;
 
 	App = a;
 	Doc = d;
 	Project = 0;
 	FileName = file;
 	
 	LFontType Font, *Use = 0;
 	if (Font.Serialize(App->GetOptions(), OPT_EditorFont, false))
 	{
 		Use = &Font;
 	}		
 	
 	Doc->AddView(Edit = new DocEdit(Doc, Use));
 	Doc->AddView(Tray = new EditTray(Edit, Doc));
 }
 
 void IdeDocPrivate::OnDelete()
 {
 	IdeDoc *Temp = Doc;
 	DeleteObj(Temp);
 }
 
 void IdeDocPrivate::UpdateName()
 {
 	char n[MAX_PATH_LEN+30];
 	
 	LString Dsp = GetDisplayName();
 	char *File = Dsp;
 	#if MDI_TAB_STYLE
 	char *Dir = File ? strrchr(File, DIR_CHAR) : NULL;
 	if (Dir) File = Dir + 1;
 	#endif
 	
 	strcpy_s(n, sizeof(n), File ? File : Untitled);
 	if (Edit->IsDirty())
 	{
 		strcat(n, " (changed)");
 	}	
 	Doc->Name(n);
 }
 
 LString IdeDocPrivate::GetDisplayName()
 {
 	if (nSrc)
 	{
 		auto Fn = nSrc->GetFileName();
 		if (Fn)
 		{
 			if (stristr(Fn, "://"))
 			{
 				LUri u(nSrc->GetFileName());
 				if (u.sPass)
 				{
 					u.sPass = "******";
 				}
 				
 				return u.ToString();
 			}
 			else if (*Fn == '.')
 			{
 				return nSrc->GetFullPath();
 			}
 		}
 
 		return LString(Fn);
 	}
 
 	return LString(FileName);
 }
 
 bool IdeDocPrivate::IsFile(const char *File)
 {
 	LString Mem;
 	char *f = NULL;
 	
 	if (nSrc)
 	{
 		Mem = nSrc->GetFullPath();
 		f = Mem;
 	}
 	else
 	{
 		f = FileName;
 	}
 
 	if (!f)
 		return false;
 
 	LToken doc(f, DIR_STR);
 	LToken in(File, DIR_STR);
 	ssize_t in_pos = (ssize_t)in.Length() - 1;
 	ssize_t doc_pos = (ssize_t)doc.Length() - 1;
 	while (in_pos >= 0 && doc_pos >= 0)
 	{
 		char *i = in[in_pos--];
 		char *d = doc[doc_pos--];
 		if (!i || !d)
 		{
 			return false;
 		}
 		
 		if (!strcmp(i, ".") ||
 			!strcmp(i, ".."))
 		{
 			continue;
 		}
 		
 		if (stricmp(i, d))
 		{
 			return false;
 		}
 	}
 	
 	return true;
 }
 
 const char *IdeDocPrivate::GetLocalFile()
 {
 	if (nSrc)
 	{
 		if (nSrc->IsWeb())
 			return nSrc->GetLocalCache();
 		
 		auto fp = nSrc->GetFullPath();
 		if (_stricmp(fp.Get()?fp.Get():"", Buffer.Get()?Buffer.Get():""))
 			Buffer = fp;
 		return Buffer;
 	}
 	
 	return FileName;
 }
 
 void IdeDocPrivate::SetFileName(const char *f)
 {
 	nSrc = NULL;
 	FileName = f;
 	Edit->IsDirty(true);
 }
 
 bool IdeDocPrivate::Load()
 {
 	bool Status = false;
 	
 	if (nSrc)
 	{
 		Status = nSrc->Load(Edit, this);
 	}
 	else if (FileName)
 	{
 		if (LFileExists(FileName))
 		{
 			Status = Edit->Open(FileName);
 		}
 		else LgiTrace("%s:%i - '%s' doesn't exist.\n", _FL, FileName.Get());
 	}
 
 	if (Status)
 		ModTs = GetModTime();	
 
 	return Status;
 }
 
 bool IdeDocPrivate::Save()
 {
 	bool Status = false;
 	
 	if (nSrc)
 	{
 		Status = nSrc->Save(Edit, this);
 	}
 	else if (FileName)
 	{
 		Status = Edit->Save(FileName);
 		if (!Status)
 		{
 			const char *Err = Edit->GetLastError();
 			LgiMsg(App, "%s", AppName, MB_OK, Err ? Err : "$unknown_error");
 		}
 		
 		OnSaveComplete(Status);
 	}
 	else
 	{
 		Edit->IsDirty(false);
 	}
 
 	if (Status)
 		ModTs = GetModTime();
 
+	LPopupNotification::Message(Doc->GetWindow(), "Saved");
+
 	return Status;
 }
 
 void IdeDocPrivate::OnSaveComplete(bool Status)
 {
 	if (Status)
 		Edit->IsDirty(false);
 	UpdateName();
 
 	ProjectNode *Node = dynamic_cast<ProjectNode*>(nSrc);
 	if (Node)
 	{
 		auto Full = nSrc->GetFullPath();
 		App->OnNode(Full, Node, FindSymbolSystem::FileReparse);
 	}
 }
 
 void IdeDocPrivate::CheckModTime()
 {
 	if (!ModTs.IsValid())
 		return;
 
 	LDateTime Ts = GetModTime();
 	if (Ts.IsValid() && Ts > ModTs)
 	{
 		static bool InCheckModTime = false;
 		if (!InCheckModTime)
 		{
 			InCheckModTime = true;
 			if (!Edit->IsDirty() ||
 				LgiMsg(Doc, "Do you want to reload modified file from\ndisk and lose your changes?", AppName, MB_YESNO) == IDYES)
 			{
 				auto Ln = Edit->GetLine();
 				Load();
 				Edit->IsDirty(false);
 				UpdateName();
 				Edit->SetLine((int)Ln);
 			}
 			InCheckModTime = false;
 		}
 	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 LString IdeDoc::CurIpDoc;
 int IdeDoc::CurIpLine = -1;
 
 IdeDoc::IdeDoc(AppWnd *a, NodeSource *src, const char *file)
 {
 	d = new IdeDocPrivate(this, a, src, file);
 	d->UpdateName();
 
 	/*
 	if (src || file)
 		d->Load();
 	*/
 }
 
 IdeDoc::~IdeDoc()
 {
 	d->App->OnDocDestroy(this);
 	DeleteObj(d);
 }
 
 class WebBuild : public LThread
 {
 	IdeDocPrivate *d;
 	LString Uri;
 	int64 SleepMs;
 	LStream *Log;
 	LCancel Cancel;
 
 public:
 	WebBuild(IdeDocPrivate *priv, LString uri, int64 sleepMs) :
 		LThread("WebBuild"), d(priv), Uri(uri), SleepMs(sleepMs)
 	{
 		Log = d->App->GetBuildLog();
 		Run();
 	}
 
 	~WebBuild()
 	{
 		Cancel.Cancel();
 		while (!IsExited())
 		{
 			LSleep(1);
 		}
 	}
 
 	int Main()
 	{
 		if (SleepMs > 0)
 		{
 			// Sleep for a number of milliseconds to allow the file to upload/save to the website
 			uint64 Ts = LCurrentTime();
 			while (!Cancel.IsCancelled() && (LCurrentTime()-Ts) < SleepMs)
 				LSleep(1);
 		}
 
 		// Download the file...
 		LStringPipe Out;
 		LString Error;
 		bool r = LgiGetUri(&Cancel, &Out, &Error, Uri, NULL/*InHdrs*/, NULL/*Proxy*/);
 		if (r)
 		{
 			// Parse through it and extract any errors...
 		}
 		else
 		{
 			// Show the download error in the build log...
 			Log->Print("%s:%i - Web build download failed: %s\n", _FL, Error.Get());
 		}
 
 		return 0;
 	}
 };
 
 bool IdeDoc::Build()
 {
 	if (!d->Edit)
 		return false;
 
 	int64 SleepMs = -1;
 	LString s = d->Edit->Name(), Uri;
 	LString::Array Lines = s.Split("\n");
 	for (auto Ln : Lines)
 	{
 		s = Ln.Strip();
 		if (s.Find("//") == 0)
 		{
 			LString::Array p = s(2,-1).Strip().Split(":", 1);
 			if (p.Length() == 2)
 			{
 				if (p[0].Equals("build-sleep"))
 				{
 					SleepMs = p[1].Strip().Int();
 				}
 				else if (p[0].Equals("build-uri"))
 				{
 					Uri = p[1].Strip();
 					break;
 				}
 			}
 		}
 	}
 
 	if (Uri)
 	{
 		if (d->Build &&
 			!d->Build->IsExited())
 		{
 			// Already building...
 			LStream *Log = d->App->GetBuildLog();
 			if (Log)
 				Log->Print("%s:%i - Already building...\n");
 			return false;
 		}
 		
 		return d->Build.Reset(new WebBuild(d, Uri, SleepMs));
 	}
 
 	return false;
 }
 
 void IdeDoc::OnLineChange(int Line)
 {
 	d->App->OnLocationChange(d->GetLocalFile(), Line);
 }
 
 void IdeDoc::OnMarginClick(int Line)
 {
 	LString Dn = d->GetDisplayName();
 	d->App->ToggleBreakpoint(Dn, Line);
 }
 
 void IdeDoc::OnTitleClick(LMouse &m)
 {
 	LMdiChild::OnTitleClick(m);
 	
 	if (m.IsContextMenu())
 	{
 		char Full[MAX_PATH_LEN] = "", sFile[MAX_PATH_LEN] = "", sFull[MAX_PATH_LEN] = "", sBrowse[MAX_PATH_LEN] = "";
 		const char *Fn = GetFileName(), *Dir = NULL;
 		IdeProject *p = GetProject();
 		if (Fn)
 		{
 			strcpy_s(Full, sizeof(Full), Fn);
 			if (LIsRelativePath(Fn) && p)
 			{
 				LAutoString Base = p->GetBasePath();
 				if (Base)
 					LMakePath(Full, sizeof(Full), Base, Fn);
 			}
 			
 			Dir = strrchr(Full, DIR_CHAR);
 			if (Dir)
 				sprintf_s(sFile, sizeof(sFile), "Copy '%s'", Dir + 1);
 			sprintf_s(sFull, sizeof(sFull), "Copy '%s'", Full);
 			sprintf_s(sBrowse, sizeof(sBrowse), "Browse to '%s'", Dir ? Dir + 1 : Full);			
 		}
 		
 		LSubMenu s;
 		s.AppendItem("Save", IDM_SAVE, d->Edit->IsDirty());
 		s.AppendItem("Close", IDM_CLOSE, true);
 		if (Fn)
 		{
 			s.AppendSeparator();
 			if (Dir)
 				s.AppendItem(sFile, IDM_COPY_FILE, true);
 			s.AppendItem(sFull, IDM_COPY_PATH, true);
 			s.AppendItem(sBrowse, IDM_BROWSE, true);
 			s.AppendItem("Show In Project", IDM_SHOW_IN_PROJECT, true);
 		}
 		if (p)
 		{
 			s.AppendSeparator();
 			s.AppendItem("Properties", IDM_PROPERTIES, true);
 		}
 		
 		m.ToScreen();
 		int Cmd = s.Float(this, m.x, m.y, m.Left());
 		switch (Cmd)
 		{
 			case IDM_SAVE:
 			{
 				SetClean(NULL);
 				break;
 			}
 			case IDM_CLOSE:
 			{
 				if (OnRequestClose(false))
 					Quit();
 				break;
 			}
 			case IDM_COPY_FILE:
 			{
 				if (Dir)
 				{
 					LClipBoard c(this);
 					c.Text(Dir + 1);
 				}
 				break;
 			}
 			case IDM_COPY_PATH:
 			{
 				LClipBoard c(this);
 				c.Text(Full);
 				break;
 			}
 			case IDM_BROWSE:
 			{
 				LBrowseToFile(Full);
 				break;
 			}
 			case IDM_SHOW_IN_PROJECT:
 			{
 				d->App->ShowInProject(Fn);
 				break;
 			}
 			case IDM_PROPERTIES:
 			{
 				p->ShowFileProperties(Full);
 				break;
 			}
 		}
 	}
 }
 
 AppWnd *IdeDoc::GetApp()
 {
 	return d->App;
 }
 
 bool IdeDoc::IsFile(const char *File)
 {
 	return File ? d->IsFile(File) : false;
 }
 
 bool IdeDoc::AddBreakPoint(ssize_t Line, bool Add)
 {
 	if (Add)
 		d->BreakPoints.Add(Line, true);
 	else
 		d->BreakPoints.Delete(Line);
 	
 	if (d->Edit)
 		d->Edit->Invalidate();
 
 	return true;
 }
 
 
 void IdeDoc::GotoSearch(int CtrlId, char *InitialText)
 {
 	LString File;
 
 	if (CtrlId == IDC_SYMBOL_SEARCH)
 	{
 		// Check if the cursor is on a #include line... in which case we
 		// should look up the header and go to that instead of looking for
 		// a symbol in the code.
 		if (d->Edit)
 		{
 			// Get current line
 			LString Ln = (*d->Edit)[d->Edit->GetLine()];
 			if (Ln.Find("#include") >= 0)
 			{
 				LString::Array a = Ln.SplitDelimit(" \t", 1);
 				if (a.Length() == 2)
 				{
 					File = a[1].Strip("\'\"<>");
 					InitialText = File;
 					CtrlId = IDC_FILE_SEARCH;
 				}
 			}			
 		}
 	}
 
 	if (d->Tray)
 		d->Tray->GotoSearch(CtrlId, InitialText);
 }
 
 #define IsVariableChar(ch) \
 	( \
 		IsAlpha(ch) \
 		|| \
 		IsDigit(ch) \
 		|| \
 		strchr("-_~", ch) != NULL \
 	)
 
 void IdeDoc::SearchSymbol()
 {
 	if (!d->Edit || !d->Tray)
 	{
 		LAssert(0);
 		return;
 	}
 	
 	ssize_t Cur = d->Edit->GetCaret();
 	auto Txt = d->Edit->NameW();
 	if (Cur >= 0 &&
 		Txt != NULL)
 	{
 		ssize_t Start = Cur;
 		while (	Start > 0 &&
 				IsVariableChar(Txt[Start-1]))
 			Start--;
 		ssize_t End = Cur;
 		while (	Txt[End] &&
 				IsVariableChar(Txt[End]))
 			End++;
 		LString Word(Txt + Start, End - Start);
 		GotoSearch(IDC_SYMBOL_SEARCH, Word);
 	}
 }
 
 void IdeDoc::UpdateControl()
 {
 	if (d->Edit)
 		d->Edit->Invalidate();
 }
 
 void IdeDoc::SearchFile()
 {
 	GotoSearch(IDC_FILE_SEARCH, NULL);
 }
 
 bool IdeDoc::IsCurrentIp()
 {
 	auto Fn = GetFileName();
 	bool DocMatch = CurIpDoc &&
 					Fn &&
 					!_stricmp(Fn, CurIpDoc);
 	return DocMatch;
 }
 
 void IdeDoc::ClearCurrentIp()
 {
 	CurIpDoc.Empty();
 	CurIpLine = -1;
 }
 
 void IdeDoc::SetCrLf(bool CrLf)
 {
 	if (d->Edit)
 		d->Edit->SetCrLf(CrLf);
 }
 
 bool IdeDoc::OpenFile(const char *File)
 {
 	if (!d->Edit)
 		return false;
 
 	auto Cs = d->GetSrc() ? d->GetSrc()->GetCharset() : NULL;
 
 	return d->Edit->Open(File, Cs);
 }
 
 void IdeDoc::SetEditorParams(int IndentSize, int TabSize, bool HardTabs, bool ShowWhiteSpace)
 {
 	if (d->Edit)
 	{
 		d->Edit->SetIndentSize(IndentSize > 0 ? IndentSize : 4);
 		d->Edit->SetTabSize(TabSize > 0 ? TabSize : 4);
 		d->Edit->SetHardTabs(HardTabs);
 		d->Edit->SetShowWhiteSpace(ShowWhiteSpace);
 		d->Edit->Invalidate();
 	}
 }
 
 bool IdeDoc::HasFocus(int Set)
 {
 	if (!d->Edit)
 		return false;
 
 	if (Set)
 		d->Edit->Focus(Set);
 
 	return d->Edit->Focus();
 }
 
 void IdeDoc::SplitSelection(LString Sep)
 {
 	if (!d->Edit)
 		return;
 
 	auto r = d->Edit->GetSelectionRange();
 	LString s = d->Edit->GetSelection();
 	if (!s)
 		return;
 
 	auto parts = s.SplitDelimit(Sep);
 	auto joined = LString("\n").Join(parts);
 
 	LAutoWString w(Utf8ToWide(joined));
 	d->Edit->DeleteSelection();
 	d->Edit->Insert(r.Start, w, StrlenW(w));
 }
 
 void IdeDoc::JoinSelection(LString Sep)
 {
 	if (!d->Edit)
 		return;
 
 	auto r = d->Edit->GetSelectionRange();
 	LString s = d->Edit->GetSelection();
 	if (!s)
 		return;
 
 	LAutoWString w(Utf8ToWide(s.Replace("\n", Sep)));
 	d->Edit->DeleteSelection();
 	d->Edit->Insert(r.Start, w, StrlenW(w));
 }
 
 void IdeDoc::EscapeSelection(bool ToEscaped)
 {
 	if (!d->Edit)
 		return;
 
 	LString s = d->Edit->GetSelection();
 	if (!s)
 		return;
 
 	auto ReplaceSelection = [this](LString s)
 	{
 		auto r = d->Edit->GetSelectionRange();
 		LAutoWString w(Utf8ToWide(s));
 		d->Edit->DeleteSelection();
 		d->Edit->Insert(r.Start, w, StrlenW(w));
 	};
 
 	if (ToEscaped)
 	{
 		LMouse m;
 		GetMouse(m);
 		LString Delim = "\r\n\\";
 		if (m.Ctrl())
 		{
 			auto Inp = new LInput(this, LString::Escape(Delim, -1, "\\"), "Delimiter chars:", "Escape");
 			Inp->DoModal([this, ReplaceSelection, s, Inp](auto d, auto code)
 			{
 				if (code)
 				{
 					auto Delim = LString::UnEscape(Inp->GetStr().Get(), -1);
 					auto str = LString::Escape(s, -1, Delim);
 					ReplaceSelection(str);
 				}
 				delete d;
 			});
 			return;
 		}
 
 		s = LString::Escape(s, -1, Delim);
 	}
 	else
 	{
 		s = LString::UnEscape(s.Get(), -1);
 	}
 
 	ReplaceSelection(s);
 }
 
 void IdeDoc::ConvertWhiteSpace(bool ToTabs)
 {
 	if (!d->Edit)
 		return;
 
 	LAutoString Sp(
 		ToTabs ?
 		SpacesToTabs(d->Edit->Name(), d->Edit->GetTabSize()) :
 		TabsToSpaces(d->Edit->Name(), d->Edit->GetTabSize())
 		);
 	if (Sp)
 	{
 		d->Edit->Name(Sp);
 		SetDirty();
 	}
 }
 
 ssize_t IdeDoc::GetLine()
 {
 	return d->Edit ? d->Edit->GetLine() : -1;
 }
 
 void IdeDoc::SetLine(int Line, bool CurIp)
 {
 	if (CurIp)
 	{
 		LString CurDoc = GetFileName();
 		
 		if (ValidStr(CurIpDoc) ^ ValidStr(CurDoc)
 			||
 			(CurIpDoc && CurDoc && strcmp(CurDoc, CurIpDoc) != 0)
 			||
 			Line != CurIpLine)
 		{
 			bool Cur = IsCurrentIp();
 			if (d->Edit && Cur && CurIpLine >= 0)
 			{
 				// Invalidate the old IP location
 				d->Edit->InvalidateLine(CurIpLine - 1);
 			}
 			
 			CurIpLine = Line;
 			CurIpDoc = CurDoc;
 			
 			// LgiTrace("%s:%i - CurIpLine=%i\n", _FL, CurIpLine);
 			d->Edit->InvalidateLine(CurIpLine - 1);
 		}
 	}
 	
 	if (d->Edit)
 	{
 		d->Edit->SetLine(Line);
 	}
 }
 
 IdeProject *IdeDoc::GetProject()
 {
 	return d->Project;
 }
 
 void IdeDoc::SetProject(IdeProject *p)
 {
 	d->Project = p;
 	
 	if (d->Project->GetApp() &&
 		d->BreakPoints.Length() == 0)
 		d->Project->GetApp()->LoadBreakPoints(this);
 }
 
 const char *IdeDoc::GetFileName()
 {
 	return d->GetLocalFile();
 }
 
 void IdeDoc::SetFileName(const char *f, bool Write)
 {
 	d->SetFileName(f);
 	if (Write)
 		d->Edit->Save(d->GetLocalFile());
 }
 
 void IdeDoc::Focus(bool f)
 {
 	d->Edit->Focus(f);
 }
 
 LMessage::Result IdeDoc::OnEvent(LMessage *Msg)
 {
 	switch (Msg->Msg())
 	{
 		case M_FIND_SYM_REQUEST:
 		{
 			LAutoPtr<FindSymRequest> Resp((FindSymRequest*)Msg->A());
 			if (Resp && d->SymPopup)
 			{
 				LViewI *SymEd;
 				if (GetViewById(IDC_SYMBOL_SEARCH, SymEd))
 				{
 					LString Input = SymEd->Name();
 					if (Input == Resp->Str) // Is the input string still the same?
 					{
 						/*
 						The problem with this is that the user it still typing something
 						and the cursor / focus jumps to the document now they are typing
 						a search string into the document, which is not what they intended.
 						
 						if (Resp->Results.Length() == 1)
 						{
 							FindSymResult *r = Resp->Results[0];
 							d->SymPopup->Visible(false);
 
 							d->App->GotoReference(r->File, r->Line, false);
 						}
 						else
 						*/
 						{
 							d->SymPopup->All = Resp->Results;
 							Resp->Results.Length(0);
 							d->SymPopup->FindCommonPathLength();
 							d->SymPopup->SetItems(d->SymPopup->All);
 							d->SymPopup->Visible(true);
 						}
 					}
 				}
 			}
 			break;
 		}
 	}
 	
 	return LMdiChild::OnEvent(Msg);
 }
 
 void IdeDoc::OnPulse()
 {
 	d->CheckModTime();
 
 	if (d->Lock(_FL))
 	{
 		if (d->WriteBuf.Length())
 		{
 			bool Pour = d->Edit->SetPourEnabled(false);
 			for (auto s: d->WriteBuf)
 			{
 				LAutoWString w(Utf8ToWide(s, s.Length()));
 				d->Edit->Insert(d->Edit->Length(), w, Strlen(w.Get()));
 			}
 			d->Edit->SetPourEnabled(Pour);
 
 			d->WriteBuf.Empty();
 			d->Edit->Invalidate();
 		}
 		d->Unlock();
 	}
 }
 
 LString IdeDoc::Read()
 {
 	return d->Edit->Name();
 }
 
 ssize_t IdeDoc::Write(const void *Ptr, ssize_t Size, int Flags)
 {
 	if (d->Lock(_FL))
 	{
 		d->WriteBuf.New().Set((char*)Ptr, Size);
 		d->Unlock();
 	}
 	return 0;
 }
 
 void IdeDoc::OnProjectChange()
 {
 	DeleteObj(d->FilePopup);
 	DeleteObj(d->MethodPopup);
 	DeleteObj(d->SymPopup);
 }
 
 int IdeDoc::OnNotify(LViewI *v, LNotification n)
 {
 	// printf("IdeDoc::OnNotify(%i, %i)\n", v->GetId(), f);
 	
 	switch (v->GetId())
 	{
 		case IDC_EDIT:
 		{
 			switch (n.Type)
 			{
 				case LNotifyDocChanged:
 				{
 					d->UpdateName();
 					break;
 				}
 				case LNotifyCursorChanged:
 				{
 					if (d->Tray)
 					{
 						LPoint Pt;
 						if (d->Edit->GetLineColumnAtIndex(Pt, d->Edit->GetCaret()))
 						{
 							d->Tray->Col = Pt.x;
 							d->Tray->Line = Pt.y;
 							d->Tray->Invalidate();
 						}
 					}
 					break;
 				}
 				default:
 					break;
 			}
 			break;
 		}
 		case IDC_FILE_SEARCH:
 		{
 			if (n.Type == LNotifyEscapeKey)
 			{
 				d->Edit->Focus(true);
 				break;
 			}
 			
 			auto SearchStr = v->Name();
 			if (ValidStr(SearchStr))
 			{
 				if (!d->FilePopup)
 				{
 					if ((d->FilePopup = new ProjFilePopup(d->App, v)))
 					{
 						// Populate with files from the project...
 						
 						// Find the root project...
 						IdeProject *p = d->Project;
 						while (p && p->GetParentProject())
 							p = p->GetParentProject();
 						
 						if (p)
 						{
 							// Get all the nodes
 							List<IdeProject> All;
 							p->GetChildProjects(All);
 							All.Insert(p);							
 							for (auto p: All)
 							{
 								p->GetAllNodes(d->FilePopup->Nodes);
 							}
 						}
 					}
 				}
 				if (d->FilePopup)
 				{
 					// Update list elements...
 					d->FilePopup->OnNotify(v, n);
 				}
 			}
 			else if (d->FilePopup)
 			{
 				DeleteObj(d->FilePopup);
 			}
 			break;
 		}
 		case IDC_METHOD_SEARCH:
 		{
 			if (n.Type == LNotifyEscapeKey)
 			{
 				printf("%s:%i Got LNotifyEscapeKey\n", _FL);
 				d->Edit->Focus(true);
 				break;
 			}
 			
 			auto SearchStr = v->Name();
 			if (ValidStr(SearchStr))
 			{
 				if (!d->MethodPopup)
 					d->MethodPopup = new ProjMethodPopup(d->App, v);
 				if (d->MethodPopup)
 				{
 					// Populate with symbols
 					d->MethodPopup->All.Length(0);
 					BuildDefnList(GetFileName(), (char16*)d->Edit->NameW(), d->MethodPopup->All, DefnFunc);
 
 					// Update list elements...
 					d->MethodPopup->OnNotify(v, n);
 				}
 			}
 			else if (d->MethodPopup)
 			{
 				DeleteObj(d->MethodPopup);
 			}
 			break;
 		}
 		case IDC_SYMBOL_SEARCH:
 		{
 			if (n.Type == LNotifyEscapeKey)
 			{
 				printf("%s:%i Got LNotifyEscapeKey\n", _FL);
 				d->Edit->Focus(true);
 				break;
 			}
 			
 			auto SearchStr = v->Name();
 			if (ValidStr(SearchStr))
 			{
 				if (!d->SymPopup)
 					d->SymPopup = new ProjSymPopup(d->App, this, v);
 				if (d->SymPopup)
 					d->SymPopup->OnNotify(v, n);
 			}
 			else if (d->SymPopup)
 			{
 				DeleteObj(d->SymPopup);
 			}
 			break;
 		}
 	}
 	
 	return 0;
 }
 
 void IdeDoc::SetDirty()
 {
 	d->Edit->IsDirty(true);
 	d->UpdateName();
 }
 
 bool IdeDoc::GetClean()
 {
 	return !d->Edit->IsDirty();
 }
 
 LString IdeDoc::GetFullPath()
 {
 	LAutoString Base;
 	if (GetProject())
 		Base = GetProject()->GetBasePath();
 	
 	LString LocalPath;
 	if (d->GetLocalFile() &&
 		LIsRelativePath(LocalPath) &&
 		Base)
 	{
 		char p[MAX_PATH_LEN];
 		LMakePath(p, sizeof(p), Base, d->GetLocalFile());
 		LocalPath = p;
 	}
 	else
 	{
 		LocalPath = d->GetLocalFile();
 	}
 	
 	if (d->Project)
 		d->Project->CheckExists(LocalPath);
 
 	return LocalPath;
 }
 
 void IdeDoc::SetClean(std::function<void(bool)> Callback)
 {
 	static bool Processing = false;
 
 	if (!Processing)
 	{
 		Processing = true;
 
 		LAutoString Base;
 		if (GetProject())
 			Base = GetProject()->GetBasePath();
 		LString LocalPath = GetFullPath();
 
 		// printf("OnSave setup d=%p\n", d);
 		auto OnSave = [this, Callback](bool ok)
 		{
 			// printf("OnSave %i d=%p\n", ok, d);
 			if (ok)
 				d->Save();
 			// printf("OnSave cb\n");
 			if (Callback)
 				Callback(ok);
 			// printf("OnSave done\n");
 		};		
 		
 		if (d->Edit->IsDirty() &&
 			!LFileExists(LocalPath))
 		{
 			// We need a valid filename to save to...			
 			auto s = new LFileSelect;
 			s->Parent(this);
 			if (Base)
 				s->InitialDir(Base);			
 			s->Save([this, OnSave](auto fileSel, auto ok)
 			{
 				// printf("Doc.Save.Cb ok=%i d=%p\n", ok, d);
 				if (ok)
 					d->SetFileName(fileSel->Name());
 				// printf("Doc.Save.Cb onsave\n", ok);
 				OnSave(ok);
 				// printf("Doc.Save.Cb del\n", ok);
 				delete fileSel;
 			});
 		}
 		else OnSave(true);
 		
 		Processing = false;
 	}
 }
 
 void IdeDoc::OnPaint(LSurface *pDC)
 {
 	LMdiChild::OnPaint(pDC);
 	
 	#if !MDI_TAB_STYLE
 	LRect c = GetClient();
 	LWideBorder(pDC, c, SUNKEN);
 	#endif
 }
 
 void IdeDoc::OnPosChange()
 {
 	LMdiChild::OnPosChange();
 }
 
 bool IdeDoc::OnRequestClose(bool OsShuttingDown)
 {
 	if (d->Edit->IsDirty())
 	{
 		LString Dsp = d->GetDisplayName();
 		int a = LgiMsg(this, "Save '%s'?", AppName, MB_YESNOCANCEL, Dsp ? Dsp.Get() : Untitled);
 		switch (a)
 		{
 			case IDYES:
 			{
 				SetClean([](bool ok)
 				{
 					if (ok)
 					{
 						LAssert(!"Impl close doc.");
 					}
 				});
 
 				// This is returned immediately... before the user has decided to save or not
 				return false;
 			}
 			case IDNO:
 			{
 				break;
 			}
 			default:
 			case IDCANCEL:
 			{
 				return false;
 			}
 		}
 	}
 	
 	return true;
 }
 
 /*
 LTextView3 *IdeDoc::GetEdit()
 {
 	return d->Edit;
 }
 */
 
 bool IdeDoc::BuildIncludePaths(LArray<LString> &Paths, IdePlatform Platform, bool IncludeSysPaths)
 {
 	if (!GetProject())
 	{
 		LgiTrace("%s:%i - GetProject failed.\n", _FL);
 		return false;
 	}
 
 	bool Status = GetProject()->BuildIncludePaths(Paths, true, IncludeSysPaths, Platform);
 	if (Status)
 	{
 		if (IncludeSysPaths)
 			GetApp()->GetSystemIncludePaths(Paths);
 	}
 	else
 	{
 		LgiTrace("%s:%i - GetProject()->BuildIncludePaths failed.\n", _FL);
 	}
 	
 	return Status;
 }
 
 bool IdeDoc::BuildHeaderList(const char16 *Cpp, LArray<char*> &Headers, LArray<LString> &IncPaths)
 {
 	LAutoString c8(WideToUtf8(Cpp));
 	if (!c8)
 		return false;
 
 	return ::BuildHeaderList(c8, Headers, IncPaths, true);
 }
 
 bool MatchSymbol(DefnInfo *Def, char16 *Symbol)
 {
 	static char16 Dots[] = {':', ':', 0};
 
 	LBase o;
 	o.Name(Def->Name);
 	auto Name = o.NameW();
 
 	auto Sep = StristrW((char16*)Name, Dots);
 	auto Start = Sep ? Sep : Name;
 	// char16 *End = StrchrW(Start, '(');
 	ssize_t Len = StrlenW(Symbol);
 	char16 *Match = StristrW((char16*)Start, Symbol);
 
 	if (Match) // && Match + Len <= End)
 	{
 		if (Match > Start && isword(Match[-1]))
 		{
 			return false;
 		}
 		
 		char16 *e = Match + Len;
 		if (*e && isword(*e))
 		{
 			return false;
 		}
 		
 		return true;
 	}
 	
 	return false;
 }
 
 bool IdeDoc::FindDefn(char16 *Symbol, const char16 *Source, List<DefnInfo> &Matches)
 {
 	if (!Symbol || !Source)
 	{
 		LgiTrace("%s:%i - Arg error.\n", _FL);
 		return false;
 	}
 
 	#if DEBUG_FIND_DEFN
 	LStringPipe Dbg;
 	LgiTrace("FindDefn(%S)\n", Symbol);
 	#endif
 
 	LString::Array Paths;
 	LArray<char*> Headers;
 
 	if (!BuildIncludePaths(Paths, PlatformCurrent, true))
 	{
 		LgiTrace("%s:%i - BuildIncludePaths failed.\n", _FL);
 		// return false;
 	}
 
 	char Local[MAX_PATH_LEN];
 	strcpy_s(Local, sizeof(Local), GetFileName());
 	LTrimDir(Local);
 	Paths.New() = Local;
 
 	if (!BuildHeaderList(Source, Headers, Paths))
 	{
 		LgiTrace("%s:%i - BuildHeaderList failed.\n", _FL);
 		// return false;
 	}
 
 	{
 		LArray<DefnInfo> Defns;
 		
 		for (int i=0; i<Headers.Length(); i++)
 		{
 			char *h = Headers[i];
 			char *c8 = LReadTextFile(h);
 			if (c8)
 			{
 				char16 *c16 = Utf8ToWide(c8);
 				DeleteArray(c8);
 				if (c16)
 				{
 					LArray<DefnInfo> Defns;
 					if (BuildDefnList(h, c16, Defns, DefnNone, false ))
 					{
 						bool Found = false;
 						for (unsigned n=0; n<Defns.Length(); n++)
 						{
 							DefnInfo &Def = Defns[n];
 							if (MatchSymbol(&Def, Symbol))
 							{
 								Matches.Insert(new DefnInfo(Def));
 								Found = true;
 							}
 						}
 						
 						#if DEBUG_FIND_DEFN
 						if (!Found)
 							Dbg.Print("Not in '%s'\n", h);
 						#endif
 					}
 					
 					DeleteArray(c16);
 				}
 			}
 		}
 
 		auto FileName = GetFileName();
 		if (BuildDefnList(FileName, (char16*)Source, Defns, DefnNone))
 		{
 			#if DEBUG_FIND_DEFN
 			bool Found = false;
 			#endif
 			
 			for (unsigned i=0; i<Defns.Length(); i++)
 			{
 				DefnInfo &Def = Defns[i];
 				if (MatchSymbol(&Def, Symbol))
 					Matches.Insert(new DefnInfo(Def));
 			}
 
 			#if DEBUG_FIND_DEFN
 			if (!Found)
 				Dbg.Print("Not in current file.\n");
 			#endif
 		}
 	}
 	
 	Headers.DeleteArrays();
 
 	#if DEBUG_FIND_DEFN
 	{
 		LAutoString a(Dbg.NewStr());
 		if (a) LgiTrace("%s", a.Get());
 	}
 	#endif
 	
 	return Matches.Length() > 0;
 }
diff --git a/Lgi.xml b/Lgi.xml
--- a/Lgi.xml
+++ b/Lgi.xml
@@ -1,576 +1,605 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project>
 	<Node Name="Source Files" Type="1" Platforms="15" Open="1" Id="1">
 		<Node Name="Core" Type="1" Platforms="15" Open="1" Id="2">
 			<Node Name="DateTime" Type="1" Platforms="15" Open="0" Id="3">
 				<Node File=".\src\common\General\DateTime.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\DateTime.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Drag and Drop" Type="1" Platforms="15" Open="0" Id="4">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="4">
 					<Node File=".\src\haiku\DragAndDrop.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="6">
 					<Node File=".\src\linux\Lgi\DragAndDrop.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Mac" Type="1" Platforms="15" Id="1">
 					<Node File="./src/mac/cocoa/DragAndDrop.mm" Type="8" Platforms="4" />
 				</Node>
 				<Node Name="Windows" Type="1" Platforms="15" Open="0" Id="7">
 					<Node File=".\include\lgi\common\Com.h" Type="3" Platforms="15" />
 					<Node File=".\src\win\Lgi\DragAndDrop.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\include\lgi\common\DragAndDrop.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Lgi\DragAndDropCommon.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\DropFiles.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="File" Type="1" Platforms="15" Open="0" Id="8">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="8">
 					<Node File=".\src\haiku\File.cpp" Type="2" Platforms="8" />
 					<Node File=".\src\haiku\ShowFileProp_Haiku.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="10">
 					<Node File="./src/linux/General/File.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/General/ShowFileProp_Linux.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Mac" Type="1" Platforms="15" Id="1">
 					<Node File="./src/mac/cocoa/ShowFileProp_Mac.mm" Type="8" Platforms="15" />
 				</Node>
 				<Node Name="Win" Type="1" Platforms="15" Open="0" Id="11">
 					<Node File=".\src\win\General\File.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\General\ShowFileProp_Win.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\src\common\General\ExeCheck.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\File.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\General\FileCommon.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Interface" Type="1" Platforms="15" Open="1" Id="12">
-				<Node Name="Haiku" Type="1" Platforms="15" Id="1">
-					<Node File="./src/haiku/App.cpp" Type="2" Platforms="8" />
-					<Node File="./private/haiku/AppPriv.h" Type="3" Platforms="8" />
-					<Node File="./src/haiku/General.cpp" Type="2" Platforms="8" />
-					<Node File="./src/haiku/Menu.cpp" Type="2" Platforms="8" />
-					<Node File="./src/haiku/Printer.cpp" Type="2" Platforms="8" />
-					<Node File="./src/haiku/View.cpp" Type="2" Platforms="8" />
-					<Node File="./src/haiku/Window.cpp" Type="2" Platforms="8" />
-				</Node>
+				<Node File="./include/lgi/common/Window.h" Type="3" Platforms="15" />
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="14">
 					<Node Name="Headers" Type="1" Platforms="15" Open="0" Id="15">
 						<Node File=".\include\lgi\linux\Gtk\LgiOsClasses.h" Type="3" Platforms="2" />
 						<Node File=".\include\lgi\linux\Gtk\LgiOsDefs.h" Type="3" Platforms="2" />
 					</Node>
 					<Node File="./src/linux/Lgi/App.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Lgi/General.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Lgi/View.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Lgi/Window.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Gtk/LgiWidget.cpp" Type="2" Platforms="2" />
 					<Node File="./include/lgi/linux/Gtk/LgiWidget.h" Type="3" Platforms="15" />
 					<Node File="./private/linux/AppPriv.h" Type="3" Platforms="2" />
+					<Node Name="Haiku" Type="1" Platforms="15" Id="1">
+						<Node File="./src/haiku/App.cpp" Type="2" Platforms="8" />
+						<Node File="./private/haiku/AppPriv.h" Type="3" Platforms="8" />
+						<Node File="./src/haiku/General.cpp" Type="2" Platforms="8" />
+						<Node File="./src/haiku/Menu.cpp" Type="2" Platforms="8" />
+						<Node File="./src/haiku/Printer.cpp" Type="2" Platforms="8" />
+						<Node File="./src/haiku/View.cpp" Type="2" Platforms="8" />
+						<Node File="./src/haiku/Window.cpp" Type="2" Platforms="8" />
+					</Node>
 				</Node>
 				<Node Name="Mac" Type="1" Platforms="15" Id="1">
 					<Node File="./src/mac/cocoa/App.mm" Type="2" Platforms="4" />
 					<Node File="./src/mac/cocoa/General.mm" Type="2" Platforms="4" />
 					<Node File="./src/mac/cocoa/View.mm" Type="2" Platforms="4" />
 					<Node File="./src/mac/cocoa/Widgets.mm" Type="2" Platforms="4" />
 					<Node File="./src/mac/cocoa/Window.mm" Type="2" Platforms="4" />
 				</Node>
 				<Node Name="Win" Type="1" Platforms="15" Open="0" Id="16">
 					<Node File=".\src\win\Lgi\App.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Lgi\General.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Lgi\Printer.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Lgi\View.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Lgi\Window.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Lgi\LgiException.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File="./include/lgi/common/App.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Lgi/AppCommon.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Lgi/WindowCommon.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Message.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/View.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Lgi/ViewCommon.cpp" Type="2" Platforms="15" />
 				<Node File="./private/common/ViewPriv.h" Type="3" Platforms="15" />
-				<Node File="./include/lgi/common/Window.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Libraries" Type="1" Platforms="15" Open="1" Id="17">
 				<Node File=".\src\common\Lgi\Library.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Library.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Memory Subsystem" Type="1" Platforms="15" Open="0" Id="18">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="6">
 					<Node File=".\src\haiku\Mem.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="20">
 					<Node File=".\src\linux\General\Mem.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Property List" Type="1" Platforms="15" Open="0" Id="21">
 					<Node File=".\src\common\General\Properties.cpp" Type="2" Platforms="15" />
 					<Node File=".\include\lgi\common\Properties.h" Type="3" Platforms="15" />
 				</Node>
 				<Node Name="Win" Type="1" Platforms="15" Open="0" Id="22">
 					<Node File=".\src\win\General\Mem.cpp" Type="2" Platforms="1" />
 					<Node File="./src/common/General/qsort.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\include\lgi\common\Array.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\General\Containers.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Containers.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\HashTable.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\HashTable.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\Mem.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\UnrolledList.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Menus" Type="1" Platforms="15" Open="0" Id="23">
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="25">
 					<Node File=".\src\linux\Lgi\Menu.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Win32" Type="1" Platforms="15" Open="0" Id="26">
 					<Node File=".\src\win\Lgi\Menu.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\include\lgi\common\Menu.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Lgi\MenuCommon.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Process" Type="1" Platforms="15" Open="0" Id="27">
 				<Node File="./src/common/Lgi/SubProcess.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/SubProcess.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Resources" Type="1" Platforms="15" Open="0" Id="28">
 				<Node File="./src/common/Resource/LgiRes.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\LgiRes.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Resource/Res.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Res.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Skin" Type="1" Platforms="15" Open="0" Id="29">
 				<Node File="./src/common/Skins/Gel/Gel.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Gdc2/Path/Path.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Stream" Type="1" Platforms="15" Open="0" Id="30">
 				<Node File=".\include\lgi\common\Dom.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Lgi\MemStream.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Lgi\Stream.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Stream.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Threads" Type="1" Platforms="15" Open="0" Id="31">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="5">
 					<Node File=".\src\haiku\Thread.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="33">
 					<Node File=".\src\linux\Lgi\Thread.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Mac" Type="1" Platforms="15" Id="1">
 					<Node File="./src/mac/cocoa/Thread.mm" Type="2" Platforms="4" />
 				</Node>
 				<Node Name="Win32" Type="1" Platforms="15" Open="0" Id="34">
 					<Node File=".\src\win\Lgi\Thread.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File="./include/lgi/common/EventTargetThread.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Lgi/Mutex.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Mutex.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/Thread.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Lgi/ThreadCommon.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Lgi/ThreadEvent.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/ThreadEvent.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Variant" Type="1" Platforms="15" Open="0" Id="35">
 				<Node File=".\src\common\Lgi\Variant.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Variant.h" Type="3" Platforms="15" />
 			</Node>
 			<Node File="./src/common/Lgi/GuiUtils.cpp" Type="2" Platforms="15" />
 			<Node File="./src/common/Lgi/LgiCommon.cpp" Type="2" Platforms="15" />
 			<Node File="./src/common/Lgi/LMsg.cpp" Type="2" Platforms="15" />
 			<Node File="./src/common/Lgi/Object.cpp" Type="2" Platforms="15" />
 			<Node File="./include/lgi/common/StructuredIo.h" Type="3" Platforms="15" />
 			<Node File="./include/lgi/common/StructuredLog.h" Type="3" Platforms="15" />
 			<Node File="./src/common/Lgi/ToolTip.cpp" Type="2" Platforms="15" />
 			<Node File="./include/lgi/common/ToolTip.h" Type="3" Platforms="15" />
 			<Node File="./src/common/Lgi/TrayIcon.cpp" Type="2" Platforms="15" />
 		</Node>
 		<Node Name="Dialogs" Type="1" Platforms="15" Open="0" Id="36">
 			<Node Name="File Select Win" Type="1" Platforms="15" Open="0" Id="38">
 				<Node File=".\src\win\Lgi\FileSelect.cpp" Type="2" Platforms="1" />
 			</Node>
 			<Node Name="File Select XP" Type="1" Platforms="15" Open="0" Id="37">
 				<Node File=".\src\common\Lgi\FileSelect.cpp" Type="2" Platforms="14" />
 				<Node File=".\include\lgi\common\FileSelect.h" Type="3" Platforms="15" />
 			</Node>
 			<Node File=".\src\common\Lgi\Alert.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Lgi\FindReplace.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Lgi\FontSelect.cpp" Type="2" Platforms="15" />
 			<Node File=".\include\lgi\common\FontSelect.h" Type="3" Platforms="15" />
 			<Node File=".\src\common\Lgi\Input.cpp" Type="2" Platforms="15" />
 			<Node File=".\include\lgi\common\Input.h" Type="3" Platforms="15" />
 		</Node>
 		<Node Name="Graphics" Type="1" Platforms="15" Open="0" Id="39">
 			<Node Name="_Core" Type="1" Platforms="15" Open="0" Id="40">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="2">
 					<Node File=".\src\haiku\Gdc2.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="42">
 					<Node File=".\src\linux\Gtk\Gdc2.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Win" Type="1" Platforms="15" Open="0" Id="43">
 					<Node File=".\src\win\Gdc2\Gdc2.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\src\common\Gdc2\Colour.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Colour.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Gdc2\Tools\ColourReduce.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\ColourSpace.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\Filter.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\Gdc2.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Gdc2\GdcCommon.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\Tools\GdcTools.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\GdcTools.h" Type="3" Platforms="15" />
 				<Node File=".\include\lgi\common\PixelRops.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Font" Type="1" Platforms="15" Open="0" Id="44">
 				<Node File="./src/common/Gdc2/Font/DisplayString.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/DisplayString.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/Font.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Font.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/StringLayout.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/FontCache.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/Charset.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/FontSystem.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/StringLayout.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/TypeFace.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Gdc2/Font/FontType.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Applicators" Type="1" Platforms="15" Open="0" Id="45">
 				<Node File=".\src\common\Gdc2\15Bit.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\16Bit.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\24Bit.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\32Bit.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\8Bit.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Gdc2\Alpha.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Filters" Type="1" Platforms="15" Open="0" Id="46">
 				<Node File=".\src\common\Gdc2\Filters\Filter.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Rect/Region" Type="1" Platforms="15" Open="0" Id="47">
 				<Node File=".\src\common\Gdc2\Rect.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Rect.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Surfaces" Type="1" Platforms="15" Open="0" Id="48">
 				<Node Name="Haiku" Type="1" Platforms="15" Id="3">
 					<Node File=".\src\haiku\MemDC.cpp" Type="2" Platforms="8" />
 					<Node File=".\src\haiku\PrintDC.cpp" Type="2" Platforms="8" />
 					<Node File=".\src\haiku\ScreenDC.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="50">
 					<Node File="./src/linux/Gtk/MemDC.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Gtk/PrintDC.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Gtk/ScreenDC.cpp" Type="2" Platforms="2" />
 					<Node File="./src/linux/Lgi/Printer.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Mac" Type="1" Platforms="15" Open="0" Id="51">
 					<Node File="./src/linux/Gtk/MemDC.cpp" Type="2" Platforms="4" />
 					<Node File="./src/linux/Gtk/PrintDC.cpp" Type="2" Platforms="4" />
 					<Node File="./src/linux/Gtk/ScreenDC.cpp" Type="2" Platforms="4" />
 				</Node>
 				<Node Name="Win" Type="1" Platforms="15" Open="0" Id="52">
 					<Node File=".\src\win\Gdc2\ScreenDC.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Gdc2\PrintDC.cpp" Type="2" Platforms="1" />
 					<Node File=".\src\win\Gdc2\MemDC.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File="./include/lgi/common/Printer.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Gdc2/Surface.cpp" Type="2" Platforms="15" />
 			</Node>
 			<Node Name="Gdi Leak" Type="1" Platforms="15" Open="0" Id="53">
 				<Node File=".\src\win\Gdc2\GdiLeak.cpp" Type="2" Platforms="1" />
 				<Node File=".\include\lgi\common\GdiLeak.h" Type="3" Platforms="15" />
 			</Node>
 		</Node>
 		<Node Name="General" Type="1" Platforms="15" Open="0" Id="54">
 			<Node Name="Clipboard" Type="1" Platforms="15" Open="0" Id="55">
 				<Node Name="Haiku" Type="1" Platforms="15" Open="0" Id="58">
 					<Node File="./src/haiku/ClipBoard.cpp" Type="2" Platforms="8" />
 				</Node>
 				<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="57">
 					<Node File=".\src\linux\Lgi\ClipBoard.cpp" Type="2" Platforms="2" />
 				</Node>
 				<Node Name="Win32" Type="1" Platforms="15" Open="0" Id="56">
 					<Node File=".\src\win\Lgi\ClipBoard.cpp" Type="2" Platforms="1" />
 				</Node>
 				<Node File=".\include\lgi\common\ClipBoard.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Data Dlg" Type="1" Platforms="15" Open="0" Id="59">
 				<Node File=".\src\common\Lgi\DataDlg.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\DataDlg.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\General\Password.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Password.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Hash" Type="1" Platforms="15" Id="1">
 				<Node File="./src/common/Hash/md5/md5.c" Type="2" Platforms="15" />
 				<Node File="./src/common/Hash/md5/md5.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Hash/sha1/sha1.c" Type="2" Platforms="15" />
 				<Node File="./src/common/Hash/sha1/sha1.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Mru" Type="1" Platforms="15" Open="0" Id="60">
 				<Node File=".\src\common\Lgi\Mru.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Mru.h" Type="3" Platforms="15" />
 			</Node>
 			<Node File="./src/common/Net/Base64.cpp" Type="2" Platforms="15" />
 			<Node File="./src/common/Lgi/OptionsFile.cpp" Type="2" Platforms="15" />
 			<Node File="./include/lgi/common/OptionsFile.h" Type="3" Platforms="15" />
 			<Node File="./src/common/Lgi/Rand.cpp" Type="2" Platforms="15" />
 		</Node>
 		<Node Name="Text" Type="1" Platforms="15" Open="0" Id="61">
 			<Node File=".\src\common\Text\String.cpp" Type="2" Platforms="15" />
 			<Node File="./include/lgi/common/LgiString.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\common\StringClass.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\common\TextFile.h" Type="3" Platforms="15" />
 			<Node File=".\src\common\Text\Token.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Text\Unicode.cpp" Type="2" Platforms="15" />
 			<Node File=".\include\lgi\common\Unicode.h" Type="3" Platforms="15" />
 			<Node File=".\src\common\Text\Utf8.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Text\XmlTree.cpp" Type="2" Platforms="15" />
 			<Node File=".\include\lgi\common\XmlTree.h" Type="3" Platforms="15" />
 		</Node>
 		<Node Name="Widgets" Type="1" Platforms="15" Open="1" Id="62">
 			<Node Name="Common" Type="1" Platforms="15" Open="0" Id="63">
 				<Node File="./src/common/Widgets/Bitmap.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Widgets/Button.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Button.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/CheckBox.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/CheckBox.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/Combo.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Combo.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Text/DocView.cpp" Type="2" Platforms="14" />
 				<Node File="./src/common/Widgets/Edit.cpp" Type="2" Platforms="14" />
 				<Node File="./include/lgi/common/Edit.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/ItemContainer.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/ItemContainer.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/Layout.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/List.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/List.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/ListItemCheckBox.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/ListItemRadioBtn.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/Panel.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Widgets/Popup.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Popup.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/PopupList.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/Progress.cpp" Type="2" Platforms="14" />
 				<Node File="./include/lgi/common/Progress.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/Progress.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/ProgressDlg.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/ProgressDlg.h" Type="3" Platforms="15" />
 				<Node File="./include/lgi/common/ProgressView.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/RadioGroup.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/RadioGroup.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/ScrollBar.cpp" Type="2" Platforms="14" />
 				<Node File="./include/lgi/common/ScrollBar.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/Slider.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Slider.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/StatusBar.cpp" Type="2" Platforms="15" />
 				<Node File="./src/common/Widgets/TabView.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/TabView.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/TextLabel.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/TextLabel.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Text/TextView3.cpp" Type="2" Platforms="14" />
 				<Node File="./include/lgi/common/TextView3.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/ToolBar.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/ToolBar.h" Type="3" Platforms="15" />
 				<Node File="./src/common/Widgets/Tree.cpp" Type="2" Platforms="15" />
 				<Node File="./include/lgi/common/Tree.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Css" Type="1" Platforms="15" Open="0" Id="64">
 				<Node File=".\src\common\Lgi\Css.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Css.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Lgi\CssTools.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\CssTools.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Haiku" Type="1" Platforms="15" Id="7">
 				<Node File=".\src\haiku\Layout.cpp" Type="2" Platforms="8" />
 				<Node File=".\src\haiku\Widgets.cpp" Type="2" Platforms="8" />
 			</Node>
 			<Node Name="Layout" Type="1" Platforms="15" Open="0" Id="68">
 				<Node File=".\src\common\Widgets\Box.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\Box.h" Type="3" Platforms="15" />
 				<Node File=".\src\common\Widgets\Splitter.cpp" Type="2" Platforms="15" />
 				<Node File=".\src\common\Widgets\TableLayout.cpp" Type="2" Platforms="15" />
 				<Node File=".\include\lgi\common\TableLayout.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="66">
 				<Node File="./include/lgi/common/Dialog.h" Type="3" Platforms="15" />
 				<Node File="./src/linux/Lgi/Layout.cpp" Type="2" Platforms="2" />
 				<Node File="./src/linux/Lgi/Widgets.cpp" Type="2" Platforms="2" />
 				<Node File="./include/lgi/common/Widgets.h" Type="3" Platforms="15" />
 			</Node>
 			<Node Name="Win" Type="1" Platforms="15" Open="0" Id="67">
 				<Node File=".\src\win\Widgets\Edit_Win.cpp" Type="2" Platforms="1" />
 				<Node File=".\src\win\Widgets\Dialog_Win.cpp" Type="2" Platforms="1" />
 				<Node File=".\src\win\Lgi\ScrollBar.cpp" Type="2" Platforms="1" />
 				<Node File=".\src\win\Lgi\Layout.cpp" Type="2" Platforms="1" />
 				<Node File=".\src\common\Widgets\Progress.cpp" Type="2" Platforms="1" />
 			</Node>
 			<Node File="./include/lgi/common/DocView.h" Type="3" Platforms="15" />
 		</Node>
 	</Node>
 	<Node Name="LgiNet" Type="1" Platforms="15" Open="0" Id="69">
 		<Node Name="Source" Type="1" Platforms="15" Open="0" Id="70">
 			<Node File=".\src\common\Net\Uri.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Net\Net.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Net\NetTools.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\common\Net\MDStringToDigest.cpp" Type="2" Platforms="15" />
 			<Node File=".\src\win\INet\MibAccess.cpp" Type="2" Platforms="1" />
 		</Node>
 		<Node Name="Header" Type="1" Platforms="15" Open="0" Id="71">
 			<Node File=".\include\lgi\common\Net.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\common\NetTools.h" Type="3" Platforms="15" />
 		</Node>
 		<Node Name="Mime Message" Type="1" Platforms="15" Open="0" Id="72">
 			<Node File=".\include\lgi\common\Mime.h" Type="3" Platforms="15" />
 		</Node>
 	</Node>
 	<Node Name="Headers" Type="1" Platforms="15" Open="0" Id="73">
 		<Node Name="Haiku" Type="1" Platforms="15" Id="1">
 			<Node File=".\include\lgi\haiku\LgiOsClasses.h" Type="3" Platforms="8" />
 			<Node File=".\include\lgi\haiku\LgiOsDefs.h" Type="3" Platforms="8" />
 		</Node>
 		<Node Name="Linux" Type="1" Platforms="15" Open="0" Id="75">
 			<Node File=".\include\lgi\linux\Gtk\LgiOsDefs.h" Type="3" Platforms="2" />
 		</Node>
 		<Node Name="Mac" Type="1" Platforms="15" Id="1">
 			<Node File=".\include\lgi\mac\cocoa\LCocoaView.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\LgiMac.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\LgiOs.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\LgiOsClasses.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\LgiOsDefs.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\ObjCWrapper.h" Type="3" Platforms="15" />
 			<Node File=".\include\lgi\mac\cocoa\SymLookup.h" Type="3" Platforms="15" />
 		</Node>
 		<Node Name="Win" Type="1" Platforms="15" Open="0" Id="76">
 			<Node File=".\include\lgi\win\LgiOsDefs.h" Type="3" Platforms="1" />
 		</Node>
-		<Node File=".\include\lgi\common\AutoPtr.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Cancel.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Error.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Json.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Lgi.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiClasses.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiCommon.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiDefs.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiInc.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiInterfaces.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiMsgs.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\LgiUiBase.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Notifications.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Point.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\RefCount.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\TextLog.h" Type="3" Platforms="15" />
-		<Node File=".\include\lgi\common\Token.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/AutoPtr.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Cancel.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Error.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Json.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Lgi.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiClasses.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiCommon.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiDefs.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiInc.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiInterfaces.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiMsgs.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/LgiUiBase.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Notifications.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Point.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/PopupNotification.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/RefCount.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/TextLog.h" Type="3" Platforms="15" />
+		<Node File="./include/lgi/common/Token.h" Type="3" Platforms="15" />
 	</Node>
 	<Node Name="Build" Type="1" Platforms="15" Id="1">
 		<Node File="./Makefile.haiku" Type="9" Platforms="15" />
 		<Node File="./Makefile.linux" Type="9" Platforms="15" />
 	</Node>
 	<Settings>
 		<General>
 			<Makefile>
 				<Linux>Makefile.linux</Linux>
 				<Windows>Makefile.win64</Windows>
 				<Mac>Makefile.macosx</Mac>
 			</Makefile>
 			<Compiler>
 				<Linux>gcc</Linux>
 			</Compiler>
 			<DebugAdmin>
 				<All>0</All>
 			</DebugAdmin>
-			<Executable />
+			<Executable>
+				<Linux />
+			</Executable>
+			<CCrossCompiler />
+			<CppCrossCompiler />
 		</General>
 		<Build>
 			<IncludePaths>
 				<All>
 					<Debug>./include
 ./private/common</Debug>
 					<Release>./include
 ./private/common</Release>
 				</All>
 				<Linux>
 					<Debug>./include/lgi/linux
 ./include/lgi/linux/Gtk
 ./private/linux</Debug>
 					<Release>./include/lgi/linux
 ./include/lgi/linux/Gtk
 ./private/linux
 </Release>
 				</Linux>
 				<Windows>
 					<Debug>./include/lgi/win
 ./private/win</Debug>
 					<Release>./include/lgi/win
 ./private/win</Release>
 				</Windows>
 				<Haiku>
 					<Debug>./include/lgi/haiku
 ./private/haiku</Debug>
 					<Release>./include/lgi/haiku
 ./private/haiku</Release>
 				</Haiku>
 			</IncludePaths>
 			<SystemIncludes>
 				<Linux>
 					<Debug>/usr/include/libappindicator3-0.1
 `pkg-config --cflags gtk+-3.0`
 `pkg-config --cflags gstreamer-1.0`</Debug>
 					<Release>/usr/include/libappindicator3-0.1
 `pkg-config --cflags gtk+-3.0`
 `pkg-config --cflags gstreamer-1.0`</Release>
 				</Linux>
 			</SystemIncludes>
 			<Libraries>
 				<Linux>
 					<Debug>magic
 appindicator3
 crypt
 -static-libgcc 
 `pkg-config --libs gtk+-3.0`</Debug>
 					<Release>magic
 appindicator3
 crypt
 -static-libgcc 
 `pkg-config --libs gtk+-3.0`</Release>
 				</Linux>
 				<Haiku>
 					<Debug>-static-libgcc
 gnu
 network
 be</Debug>
 					<Release>-static-libgcc
 gnu
 network
 be</Release>
 				</Haiku>
+				<All />
 			</Libraries>
 			<TargetName>
 				<Linux>
 					<Debug>lgi-gtk3</Debug>
 					<Release>lgi-gtk3</Release>
 				</Linux>
 			</TargetName>
 			<TargetType>
 				<All>DynamicLibrary</All>
 			</TargetType>
 			<Defines>
 				<All>
 					<Debug>LGI_LIBRARY</Debug>
 					<Release>LGI_LIBRARY</Release>
 				</All>
 				<Haiku>
 					<Debug>POSIX
 _GNU_SOURCE</Debug>
 					<Release>POSIX
 _GNU_SOURCE</Release>
 				</Haiku>
+				<Linux />
 			</Defines>
-			<LibraryPaths />
+			<LibraryPaths>
+				<All />
+				<Linux />
+			</LibraryPaths>
+			<ApplicationIcon />
 		</Build>
 		<Advanced>
-			<PostBuildCommands />
+			<OtherMakefileRules />
+			<PostBuildCommands>
+				<Linux />
+			</PostBuildCommands>
 		</Advanced>
 		<Debug>
-			<Arguments />
+			<Environment />
+			<Arguments>
+				<All />
+			</Arguments>
+			<DebugAdmin />
+			<InitialDir />
 		</Debug>
-		<Remote />
-		<Editor />
+		<Remote>
+			<RemoteUri />
+			<RemotePass />
+		</Remote>
+		<Editor>
+			<TabSize />
+			<IndentSize />
+			<ShowWhiteSpace />
+			<UseHardTabs />
+			<CommentFile />
+			<CommentFunction />
+		</Editor>
 	</Settings>
 </Project>
diff --git a/include/lgi/common/PopupNotification.h b/include/lgi/common/PopupNotification.h
--- a/include/lgi/common/PopupNotification.h
+++ b/include/lgi/common/PopupNotification.h
@@ -1,30 +1,30 @@
 #pragma once
 
 #include "lgi/common/DisplayString.h"
 
 class LgiClass LPopupNotification : public LWindow
 {
 	constexpr static int Border = 10; // px
 	constexpr static int ShowMs = 2300; // milliseconds
 
-	LColour Back = LColour(0xf7, 0xf0, 0xd5);
-	LColour Fore = LColour(0xd4, 0xb8, 0x62);
+	LColour Back;
+	LColour Fore;
 	LWindow *RefWnd = NULL;
 	LArray<LDisplayString*> Msgs;
 	LPoint Decor = LPoint(2, 2);
 	uint64_t HideTs = 0;
 
 	LPoint CalcSize();
 
 public:
 	static LPopupNotification *Message(LWindow *ref, LString msg);
 
 	LPopupNotification(LWindow *ref, LString msg = LString());
 	~LPopupNotification();
 
 	void Init();
 	void Add(LWindow *ref, LString msg);
 	void OnPaint(LSurface *pDC);
 	void OnPulse();
 };
 
diff --git a/src/common/Lgi/AppCommon.cpp b/src/common/Lgi/AppCommon.cpp
--- a/src/common/Lgi/AppCommon.cpp
+++ b/src/common/Lgi/AppCommon.cpp
@@ -1,289 +1,296 @@
 #include "lgi/common/Lgi.h"
 #include "lgi/common/PopupNotification.h"
 
 #include "AppPriv.h"
 
 #ifdef LINUX
 namespace Gtk {
 #include "LgiWidget.h"
 }
 #endif
 
 class LPopupNotificationFactory
 {
 public:
 	LHashTbl<PtrKey<LWindow*>, LPopupNotification*> map;
 
 	void Empty()
 	{
 		while (map.Length())
 		{
 			auto p = map.begin();
 			if (p != map.end())
 			{
 				delete (*p).value;
 			}
 		}
 	}
 
 }	PopupNotificationFactory;
 
 
 void LApp::CommonCleanup()
 {
 	PopupNotificationFactory.Empty();
 }
 
 LString LApp::GetConfigPath()
 {
 	#if defined(LINUX)
 	::LFile::Path p(LSP_HOME);
 	p += ".config";
 	#else
 	::LFile::Path p(LSP_USER_APP_DATA);
 	p += "MemecodeLgi";
 	if (!p.Exists())
 		FileDev->CreateFolder(p);
 	#endif
 
 	if (p.Exists())
 	{
 		p += "lgi.json";
 		return p.GetFull();
 	}
 	
 	p--;
 	p += ".lgi.json";
 	return p.GetFull();
 }
 
 ::LString LApp::GetConfig(const char *Variable)
 {
 	auto c = d->GetConfig();
 	return c ? c->Get(Variable) : NULL;
 }
 
 void LApp::SetConfig(const char *Variable, const char *Value)
 {
 	auto c = d->GetConfig();
 	if (c && c->Set(Variable, Value))
 		d->SaveConfig();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
 LJson *LAppPrivate::GetConfig()
 {
 	if (!Config)
 	{
 		auto Path = Owner->GetConfigPath();
 		if (Config.Reset(new LJson()))
 		{
 			::LFile f;
 			if (f.Open(Path, O_READ))
 				Config->SetJson(f.Read());
 				
 			bool Dirty = false;				
 			#define DEFAULT(var, val) \
 				if (Config->Get(var).Length() == 0) \
 					Dirty |= Config->Set(var, val);
 
 			#ifdef LINUX
 
 				DEFAULT(LApp::CfgLinuxKeysShift, "GDK_SHIFT_MASK");
 				DEFAULT(LApp::CfgLinuxKeysCtrl, "GDK_CONTROL_MASK");
 				DEFAULT(LApp::CfgLinuxKeysAlt, "GDK_MOD1_MASK");
 
 				auto Sys =
 					#if defined(MAC)
 					"GDK_MOD2_MASK";
 					#else
 					"GDK_SUPER_MASK";
 					#endif
 				DEFAULT(LApp::CfgLinuxKeysSystem, Sys);
 				DEFAULT("Linux.Keys.Debug", "0");
 				
 				auto str = [](Gtk::GDK_MouseButtons btn)
 				{
 					LString s;
 					s.Printf("%i", btn);
 					return s;
 				};
 				
 				DEFAULT(LApp::CfgLinuxMouseLeft,    str(Gtk::GDK_LEFT_BTN));
 				DEFAULT(LApp::CfgLinuxMouseMiddle,  str(Gtk::GDK_MIDDLE_BTN));
 				DEFAULT(LApp::CfgLinuxMouseRight,   str(Gtk::GDK_RIGHT_BTN));
 				DEFAULT(LApp::CfgLinuxMouseBack,    str(Gtk::GDK_BACK_BTN));
 				DEFAULT(LApp::CfgLinuxMouseForward, str(Gtk::GDK_FORWARD_BTN));
 
 			#endif
 
 			DEFAULT("Language", "-");
 
 			DEFAULT("Fonts.Comment", "Fonts are specified in the <face>:<pointSize> format.");
 			DEFAULT(LApp::CfgFontsGlyphSub, "1");
 			DEFAULT(LApp::CfgFontsPointSizeOffset, "0");
 			DEFAULT(LApp::CfgFontsSystemFont, "-");
 			DEFAULT(LApp::CfgFontsBoldFont, "-");
 			DEFAULT(LApp::CfgFontsMonoFont, "-");
 			DEFAULT(LApp::CfgFontsSmallFont, "-");
 			DEFAULT(LApp::CfgFontsCaptionFont, "-");
 			DEFAULT(LApp::CfgFontsMenuFont, "-");
 				
 			DEFAULT("Colours.Comment", "Use CSS hex definitions here, ie #RRGGBB in hex.");
 			#define _(name) \
 				if (L_##name < L_MAXIMUM) \
 					DEFAULT("Colours.L_" #name, "-");
 			_SystemColour();
 			#undef _
 				
 			if (Dirty)
 				SaveConfig();
 				
 			LgiTrace("Using LGI config: '%s'\n", Path.Get()); 
 		}
 		else printf("%s:%i - Alloc failed.\n", _FL);
 	}
 		
 	return Config;
 }
 	
 bool LAppPrivate::SaveConfig()
 {
 	auto Path = Owner->GetConfigPath();
 	if (!Path || !Config)
 		return false;
 			
 	::LFile f;
 	if (!f.Open(Path, O_WRITE))
 		return false;
 			
 	f.SetSize(0);
 	return f.Write(Config->GetJson());		
 }
 	
 ////////////////////////////////////////////////////////////////////////////////////////////////
 LPopupNotification *LPopupNotification::Message(LWindow *ref, LString msg)
 {
 	if (!ref)
 		return NULL;
 
 	auto w = PopupNotificationFactory.map.Find(ref);
 	if (w)
 	{
 		w->Add(ref, msg);
 	}
 	else
 	{
 		w = new LPopupNotification(ref, msg);
 		if (w)
 			PopupNotificationFactory.map.Add(ref, w);
 	}
 
 	return w;
 }
 
 LPopupNotification::LPopupNotification(LWindow *ref, LString msg)
 {
+	Fore = Back = L_TOOL_TIP;
+	Fore.ToHLS();
+	Fore.SetHLS(Fore.GetH(), Fore.GetL() * 0.4, Fore.GetS());
+
+	// Fore = LColour(0xd4, 0xb8, 0x62);
+	// Back = LColour(0xf7, 0xf0, 0xd5);
+
 	SetTitleBar(false);
 	SetWillFocus(false); // Don't take focus
 	Name("Notification");
 
 	if (ref)
 		RefWnd = ref;
 	if (ref && msg)
 		Add(ref, msg);
 }
 
 LPopupNotification::~LPopupNotification()
 {
 	LAssert(PopupNotificationFactory.map.Find(RefWnd) == this);
 	PopupNotificationFactory.map.Delete(RefWnd);
 }
 
 LPoint LPopupNotification::CalcSize()
 {
 	LPoint p;
 	for (auto ds: Msgs)
 	{
 		p.x = MAX(p.x, ds->X());
 		p.y += ds->Y();
 	}
 
 	p.x += Border * 2 + Decor.x;
 	p.y += Border * 2 + Decor.y;
 
 	return p;
 }
 
 void LPopupNotification::Init()
 {
 	if (!RefWnd)
 	{
 		LAssert(!"No reference window.");
 		return;
 	}
 
 	auto r = RefWnd->GetPos();
 	auto Sz = CalcSize();
 
 	LRect pos;
 	pos.ZOff(Sz.x - 1, Sz.y - 1);
 	pos.Offset(r.x2 - pos.X(), r.y2 - pos.Y());
 	SetPos(pos);
 
 	SetAlwaysOnTop(true);
 	SetPulse(500);		
 	if (!IsAttached())
 		Attach(0);
 	Visible(true);
 }
 
 void LPopupNotification::Add(LWindow *ref, LString msg)
 {
 	if (msg)
 	{
 		HideTs = LCurrentTime();
 		Msgs.Add(new LDisplayString(GetFont(), msg));
 	}
 			
 	if (ref && RefWnd != ref)
 		RefWnd = ref;
 
 	if (RefWnd && Msgs.Length() > 0)
 		Init();
 }
 
 void LPopupNotification::OnPaint(LSurface *pDC)
 {
 	pDC->Colour(Fore);
 	auto c = GetClient();
 	pDC->Box(&c);
 	c.Inset(1, 1);
 	pDC->Colour(Back);
 	pDC->Rectangle(&c);
 
 	auto f = GetFont();
 	f->Fore(Fore);
 	f->Back(Back);
 	f->Transparent(true);
 		
 	int x = c.x1 + Border;
 	int y = c.y1 + Border;
 	for (auto ds: Msgs)
 	{
 		ds->Draw(pDC, x, y);
 		y += ds->Y();
 	}
 }
 
 void LPopupNotification::OnPulse()
 {
 	if (HideTs &&
 		LCurrentTime() >= HideTs + ShowMs)
 	{
 		HideTs = 0;
 		Visible(false);
 		SetPulse();
 		Msgs.DeleteObjects();
 	}
 }