diff --git a/include/lgi/win/LgiOsDefs.h b/include/lgi/win/LgiOsDefs.h
--- a/include/lgi/win/LgiOsDefs.h
+++ b/include/lgi/win/LgiOsDefs.h
@@ -1,307 +1,308 @@
 //
 //      FILE:           LgiOsDefs.h (Win32)
 //      AUTHOR:         Matthew Allen
 //      DATE:           24/9/99
 //      DESCRIPTION:    Lgi Win32 OS defines
 //
 //      Copyright (C) 1999, Matthew Allen
 //              fret@memecode.com
 //
 
 #pragma once
 
 #pragma warning(disable : 4251 4275)
 
 #define WIN32GTK					0
 #define WINNATIVE					1
 #define LGI_VIEW_HANDLE				1
 #define LGI_VIEW_HASH				0
 #ifndef WINDOWS
 	#error "Define WINDOWS in your project"
 #endif
 #ifdef _WIN64
 	#define LGI_64BIT				1
 	#ifndef WIN64
 		#define WIN64				1
 	#endif
 #else
 	#define LGI_32BIT				1
 	#ifndef WIN32
 		#define WIN32				1
 	#endif
 #endif
 
 #include <string.h>
 #include <stdio.h>
 #include "lgi/common/LgiInc.h"
 #include "lgi/common/LgiDefs.h"
 
+#define _MSC_VER_VS2022	1930 // MSVC++ 17.0 (really all 193x values)
 #define _MSC_VER_VS2019	1920 // MSVC++ 16.0 (really all 192x values)
 #define _MSC_VER_VS2017	1910 // MSVC++ 15.0
 #define _MSC_VER_VS2015	1900 // MSVC++ 14.0
 #define _MSC_VER_VS2013	1800 // MSVC++ 12.0
 #define _MSC_VER_VS2012	1700 // MSVC++ 11.0
 #define _MSC_VER_VS2010	1600 // MSVC++ 10.0
 #define _MSC_VER_VS2008	1500 // MSVC++ 9.0
 #define _MSC_VER_VS2005	1400 // MSVC++ 8.0
 #define _MSC_VER_VS2003	1310 // MSVC++ 7.1
 #define _MSC_VER_VC7	1300 // MSVC++ 7.0
 #define _MSC_VER_VC6	1200 // MSVC++ 6.0
 #define _MSC_VER_VC5	1100 // MSVC++ 5.0
 
 #if _MSC_VER >= _MSC_VER_VS2019
 #define _MSC_VER_STR	"16"
 #define _MSC_YEAR_STR	"19"
 #elif _MSC_VER >= _MSC_VER_VS2017
 #define _MSC_VER_STR	"15"
 #define _MSC_YEAR_STR	"17"
 #elif _MSC_VER >= _MSC_VER_VS2015
 #define _MSC_VER_STR	"14"
 #define _MSC_YEAR_STR	"15"
 #elif _MSC_VER >= _MSC_VER_VS2013
 #define _MSC_VER_STR	"12"
 #define _MSC_YEAR_STR	"13"
 #elif _MSC_VER >= _MSC_VER_VS2012
 #define _MSC_VER_STR	"11"
 #define _MSC_YEAR_STR	"12"
 #elif _MSC_VER >= _MSC_VER_VS2010
 #define _MSC_VER_STR	"10"
 #define _MSC_YEAR_STR	"10"
 #else
 #define _MSC_VER_STR	"9"
 #endif
 
 //////////////////////////////////////////////////////////////////
 // Includes
 #define WIN32_LEAN_AND_MEAN
 #include "winsock2.h"
 
 #include "windows.h"
 #include "SHELLAPI.H"
 #include "COMMDLG.H"
 #include <crtdefs.h>
 
 //////////////////////////////////////////////////////////////////
 // Typedefs
 typedef HWND				OsWindow;
 typedef HWND				OsView;
 typedef HANDLE				OsThread;
 typedef HANDLE				OsProcess;
 typedef char16				OsChar;
 typedef HBITMAP				OsBitmap;
 typedef HDC					OsPainter;
 typedef HFONT				OsFont;
 #if _MSC_VER <= _MSC_VER_VC6
 typedef unsigned long		ULONG_PTR, *PULONG_PTR;
 #define sprintf_s			_snprintf
 #endif
 
 typedef BOOL (__stdcall *pSHGetSpecialFolderPathA)(HWND hwndOwner, LPSTR lpszPath, int nFolder, BOOL fCreate);
 typedef BOOL (__stdcall *pSHGetSpecialFolderPathW)(HWND hwndOwner, LPWSTR lpszPath, int nFolder, BOOL fCreate);
 typedef int (__stdcall *pSHFileOperationA)(LPSHFILEOPSTRUCTA lpFileOp);
 typedef int (__stdcall *pSHFileOperationW)(LPSHFILEOPSTRUCTW lpFileOp);
 typedef int (__stdcall *p_vscprintf)(const char *format, va_list argptr);
 
 #include "lgi/common/Message.h"
 
 class LgiClass OsAppArguments
 {
 	LAutoWString CmdLine;
 
 	void _Default();
 
 public:
 	HINSTANCE hInstance;
 	DWORD Pid;
 	char16 *lpCmdLine;
 	int nCmdShow;
 
 	OsAppArguments();
 	OsAppArguments(int Args, const char **Arg);
 
 	OsAppArguments &operator =(OsAppArguments &p);
 
 	void Set(char *Utf);
 	void Set(int Args, const char **Arg);
 };
 
 //////////////////////////////////////////////////////////////////
 // Defines
 #define IsWin9x							(LApp::Win9x)
 #define DefaultOsView(t)				NULL
 
 #define GWL_LGI_MAGIC					8
 #define GWL_EXTRA_BYTES					12
 
 // Key redefs
 enum LgiKeys {
 	LK_TAB = VK_TAB,
 	LK_RETURN = VK_RETURN,
 	LK_SPACE = VK_SPACE,
 	LK_DELETE = VK_DELETE,
 	LK_ESCAPE = VK_ESCAPE,
 	LK_PAGEUP = VK_PRIOR,
 	LK_PAGEDOWN = VK_NEXT,
 	LK_BACKSPACE = VK_BACK,
 	LK_F1 = VK_F1,
 	LK_F2 = VK_F2,
 	LK_F3 = VK_F3,
 	LK_F4 = VK_F4,
 	LK_F5 = VK_F5,
 	LK_F6 = VK_F6,
 	LK_F7 = VK_F7,
 	LK_F8 = VK_F8,
 	LK_F9 = VK_F9,
 	LK_F10 = VK_F10,
 	LK_F11 = VK_F11,
 	LK_F12 = VK_F12,
 	LK_LEFT = VK_LEFT,
 	LK_RIGHT = VK_RIGHT,
 	LK_UP = VK_UP,
 	LK_DOWN = VK_DOWN,
 	LK_HOME = VK_HOME,
 	LK_END = VK_END,
 	LK_INSERT = VK_INSERT,
 	LK_SHIFT = VK_SHIFT,
 	LK_ALT = VK_MENU,
 	LK_CTRL = VK_CONTROL,
 	LK_DECIMAL = VK_DECIMAL,
 
 	LK_COMMA			= VK_OEM_COMMA, // , .
 	LK_MINUS			= VK_OEM_MINUS, // - _
 	LK_EQUALS			= VK_OEM_PLUS, // = +
 	LK_SEMI_COLON		= VK_OEM_1, // ; :
 	LK_SLASH			= VK_OEM_2, // / ?
 	LK_TILDE			= VK_OEM_3, // ~
 	LK_OPEN_BRACKET		= VK_OEM_4, // [ {
 	LK_BACK_SLASH		= VK_OEM_5, // \ |
 	LK_CLOSE_BRACKET	= VK_OEM_6, // ] }
 	LK_SINGLE_QUOTE		= VK_OEM_7, // ' "
 };
 
 // Sleep the current thread
 LgiFunc void LSleep(DWORD i);
 
 // Process
 typedef DWORD							OsProcessId;
 LgiExtern HINSTANCE						_lgi_app_instance;
 #define LProcessInst()					_lgi_app_instance
 extern p_vscprintf						lgi_vscprintf;
 #define LGetCurrentProcess()			GetCurrentProcessId()
 
 // Threads
 typedef DWORD							OsThreadId;
 typedef CRITICAL_SECTION				OsSemaphore;
 #define LGetCurrentThread()				GetCurrentThread()
 // #define GetCurrentThreadId()			GetCurrentThreadId()
 
 // Socket/Network
 #define ValidSocket(s)					((s) != INVALID_SOCKET)
 typedef SOCKET							OsSocket;
 
 #define LGI_GViewMagic					0x14412662
 #define LGI_FileDropFormat				"CF_HDROP"
 #define LGI_StreamDropFormat			CFSTR_FILEDESCRIPTORW
 #define LGI_WideCharset					"ucs-2"
 #define LPrintfInt64					"%I64i"
 #define LPrintfHex64					"%I64x"
 
 #if LGI_64BIT
 	#define LPrintfSizeT				"%I64u"
 	#define LPrintfSSizeT				"%I64d"
 #else
 	#define LPrintfSizeT				"%u"
 	#define LPrintfSSizeT				"%d"
 #endif
 #define LGI_IllegalFileNameChars		"\t\r\n/\\:*?\"<>|"
 
 #define MK_LEFT							MK_LBUTTON
 #define MK_RIGHT						MK_RBUTTON
 #define MK_MIDDLE						MK_MBUTTON
 #define MK_CTRL							MK_CONTROL
 	
 // Stupid mouse wheel defines don't work. hmmm
 #define WM_MOUSEWHEEL					0x020A
 #define WHEEL_DELTA						120
 #ifndef SPI_GETWHEELSCROLLLINES
 #define SPI_GETWHEELSCROLLLINES			104
 #endif
 
 // Window flags
 #define GWF_VISIBLE						WS_VISIBLE
 #define GWF_DISABLED					WS_DISABLED
 #define GWF_BORDER						WS_BORDER
 #define GWF_TABSTOP						WS_TABSTOP
 #define GWF_FOCUS						0x00000001
 #define GWF_OVER						0x00000002
 #define GWF_DROP_TARGET					0x00000004
 #define GWF_SUNKEN						0x00000008
 #define GWF_FLAT						0x00000010
 #define GWF_RAISED						0x00000020
 #define GWF_DIALOG						0x00000040
 #define GWF_DESTRUCTOR					0x00000080
 #define GWF_QUIT_WND					0x00000100
 #define GWF_SYS_BORDER					0x00000200 // ask the system to draw the border
 
 // Widgets
 #define DialogToPixelX(i)				(((i)*Bx)/4)
 #define DialogToPixelY(i)				(((i)*By)/8)
 #define PixelToDialogX(i)				(((i)*4)/Bx)
 #define PixelToDialogY(i)				(((i)*8)/By)
 
 #define DIALOG_X						1.56
 #define DIALOG_Y						1.85
 #define CTRL_X							1.50
 #define CTRL_Y							1.64
 
 // Directories
 #define DIR_CHAR						'\\'
 #define DIR_STR							"\\"
 #define EOL_SEQUENCE					"\r\n"
 
 #define LGI_PATH_SEPARATOR				";"
 #define LGI_ALL_FILES					"*.*"
 #define LGI_LIBRARY_EXT					"dll"
 #define LGI_EXECUTABLE_EXT				".exe"
 
 /////////////////////////////////////////////////////////////////////////////////////
 // Typedefs
 typedef HWND OsView;
 
 /////////////////////////////////////////////////////////////////////////////////////
 // Externs
 LgiFunc class LViewI *LWindowFromHandle(OsView hWnd);
 LgiFunc int GetMouseWheelLines();
 LgiFunc int WinPointToHeight(int Pt, HDC hDC = NULL);
 LgiFunc int WinHeightToPoint(int Ht, HDC hDC = NULL);
 LgiExtern class LString WinGetSpecialFolderPath(int Id);
 
 /// Convert a string d'n'd format to an OS dependant integer.
 LgiFunc int FormatToInt(LString s);
 /// Convert a Os dependant integer d'n'd format to a string.
 LgiFunc char *FormatToStr(int f);
 extern bool LgiToWindowsCursor(OsView Hnd, LCursor Cursor);
 
 #ifdef _MSC_VER
 #define snprintf					_snprintf
 //#define vsnprintf					_vsnprintf
 #define vsnwprintf					_vsnwprintf
 #define stricmp						_stricmp
 #define strlwr						_strlwr
 #define strnicmp					_strnicmp
 #define vsnprintf					_vsnprintf_s
 // #define getcwd						_getcwd
 #endif
 #define atoi64						_atoi64
 
 #ifdef __GNUC__
 // #define stricmp					strcasecmp
 // #define strnicmp					strncasecmp
 #define vsnprintf_s vsnprintf
 #define swprintf_s snwprintf
 #define vsprintf_s vsnprintf
 #if !defined(_TRUNCATE)
 #define _TRUNCATE ((size_t)-1)
 #endif
 #endif
 
diff --git a/test/HtmlViewer/TestSuite.cpp b/test/HtmlViewer/TestSuite.cpp
--- a/test/HtmlViewer/TestSuite.cpp
+++ b/test/HtmlViewer/TestSuite.cpp
@@ -1,631 +1,630 @@
 #include "lgi/common/Lgi.h"
 #include "lgi/common/Html.h"
 #include "lgi/common/List.h"
 #include "lgi/common/DateTime.h"
 #include "lgi/common/ClipBoard.h"
 #include "lgi/common/Scripting.h"
 #include "lgi/common/Box.h"
 #include "lgi/common/TextView3.h"
 #include "lgi/common/ProgressDlg.h"
 #include "lgi/common/Combo.h"
 #include "lgi/common/Net.h"
 #include "lgi/common/Http.h"
 #include "lgi/common/Filter.h"
-#include "lgi/common/NetTools.h"
 #include "lgi/common/ImageComparison.h"
 #include "lgi/common/OpenSSLSocket.h"
 #include "lgi/common/Net.h"
 #include "lgi/common/EmojiFont.h"
 #include "lgi/common/Http.h"
 #include "lgi/common/Menu.h"
 #include "resdefs.h"
 
 #define HAS_LOG_VIEW			0
 #define HAS_IMAGE_LOADER		1
 
 enum Controls
 {
 	IDC_HTML = 100,
 	IDC_LOG,
 	IDC_LIST
 };
 
 class FileInf
 {
 public:
 	char *File;
 	LDateTime Date;
 
 	FileInf()
 	{
 		File = 0;
 	}
 
 	~FileInf()
 	{
 		DeleteArray(File);
 	}
 };
 
 int InfCmp(FileInf *a, FileInf *b, NativeInt d)
 {
 	return -a->Date.Compare(&b->Date);
 }
 
 class HtmlItem : public LListItem
 {
     char *Base;
     
 public:
     HtmlItem(char *b, char *n)
     {
         Base = b;
         SetText(n);
     }
     
 	void OnMouseClick(LMouse &m)
     {
         if (m.IsContextMenu())
         {
             LSubMenu s;
             s.AppendItem("Copy Path", 100);
             m.ToScreen();
             if (s.Float(GetList(), m.x, m.y, m.Left()) == 100)
             {
                 LClipBoard c(GetList());
                 char Path[MAX_PATH_LEN];
                 LMakePath(Path, sizeof(Path), Base, GetText(0));
                 c.Text(Path);
             }
         }
     }
 };
 
 class HtmlScriptContext :
 	#ifdef _GHTML2_H
 	public Html2::LHtml2,
 	#else
 	public Html1::LHtml,
 	#endif
 	public LScriptContext
 {
 	LScriptEngine *Eng;
 	
 public:
 	static LHostFunc Methods[];
 
 	HtmlScriptContext(int Id, LDocumentEnv *Env) :
 		#ifdef _GHTML2_H
 		Html2::LHtml2
 		#else
 		Html1::LHtml
 		#endif
 		(Id, 0, 0, 100, 100, Env)
 	{
 		Eng = NULL;
 		
 		LFont *f = new LFont;
 		if (f)
 		{
 			f->Face("Times New Roman");
 			f->PointSize(12); // Size '16' is about 12 pt. Maybe they mean 16px?
 			SetFont(f, true);
 		}
 	}
 
 	LHostFunc *GetCommands()
 	{
 		return Methods;
 	}
 	
 	void SetEngine(LScriptEngine *Eng)
 	{		
 	}
 	
 	LString GetIncludeFile(const char *FileName)
 	{
 		return NULL;
 	}
 	
 	LAutoString GetDataFolder()
 	{
 		return LAutoString();
 	}
 };
 
 LHostFunc HtmlScriptContext::Methods[] =
 {
 	LHostFunc(0, 0, 0),
 };
 
 class HtmlImageLoader : public LThread, public LMutex, public LCancel
 {
 	LArray<LDocumentEnv::LoadJob*> In;
 
 public:
 	HtmlImageLoader() :
 		LThread("HtmlImageLoader.Thread"),
 		LMutex("HtmlImageLoader.Mutex")
 	{
 		Run();
 	}
 	
 	~HtmlImageLoader()
 	{
 		Cancel(true);
 		while (!IsExited())
 			LSleep(1);
 	}
 	
 	void Add(LDocumentEnv::LoadJob *j)
 	{
 		if (Lock(_FL))
 		{
 			In.Add(j);
 			Unlock();
 		}
 	}
 	
 	LAutoPtr<LSocketI> CreateSock(const char *Proto)
 	{
 		LAutoPtr<LSocketI> s;
 		if (Proto && !_stricmp(Proto, "https"))
 		{
 			SslSocket *ss;
 			s.Reset(ss = new SslSocket);
 			ss->SetSslOnConnect(false);
 		}
 		else
 			s.Reset(new LSocket);
 		
 		return s;
 	}
 	
 	int Main()
 	{
 		while (!IsCancelled())
 		{
 			LAutoPtr<LThreadJob> j;
 			if (Lock(_FL))
 			{
 				if (In.Length())
 				{
 					j.Reset(In[0]);
 					In.DeleteAt(0, true);
 				}
 				Unlock();
 			}
 			
 			LDocumentEnv::LoadJob *Job = dynamic_cast<LDocumentEnv::LoadJob*>(j.Get());
 			if (Job)
 			{
 				LUri u(Job->Uri);
 				if (u.IsFile())
 				{
 					// Local document?
 					if (Job->pDC.Reset(GdcD->Load(Job->Uri)))
 					{
 						LDocumentEnv *e = Job->Env;
 						if (e)
 						{
 							// LgiTrace("Loaded '%s' as image %ix%i\n", u.Path, j->pDC->X(), j->pDC->Y());
 							e->OnDone(j);
 						}
 					}
 				}
 				else
 				{
 					LMemQueue p(1024);
 					LString Err;
 					auto r = LgiGetUri(this, &p, &Err, Job->Uri);
 					if (r)
 					{
 						uchar Hint[16];
 						p.Peek(Hint, sizeof(Hint));
 						auto Filter = LFilterFactory::New(u.sPath, FILTER_CAP_READ, Hint);
 						if (Filter)
 						{
 							LAutoPtr<LSurface> Img(new LMemDC);
 							LFilter::IoStatus Rd = Filter->ReadImage(Img, &p);
 							if (Rd == LFilter::IoSuccess)
 							{
 								Job->pDC = Img;
 								if (Job->Env)
 								{
 									// LgiTrace("Loaded '%s' as image %ix%i\n", u.Path, j->pDC->X(), j->pDC->Y());
 									Job->Env->OnDone(j);
 								}
 								else
 								{
 									LgiTrace("%s:%i - No env for '%s'\n", _FL, u.sPath.Get());
 									LAssert(0);
 								}
 							}
 							else LgiTrace("%s:%i - Failed to read '%s'\n", _FL, u.sPath.Get());
 						}
 						else LgiTrace("%s:%i - Failed to find filter for '%s'\n", _FL, u.sPath.Get());
 					}
 					else LgiTrace("%s:%i - Failed to get '%s'\n", _FL, Job->Uri.Get());
 				}
 			}
 			else LSleep(10);
 		}
 	
 		return 0;
 	}
 };
 
 class AppWnd : public LWindow, public LDefaultDocumentEnv
 {
 	LList *Lst;
     HtmlScriptContext *Html;
     LTextView3 *Text;
 	char Base[256];
 	LAutoPtr<LScriptEngine> Script;
 	LAutoPtr<HtmlImageLoader> Worker;
 	LAutoPtr<LEmojiFont> Emoji;
 
 	LoadType GetContent(LoadJob *&j)
 	{
 		LUri u(j->Uri);
 		if (!u.sProtocol)
 		{
 			char p[MAX_PATH_LEN];
 			if (LMakePath(p, sizeof(p), Base, j->Uri) &&
 				LFileExists(p))
 			{
 				LString Ext = LGetExtension(p);
 				if (Ext.Equals("css") ||
 					Ext.Equals("html"))
 				{
 					LAutoPtr<LFile> f(new LFile);
 					if (f && f->Open(p, O_READ))
 					{
 						j->Stream.Reset(f.Release());
 						return LoadImmediate;
 					}
 				}
 				else
 				{
 					j->pDC.Reset(GdcD->Load(p));
 					if (j->pDC)
 						return LoadImmediate;
 				}
 
 				return LoadError;
 			}
 		}		
 	
 		#if HAS_IMAGE_LOADER
 		if (!Worker)
 			Worker.Reset(new HtmlImageLoader);
 		Worker->Add(j);
 		j = NULL;
 		return LoadDeferred;
 		#else
 		return LoadNotImpl; // GDefaultDocumentEnv::GetContent(j);
 		#endif
 	}
 
 public:
 	AppWnd()
 	{
 		Html = 0;
 		Lst = 0;
 		Text = NULL;
 		Base[0] = 0;
 		Emoji.Reset(new LEmojiFont());
 		
 		Name("Html Test Suite");
 		SetQuitOnClose(true);
 		if (Attach(0))
 		{
 			Menu = new LMenu();
 			if (Menu)
 			{
 				Menu->Attach(this);
 				Menu->Load(this, "IDM_MENU");
 			}
 			
 			LBox *s = new LBox;
 			if (s)
 			{
 				AddView(s);
 				s->AddView(Lst = new LList(IDC_LIST, 0, 0, 100, 100));
 				Lst->Sunken(false);
 				Lst->AddColumn("File", 400);
 				Lst->CssStyles("width: 200px;");
 				s->Value(200);
 
 				#if HAS_LOG_VIEW
 				LBox *vert = new LBox;
 				vert->SetVertical(true);
 				s->AddView(vert);
 
 				vert->AddView(Html = new HtmlScriptContext(IDC_HTML, this));
 				Html->SetCssStyle("height: 70%;");
 
 				vert->AddView(Text = new LTextView3(IDC_LOG, 0, 0, 100, 100));
 				
 				LBox::Spacer *sp = s->GetSpacer(0);
 				if (sp)
 				{
 					sp->Colour.Rgb(64, 64, 64);
 					sp->SizePx = 2;
 				}
 				sp = vert->GetSpacer(0);
 				if (sp)
 				{
 					sp->Colour.Rgb(64, 64, 64);
 					sp->SizePx = 2;
 				}
 				#else
 				s->AddView(Html = new HtmlScriptContext(IDC_HTML, this));
 				#endif
 
 				Script.Reset(new LScriptEngine(this, Html, NULL));
 
 				if (Html)
 					Html->SetEnv(this);
 				#if HAS_IMAGE_LOADER
 				Html->SetLoadImages(true);
 				#endif
 				
 				if (sprintf_s(Base, sizeof(Base), "%s", LGetExePath().Get()) > 0)
 				{
 					#if defined(WIN32)
 					if (stristr(Base, "Release") || stristr(Base, "Debug"))
 						LTrimDir(Base);
 					#endif
 					#if defined(MAC) && defined(__GTK_H__)
 					LMakePath(Base, sizeof(Base), Base, "../../../..");
 					#endif
 
 					List<FileInf> Files;
 					LDirectory *d = new LDirectory;
 					if (d)
 					{
 						LMakePath(Base, sizeof(Base), Base, "Files");
 						for (bool b = d->First(Base); b; b = d->Next())
 						{
 							if (!d->IsDir() && MatchStr("*.html", d->GetName()))
 							{
 								char p[256];
 								if (d->Path(p, sizeof(p)))
 								{
 									FileInf *f = new FileInf;
 									if (f)
 									{
 										f->File = NewStr(p);
 										f->Date.Set(d->GetLastWriteTime());
 										Files.Insert(f);
 									}
 								}
 							}
 						}
 						DeleteObj(d);
 						Files.Sort(InfCmp);
 
 						for (auto f: Files)
 						{
 							char *d = strrchr(f->File, DIR_CHAR);
 							if (d)
 							{
 								HtmlItem *i = new HtmlItem(Base, d + 1);
 								if (i)
 									Lst->Insert(i);
 							}
 						}
 
 						Files.DeleteObjects();
 					}
 				}
 			}
 			
 			
 			LRect r(0, 0, 1200, 800);
 			SetPos(r);
 			MoveToCenter();
 			AttachChildren();
 			
 			Visible(true);
 			OnNotify(FindControl(IDC_LIST), LNotifyItemSelect);
 		}
 		else LExitApp();
 	}
 
 	~AppWnd()
 	{
 	}
 	
 	int OnCommand(int Cmd, int Event, OsView Wnd)
 	{
 		switch (Cmd)
 		{
 			case IDM_SAVE_IMGS:
 			{
 				LPoint PageSize(1000, 2000);
 				
 				LProgressDlg Prog(this, true);
 				Prog.SetDescription("Scanning for HTML...");
 				
 				char p[MAX_PATH_LEN];
 				LGetSystemPath(LSP_APP_INSTALL, p, sizeof(p));
 				LArray<const char*> Ext;
 				LArray<char*> Files;
 				Ext.Add("*.html");
 				Ext.Add("*.htm");				
 				if (LRecursiveFileSearch(p, &Ext, &Files))
 				{
 					LDateTime Now;
 					Now.SetNow();
 					char OutPath[MAX_PATH_LEN], NowStr[32];
 					sprintf_s(	NowStr, sizeof(NowStr),
 								"%.4i-%.2i-%.2i_%.2i-%.2i-%.2i",
 								Now.Year(), Now.Month(), Now.Day(),
 								Now.Hours(), Now.Minutes(), Now.Seconds());
 					LMakePath(OutPath, sizeof(OutPath), p, "Output");
 					if (!LDirExists(OutPath))
 						FileDev->CreateFolder(OutPath);
 					LMakePath(OutPath, sizeof(OutPath), OutPath, NowStr);
 					if (!LDirExists(OutPath))
 						FileDev->CreateFolder(OutPath);
 					
 					Prog.SetDescription("Saving renders...");
 					Prog.SetRange(Files.Length());
 					for (int i=0; i<Files.Length() && !Prog.IsCancelled(); i++)
 					{
 						char *File = Files[i];
 						LAutoString Content(LReadTextFile(File));
 						if (!Content)
 						{
 							LAssert(0);
 							continue;
 						}
 
 						char *Leaf = strrchr(File, DIR_CHAR);
 						if (!Leaf)
 						{
 							LAssert(0);
 							continue;
 						}
 						Leaf++;
 						char Png[256];
 						strcpy_s(Png, sizeof(Png), Leaf);
 						char *Ext = strrchr(Png, '.');
 						if (Ext) *Ext = 0;
 						strcat_s(Png, sizeof(Png), ".png");
 						LMakePath(p, sizeof(p), OutPath, Png);
 
 						Html1::LHtml Html(100, 0, 0, PageSize.x, PageSize.y, this);
 						Html.Name(Content);
 						LMemDC Screen(PageSize.x, PageSize.y, System24BitColourSpace);
 						Screen.Colour(LColour(255, 255, 255));
 						Screen.Rectangle();
 						Html.OnPaint(&Screen);
 						if (!GdcD->Save(p, &Screen))
 							LAssert(0);
 						
 						Prog.Value(i);
 						LYield();
 					}
 					Files.DeleteArrays();
 				}
 				break;
 			}
 			case IDM_COMPARE_IMAGES:
 			{
 				char p[MAX_PATH_LEN];
 				LGetSystemPath(LSP_APP_INSTALL, p, sizeof(p));
 				LArray<const char*> Ext;
 				LArray<char*> Files;
 				Ext.Add("*.png");
 				// if (LRecursiveFileSearch(p, &Ext, &Files))
 
 				char OutPath[MAX_PATH_LEN];
 				LMakePath(OutPath, sizeof(OutPath), p, "Output");
 				if (!LDirExists(OutPath))
 				{
 					LgiMsg(this, "No output render folder.", "Html Test Suite");
 					break;
 				}
 				
 				new ImageCompareDlg(this, OutPath);
 				break;
 			}
 		}
 		
 		return 0;
 	}
 	
 	int OnNotify(LViewI *c, LNotification n)
 	{
 		switch (c->GetId())
 		{
 			case IDC_LIST:
 			{
 				if (n.Type == LNotifyItemSelect)
 				{
 					LListItem *s = Lst->GetSelected();
 					if (s)
 					{
 						char p[256];
 
 						LMakePath(p, sizeof(p), Base, s->GetText(0));
 						if (LFileExists(p))
 						{
 							char *h = LReadTextFile(p);
 							if (h)
 							{
 								if (Html)
 									Html->Name(h);
 								DeleteArray(h);
 							}
 						}
 					}
 				}
 				break;
 			}
 			case IDC_HTML:
 			{
 				switch (n.Type)
 				{
 					case LNotifySelectionChanged:
 					{
 						if (Text)
 						{
 							LAutoString s(Html->GetSelection());
 							if (s)
 								Text->Name(s);
 							else
 								Text->Name("(null)");
 						}
 						break;
 					}
 					default:
 						break;
 				}
 				break;
 			}
 		}
 		
 		return 0;
 	}
 
 	bool OnCompileScript(LDocView *Parent, char *Script, const char *Language, const char *MimeType)
 	{
 		// return Script->Compile(Code, true);
 		return false;
 	}
 
 	bool OnExecuteScript(LDocView *Parent, char *Script)
 	{
 		return false; // Script->RunTemporary(Code);
 	}
 };
 
 void FontSz()
 {
 	for (int i=6; i<32; i++)
 	{
 		LFont f;
 		if (f.Create("verdana", LCss::Len(LCss::LenPx, i)))
 		{
 			double a = (double) f.GetHeight() / f.Ascent();
 			LgiTrace("%i: %i, ascent=%f, a=%f\n", i, f.GetHeight(), f.Ascent(), a);
 		}
 	}
 }
 
 int LgiMain(OsAppArguments &AppArgs)
 {
 	LApp a(AppArgs, "HtmlTestSuite");
 	if (a.IsOk())
 	{
 		//FontSz();
 
 		a.AppWnd = new AppWnd;
 		a.Run();
 	}
 	return 0;
 }
diff --git a/utils/VsLaunch/Main.cpp b/utils/VsLaunch/Main.cpp
--- a/utils/VsLaunch/Main.cpp
+++ b/utils/VsLaunch/Main.cpp
@@ -1,166 +1,171 @@
 #include "lgi/common/Lgi.h"
 #include "resdefs.h"
 #include "lgi/common/TextLog.h"
 
 //////////////////////////////////////////////////////////////////
 const char *AppName = "VsLaunch";
 
 struct VsInfo
 {
 	int Year;
 	int MscVer;
 	double Ver;
+	bool x64;
 }
 Versions[] =
 {
-	{2019, _MSC_VER_VS2019, 16.0},
-	{2017, _MSC_VER_VS2017, 15.0},
-	{2015, _MSC_VER_VS2015, 14.0},
-	{2013, _MSC_VER_VS2013,	12.0},
-	{2012, _MSC_VER_VS2012, 11.0},
-	{2010, _MSC_VER_VS2010, 10.0},
-	{2008, _MSC_VER_VS2008, 9.0},
-	{2005, _MSC_VER_VS2005, 8.0},
-	{2003, _MSC_VER_VS2003, 7.1},
-	{7, _MSC_VER_VC7, 7.0},
-	{6, _MSC_VER_VC6, 6.0},
-	{5, _MSC_VER_VC5, 5.0},
+	{2022, _MSC_VER_VS2022, 17.0, true},
+	{2019, _MSC_VER_VS2019, 16.0, false},
+	{2017, _MSC_VER_VS2017, 15.0, false},
+	{2015, _MSC_VER_VS2015, 14.0, false},
+	{2013, _MSC_VER_VS2013,	12.0, false}
 };
 
+VsInfo *GetVsInfo(int VsYear)
+{
+	for (int i=0; i<CountOf(Versions); i++)
+	{
+		if (Versions[i].Year == VsYear)
+			return Versions + i;
+	}
+	
+	return NULL;
+}
+
 double YearToVer(int64 y)
 {
 	for (int i=0; i<CountOf(Versions); i++)
 	{
 		if (Versions[i].Year == y)
 			return Versions[i].Ver;
 	}
 	
 	return 0.0;
 }
 
 int VerToYear(double v)
 {
 	for (int i=0; i<CountOf(Versions); i++)
 	{
 		if (Versions[i].Ver - v < 0.001)
 			return Versions[i].Year;
 	}
 	
 	return 0;
 }
 
 class App : public LWindow
 {
 	LTextLog *Log;
 
 public:
     App()
     {
         Name(AppName);
         LRect r(0, 0, 500, 300);
         SetPos(r);
         MoveToCenter();
         SetQuitOnClose(true);
 
         if (Attach(0))
         {
 			AddView(Log = new LTextLog(100));
 			AttachChildren();
 			SetPulse(500);
         }
     }
 
 	void OnPulse()
 	{
 		Visible(true);
 	}
     
 	void OnReceiveFiles(LArray<const char*> &Files)
 	{
 		Log->Print("Got %i files...\n", Files.Length());
 		for (unsigned i=0; i<Files.Length(); i++)
 		{
-			const char *File = Files[i];
+			auto File = Files[i];
 			Log->Print("\t%s...\n", File);
 	
-			const char *Ext = LGetExtension(File);
+			auto Ext = LGetExtension(File);
 			if (Ext && !_stricmp(Ext, "sln"))
 			{
 				LFile f;
 				if (f.Open(File, O_READ))
 				{
-					LString::Array a = f.Read().Split("\n");
+					auto a = f.Read().Split("\n");
 					f.Close();
 					
 					double FileVersion = 0.0;
 					int64 VsYear = -1;
 					double VsVersion = 0.0;
 					for (unsigned i=0; i<a.Length() && VsVersion == 0.0; i++)
 					{
 						if (a[i].Find("File, Format Version") >= 0)
 						{
-							LString::Array p = a[i].Split(" ");
+							auto p = a[i].Split(" ");
 							FileVersion = p.Last().Float();
 						}
 						else if (a[i](0) == '#')
 						{
 							LString::Array p = a[i].Split(" ");
 							for (auto s : p)
 							{
 								auto i = s.Int();
 								if (i > 2000 && i < 2030)
 								{
 									VsYear = i;
 									VsVersion = YearToVer(VsYear);
 									break;
 								}
 								else if (i >= 10 && i <= 16)
 								{
 									VsVersion = (double)i;
 									VsYear = VerToYear(VsVersion);
 								}
 							}
 						}
 					}
 					
 					if (VsVersion > 0.0)
 					{
-						// C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe
-						LFile::Path p(LSP_USER_APPS, 32);
+						auto Info = GetVsInfo(VsYear);
+						LFile::Path p(LSP_USER_APPS, Info && Info->x64 ? 64 : 32);
 						LString v;
 
 						if (VsVersion >= 16.0)
 							v.Printf("Microsoft Visual Studio\\%" PRIi64 "\\Community", VsYear);
 						else
 							v.Printf("Microsoft Visual Studio %.1f", VsVersion);
 
 						p += v;
 						p += "Common7\\IDE\\devenv.exe";
 						if (p.IsFile())
 						{
 							LExecute(p, File);
 							LCloseApp();
 						}
 						else Log->Print("\t\tError: The file '%s' doesn't exist.", p.GetFull().Get());
 					}
 					else Log->Print("\t\tError: No version in '%s'.", File);
 				}
 				else Log->Print("\t\tError: Failed to open '%s'\n", File);
 			}
 		}
 	}
 };
 
 //////////////////////////////////////////////////////////////////
 int LgiMain(OsAppArguments &AppArgs)
 {
 	LApp a(AppArgs, AppName);
 	if (a.IsOk())
 	{
 		a.AppWnd = new App;
 		a.Run();
 	}
 
 	return 0;
 }
 
diff --git a/win/Lgi_vs2022.vcxproj b/win/Lgi_vs2022.vcxproj
--- a/win/Lgi_vs2022.vcxproj
+++ b/win/Lgi_vs2022.vcxproj
@@ -1,630 +1,624 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseNoOptimize|x64">
       <Configuration>ReleaseNoOptimize</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Lgi</ProjectName>
     <ProjectGuid>{95DF9CA4-6D37-4A85-A648-80C2712E0DA1}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\Lgi.props" Condition="Exists('$(SolutionDir)\Lgi.props')" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>..\Lib\</OutDir>
     <IntDir>$(Platform)$(Configuration)22\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi22</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>..\Lib\</OutDir>
     <IntDir>$(Platform)$(Configuration)22\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi22d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">
     <OutDir>..\Lib\</OutDir>
     <IntDir>$(Platform)$(Configuration)22\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi22nop</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
       <TypeLibraryName>.\Release/Lgi.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\include;..\include\lgi\win;..\private\common;..\private\win;..\..\..\..\CodeLib\libiconv\include;..\..\..\scribe\libs\build-x64\libiconv-1.17\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;WINDOWS;LGI_RES;LGI_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <BrowseInformation />
       <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <SupportJustMyCode>true</SupportJustMyCode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ComCtl32.lib;Ws2_32.lib;UxTheme.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
       <TypeLibraryName>.\Debug/Lgi.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\include\lgi\win;..\private\common;..\private\win;..\..\..\..\CodeLib\libiconv\include;..\..\..\scribe\libs\build-x64\libiconv-1.17\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;LGI_LIBRARY;_DEBUG;WINDOWS;LGI_RES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <BrowseInformation />
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
       <SupportJustMyCode>true</SupportJustMyCode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ComCtl32.lib;Ws2_32.lib;UxTheme.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
       <TypeLibraryName>.\Release/Lgi.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\include;..\include\lgi\win;..\private\common;..\private\win;..\..\..\..\CodeLib\libiconv\include;..\..\..\scribe\libs\build-x64\libiconv-1.17\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;WINDOWS;LGI_RES;LGI_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <BrowseInformation />
       <WarningLevel>Level2</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ShowIncludes>false</ShowIncludes>
       <SupportJustMyCode>true</SupportJustMyCode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ComCtl32.lib;Ws2_32.lib;UxTheme.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\common\Gdc2\15Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\16Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\24Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\32Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\48Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\64Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\8Bit.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Alpha.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Filters\Filter.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\DisplayString.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\Font.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\Charset.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\FontSystem.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\FontType.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\StringLayout.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Font\TypeFace.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Colour.cpp" />
     <ClCompile Include="..\src\common\Gdc2\GdcCommon.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Rect.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Surface.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Path\Path.cpp" />
     <ClCompile Include="..\src\common\Gdc2\Tools\ColourReduce.cpp" />
     <ClCompile Include="..\src\common\General\Containers.cpp" />
     <ClCompile Include="..\src\common\General\ExeCheck.cpp" />
     <ClCompile Include="..\src\common\General\FileCommon.cpp" />
     <ClCompile Include="..\src\common\General\Growl.cpp" />
     <ClCompile Include="..\src\common\General\Password.cpp" />
     <ClCompile Include="..\src\common\General\DateTime.cpp" />
     <ClCompile Include="..\src\common\Hash\md5\md5.c" />
     <ClCompile Include="..\src\common\Hash\sha1\sha1.c" />
     <ClCompile Include="..\src\common\Net\Base64.cpp" />
     <ClCompile Include="..\src\common\Net\Uri.cpp" />
     <ClCompile Include="..\src\common\Net\Net.cpp" />
-    <ClCompile Include="..\src\common\Net\NetTools.cpp" />
     <ClCompile Include="..\src\common\Net\MDStringToDigest.cpp" />
     <ClCompile Include="..\src\common\Lgi\Alert.cpp" />
     <ClCompile Include="..\src\common\Lgi\AppCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\Css.cpp" />
     <ClCompile Include="..\src\common\Lgi\CssTools.cpp" />
     <ClCompile Include="..\src\common\Lgi\DragAndDropCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\DropFiles.cpp" />
     <ClCompile Include="..\src\common\Lgi\FindReplace.cpp" />
     <ClCompile Include="..\src\common\Lgi\FontSelect.cpp" />
     <ClCompile Include="..\src\common\Lgi\GuiUtils.cpp" />
     <ClCompile Include="..\src\common\Lgi\Input.cpp" />
     <ClCompile Include="..\src\common\Lgi\Library.cpp" />
     <ClCompile Include="..\src\common\Lgi\MemStream.cpp" />
     <ClCompile Include="..\src\common\Lgi\MenuCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\Mru.cpp" />
     <ClCompile Include="..\src\common\Lgi\Object.cpp" />
     <ClCompile Include="..\src\common\Lgi\OptionsFile.cpp" />
     <ClCompile Include="..\src\common\Lgi\Stream.cpp" />
     <ClCompile Include="..\src\common\Lgi\SubProcess.cpp" />
     <ClCompile Include="..\src\common\Lgi\ToolTip.cpp" />
     <ClCompile Include="..\src\common\Lgi\TrayIcon.cpp" />
     <ClCompile Include="..\src\common\Lgi\Variant.cpp" />
     <ClCompile Include="..\src\common\Lgi\ViewCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\WindowCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\LgiCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\LMsg.cpp" />
     <ClCompile Include="..\src\common\Lgi\Rand.cpp" />
     <ClCompile Include="..\src\common\Lgi\Mutex.cpp" />
     <ClCompile Include="..\src\common\Lgi\ThreadCommon.cpp" />
     <ClCompile Include="..\src\common\Lgi\ThreadEvent.cpp" />
     <ClCompile Include="..\src\common\Resource\LgiRes.cpp" />
     <ClCompile Include="..\src\common\Resource\Res.cpp" />
     <ClCompile Include="..\src\common\Skins\Gel\Gel.cpp" />
     <ClCompile Include="..\src\common\Text\DocView.cpp" />
     <ClCompile Include="..\src\common\Text\String.cpp" />
     <ClCompile Include="..\src\common\Text\TextView3.cpp" />
     <ClCompile Include="..\src\common\Text\TextView4.cpp" />
-    <ClCompile Include="..\src\common\Text\Token.cpp" />
     <ClCompile Include="..\src\common\Text\Unicode.cpp" />
     <ClCompile Include="..\src\common\Text\Utf8.cpp" />
     <ClCompile Include="..\src\common\Text\XmlTree.cpp" />
     <ClCompile Include="..\src\common\Text\UnicodeString.cpp" />
     <ClCompile Include="..\src\common\Widgets\Bitmap.cpp" />
     <ClCompile Include="..\src\common\Widgets\Box.cpp" />
     <ClCompile Include="..\src\common\Widgets\Button.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\CheckBox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Combo.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Edit.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\ItemContainer.cpp" />
     <ClCompile Include="..\src\common\Widgets\Panel.cpp" />
     <ClCompile Include="..\src\common\Widgets\Popup.cpp" />
     <ClCompile Include="..\src\common\Widgets\ProgressDlg.cpp" />
     <ClCompile Include="..\src\common\Widgets\RadioGroup.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Slider.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Splitter.cpp" />
     <ClCompile Include="..\src\common\Widgets\StatusBar.cpp" />
     <ClCompile Include="..\src\common\Widgets\TableLayout.cpp" />
     <ClCompile Include="..\src\common\Widgets\TabView.cpp" />
     <ClCompile Include="..\src\common\Widgets\TextLabel.cpp" />
     <ClCompile Include="..\src\common\Widgets\ToolBar.cpp" />
     <ClCompile Include="..\src\common\Widgets\Tree.cpp" />
     <ClCompile Include="..\src\common\Widgets\List.cpp" />
     <ClCompile Include="..\src\win\Gdc2\Gdc2.cpp" />
     <ClCompile Include="..\src\win\Gdc2\GdiLeak.cpp" />
     <ClCompile Include="..\src\win\Gdc2\MemDC.cpp" />
     <ClCompile Include="..\src\win\Gdc2\PrintDC.cpp" />
     <ClCompile Include="..\src\win\Gdc2\ScreenDC.cpp" />
     <ClCompile Include="..\src\win\General\File.cpp" />
     <ClCompile Include="..\src\win\General\Mem.cpp" />
     <ClCompile Include="..\src\win\General\ShowFileProp_Win.cpp" />
     <ClCompile Include="..\src\win\INet\MibAccess.cpp" />
     <ClCompile Include="..\src\win\Lgi\App.cpp" />
     <ClCompile Include="..\src\win\Lgi\ClipBoard.cpp" />
     <ClCompile Include="..\src\win\Lgi\DragAndDrop.cpp" />
     <ClCompile Include="..\src\win\Lgi\FileSelect.cpp" />
     <ClCompile Include="..\src\win\Lgi\General.cpp" />
     <ClCompile Include="..\src\win\Lgi\Layout.cpp" />
     <ClCompile Include="..\src\win\Lgi\Menu.cpp" />
     <ClCompile Include="..\src\win\Lgi\Printer.cpp" />
     <ClCompile Include="..\src\win\Lgi\ScrollBar.cpp" />
     <ClCompile Include="..\src\win\Lgi\View.cpp" />
     <ClCompile Include="..\src\win\Lgi\Window.cpp" />
     <ClCompile Include="..\src\win\Lgi\LgiException.cpp" />
     <ClCompile Include="..\src\win\Lgi\Thread.cpp" />
     <ClCompile Include="..\src\win\Widgets\Button_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\CheckBox_Win.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\win\Widgets\Combo_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\Dialog_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\Edit_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\Progress_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\RadioGroup_Win.cpp" />
     <ClCompile Include="..\src\win\Widgets\Slider_Win.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\lgi\common\Gdc2.h" />
     <ClInclude Include="..\include\lgi\common\GdiLeak.h" />
     <ClInclude Include="..\include\lgi\common\LgiRes.h" />
     <ClInclude Include="..\include\lgi\common\Res.h" />
     <ClInclude Include="..\include\lgi\common\About.h" />
     <ClInclude Include="..\include\lgi\common\AnonPipe.h" />
     <ClInclude Include="..\include\lgi\common\App.h" />
     <ClInclude Include="..\include\lgi\common\Array.h" />
     <ClInclude Include="..\include\lgi\common\AudioView.h" />
     <ClInclude Include="..\include\lgi\common\AutoPtr.h" />
     <ClInclude Include="..\include\lgi\common\Base64.h" />
     <ClInclude Include="..\include\lgi\common\Bitmap.h" />
     <ClInclude Include="..\include\lgi\common\Bits.h" />
     <ClInclude Include="..\include\lgi\common\Box.h" />
     <ClInclude Include="..\include\lgi\common\Browser.h" />
     <ClInclude Include="..\include\lgi\common\Button.h" />
     <ClInclude Include="..\include\lgi\common\CairoSurface.h" />
     <ClInclude Include="..\include\lgi\common\Cancel.h" />
     <ClInclude Include="..\include\lgi\common\Capabilities.h" />
     <ClInclude Include="..\include\lgi\common\Charset.h" />
     <ClInclude Include="..\include\lgi\common\CheckBox.h" />
     <ClInclude Include="..\include\lgi\common\ClipBoard.h" />
     <ClInclude Include="..\include\lgi\common\Colour.h" />
     <ClInclude Include="..\include\lgi\common\ColourSelect.h" />
     <ClInclude Include="..\include\lgi\common\ColourSpace.h" />
     <ClInclude Include="..\include\lgi\common\Com.h" />
     <ClInclude Include="..\include\lgi\common\Combo.h" />
     <ClInclude Include="..\include\lgi\common\Console.h" />
     <ClInclude Include="..\include\lgi\common\Containers.h" />
     <ClInclude Include="..\include\lgi\common\ControlTree.h" />
     <ClInclude Include="..\include\lgi\common\Core.h" />
     <ClInclude Include="..\include\lgi\common\Css.h" />
     <ClInclude Include="..\include\lgi\common\CssTools.h" />
     <ClInclude Include="..\include\lgi\common\CurrentTime.h" />
     <ClInclude Include="..\include\lgi\common\DataDlg.h" />
     <ClInclude Include="..\include\lgi\common\DataGrid.h" />
     <ClInclude Include="..\include\lgi\common\DateTime.h" />
     <ClInclude Include="..\include\lgi\common\DateTimeCtrls.h" />
     <ClInclude Include="..\include\lgi\common\Db.h" />
     <ClInclude Include="..\include\lgi\common\DbTable.h" />
     <ClInclude Include="..\include\lgi\common\DeEscape.h" />
     <ClInclude Include="..\include\lgi\common\Dialog.h" />
     <ClInclude Include="..\include\lgi\common\DiskBTree.h" />
     <ClInclude Include="..\include\lgi\common\DisplayString.h" />
     <ClInclude Include="..\include\lgi\common\Dns.h" />
     <ClInclude Include="..\include\lgi\common\DocApp.h" />
     <ClInclude Include="..\include\lgi\common\DocView.h" />
     <ClInclude Include="..\include\lgi\common\Dom.h" />
     <ClInclude Include="..\include\lgi\common\DomFields.h" />
     <ClInclude Include="..\include\lgi\common\DragAndDrop.h" />
     <ClInclude Include="..\include\lgi\common\DrawListSurface.h" />
     <ClInclude Include="..\include\lgi\common\DropFiles.h" />
     <ClInclude Include="..\include\lgi\common\Edit.h" />
     <ClInclude Include="..\include\lgi\common\Emoji.h" />
     <ClInclude Include="..\include\lgi\common\EmojiFont.h" />
     <ClInclude Include="..\include\lgi\common\Error.h" />
     <ClInclude Include="..\include\lgi\common\EventTargetThread.h" />
     <ClInclude Include="..\include\lgi\common\FfmpegFile.h" />
     <ClInclude Include="..\include\lgi\common\File.h" />
     <ClInclude Include="..\include\lgi\common\FileAssoc.h" />
     <ClInclude Include="..\include\lgi\common\FileSelect.h" />
     <ClInclude Include="..\include\lgi\common\FileTransferProgress.h" />
     <ClInclude Include="..\include\lgi\common\Filter.h" />
     <ClInclude Include="..\include\lgi\common\FilterUi.h" />
     <ClInclude Include="..\include\lgi\common\FindInFiles.h" />
     <ClInclude Include="..\include\lgi\common\FindReplaceDlg.h" />
     <ClInclude Include="..\include\lgi\common\Font.h" />
     <ClInclude Include="..\include\lgi\common\FontCache.h" />
     <ClInclude Include="..\include\lgi\common\FontSelect.h" />
     <ClInclude Include="..\include\lgi\common\Ftp.h" />
     <ClInclude Include="..\include\lgi\common\GdcTools.h" />
     <ClInclude Include="..\include\lgi\common\Graph.h" />
     <ClInclude Include="..\include\lgi\common\Growl.h" />
     <ClInclude Include="..\include\lgi\common\HashDom.h" />
     <ClInclude Include="..\include\lgi\common\HashTable.h" />
     <ClInclude Include="..\include\lgi\common\HashTbl_Depr.h" />
     <ClInclude Include="..\include\lgi\common\Homoglyphs.h" />
     <ClInclude Include="..\include\lgi\common\Html.h" />
     <ClInclude Include="..\include\lgi\common\Html2.h" />
     <ClInclude Include="..\include\lgi\common\HtmlCommon.h" />
     <ClInclude Include="..\include\lgi\common\HtmlEdit.h" />
     <ClInclude Include="..\include\lgi\common\HtmlParser.h" />
     <ClInclude Include="..\include\lgi\common\Http.h" />
     <ClInclude Include="..\include\lgi\common\HttpTools.h" />
     <ClInclude Include="..\include\lgi\common\HttpUi.h" />
     <ClInclude Include="..\include\lgi\common\Icc.h" />
     <ClInclude Include="..\include\lgi\common\ImageComparison.h" />
     <ClInclude Include="..\include\lgi\common\ImageList.h" />
     <ClInclude Include="..\include\lgi\common\Input.h" />
     <ClInclude Include="..\include\lgi\common\ItemContainer.h" />
     <ClInclude Include="..\include\lgi\common\Jpeg.h" />
     <ClInclude Include="..\include\lgi\common\Json.h" />
     <ClInclude Include="..\include\lgi\common\Layout.h" />
     <ClInclude Include="..\include\lgi\common\Ldap.h" />
     <ClInclude Include="..\include\lgi\common\LdapServer.h" />
     <ClInclude Include="..\include\lgi\common\Levenshtein.h" />
     <ClInclude Include="..\include\lgi\common\LexCpp.h" />
     <ClInclude Include="..\include\lgi\common\Lgi.h" />
     <ClInclude Include="..\include\lgi\common\LgiClasses.h" />
     <ClInclude Include="..\include\lgi\common\LgiCommon.h" />
     <ClInclude Include="..\include\lgi\common\LgiConfig.h" />
     <ClInclude Include="..\include\lgi\common\LgiDefs.h" />
     <ClInclude Include="..\include\lgi\common\LgiInc.h" />
     <ClInclude Include="..\include\lgi\common\LgiInterfaces.h" />
     <ClInclude Include="..\include\lgi\common\LgiMsgs.h" />
     <ClInclude Include="..\include\lgi\common\LgiNetInc.h" />
     <ClInclude Include="..\include\lgi\common\QuickSort.h" />
     <ClInclude Include="..\include\lgi\common\LgiString.h" />
     <ClInclude Include="..\include\lgi\common\LgiUiBase.h" />
     <ClInclude Include="..\include\lgi\common\Library.h" />
     <ClInclude Include="..\include\lgi\common\LibraryUtils.h" />
     <ClInclude Include="..\include\lgi\common\List.h" />
     <ClInclude Include="..\include\lgi\common\ListItemCheckBox.h" />
     <ClInclude Include="..\include\lgi\common\ListItemRadioBtn.h" />
     <ClInclude Include="..\include\lgi\common\LMallocArray.h" />
     <ClInclude Include="..\include\lgi\common\Log.h" />
     <ClInclude Include="..\include\lgi\common\Lzw.h" />
     <ClInclude Include="..\include\lgi\common\Mail.h" />
     <ClInclude Include="..\include\lgi\common\Map.h" />
     <ClInclude Include="..\include\lgi\common\Matrix.h" />
     <ClInclude Include="..\include\lgi\common\Mdi.h" />
     <ClInclude Include="..\include\lgi\common\Mem.h" />
     <ClInclude Include="..\include\lgi\common\MemoryPool.h" />
     <ClInclude Include="..\include\lgi\common\Menu.h" />
     <ClInclude Include="..\include\lgi\common\MenuImpl.h" />
     <ClInclude Include="..\include\lgi\common\Midi.h" />
     <ClInclude Include="..\include\lgi\common\Mime.h" />
     <ClInclude Include="..\include\lgi\common\MonthView.h" />
     <ClInclude Include="..\include\lgi\common\Mru.h" />
     <ClInclude Include="..\include\lgi\common\Mutex.h" />
     <ClInclude Include="..\include\lgi\common\Net.h" />
     <ClInclude Include="..\include\lgi\common\NetTools.h" />
     <ClInclude Include="..\include\lgi\common\Notifications.h" />
     <ClInclude Include="..\include\lgi\common\OAuth2.h" />
     <ClInclude Include="..\include\lgi\common\OpenGL.h" />
     <ClInclude Include="..\include\lgi\common\OpenSSLSocket.h" />
     <ClInclude Include="..\include\lgi\common\OptionsFile.h" />
     <ClInclude Include="..\include\lgi\common\Palette.h" />
     <ClInclude Include="..\include\lgi\common\Panel.h" />
     <ClInclude Include="..\include\lgi\common\ParseCpp.h" />
     <ClInclude Include="..\include\lgi\common\ParsePart.h" />
     <ClInclude Include="..\include\lgi\common\Password.h" />
     <ClInclude Include="..\include\lgi\common\Path.h" />
     <ClInclude Include="..\include\lgi\common\Permissions.h" />
     <ClInclude Include="..\include\lgi\common\PixelRops.h" />
     <ClInclude Include="..\include\lgi\common\Point.h" />
     <ClInclude Include="..\include\lgi\common\Popup.h" />
     <ClInclude Include="..\include\lgi\common\PopupList.h" />
     <ClInclude Include="..\include\lgi\common\Printer.h" />
     <ClInclude Include="..\include\lgi\common\Process.h" />
     <ClInclude Include="..\include\lgi\common\Profile.h" />
     <ClInclude Include="..\include\lgi\common\Progress.h" />
     <ClInclude Include="..\include\lgi\common\ProgressDlg.h" />
     <ClInclude Include="..\include\lgi\common\ProgressStatusPane.h" />
     <ClInclude Include="..\include\lgi\common\ProgressView.h" />
     <ClInclude Include="..\include\lgi\common\Properties.h" />
     <ClInclude Include="..\include\lgi\common\RadioGroup.h" />
     <ClInclude Include="..\include\lgi\common\Range.h" />
     <ClInclude Include="..\include\lgi\common\Ranges.h" />
     <ClInclude Include="..\include\lgi\common\Rect.h" />
     <ClInclude Include="..\include\lgi\common\RectF.h" />
     <ClInclude Include="..\include\lgi\common\RefCount.h" />
     <ClInclude Include="..\include\lgi\common\Message.h" />
     <ClInclude Include="..\include\lgi\common\RegionClipDC.h" />
     <ClInclude Include="..\include\lgi\common\RegKey.h" />
     <ClInclude Include="..\include\lgi\common\RichTextEdit.h" />
     <ClInclude Include="..\include\lgi\common\Rops.h" />
     <ClInclude Include="..\include\lgi\common\RtfHtml.h" />
     <ClInclude Include="..\include\lgi\common\Scp.h" />
     <ClInclude Include="..\include\lgi\common\Scripting.h" />
     <ClInclude Include="..\include\lgi\common\ScrollBar.h" />
     <ClInclude Include="..\include\lgi\common\SegmentTree.h" />
     <ClInclude Include="..\include\lgi\common\Serialize.h" />
     <ClInclude Include="..\include\lgi\common\SharedMemory.h" />
     <ClInclude Include="..\include\lgi\common\SkinEngine.h" />
     <ClInclude Include="..\include\lgi\common\SkinGel.h" />
     <ClInclude Include="..\include\lgi\common\Slider.h" />
     <ClInclude Include="..\include\lgi\common\Smb.h" />
     <ClInclude Include="..\include\lgi\common\SoftwareUpdate.h" />
     <ClInclude Include="..\include\lgi\common\SpellCheck.h" />
     <ClInclude Include="..\include\lgi\common\Splitter.h" />
     <ClInclude Include="..\include\lgi\common\Ssh.h" />
     <ClInclude Include="..\include\lgi\common\Stat.h" />
     <ClInclude Include="..\include\lgi\common\StatusBar.h" />
     <ClInclude Include="..\include\lgi\common\Store.h" />
     <ClInclude Include="..\include\lgi\common\Store2.h" />
     <ClInclude Include="..\include\lgi\common\Store3.h" />
     <ClInclude Include="..\include\lgi\common\Store3Defs.h" />
     <ClInclude Include="..\include\lgi\common\Store3MimeTree.h" />
     <ClInclude Include="..\include\lgi\common\StoreCommon.h" />
     <ClInclude Include="..\include\lgi\common\StoreConvert1To2.h" />
     <ClInclude Include="..\include\lgi\common\Stream.h" />
     <ClInclude Include="..\include\lgi\common\StreamConcat.h" />
     <ClInclude Include="..\include\lgi\common\StringClass.h" />
     <ClInclude Include="..\include\lgi\common\StringLayout.h" />
     <ClInclude Include="..\include\lgi\common\StructuredIo.h" />
     <ClInclude Include="..\include\lgi\common\StructuredLog.h" />
     <ClInclude Include="..\include\lgi\common\SubProcess.h" />
     <ClInclude Include="..\include\lgi\common\TableDb.h" />
     <ClInclude Include="..\include\lgi\common\TableLayout.h" />
     <ClInclude Include="..\include\lgi\common\TabView.h" />
     <ClInclude Include="..\include\lgi\common\Tag.h" />
     <ClInclude Include="..\include\lgi\common\TarFile.h" />
     <ClInclude Include="..\include\lgi\common\Telnet.h" />
     <ClInclude Include="..\include\lgi\common\Text.h" />
     <ClInclude Include="..\include\lgi\common\TextConvert.h" />
     <ClInclude Include="..\include\lgi\common\TextFile.h" />
     <ClInclude Include="..\include\lgi\common\TextLabel.h" />
     <ClInclude Include="..\include\lgi\common\TextLog.h" />
     <ClInclude Include="..\include\lgi\common\TextView3.h" />
     <ClInclude Include="..\include\lgi\common\TextView4.h" />
     <ClInclude Include="..\include\lgi\common\Thread.h" />
     <ClInclude Include="..\include\lgi\common\ThreadEvent.h" />
     <ClInclude Include="..\include\lgi\common\Tnef.h" />
     <ClInclude Include="..\include\lgi\common\Token.h" />
     <ClInclude Include="..\include\lgi\common\ToolBar.h" />
     <ClInclude Include="..\include\lgi\common\ToolTabBar.h" />
     <ClInclude Include="..\include\lgi\common\ToolTip.h" />
     <ClInclude Include="..\include\lgi\common\TrayIcon.h" />
     <ClInclude Include="..\include\lgi\common\Tree.h" />
     <ClInclude Include="..\include\lgi\common\Undo.h" />
     <ClInclude Include="..\include\lgi\common\Unicode.h" />
     <ClInclude Include="..\include\lgi\common\UnicodeString.h" />
     <ClInclude Include="..\include\lgi\common\UnrolledList.h" />
     <ClInclude Include="..\include\lgi\common\Variant.h" />
     <ClInclude Include="..\include\lgi\common\vCard-vCal.h" />
     <ClInclude Include="..\include\lgi\common\View.h" />
     <ClInclude Include="..\include\lgi\common\WebDav.h" />
     <ClInclude Include="..\include\lgi\common\WebSocket.h" />
     <ClInclude Include="..\include\lgi\common\Widgets.h" />
     <ClInclude Include="..\include\lgi\common\Window.h" />
     <ClInclude Include="..\include\lgi\common\WordStore.h" />
     <ClInclude Include="..\include\lgi\common\XmlTree.h" />
     <ClInclude Include="..\include\lgi\common\XmlTreeUi.h" />
     <ClInclude Include="..\include\lgi\common\YearView.h" />
     <ClInclude Include="..\include\lgi\common\ZipFile.h" />
     <ClInclude Include="..\include\lgi\common\ZipLibrary.h" />
     <ClInclude Include="..\include\lgi\common\ZlibWrapper.h" />
     <ClInclude Include="..\include\lgi\common\ZoomView.h" />
     <ClInclude Include="..\src\common\Hash\md5\md5.h" />
     <ClInclude Include="..\src\common\Hash\sha1\sha1.h" />
     <ClInclude Include="..\src\win\INet\MibAccess.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\include\lgi\common\Message.h.orig" />
-    <None Include="..\include\lgi\common\OptionsFile.h.orig" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/win/Lgi_vs2022.vcxproj.filters b/win/Lgi_vs2022.vcxproj.filters
--- a/win/Lgi_vs2022.vcxproj.filters
+++ b/win/Lgi_vs2022.vcxproj.filters
@@ -1,1236 +1,1226 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{afe8cb77-9ad1-4536-bbdd-3c127e7ed08c}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Source Files\Core">
       <UniqueIdentifier>{66a64573-871b-4499-ae26-c19e9e2a514a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Libraries">
       <UniqueIdentifier>{3fc23ef0-f144-4f1f-a9b4-18d3392bb63d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Mutex">
       <UniqueIdentifier>{c6cd6d73-d33c-4413-ade1-9dad78e2dc9c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Drag and Drop">
       <UniqueIdentifier>{c8684fc7-2e3c-4f15-8284-9d44b044f6c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Menus">
       <UniqueIdentifier>{87b1c801-b9ce-4f6c-97ab-a8f89aee9594}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Resources">
       <UniqueIdentifier>{c06c25f2-2c07-4900-a517-4a6a324069e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Threads">
       <UniqueIdentifier>{2c01a737-36cf-4197-bfa1-20395060263f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Variant">
       <UniqueIdentifier>{1e4cd802-8b94-4328-930e-37bfbfbedff5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Stream">
       <UniqueIdentifier>{01075698-dde2-4ed0-808f-7dd54414b597}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\DateTime">
       <UniqueIdentifier>{4a6845a8-e6ec-47d5-8f6c-aa0cfdbc68df}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Memory Subsystem">
       <UniqueIdentifier>{f567a76b-edd5-434d-b0d9-d51481f34845}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\File">
       <UniqueIdentifier>{3dee0237-b01c-44e8-a730-08dc661df82f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Process">
       <UniqueIdentifier>{bbaaace6-0ac7-4e76-90ae-9e5d5a0cb899}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Core\Skin">
       <UniqueIdentifier>{71e7b970-a070-40a7-a99f-88c215e14e44}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets">
       <UniqueIdentifier>{6e115ea1-09fb-492b-82b6-428afe17fed9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets\Css">
       <UniqueIdentifier>{719ef36f-419f-46f9-aef9-2f8158e4d106}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets\Layout">
       <UniqueIdentifier>{fb221556-3700-4dd8-ba9a-10b5d66bfe54}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets\Container">
       <UniqueIdentifier>{8e9f0321-56ae-4485-a338-e87d714c7f50}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets\Native Windows">
       <UniqueIdentifier>{c6050f41-574b-4a92-9ce5-860be2719ecf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Widgets\Xp">
       <UniqueIdentifier>{a07cd969-801e-4ec9-9394-e34912a3271d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\General">
       <UniqueIdentifier>{e067fae0-ef98-4e7a-8434-6f36590ba0e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\General\Mru">
       <UniqueIdentifier>{0a3e2151-b13a-407a-8cd9-ccb20f15cacf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\General\Clipboard">
       <UniqueIdentifier>{c72248a4-c2f0-43b9-950d-89d09bfddbb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\General\Hash">
       <UniqueIdentifier>{dad60202-c763-4f32-9dfb-fe7def4637ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\General\Growl">
       <UniqueIdentifier>{532dfa4a-58d3-4133-9ed6-a9fbf7f1556e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Text">
       <UniqueIdentifier>{5409aca4-2a55-4b2f-a719-d3db4e3cd7e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics">
       <UniqueIdentifier>{e3a3aadd-47ef-4723-9bcc-7db1f75a18b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Font">
       <UniqueIdentifier>{c4327acf-78c3-4ef1-b8bc-3aac9ea52b41}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Applicators">
       <UniqueIdentifier>{b3c906b8-595e-4641-8eec-8ad03ab13f6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Filters">
       <UniqueIdentifier>{baf0a65b-4a9c-4b11-850d-a957c19a22bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Rect/Region">
       <UniqueIdentifier>{6e349f5b-36a8-4821-9574-4040a3784204}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Surfaces">
       <UniqueIdentifier>{ddfdebae-8bcf-4224-8938-2716aba03822}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Gdi Leak">
       <UniqueIdentifier>{a126c55a-edee-489f-a852-25cbd1b433b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Graphics\Colour Reduction">
       <UniqueIdentifier>{ab5fd4a0-3862-42fd-b4ff-d5d8b0443f53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Dialogs">
       <UniqueIdentifier>{048d5e0a-220f-4911-999d-96965eb53691}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Network">
       <UniqueIdentifier>{258aef64-8cd0-4838-8131-147196656a99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Interface">
       <UniqueIdentifier>{814a5d81-3fd5-461b-a4a3-cda593ea404b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{5fe450b8-5fa9-440e-9fb0-03860b3548d0}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\common\Gdc2\64Bit.cpp">
+      <Filter>Source Files\Graphics\Applicators</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\8Bit.cpp">
+      <Filter>Source Files\Graphics\Applicators</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\15Bit.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\16Bit.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\24Bit.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\32Bit.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\48Bit.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\64Bit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\8Bit.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Lgi\Alert.cpp">
+      <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Alpha.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Filters\Filter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\DisplayString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\Font.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\Charset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\FontSystem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\FontType.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\StringLayout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Font\TypeFace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Colour.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\GdcCommon.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Rect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Surface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Path\Path.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Gdc2\Tools\ColourReduce.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\General\Containers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\General\ExeCheck.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Lgi\App.cpp">
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\General\FileCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\General\Growl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\General\Password.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\General\DateTime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Hash\md5\md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Hash\sha1\sha1.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Lgi\AppCommon.cpp">
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Net\Base64.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Bitmap.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Button.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Net\Uri.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Widgets\Button_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Net\Net.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Widgets\CheckBox_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Combo.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Net\NetTools.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Widgets\Combo_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Net\MDStringToDigest.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Gdc2\Font\Charset.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\CheckBox.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\Alert.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Lgi\ClipBoard.cpp">
+      <Filter>Source Files\General\Clipboard</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Colour.cpp">
+      <Filter>Source Files\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\AppCommon.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Gdc2\Tools\ColourReduce.cpp">
+      <Filter>Source Files\Graphics\Colour Reduction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\Containers.cpp">
+      <Filter>Source Files\Core\Memory Subsystem</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Css.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets\Css</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\CssTools.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets\Css</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\DateTime.cpp">
+      <Filter>Source Files\Core\DateTime</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Widgets\Dialog_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Font\DisplayString.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Text\DocView.cpp">
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\DragAndDrop.cpp">
+      <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\DragAndDropCommon.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\DropFiles.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Drag and Drop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Edit.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Widgets\Edit_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\ExeCheck.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\General\File.cpp">
+      <Filter>Source Files\Core\File</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\FileCommon.cpp">
+      <Filter>Source Files\Core\File</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\FileSelect.cpp">
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Filters\Filter.cpp">
+      <Filter>Source Files\Graphics\Filters</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\FindReplace.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Font\Font.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Font\FontSystem.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Font\FontType.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\FontSelect.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\GdcCommon.cpp">
+      <Filter>Source Files\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Gdc2\Gdc2.cpp">
+      <Filter>Source Files\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Gdc2\GdiLeak.cpp">
+      <Filter>Source Files\Graphics\Gdi Leak</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Skins\Gel\Gel.cpp">
+      <Filter>Source Files\Core\Skin</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\General.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\Growl.cpp">
+      <Filter>Source Files\General\Growl</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\GuiUtils.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Input.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Hash\md5\md5.c">
+      <Filter>Source Files\General\Hash</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\LgiCommon.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\LgiException.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Resource\LgiRes.cpp">
+      <Filter>Source Files\Core\Resources</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Library.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Libraries</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\LMsg.cpp">
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Net\MDStringToDigest.cpp">
+      <Filter>Source Files\General\Hash</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\General\Mem.cpp">
+      <Filter>Source Files\Core\Memory Subsystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Gdc2\MemDC.cpp">
+      <Filter>Source Files\Graphics\Surfaces</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\MemStream.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Memory Subsystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\Menu.cpp">
+      <Filter>Source Files\Core\Menus</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\MenuCommon.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\INet\MibAccess.cpp">
+      <Filter>Source Files\Network</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Mru.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\Mutex.cpp">
+      <Filter>Source Files\Core\Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Net\Net.cpp">
+      <Filter>Source Files\Network</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Object.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\General</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\OptionsFile.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Panel.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\General\Password.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Path\Path.cpp">
+      <Filter>Source Files\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Popup.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Gdc2\PrintDC.cpp">
+      <Filter>Source Files\Graphics\Surfaces</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\Printer.cpp">
+      <Filter>Source Files\Graphics\Surfaces</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Widgets\Progress_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\Layout.cpp">
+      <Filter>Source Files\Widgets\Layout</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\ProgressDlg.cpp">
+      <Filter>Source Files\Dialogs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\General\ShowFileProp_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\RadioGroup.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Widgets\RadioGroup_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\Rand.cpp">
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Hash\sha1\sha1.c">
+      <Filter>Source Files\General\Hash</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Rect.cpp">
+      <Filter>Source Files\Graphics\Rect/Region</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Resource\Res.cpp">
+      <Filter>Source Files\Core\Resources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Gdc2\ScreenDC.cpp">
+      <Filter>Source Files\Graphics\Surfaces</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Lgi\ScrollBar.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Slider.cpp">
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\win\Widgets\Slider_Win.cpp">
+      <Filter>Source Files\Widgets\Native Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\Splitter.cpp">
+      <Filter>Source Files\Widgets\Layout</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\StatusBar.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Stream.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Memory Subsystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Text\String.cpp">
+      <Filter>Source Files\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Font\StringLayout.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\SubProcess.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Process</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Gdc2\Surface.cpp">
+      <Filter>Source Files\Graphics\Surfaces</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\TableLayout.cpp">
+      <Filter>Source Files\Widgets\Layout</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\ToolTip.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Widgets\Box.cpp">
+      <Filter>Source Files\Widgets\Layout</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\ItemContainer.cpp">
+      <Filter>Source Files\Widgets\Container</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Widgets\List.cpp">
+      <Filter>Source Files\Widgets\Container</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Text\XmlTree.cpp">
+      <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\TrayIcon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\Variant.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\ViewCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\WindowCommon.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\LgiCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\LMsg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\Rand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\Mutex.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Lgi\ThreadEvent.cpp">
+      <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\ThreadCommon.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Lgi\ThreadEvent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Resource\LgiRes.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\win\Lgi\Thread.cpp">
+      <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Resource\Res.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Skins\Gel\Gel.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Widgets\TabView.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\Text\DocView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\String.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Widgets\TextLabel.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\TextView3.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\TextView4.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\Token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\Unicode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\Utf8.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\XmlTree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Text\UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Bitmap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Box.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Button.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\CheckBox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Combo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Edit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\ItemContainer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Panel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Popup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\ProgressDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\RadioGroup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Slider.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\Splitter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\StatusBar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\TableLayout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\TabView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\TextLabel.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\ToolBar.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\ToolTip.cpp">
+      <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Tree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\Widgets\List.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Gdc2\Gdc2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Gdc2\GdiLeak.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Gdc2\MemDC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Gdc2\PrintDC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Gdc2\ScreenDC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\General\File.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\General\Mem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\General\ShowFileProp_Win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\INet\MibAccess.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\App.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\ClipBoard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\DragAndDrop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\FileSelect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\General.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\Layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\Menu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\Printer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\ScrollBar.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Widgets\Container</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\View.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\Lgi\ViewCommon.cpp">
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\Window.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\LgiException.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Lgi\WindowCommon.cpp">
+      <Filter>Source Files\Core</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Lgi\Thread.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Gdc2\Font\TypeFace.cpp">
+      <Filter>Source Files\Graphics\Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Button_Win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\CheckBox_Win.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Lgi\Variant.cpp">
+      <Filter>Source Files\General</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Combo_Win.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Text\Unicode.cpp">
+      <Filter>Source Files\Text</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Dialog_Win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Edit_Win.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Text\UnicodeString.cpp">
+      <Filter>Source Files\Text</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Progress_Win.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Text\Utf8.cpp">
+      <Filter>Source Files\Text</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\RadioGroup_Win.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win\Widgets\Slider_Win.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\common\Net\Uri.cpp">
+      <Filter>Source Files\Network</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\lgi\common\Gdc2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\GdiLeak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiRes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\About.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\AnonPipe.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\App.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Array.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\AudioView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\AutoPtr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Base64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Bitmap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Bits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Box.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Browser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Button.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\CairoSurface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Cancel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Capabilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Charset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\CheckBox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ClipBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Colour.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ColourSelect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ColourSpace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Com.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Combo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Console.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Containers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ControlTree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Core.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Css.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\CssTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\CurrentTime.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DataDlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DataGrid.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DateTime.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DateTimeCtrls.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Db.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DbTable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DeEscape.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Dialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DiskBTree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DisplayString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Dns.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DocApp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DocView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Dom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DomFields.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DragAndDrop.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DrawListSurface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DropFiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Edit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Emoji.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\EmojiFont.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\EventTargetThread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FfmpegFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\File.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FileAssoc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FileSelect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FileTransferProgress.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Filter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FilterUi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FindInFiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FindReplaceDlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FontCache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FontSelect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Ftp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\GdcTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Graph.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Growl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HashDom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HashTable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HashTbl_Depr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Homoglyphs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Html.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Html2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HtmlCommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HtmlEdit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HtmlParser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Http.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HttpTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\HttpUi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Icc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ImageComparison.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ImageList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ItemContainer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Jpeg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Json.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Ldap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LdapServer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Levenshtein.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LexCpp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Lgi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiClasses.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiCommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiDefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiInc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiInterfaces.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiMsgs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiNetInc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\QuickSort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiUiBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Library.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LibraryUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\List.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ListItemCheckBox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ListItemRadioBtn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LMallocArray.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Lzw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mail.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Matrix.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mdi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\MemoryPool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Menu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\MenuImpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Midi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mime.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\MonthView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mru.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mutex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Net.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\NetTools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Notifications.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\OAuth2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\OpenGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\OpenSSLSocket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\OptionsFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Palette.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Panel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ParseCpp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ParsePart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Password.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Path.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Permissions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\PixelRops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Point.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Popup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\PopupList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Printer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Process.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Profile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Progress.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ProgressDlg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ProgressStatusPane.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ProgressView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Properties.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RadioGroup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Range.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Ranges.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Rect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RectF.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RefCount.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Message.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RegionClipDC.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RegKey.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RichTextEdit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Rops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RtfHtml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Scp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Scripting.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ScrollBar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SegmentTree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Serialize.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SharedMemory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SkinEngine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SkinGel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Slider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Smb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SoftwareUpdate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SpellCheck.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Splitter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Ssh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Stat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StatusBar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Store.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Store2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Store3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Store3Defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Store3MimeTree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StoreCommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StoreConvert1To2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Stream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StreamConcat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StringClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StringLayout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StructuredIo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StructuredLog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SubProcess.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TableDb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TableLayout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TabView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Tag.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TarFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Telnet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextConvert.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextLabel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextLog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextView3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextView4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Thread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ThreadEvent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Tnef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Token.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolBar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolTabBar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolTip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TrayIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Tree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Undo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Unicode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\UnicodeString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\UnrolledList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Variant.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\vCard-vCal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\View.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\WebDav.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\WebSocket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Widgets.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Window.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\WordStore.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\XmlTree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\XmlTreeUi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\YearView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ZipFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ZipLibrary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ZlibWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ZoomView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\Hash\md5\md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\Hash\sha1\sha1.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\win\INet\MibAccess.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\include\lgi\common\Message.h.orig" />
-    <None Include="..\include\lgi\common\OptionsFile.h.orig" />
-  </ItemGroup>
 </Project>
\ No newline at end of file