diff --git a/include/lgi/common/DateTime.h b/include/lgi/common/DateTime.h
--- a/include/lgi/common/DateTime.h
+++ b/include/lgi/common/DateTime.h
@@ -1,469 +1,478 @@
 /// \file
 /// \author Matthew Allen
 
 /**
  * \defgroup Time Time and date handling
  * \ingroup Lgi
  */
 
 #ifndef __DATE_TIME_H
 #define __DATE_TIME_H
 
 #include <time.h>
 #include "lgi/common/StringClass.h"
 
 #define GDTF_DEFAULT				0
 
 /// Format the date as DD/MM/YYYY
 /// \ingroup Time
 #define GDTF_DAY_MONTH_YEAR			0x001
 
 /// Format the date as MM/DD/YYYY	
 /// \ingroup Time
 #define GDTF_MONTH_DAY_YEAR			0x002
 
 /// Format the date as YYYY/MM/DD
 /// \ingroup Time
 #define GDTF_YEAR_MONTH_DAY			0x004
 
 /// The bit mask for the date
 /// \ingroup Time
 #define GDTF_DATE_MASK				0x00f
 
 /// Format the time as HH:MM and an am/pm marker
 /// \ingroup Time
 #define GDTF_12HOUR					0x010
 
 /// Format the time as 24 hour time
 /// \ingroup Time
 #define GDTF_24HOUR					0x020
 
 /// The bit mask for the time
 /// \ingroup Time
 #define GDTF_TIME_MASK				0x0f0
 
 /// Format the date with a leading zero
 /// \ingroup Time
 #define GDTF_DAY_LEADINGZ			0x100
 
 /// Format the month with a leading zero
 /// \ingroup Time
 #define GDTF_MONTH_LEADINGZ			0x200
 
 class LDateTime;
 
 class LgiClass LTimeStamp
 {
 	uint64_t ts = 0;
 	
 public:
 	constexpr static uint64_t WINDOWS_TICK = 10000000;
 	constexpr static uint64_t SEC_TO_UNIX_EPOCH = 11644473600LL;
 	
 	LTimeStamp(uint64_t sysTime)
 	{
 		ts = sysTime;
 	}
 
 	LTimeStamp(time_t unixTime = 0)
 	{
 		if (unixTime)
 			*this = unixTime;
 	}
 
 	uint64_t Get() const { return ts; }
 	uint64_t &Ref() { return ts; }
 	
 	// Convert from unit time to LGI time stamp
 	LTimeStamp &operator =(const time_t unixTime);
 	// Convert from LDateTime
 	LTimeStamp &operator =(const LDateTime &dt);
 	
 	// Convert from LGI time stamp to unix time
 	time_t Unix() const;
 
 	// operator bool() const { return ts != 0; }
 	bool Valid() const { return ts != 0; }
 
 	LTimeStamp operator +(uint64_t offset) { LTimeStamp t; t.Ref() = ts + offset; return t; }
 	bool operator <(const LTimeStamp &b) const { return ts < b.ts; }
 	bool operator <=(const LTimeStamp &b) const { return ts <= b.ts; }
 	bool operator >(const LTimeStamp &b) const { return ts > b.ts; }
 	bool operator >=(const LTimeStamp &b) const { return ts >= b.ts; }
 	int64_t operator -(const LTimeStamp &b) const { return (int64_t)ts - (int64_t)b.ts; }
 	LTimeStamp &operator +=(int64_t i) { ts += i; return *this; }
 	LTimeStamp &operator -=(int64_t i) { ts -= i; return *this; }
 };
 
 
 /// A date/time class
 ///
 /// This class interacts with system times represented as 64bit ints. The various OS support different
 /// formats for that 64bit int values.
 ///     - On windows the system times are in 100-nanosecond intervals since 
 ///       January 1, 1601 (UTC), as per the FILETIME structure.
 ///     - On Posix systems (Linux/Mac) the 64bit values are in milliseconds since January 1, 1800 UTC.
 ///       This is just (unixTime + Offset1800) * 1000.
 /// If you are serializing these 64bit values you should take that into account, they are NOT cross platform.
 /// The LDirectory class uses the same 64bit values as accepted here for the file's last modified timestamp 
 /// etc. To convert the 64bit values to seconds, divide by LDateTime::Second64Bit, useful for calculating 
 /// the time in seconds between 2 LDateTime objects.
 ///
 /// \ingroup Time
 class LgiClass LDateTime // This class can't have a virtual table, because it's used in 
 						 // LArray's which initialize with all zero bytes.
 {
 	/// 1 - DaysInMonth
 	int16 _Day;
 	/// ####
 	int16 _Year;
 	/// Milliseconds: 0-999
 	int16 _Thousands;
 
 	/// 1-12
 	int16 _Month;
 	/// 0-59
 	int16 _Seconds;
 	/// 0-59
 	int16 _Minutes;
 	/// 0-23 (24hr)
 	int16 _Hours;
 
 	/// The current timezone of this object, defaults to the system timezone
 	int16 _Tz;			// in minutes (+10 == 600 etc)
 
 	/// Combination of (#GDTF_DAY_MONTH_YEAR or #GDTF_MONTH_DAY_YEAR or #GDTF_YEAR_MONTH_DAY) and (#GDTF_12HOUR or #GDTF_24HOUR)
 	uint16 _Format;
 	/// The default formatting of datetimes
 	static uint16 DefaultFormat;
 	/// The default date separator character
 	static char DefaultSeparator;
 
 public:
 	LDateTime(const char *Init = NULL);
 	LDateTime(time_t unixTime);
 	LDateTime(const LTimeStamp &Ts);
 	LDateTime(const LDateTime &dt) { *this = dt; }
 	~LDateTime();
 
     /// Resolution of a second when using 64 bit int's
     /// \sa LDateTime::Get(int64), LDateTime::Set(int64)
     #ifdef WIN32
     static constexpr int64_t Second64Bit	= 10000000;
     #else
     static constexpr int64_t Second64Bit	= 1000;
     #endif
 	static constexpr int64_t MinuteLength	= 60; // seconds
     static constexpr int64_t HourLength		= MinuteLength * 60; // seconds
     static constexpr int64_t DayLength		= HourLength   * 24; // seconds
 	static constexpr const char *WeekdaysShort[7]	= {"Sun",    "Mon",    "Tue",     "Wed",       "Thu",      "Fri",     "Sat"};
 	static constexpr const char *WeekdaysLong[7]	= {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
 	static constexpr const char *MonthsShort[12]	= {"Jan",     "Feb",      "Mar",   "Apr",   "May", "Jun",  "Jul",  "Aug",    "Sep",       "Oct",     "Nov",      "Dec"};
 	static constexpr const char *MonthsLong[12]		= {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
 	
 	// On Posix systems this allows representation of times before 1/1/1970.
 	// The Lgi epoch is considered to be 1/1/1800 instead and this offset converts
 	// from one to the other.
 	static constexpr int64_t Offset1800		= 5364662400; // Seconds from 1/1/1800 to 1/1/1970
 
 	/// Returns true if all the components are in a valid range
 	bool IsValid() const;
 	/// Sets the date to an NULL state
 	void Empty();
 
 	/// Returns the day
 	int Day() const { return _Day; }
 	/// Sets the day
 	void Day(int d) { _Day = d; }
 	/// Returns the month
 	int Month() const { return _Month; }
 	/// Sets the month
 	void Month(int m) { _Month = m; }
 	/// Sets the month by it's name
 	void Month(char *m);
 	/// Returns the year
 	int Year() const { return _Year; }
 	/// Sets the year
 	void Year(int y) { _Year = y; }
 
 	/// Returns the millisecond part of the time
 	int Thousands() const { return _Thousands; }
 	/// Sets the millisecond part of the time
 	void Thousands(int t) { _Thousands = t; }
 	/// Returns the seconds part of the time
 	int Seconds() const { return _Seconds; }
 	/// Sets the seconds part of the time
 	void Seconds(int s) { _Seconds = s; }
 	/// Returns the minutes part of the time
 	int Minutes() const { return _Minutes; }
 	/// Sets the minutes part of the time
 	void Minutes(int m) { _Minutes = m; }
 	/// Returns the hours part of the time
 	int Hours() const { return _Hours; }
 	/// Sets the hours part of the time
 	void Hours(int h) { _Hours = h; }
 
 	/// Returns the timezone of this current date time object in minutes (+10 = 600)
 	int GetTimeZone() const { return _Tz; }
 	/// Returns the timezone in hours
 	double GetTimeZoneHours() const { return (double)_Tz / 60.0; }
 
 	/// Sets the timezone of this current object.in minutes (+10 = 600)
 	void SetTimeZone
 	(
 		/// The new timezone (in minutes, 600 = +10:00)
 		int Tz,
 		/// True if you want to convert the date and time to the new zone,
 		/// False if you want to leave the date/time as it is.
 		bool ConvertTime
 	);
+	/// Figure out the right TZ offset for a given date according to the DST
+	/// rules for the current timezone.
+	bool InferTimeZone(bool ConvertTime = true);
+
 	/// Set this object to UTC timezone, changing the other members as
 	/// needed
 	LDateTime &ToUtc(bool AssumeLocal = false)
 	{
 		if (AssumeLocal) _Tz = SystemTimeZone();
 		SetTimeZone(0, true);
 		return *this;
 	}
 
 	/// \returns the UTC version of this object.
 	LDateTime Utc() const
 	{
 		LDateTime dt = *this;
 		return dt.ToUtc();
 	}
 
 	/// Changes the timezone to the local zone, changing other members
 	/// as needed.
 	LDateTime &ToLocal(bool AssumeUtc = false)
 	{
 		if (AssumeUtc) _Tz = 0;
 		SetTimeZone(SystemTimeZone(), true);
 		return *this;
 	}
 
 	/// \returns the local time version of this object.
 	LDateTime Local() const
 	{
 		LDateTime dt = *this;
 		return dt.ToLocal();
 	}
 
 
 	/// Gets the current formatting of the date, the format only effects
 	/// the representation of the date when converted to/from a string.
 	/// \returns a bit mask of (#GDTF_DAY_MONTH_YEAR or #GDTF_MONTH_DAY_YEAR or #GDTF_YEAR_MONTH_DAY) and (#GDTF_12HOUR or #GDTF_24HOUR)
 	uint16 GetFormat() const { return _Format; }
 	/// Sets the current formatting of the date, the format only effects
 	/// the representation of the date when converted to/from a string
 	void SetFormat
 	(
 		/// a bit mask of (#GDTF_DAY_MONTH_YEAR or #GDTF_MONTH_DAY_YEAR or #GDTF_YEAR_MONTH_DAY) and (#GDTF_12HOUR or #GDTF_24HOUR)
 		uint16 f
 	) { _Format = f; }
 
 	/// \returns zero based index of weekday, or -1 if not found.
 	static int IsWeekDay(const char *s);
 	/// \returns zero based index of month, or -1 if not found.
 	static int IsMonth(const char *s);
 	/// The default format for the date when formatted as a string
 	static uint16 GetDefaultFormat();
 	/// Sets the default format for the date when formatted as a string
 	static void SetDefaultFormat(uint16 f) { DefaultFormat = f; }
 
 	/// Gets the data and time as a LString
 	LString Get() const;
 	/// Gets the date and time as a string
 	/// \sa LDateTime::GetFormat()
 	void Get(char *Str, size_t SLen) const;
 	/// Gets the data and time as a 64 bit int (os specific)
 	bool Get(LTimeStamp &s) const;
 	/// Gets just the date as a string
 	/// \sa LDateTime::GetFormat()
 	/// \returns The number of characters written to 'Str'
 	int GetDate(char *Str, size_t SLen) const;
 	/// Gets just the date as a LString
 	/// \sa LDateTime::GetFormat()
 	LString GetDate() const;
 	/// Gets just the time as a string
 	/// \sa LDateTime::GetFormat()
 	/// \returns The number of characters written to 'Str'
 	int GetTime(char *Str, size_t SLen) const;
 	/// Gets just the time as a LString
 	/// \sa LDateTime::GetFormat()
 	LString GetTime() const;
 
 	// Unix epoch support	
 	uint64_t GetUnix();
 	bool SetUnix(uint64_t s);
 
 	/// Returns the 64bit LTimeStamp.
 	LTimeStamp Ts() const;
 
 	/// Get the timestamp in a format compatible with the current operating system APIs.
 	/// \returns the timestamp or zero on error.
 	uint64_t OsTime() const;
 	bool OsTime(uint64_t ts);
 
 	/// Get the current time...
 	static LDateTime Now();
 	/// Sets the date and time to the system clock
 	LDateTime &SetNow();
 	/// Parses a date time from a string
 	/// \sa LDateTime::GetFormat()
 	bool Set(const char *Str);
 	/// Sets the date and time from a 64 bit int (os specific)
 	bool Set(const LTimeStamp &s);
 	/// Sets the time from a unit time_t
 	bool Set(time_t tt);
 	/// Parses the date from a string
 	/// \sa LDateTime::GetFormat()
 	bool SetDate(const char *Str);
 	/// Parses the time from a string
 	/// \sa LDateTime::GetFormat()
 	bool SetTime(const char *Str);
 	/// Parses the date time from a free form string
 	bool Parse(LString s);
 	/// Set to a tm struct
 	bool Set(struct tm *t, bool inferTimezone);
 
 	/// Describes the perios between this and 'to' in the form:
 	/// ##d ##h ##m ##s
 	/// Order of the dates isn't important.
 	LString DescribePeriod(LDateTime to);
 	static LString DescribePeriod(double seconds);
 
 	/// \returns true if 'd' is on the same day as this object
 	bool IsSameDay(LDateTime &d) const;
 	/// \returns true if 'd' is on the same month as this object
 	bool IsSameMonth(LDateTime &d) const;
 	/// \returns true if 'd' is on the same year as this object
 	bool IsSameYear(LDateTime &d) const;
 
 	/// \returns the start of day, same date but time: 00:00:00
 	LDateTime StartOfDay() const;
 	/// \returns the end of day, same date but time: 23:59:59
 	LDateTime EndOfDay() const;
 
 	/// \returns whether a year is a leap year or not
 	bool IsLeapYear
 	(
 		/// Pass a specific year here, or ignore to return if the current Date/Time is in a leap year.
 		int Year = -1
 	) const;
 
 	/// Returns the day of the week as an index, 0=sun, 1=mon, 2=teus etc
 	int DayOfWeek() const;
 	/// \returns the number of days in the current month
 	int DaysInMonth() const;
 	
 	/// Adds a number of seconds to the current date/time
 	void AddSeconds(int64 Seconds);
 	/// Adds a number of minutes to the current date/time
 	void AddMinutes(int64 Minutes);
 	/// Adds a number of hours to the current date/time
 	void AddHours(int64 Hours);
 	/// Adds a number of days to the current date/time
 	bool AddDays(int64 Days);
 	/// Adds a number of months to the current date/time
 	void AddMonths(int64 Months);
 	/// Adds years
 	void AddYears(int yr) { _Year += yr; }
 
 	/// The system timezone including daylight savings offset in minutes, +10 would return 600
 	static int SystemTimeZone(bool ForceUpdate = false);
 	/// Any daylight savings offset applied to TimeZone(), in minutes. e.g. to retreive the 
 	/// timezone uneffected by DST use TimeZone() - TimeZoneOffset().
 	static int SystemTimeZoneOffset();
 
 	/// Daylight savings info record
 	struct LgiClass LDstInfo
 	{
 		/// Timestamp where the DST timezone changes to 'Offset'
 		LTimeStamp Utc;
 		/// The new offset in minutes (e.g. 600 = +10 hours)
 		int Offset;
 
 		LDateTime GetLocal();
 	};
 
 	/// Retreives daylight savings start and end events for a given period. One event will be emitted
 	/// for the current DST/TZ setting at the datetime specified by 'Start', followed by any changes that occur
 	/// between that and the 'End' datetime. To retreive just the DST info for start, use NULL for end.
 	static bool
 	GetDaylightSavingsInfo
 	(
 		/// [Out] The array to receive DST info. At minimum one record will be returned
 		/// matching the TZ in place for the start datetime.
 		LArray<LDstInfo> &Out,
 		/// [In] The start date that you want DST info for.
 		LDateTime &Start,
 		/// [Optional In] The end of the period you want DST info for.
 		LDateTime *End = 0
 	);
 
 	/// Using the DST info this will convert 'dt' from UTC to local
 	static bool DstToLocal(LArray<LDstInfo> &Dst, LDateTime &dt);
 
 	/// Decodes an email date into the current instance
 	bool Decode(const char *In);
 
 	/// Returns a month index from a month name
 	static int MonthFromName(const char *Name);
 	
 	// File
 	int Sizeof();
 	bool Serialize(class LFile &f, bool Write);
 	bool Serialize(class LDom *Props, char *Name, bool Write);
 
 	// operators
 	bool operator <(const LDateTime &dt) const;
 	bool operator <=(const LDateTime &dt) const;
 	bool operator >(const LDateTime &dt) const;
 	bool operator >=(const LDateTime &dt) const;
 	bool operator ==(const LDateTime &dt) const;
 	bool operator !=(const LDateTime &dt) const;
 	int Compare(const LDateTime *d) const;
 
 	LDateTime operator -(const LDateTime &dt);
 	LDateTime operator +(const LDateTime &dt);
 	int DiffMonths(const LDateTime &dt);
 
 	LDateTime &operator =(struct tm *t);
 	LDateTime &operator =(const LDateTime &t);
 	LDateTime &operator =(LDateTime const *t)
 	{
 		if (t)
 			*this = *t;
 		return *this;
 	}
 
 	/// LDom interface.
 	///
 	/// Even though we don't inherit from a LDom class this class supports the same
 	/// interface for ease of use. Currently there are cases where LDateTime is used
 	/// in LArray's which don't implement calling a constructor (they init with all
 	/// zeros).
 	bool GetVariant(const char *Name, class LVariant &Value, char *Array = NULL);
 	bool SetVariant(const char *Name, class LVariant &Value, char *Array = NULL);
 	bool CallMethod(const char *Name, class LVariant *ReturnValue, LArray<class LVariant*> &Args);
+
+	#ifdef WINDOWS
+	operator SYSTEMTIME() const;
+	LDateTime &operator =(const SYSTEMTIME &st);
+	#endif
 };
 
 /// Time zone information
 struct LTimeZone
 {
 public:
 	/// The offset from UTC
 	float Offset;
 	/// The name of the zone
 	const char *Text;
 };
 
 /// A list of all known timezones.
 extern LTimeZone LTimeZones[];
 
 #ifdef _DEBUG
 LgiFunc bool LDateTime_Test();
 #endif
 
 #endif
diff --git a/src/common/General/DateTime.cpp b/src/common/General/DateTime.cpp
--- a/src/common/General/DateTime.cpp
+++ b/src/common/General/DateTime.cpp
@@ -1,2427 +1,2439 @@
 /*
 **	FILE:			LDateTime.cpp
 **	AUTHOR:			Matthew Allen
 **	DATE:			11/11/98
 **	DESCRIPTION:	Scribe Date Time Object
 **
 **	Copyright (C) 1998, Matthew Allen
 **		fret@memecode.com
 */
 
 #define _DEFAULT_SOURCE
 #include <time.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/timeb.h>
 #if defined(MAC)
 #include <sys/time.h>
 #endif
 #ifdef WINDOWS
 #include <tchar.h>
 #endif
 
 #include "lgi/common/Lgi.h"
 #include "lgi/common/DateTime.h"
 #include "lgi/common/DocView.h"
 
 constexpr const char *LDateTime::WeekdaysShort[7];
 constexpr const char *LDateTime::WeekdaysLong[7];
 constexpr const char *LDateTime::MonthsShort[12];
 constexpr const char *LDateTime::MonthsLong[12];
 
 #if !defined(WINDOWS)
 	#define MIN_YEAR		1800
 #endif
 #if defined(LINUX)
 	#define USE_ZDUMP		1
 #elif defined(HAIKU)
 	#include "lgi/common/TimeZoneInfo.h"
 #endif
 #define DEBUG_DST_INFO		0
 
 //////////////////////////////////////////////////////////////////////////////
 uint16 LDateTime::DefaultFormat = GDTF_DEFAULT;
 char LDateTime::DefaultSeparator = '/';
 
 uint16 LDateTime::GetDefaultFormat()
 {
 	if (DefaultFormat == GDTF_DEFAULT)
 	{
 		#ifdef WIN32
 
 		TCHAR s[80] = _T("1");
 		GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE, s, CountOf(s));
 		switch (_tstoi(s))
 		{
 			case 0:
 				DefaultFormat = GDTF_MONTH_DAY_YEAR;
 				break;
 			default:
 			case 1:
 				DefaultFormat = GDTF_DAY_MONTH_YEAR;
 				break;
 			case 2:
 				DefaultFormat = GDTF_YEAR_MONTH_DAY;
 				break;
 		}
 
 		GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ITIME, s, sizeof(s));
 		if (_tstoi(s) == 1)
 		{
 			DefaultFormat |= GDTF_24HOUR;
 		}
 		else
 		{
 			DefaultFormat |= GDTF_12HOUR;
 		}
 
 		if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, s, sizeof(s)))
 			DefaultSeparator = (char)s[0];
 
 		if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, s, sizeof(s)))
 		{
 			char Sep[] = { DefaultSeparator, '/', '\\', '-', '.', 0 };
 			LString Str = s;
 			auto t = Str.SplitDelimit(Sep);
 			for (int i=0; i<t.Length(); i++)
 			{
 				if (t[i].Equals("mm"))
 					DefaultFormat |= GDTF_MONTH_LEADINGZ;
 				else if (t[i].Equals("dd"))
 					DefaultFormat |= GDTF_DAY_LEADINGZ;
 			}
 		}
 
 		#else
 
 		// get some user setting from the system??
 		DefaultFormat = GDTF_DAY_MONTH_YEAR | GDTF_12HOUR;
 
 		#endif
 	}
 
 	return DefaultFormat;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 #define NO_ZONE				-1000
 static int CurTz			= NO_ZONE;
 static int CurTzOff			= NO_ZONE;
 
 LDateTime::LDateTime(const char *Init)
 {
 	Empty();
 	if (Init)
 		Set(Init);
 }
 
 LDateTime::LDateTime(time_t unixTime)
 {
 	Empty();
 	if (unixTime)
 		Set(unixTime);
 }
 
 LDateTime::LDateTime(const LTimeStamp &lgiTime)
 {
 	Empty();
 	if (lgiTime.Valid())
 		Set(lgiTime);
 }
 
 LDateTime::~LDateTime()
 {
 }
 
 void LDateTime::Empty()
 {
 	_Year = 0;
 	_Month = 0;
 	_Day = 0;
 	_Minutes = 0;
 	_Hours = 0;
 	_Seconds = 0;
 	_Thousands = 0;
 
 	if (CurTz == NO_ZONE)
 		_Tz = SystemTimeZone();
 	else
 		_Tz = CurTz + CurTzOff;
 
 	_Format = GetDefaultFormat();
 }
 
 #define InRange(v, low, high) ((v) >= low && (v) <= high)
 bool LDateTime::IsValid() const
 {
-	return	InRange(_Day, 1, 31) &&
-			InRange(_Year, 1600, 2100) &&
-			InRange(_Thousands, 0, 999) &&
-			InRange(_Month, 1, 12) &&
-			InRange(_Seconds, 0, 59) &&
-			InRange(_Minutes, 0, 59) &&
-			InRange(_Hours, 0, 23) &&
-			InRange(_Tz, -780, 780);
+	return	InRange(_Day,       1,    31  ) &&
+			InRange(_Year,      1600, 2100) &&
+			InRange(_Thousands, 0,    999 ) &&
+			InRange(_Month,     1,    12  ) &&
+			InRange(_Seconds,   0,    59  ) &&
+			InRange(_Minutes,   0,    59  ) &&
+			InRange(_Hours,     0,    23  ) &&
+			InRange(_Tz,        -780, 780 );
 }
 
 void LDateTime::SetTimeZone(int NewTz, bool ConvertTime)
 {
 	if (ConvertTime && NewTz != _Tz)
-	{
-		// printf("SetTimeZone: %i\n", NewTz - _Tz);
 		AddMinutes(NewTz - _Tz);
-	}
 
 	_Tz = NewTz;
 }
 
+#ifdef WINDOWS
+LDateTime::operator SYSTEMTIME() const
+{
+	SYSTEMTIME System = {};
+
+	System.wYear         = _Year;
+	System.wMonth        = limit(_Month,     1, 12);
+	System.wDay          = limit(_Day,       1, 31);
+	System.wHour         = limit(_Hours,     0, 23);
+	System.wMinute       = limit(_Minutes,   0, 59);
+	System.wSecond       = limit(_Seconds,   0, 59);
+	System.wMilliseconds = limit(_Thousands, 0, 999);
+	System.wDayOfWeek    = DayOfWeek();
+
+	return System;
+}
+
+LDateTime &LDateTime::operator =(const SYSTEMTIME &st)
+{
+	_Year      = st.wYear;
+	_Month     = st.wMonth;
+	_Day       = st.wDay;
+	_Hours     = st.wHour;
+	_Minutes   = st.wMinute;
+	_Seconds   = st.wSecond;
+	_Thousands = st.wMilliseconds;
+
+	return *this;
+}
+#endif
+
+bool LDateTime::InferTimeZone(bool ConvertTime)
+{
+	#ifdef WINDOWS
+
+		SYSTEMTIME System = *this;
+
+		// Compare the non-year parts of the SYSTEMTIMEs
+		auto SysCmp = [](SYSTEMTIME &a, SYSTEMTIME &b)
+		{
+			#define CMP(name) if (auto d = a.name - b.name) return d;
+			CMP(wMonth); CMP(wDay); CMP(wHour); CMP(wMinute); CMP(wSecond); CMP(wMilliseconds);
+			return 0;
+		};
+
+		// 'System' is currently in 'UTC' but we want the local version of the time,
+		// not in the _Tz timezone, but the effective timezone for that
+		// actual moment in question, which could have a different DST offset.
+		TIME_ZONE_INFORMATION tzi = {};
+		if (!GetTimeZoneInformationForYear(_Year, NULL, &tzi))
+			return false;
+
+		auto order = SysCmp(tzi.DaylightDate, tzi.StandardDate);
+		// order > 0 = DaylightDate is after StandardDate
+		// order < 0 = DaylightDate is before StandardDate
+		LAssert(order != 0);
+
+		auto a = SysCmp(System, tzi.StandardDate);
+		// a > 0 = System is after StandardDate
+		// a < 0 = System is before StandardDate
+
+		auto b = SysCmp(System, tzi.DaylightDate);
+		// b > 0 = System is after DaylightDate
+		// b < 0 = System is before DaylightDate
+
+		int tz = (int16)-tzi.Bias;
+		if (order > 0)
+		{
+			// year is: DST -> Normal -> DST
+			if (a < 0 || b > 0)
+				tz -= (int16)tzi.DaylightBias;
+		}
+		else
+		{
+			// year is: Normal -> DST -> Normal
+			if (a < 0 && b > 0)
+				tz -= (int16)tzi.DaylightBias;
+		}
+
+		if (ConvertTime)
+			SetTimeZone(tz -_Tz, true);
+
+		return true;
+
+	#else
+
+		#warning "Impl me."
+
+	#endif
+
+	return false;
+}
+
 int LDateTime::SystemTimeZone(bool ForceUpdate)
 {
 	if (ForceUpdate || CurTz == NO_ZONE)
 	{
 		CurTz = 0;
 		CurTzOff = 0;
 
 		#ifdef MAC
 
 			#ifdef LGI_COCOA
 
 				NSTimeZone *timeZone = [NSTimeZone localTimeZone];
 				if (timeZone)
 				{
 					NSDate *Now = [NSDate date];
 					CurTz = (int) [timeZone secondsFromGMTForDate:Now] / 60;
 					CurTzOff = [timeZone daylightSavingTimeOffsetForDate:Now] / 60;
 					CurTz -= CurTzOff;
 				}
 
 			#elif defined LGI_CARBON
 			
 				CFTimeZoneRef tz = CFTimeZoneCopySystem();
 				CFAbsoluteTime now = CFAbsoluteTimeGetCurrent();
 				Boolean dst = CFTimeZoneIsDaylightSavingTime(tz, now);
 				if (dst)
 				{
 					CFAbsoluteTime next = CFTimeZoneGetNextDaylightSavingTimeTransition(tz, now);
 					CurTz = CFTimeZoneGetSecondsFromGMT(tz, next + 100) / 60;
 				}
 				else
 				{
 					CurTz = CFTimeZoneGetSecondsFromGMT(tz, now) / 60;
 				}
 
 				CurTzOff = CFTimeZoneGetDaylightSavingTimeOffset(tz, now) / 60;
 				CFRelease(tz);
 			
 			#endif
 		
 		#elif defined(WIN32)
 		
 			timeb tbTime;
 			ftime(&tbTime);
 			CurTz = -tbTime.timezone;
 
 			TIME_ZONE_INFORMATION Tzi;
 			if (GetTimeZoneInformation(&Tzi) == TIME_ZONE_ID_DAYLIGHT)
 				CurTzOff = -Tzi.DaylightBias;
 		
 		#elif defined(LINUX) || defined(HAIKU)
 
 			int six_months = (365 * 24 * 60 * 60) / 2;
 			time_t now = 0, then = 0;
 			time (&now);
 			then = now - six_months;
 			
 			tm now_tz, then_tz;
 			tm *t = localtime_r(&now, &now_tz);
 			if (t)
 			{
 				localtime_r(&then, &then_tz);
 				
 				CurTz = now_tz.tm_gmtoff / 60;
 				if (now_tz.tm_isdst)
 				{
 					CurTzOff = (now_tz.tm_gmtoff - then_tz.tm_gmtoff) / 60;
 					CurTz = then_tz.tm_gmtoff / 60;
 				}
 				else
 					// This is not DST so there is no offset right?
 					CurTzOff = 0; // (then_tz.tm_gmtoff - now_tz.tm_gmtoff) / 60;
 			}
 			else return NO_ZONE;
 		
 		#else
 		
 			#error "Impl me."
 		
 		#endif
 	}
 	
 	return CurTz + CurTzOff;
 }
 
 int LDateTime::SystemTimeZoneOffset()
 {
 	if (CurTz == NO_ZONE)
 		SystemTimeZone();
 
 	return CurTzOff;
 }
 
 #if defined WIN32
 
 LDateTime ConvertSysTime(SYSTEMTIME &st, int year)
 {
 	LDateTime n;
 	if (st.wYear)
 	{
 		n.Year(st.wYear);
 		n.Month(st.wMonth);
 		n.Day(st.wDay);
 	}
 	else
 	{
 		n.Year(year);
 		n.Month(st.wMonth);
 		
 		// Find the 'nth' matching weekday, starting from the first day in the month
 		n.Day(1);
 		LDateTime c = n;
 		for (int i=0; i<st.wDay && c.Month() == n.Month(); i++)
 		{
 			while (c.DayOfWeek() != st.wDayOfWeek)
 				c.AddDays(1);
 			if (c.Month() != n.Month())
 				break;
 			n = c;
 		}
 	}
 
 	n.Hours(st.wHour);
 	n.Minutes(st.wMinute);
 	n.Seconds(st.wSecond);
 	n.Thousands(st.wMilliseconds);
 	return n;
 }
 
 static int LDateCmp(LDateTime *a, LDateTime *b)
 {
 	return a->Compare(b);
 }
 
 #elif USE_ZDUMP
 
 static bool ParseValue(char *s, LString &var, LString &val)
 {
 	if (!s)
 		return false;
 	char *e = strchr(s, '=');
 	if (!e)
 		return false;
 	
 	*e++ = 0;
 	var = s;
 	val = e;
 	*e = '=';
 	
 	return var != 0 && val != 0;
 }
 
 #endif
 
 /* Testing code...
 	LDateTime Start, End;
 	LArray<LDateTime::LDstInfo> Info;
 
 	Start.Set("1/1/2010");
 	End.Set("31/12/2014");
 	LDateTime::GetDaylightSavingsInfo(Info, Start, &End);
 
 	LStringPipe p;
 	for (int i=0; i<Info.Length(); i++)
 	{
 		LDateTime dt;
 		dt = Info[i].UtcTimeStamp;
 		char s[64];
 		dt.Get(s);
 		p.Print("%s, %i\n", s, Info[i].Offset);
 	}
 	LAutoString s(p.NewStr());
 	LgiMsg(0, s, "Test");
 */
 
 LDateTime LDateTime::LDstInfo::GetLocal()
 {
 	LDateTime d;
 	d.Set(Utc);
 	d.SetTimeZone(0, false);
 	d.SetTimeZone(Offset, true);
 	return d;
 }
 
 struct MonthHash : public LHashTbl<ConstStrKey<char,false>,int>
 {
 	MonthHash()
 	{
 		for (int i=0; i<CountOf(LDateTime::MonthsShort); i++)
 			Add(LDateTime::MonthsShort[i], i + 1);
 
 		for (int i=0; i<CountOf(LDateTime::MonthsLong); i++)
 			Add(LDateTime::MonthsLong[i], i + 1);
 	}
 };
 
 LString::Array Zdump;
 
 bool LDateTime::GetDaylightSavingsInfo(LArray<LDstInfo> &Info, LDateTime &Start, LDateTime *End)
 {
 	bool Status = false;
 	
 	#if defined(WIN32)
 
 		TIME_ZONE_INFORMATION Tzi;
 		auto r = GetTimeZoneInformation(&Tzi);
 		if (r > TIME_ZONE_ID_UNKNOWN)
 		{
 			Info.Length(0);
 
 			// Find the dates for the previous year from Start. This allows
 			// us to cover the start of the current year.
 			LDateTime s = ConvertSysTime(Tzi.StandardDate, Start.Year() - 1);
 			LDateTime d = ConvertSysTime(Tzi.DaylightDate, Start.Year() - 1);
 
 			// Create initial Info entry, as the last change in the previous year
 			auto *i = &Info.New();
 			if (s < d)
 			{
 				// Year is: Daylight->Standard->Daylight
 				LDateTime tmp = d;
 				i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 				tmp.AddMinutes(-i->Offset);
 				i->Utc = tmp;
 			}
 			else
 			{
 				// Year is: Standard->Daylight->Standard
 				LDateTime tmp = s;
 				i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 				tmp.AddMinutes(-i->Offset);
 				i->Utc = tmp;
 			}
 				
 			for (auto y=Start.Year(); y<=(End?End->Year():Start.Year()); y++)
 			{
 				if (s < d)
 				{
 					// Cur year, first event: end of DST
 					i = &Info.New();
 					auto tmp = ConvertSysTime(Tzi.StandardDate, y);
 					i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 
 					// Cur year, second event: start of DST
 					i = &Info.New();
 					tmp = ConvertSysTime(Tzi.DaylightDate, y);
 					i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 				}
 				else
 				{
 					// Cur year, first event: start of DST
 					i = &Info.New();
 					auto tmp = ConvertSysTime(Tzi.DaylightDate, Start.Year());
 					i->Offset = -(Tzi.Bias + Tzi.DaylightBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 
 					// Cur year, second event: end of DST
 					i = &Info.New();
 					tmp = ConvertSysTime(Tzi.StandardDate, Start.Year());
 					i->Offset = -(Tzi.Bias + Tzi.StandardBias);
 					tmp.AddMinutes(-i->Offset);
 					i->Utc = tmp;
 				}
 			}
 
 			Status = true;
 		}
 	
 	#elif defined(MAC)
 	
 		LDateTime From = Start;
 		From.AddMonths(-6);
 		LDateTime To = End ? *End : Start;
 		To.AddMonths(6);
 		auto ToUnix = To.GetUnix();
 
 		auto tz = [NSTimeZone systemTimeZone];
 		auto startDate = [[NSDate alloc] initWithTimeIntervalSince1970:(From.Ts() / Second64Bit) - Offset1800];
 		while (startDate)
 		{
 			auto next = [tz nextDaylightSavingTimeTransitionAfterDate:startDate];
 			auto &i = Info.New();
 			
 			auto nextTs = [next timeIntervalSince1970];
 			i.UtcTimeStamp = (nextTs + Offset1800) * Second64Bit;
 			i.Offset = (int)([tz secondsFromGMTForDate:[next dateByAddingTimeInterval:60]]/60);
 			
 			#if DEBUG_DST_INFO
 			{
 				LDateTime dt;
 				dt.Set(i.UtcTimeStamp);
 				LgiTrace("%s:%i - Ts=%s Off=%i\n", _FL, dt.Get().Get(), i.Offset);
 			}
 			#endif
 
 			if (nextTs >= ToUnix)
 				break;
 
 			[startDate release];
 			startDate = next;
 		}
 		if (startDate)
 			[startDate release];
 
 	#elif USE_ZDUMP
 
 		if (!Zdump.Length())
 		{
 			static bool First = true;
 			
 			auto linkLoc = "/etc/localtime";
 			#if defined(LINUX)
 				auto zoneLoc = "/usr/share/zoneinfo";
 			#elif defined(HAIKU)
 				auto zoneLoc = "/boot/system/data/zoneinfo";
 			#else
 				#error "Impl me"
 			#endif
 
 			if (!LFileExists(linkLoc))
 			{
 				if (First)
 				{
 					LgiTrace("%s:%i - LDateTime::GetDaylightSavingsInfo error: '%s' doesn't exist.\n"
 							 "    It should link to something in the '%s' tree.\n",
 							 _FL,
 							 linkLoc,
 							 zoneLoc);
 					#ifdef HAIKU
 					LgiTrace("    To fix that: pkgman install timezone_data and then create the '%s' link.\n", linkLoc);
 					#endif
 				}
 				return First = false;
 			}
 
 			auto f = popen(LString::Fmt("zdump -v %s", linkLoc), "r");
 			if (f)
 			{
 				char s[1024];
 				size_t r;
 				LStringPipe p(1024);
 				while ((r = fread(s, 1, sizeof(s), f)) > 0)
 					p.Write(s, (int)r);
 
 				fclose(f);
 				Zdump = p.NewLStr().Split("\n");
 			}
 			else
 			{
 				if (First)
 				{
 					LgiTrace("%s:%i - LDateTime::GetDaylightSavingsInfo error: zdump didn't run.\n", _FL);
 					#ifdef HAIKU
 					LgiTrace("To fix that: pkgman install timezone_data\n");
 					#endif
 				}
 				return First = false;
 			}
 		}
 			
 		MonthHash Lut;
 		LDateTime Prev;
 		int PrevOff = 0;
 		for (auto Line: Zdump)
 		{
 			auto l = Line.SplitDelimit(" \t");
 			if (l.Length() >= 16 &&
 				l[0].Equals("/etc/localtime"))
 			{
 				// /etc/localtime  Sat Oct  3 15:59:59 2037 UTC = Sun Oct  4 01:59:59 2037 EST isdst=0 gmtoff=36000
 				// 0               1   2    3 4        5    6   7 8   9    10 11      12   13  14      15
 				
 				LDateTime Utc;
 				Utc.Year(l[5].Int());
 
 				#if DEBUG_DST_INFO
 				if (Utc.Year() < 2020)
 					continue;
 				// printf("DST: %s\n", Line.Get());
 				#endif				
 
 				auto Tm = l[4].SplitDelimit(":");
 				if (Tm.Length() != 3)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Tm '%s' has wrong parts: %s\n", _FL, l[4].Get(), Line.Get());
 					#endif
 					continue;
 				}
 
 				Utc.Hours(Tm[0].Int());
 				Utc.Minutes(Tm[1].Int());
 				Utc.Seconds(Tm[2].Int());
 				if (Utc.Minutes() < 0)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Mins is zero: %s\n", _FL, l[4].Get());
 					#endif
 					continue;
 				}
 
 				int m = Lut.Find(l[2]);
 				if (!m)
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown month '%s'\n", _FL, l[2].Get());
 					#endif
 					continue;
 				}
 
 				Utc.Day(l[3].Int());
 				Utc.Month(m);
 
 				LString Var, Val;
 				if (!ParseValue(l[14], Var, Val) ||
 					Var != "isdst")
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown value for isdst\n", _FL);
 					#endif
 					continue;
 				}
 				
 				if (!ParseValue(l[15], Var, Val) ||
 					Var != "gmtoff")
 				{
 					#if DEBUG_DST_INFO
 					printf("%s:%i - Unknown value for isdst\n", _FL);
 					#endif
 					continue;
 				}
 				
 				int Off = atoi(Val) / 60;
 
 				if (Utc.Ts().Valid() == 0)
 					continue;
 
 				if (Prev.Year() &&
 					Prev < Start &&
 					Start < Utc)
 				{
 					// Emit initial entry for 'start'
 					auto &inf = Info.New();
 					Prev.Get(inf.Utc);
 					inf.Offset = PrevOff;
 					#if DEBUG_DST_INFO
 					printf("Info: Start=%s %i\n", Prev.Get().Get(), inf.Offset);
 					#endif
 				}
 				
 				if (Utc > Start)
 				{
 					// Emit furthur entries for DST events between start and end.
 					auto &inf = Info.New();
 					Utc.Get(inf.Utc);
 					inf.Offset = Off;
 					#if DEBUG_DST_INFO
 					printf("Info: Next=%s %i\n", Utc.Get().Get(), inf.Offset);
 					#endif
 					
 					if (End && Utc > *End)
 					{
 						// printf("Utc after end: %s > %s\n", Utc.Get().Get(), End->Get().Get());
 						break;
 					}
 				}
 
 				Prev = Utc;
 				PrevOff = Off;
 			}
 		}
 		Status = Info.Length() > 1;
 
 	#elif defined(HAIKU)
 
 		LTimeZoneInfo tzinfo;
 		
 		if (!tzinfo.Read())
 		{
 			#if DEBUG_DST_INFO
 			LgiTrace("%s:%i - info read failed.\n", _FL);
 			#endif
 			return false;
 		}
 		
 		Status = tzinfo.GetDaylightSavingsInfo(Info, Start, End);
 		#if DEBUG_DST_INFO
 		if (!Status)
 			printf("%s:%i - GetDaylightSavingsInfo failed.\n", _FL);
 		#endif
 		
 	
 	#else
 
 		LAssert(!"Not implemented.");
 
 	#endif
 
 	return Status;
 }
 
 bool LDateTime::DstToLocal(LArray<LDstInfo> &Dst, LDateTime &dt)
 {
 	if (dt.GetTimeZone())
 	{
 		LAssert(!"Should be a UTC date.");
 		return true;
 	}
 
 	#if DEBUG_DST_INFO
 	LgiTrace("DstToLocal: %s\n", dt.Get().Get());
 	#endif
 	LAssert(Dst.Length() > 1); // Needs to have at least 2 entries...?
 	for (size_t i=0; i<Dst.Length()-1; i++)
 	{
 		auto &a = Dst[i];
 		auto &b = Dst[i+1];
 		LDateTime start, end;
 		start.Set(a.Utc);
 		end.Set(b.Utc);
 
 		auto InRange = dt >= start && dt < end;
 		if (InRange)
 		{
 			dt.SetTimeZone(a.Offset, true);
 			#if DEBUG_DST_INFO
 			LgiTrace("\tRng[%i]: %s -> %s, SetTimeZone(%g), dt=%s\n",
 				(int)i,
 				start.Get().Get(), end.Get().Get(),
 				(double)a.Offset/60.0,
 				dt.Get().Get());
 			#endif
 			return true;
 		}
 	}
 
 	auto Last = Dst.Last();
 	LDateTime d;
 	d.Set(Last.Utc);
 	if (dt >= d && dt.Year() == d.Year())
 	{
 		// If it's after the last DST change but in the same year... it's ok...
 		// Just use the last offset.
 		dt.SetTimeZone(Last.Offset, true);
 		return true;
 	}
 
 	#if DEBUG_DST_INFO
 	for (auto d: Dst)
 		LgiTrace("Dst: %s = %i\n", d.GetLocal().Get().Get(), d.Offset);
 	#endif
 	LgiTrace("%s:%i - No valid DST range for: %s\n", _FL, dt.Get().Get());
 	LAssert(!"No valid DST range for this date.");
 	return false;
 }
 
 int LDateTime::DayOfWeek() const
 {
 	int Index = 0;
 	int Day = IsLeapYear() ? 29 : 28;
 
 	switch (_Year / 100)
 	{
 		case 19:
 		{
 			Index = 3;
 			break;
 		}
 		case 20:
 		{
 			Index = 2;
 			break;
 		}
 	}
 
 	// get year right
 	int y = _Year % 100;
 	int r = y % 12;
 	Index = (Index + (y / 12) + r + (r / 4)) % 7;
 	
 	// get month right
 	if (_Month % 2 == 0)
 	{
 		// even month
 		if (_Month > 2) Day = _Month;
 	}
 	else
 	{
 		// odd month
 		switch (_Month)
 		{
 			case 1:
 			{
 				Day = 31;
 				if (IsLeapYear())
 				{
 					Index = Index > 0 ? Index - 1 : Index + 6;
 				}
 				break;
 			}
 			case 11:
 			case 3:
 			{
 				Day = 7;
 				break;
 			}
 			case 5:
 			{
 				Day = 9;
 				break;
 			}
 			case 7:
 			{
 				Day = 11;
 				break;
 			}
 			case 9:
 			{
 				Day = 5;
 				break;
 			}
 		}
 	}
 
 	// get day right
 	int Diff = Index - (Day - _Day);
 	while (Diff < 0) Diff += 7;
 
 	return Diff % 7;
 }
 
 LDateTime LDateTime::Now()
 {
 	LDateTime dt;
 	dt.SetNow();
 	return dt;
 }
 
 LDateTime &LDateTime::SetNow()
 {
     #ifdef WIN32
 
 		SYSTEMTIME stNow;
 		auto sysTz = SystemTimeZone();
 
 		if (_Tz == sysTz)
 			GetLocalTime(&stNow);
 		else
 			GetSystemTime(&stNow);
 
 		#if 1
-			_Day   = stNow.wDay;
-			_Month = stNow.wMonth;
-			_Year  = stNow.wYear;
-
-			_Hours     = stNow.wHour;
-			_Minutes   = stNow.wMinute;
-			_Seconds   = stNow.wSecond;
-			_Thousands = stNow.wMilliseconds;
+			
+			*this = stNow;
 			if (_Tz && _Tz != sysTz)
 			{
 				// Adjust to this objects timezone...
 				auto tz = _Tz;
 				_Tz = 0;
 				SetTimeZone(tz, true);
 			}
 
 		#else
 			// This is actually less efficient.
 			FILETIME ftNow;
 			SystemTimeToFileTime(&stNow, &ftNow);
 			uint64 i64 = ((uint64)ftNow.dwHighDateTime << 32) | ftNow.dwLowDateTime;
 			OsTime(i64);
 		#endif
     
     #else
 
 		time_t now;
 		time(&now);
 		struct tm *time = localtime(&now);
 		if (time)
 			*this = time;
 		#ifndef LGI_STATIC
 		else
 		{
     		LgiTrace("%s:%i - Error: localtime failed, now=%u\n", _FL, now);
 		}
 		#endif
 	
 	#endif
 
 	return *this;
 }
 
 #define Convert24HrTo12Hr(h)			( (h) == 0 ? 12 : (h) > 12 ? (h) % 12 : (h) )
 #define Convert24HrToAmPm(h)		( (h) >= 12 ? "p" : "a" )
 
 LString LDateTime::GetDate() const
 {
 	char s[32];
 	int Ch = GetDate(s, sizeof(s));
 	return LString(s, Ch);
 }
 
 int LDateTime::GetDate(char *Str, size_t SLen) const
 {
 	int Ch = 0;
 
 	if (Str && SLen > 0)
 	{
 		switch (_Format & GDTF_DATE_MASK)
 		{
 			case GDTF_MONTH_DAY_YEAR:
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_MONTH_LEADINGZ?"%2.2i"  :"%i"  , _Month);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_DAY_LEADINGZ  ?"%c%2.2i":"%c%i", DefaultSeparator, _Day);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, "%c%i", DefaultSeparator, _Year);
 				break;
 			default:
 			case GDTF_DAY_MONTH_YEAR:
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_DAY_LEADINGZ  ?"%2.2i"  :"%i"  , _Day);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_MONTH_LEADINGZ?"%c%2.2i":"%c%i", DefaultSeparator, _Month);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, "%c%i", DefaultSeparator, _Year);
 				break;
 			case GDTF_YEAR_MONTH_DAY:
 				Ch += sprintf_s(Str+Ch, SLen-Ch, "%i", _Year);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_MONTH_LEADINGZ?"%c%2.2i":"%c%i", DefaultSeparator, _Month);
 				Ch += sprintf_s(Str+Ch, SLen-Ch, _Format&GDTF_DAY_LEADINGZ  ?"%c%2.2i":"%c%i", DefaultSeparator, _Day);
 				break;
 		}
 	}
 	
 	return Ch;
 }
 
 LString LDateTime::GetTime() const
 {
 	char s[32];
 	int Ch = GetTime(s, sizeof(s));
 	return LString(s, Ch);
 }
 
 int LDateTime::GetTime(char *Str, size_t SLen) const
 {
 	int Ch = 0;
 
 	if (Str && SLen > 0)
 	{
 		switch (_Format & GDTF_TIME_MASK)
 		{
 			case GDTF_12HOUR:
 			default:
 			{
 				Ch += sprintf_s(Str, SLen, "%i:%2.2i:%2.2i%s", Convert24HrTo12Hr(_Hours), _Minutes, _Seconds, Convert24HrToAmPm(_Hours));
 				break;
 			}
 			case GDTF_24HOUR:
 			{
 				Ch += sprintf_s(Str, SLen, "%i:%2.2i:%2.2i", _Hours, _Minutes, _Seconds);
 				break;
 			}
 		}
 	}
 	
 	return Ch;
 }
 
 LTimeStamp LDateTime::Ts() const
 {
 	LTimeStamp ts;
 	Get(ts);
 	return ts;
 }
 
 uint64_t LDateTime::GetUnix()
 {
 	LTimeStamp s;
 	Get(s);
 	#if defined(WINDOWS)
 	return s.Get() / LDateTime::Second64Bit / 116445168000000000LL;
 	#else
 	return s.Get() / LDateTime::Second64Bit - Offset1800;
 	#endif
 }
 
 bool LDateTime::SetUnix(uint64 s)
 {
 	#if defined(WINDOWS)
 	return Set(s * LDateTime::Second64Bit + 116445168000000000LL);
 	#else
 	return Set((s + Offset1800) * LDateTime::Second64Bit);
 	#endif
 }
 
 bool LDateTime::Set(const LTimeStamp &s)
 {
 	#if defined WIN32
 
 		FILETIME Utc;
 		SYSTEMTIME System;
 
-		// Compare the non-year parts of the SYSTEMTIMEs
-		auto SysCmp = [](SYSTEMTIME &a, SYSTEMTIME &b)
-		{
-			#define CMP(name) if (auto d = a.name - b.name) return d;
-			CMP(wMonth); CMP(wDay); CMP(wHour); CMP(wMinute); CMP(wSecond); CMP(wMilliseconds);
-			return 0;
-		};
-
 		// Adjust to the desired timezone
 		uint64 u = s.Get();
 		Utc.dwHighDateTime = u >> 32;
 		Utc.dwLowDateTime = u & 0xffffffff;
 
 		if (!FileTimeToSystemTime(&Utc, &System))
 			return false;
-			
-		if (_Tz)
-		{
-			// 'System' is currently in 'UTC' but we want the local version of the time,
-			// not in the _Tz timezone, but the effective timezone for that
-			// actual moment in question, which could have a different DST offset.
-			TIME_ZONE_INFORMATION tzi = {};
-			if (GetTimeZoneInformationForYear(System.wYear, NULL, &tzi))
-			{
-				auto order = SysCmp(tzi.DaylightDate, tzi.StandardDate);
-				// order > 0 = DaylightDate is after StandardDate
-				// order < 0 = DaylightDate is before StandardDate
-				LAssert(order != 0);
 
-				auto a = SysCmp(System, tzi.StandardDate);
-				// a > 0 = System is after StandardDate
-				// a < 0 = System is before StandardDate
-
-				auto b = SysCmp(System, tzi.DaylightDate);
-				// b > 0 = System is after DaylightDate
-				// b < 0 = System is before DaylightDate
-
-				_Tz = (int16)-tzi.Bias;
-				if (order > 0)
-				{
-					// year is: DST -> Normal -> DST
-					if (a < 0 || b > 0)
-						_Tz -= (int16)tzi.DaylightBias;
-				}
-				else
-				{
-					// year is: Normal -> DST -> Normal
-					if (a < 0 && b > 0)
-						_Tz -= (int16)tzi.DaylightBias;
-				}
-
-				u += _Tz * 60 * Second64Bit;
-				Utc.dwHighDateTime = u >> 32;
-				Utc.dwLowDateTime = u & 0xffffffff;
-				if (!FileTimeToSystemTime(&Utc, &System))
-					return false;
-			}
-			else
-			{
-				_Tz = 0; // Can't convert to localtime...
-			}
-		}
-
-		_Year = System.wYear;
-		_Month = System.wMonth;
-		_Day = System.wDay;
-
-		_Hours = System.wHour;
-		_Minutes = System.wMinute;
-		_Seconds = System.wSecond;
-		_Thousands = System.wMilliseconds;
-
+		*this = System;
 		return true;
 
 	#else
 
 		Set(s.Unix());
 		_Thousands = s.Get() % Second64Bit;
 		return true;
 	
 	#endif
 }
 
 bool LDateTime::Set(struct tm *t, bool inferTimezone)
 {
 	if (!t)
 		return false;
 		
 	_Year  = t->tm_year + 1900;
 	_Month = t->tm_mon + 1;
 	_Day   = t->tm_mday;
 
 	_Hours     = t->tm_hour;
 	_Minutes   = t->tm_min;
 	_Seconds   = t->tm_sec;
 	_Thousands = 0;
 	
 	if (inferTimezone)
 	{
 		#ifdef WINDOWS
 		#define timegm _mkgmtime
 		#endif
 		auto diff = timegm(t) - mktime(t);
 		_Tz = (int16)(diff / 60);
 	}
 
 	return true;
 }
 
 bool LDateTime::Set(time_t tt)
 {
 	struct tm *t;
 
 	if (_Tz)
 		tt += _Tz * 60;
 
 #if !defined(_MSC_VER) || _MSC_VER < _MSC_VER_VS2005
 	t = gmtime(&tt);
 	if (t)
 #else
 	struct tm tmp;
 	if (_gmtime64_s(t = &tmp, &tt) == 0)
 #endif
 	{
 		return Set(t, false);
 	}
 
 	return false;
 }
 
 uint64_t LDateTime::OsTime() const
 {
 	#ifdef WINDOWS
 	
 		FILETIME Utc;
-		SYSTEMTIME System;
-
-		System.wYear			= _Year;
-		System.wMonth			= limit(_Month, 1, 12);
-		System.wDay				= limit(_Day, 1, 31);
-		System.wHour			= limit(_Hours, 0, 23);
-		System.wMinute			= limit(_Minutes, 0, 59);
-		System.wSecond			= limit(_Seconds, 0, 59);
-		System.wMilliseconds	= limit(_Thousands, 0, 999);
-		System.wDayOfWeek		= DayOfWeek();
+		SYSTEMTIME System = *this;
 
 		if (SystemTimeToFileTime(&System, &Utc))
 		{
 			uint64_t s = ((uint64_t)Utc.dwHighDateTime << 32) | Utc.dwLowDateTime;
 
 			if (_Tz)
 				// Adjust for timezone
 				s -= (int64)_Tz * 60 * Second64Bit;
 
 			return s;
 		}
 		else
 		{
 			DWORD Err = GetLastError();
 			LAssert(!"SystemTimeToFileTime failed.");
 		}
 	
 	#else
 	
 		if (_Year < MIN_YEAR)
 			return 0;
 
 		struct tm t;
 		ZeroObj(t);
 		t.tm_year	= _Year - 1900;
 		t.tm_mon	= _Month - 1;
 		t.tm_mday	= _Day;
 
 		t.tm_hour	= _Hours;
 		t.tm_min	= _Minutes;
 		t.tm_sec	= _Seconds;
 		t.tm_isdst	= -1;
 		
 		time_t sec = timegm(&t);
 		if (sec == -1)
 			return 0;
 		
 		if (_Tz)
 		{
 			// Adjust the output to UTC from the current timezone.
 			sec -= _Tz * 60;
 		}
 		
 		return sec;
 	
 	#endif
 
 	return 0;
 }
 
 bool LDateTime::OsTime(uint64_t ts)
 {
 	return Set((time_t)ts);
 }
 
 bool LDateTime::Get(LTimeStamp &s) const
 {
 	#ifdef WINDOWS
 	
 		if (!IsValid())
 		{
 			LAssert(!"Needs a valid date.");
 			return false;
 		}
 
 		s.Ref() = OsTime();
 		if (!s.Valid())
 			return false;
 
 		return true;
 	
 	#else
 	
 		if (_Year < MIN_YEAR)
 			return false;
 
 		auto sec = OsTime();
 		s.Ref() = (uint64)(sec + Offset1800) * Second64Bit + _Thousands;
 		
 		return true;
 	
 	#endif
 }
 
 LString LDateTime::Get() const
 {
 	char buf[32];
 	int Ch = GetDate(buf, sizeof(buf));
 	buf[Ch++] = ' ';
 	Ch += GetTime(buf+Ch, sizeof(buf)-Ch);
 	return LString(buf, Ch);
 }
 
 void LDateTime::Get(char *Str, size_t SLen) const
 {
 	if (Str)
 	{
 		GetDate(Str, SLen);
 		size_t len = strlen(Str);
 		if (len < SLen - 1)
 		{
 			Str[len++] = ' ';
 			GetTime(Str+len, SLen-len);
 		}
 	}
 }
 
 bool LDateTime::Set(const char *Str)
 {
 	if (!Str)
 		return false;
 	if (Strlen(Str) > 100)
 		return false;
 
 	char Local[256];
 	strcpy_s(Local, sizeof(Local), Str);
 	char *Sep = strchr(Local, ' ');
 	if (Sep)
 	{
 		*Sep++ = 0;
 		if (!SetTime(Sep))
 			return false;
 	}
 
 	if (!SetDate(Local))
 		return false;
 
 	return true;
 }
 
 void LDateTime::Month(char *m)
 {
 	int i = IsMonth(m);
 	if (i >= 0)
 		_Month = i + 1;	
 }
 
 int DateComponent(const char *s)
 {
 	int64 i = Atoi(s);
 	return i ? (int)i : LDateTime::IsMonth(s);
 }
 
 bool LDateTime::SetDate(const char *Str)
 {
 	bool Status = false;
 
 	if (Str)
 	{
 		auto T = LString(Str).SplitDelimit("/-.,_\\");
 		if (T.Length() == 3)
 		{
 			int i[3] = { DateComponent(T[0]), DateComponent(T[1]), DateComponent(T[2]) };
 			int fmt = _Format & GDTF_DATE_MASK;
 			
 			// Do some guessing / overrides.
 			// Don't let _Format define the format completely.
 			if (i[0] > 1000)
 			{
 				fmt = GDTF_YEAR_MONTH_DAY;
 			}
 			else if (i[2] > 1000)
 			{
 				if (i[0] > 12)
 					fmt = GDTF_DAY_MONTH_YEAR;
 				else if (i[1] > 12)
 					fmt = GDTF_MONTH_DAY_YEAR;
 			}
 
 			switch (fmt)
 			{
 				case GDTF_MONTH_DAY_YEAR:
 				{
 					_Month = i[0];
 					_Day = i[1];
 					_Year = i[2];
 					break;
 				}
 				case GDTF_DAY_MONTH_YEAR:
 				{
 					_Day = i[0];
 					_Month = i[1];
 					_Year = i[2];
 					break;
 				}
 				case GDTF_YEAR_MONTH_DAY:
 				{
 					_Year = i[0];
 					_Month = i[1];
 					_Day = i[2];
 					break;
 				}
 				default:
 				{
 					_Year = i[2];
 					if ((DefaultFormat & GDTF_DATE_MASK) == GDTF_MONTH_DAY_YEAR)
 					{
 						// Assume m/d/yyyy
 						_Day = i[1];
 						_Month = i[0];
 					}
 					else
 					{
 						// Who knows???
 						// Assume d/m/yyyy
 						_Day = i[0];
 						_Month = i[1];
 					}
 					break;
 				}
 			}
 
 			if (_Year < 100)
 			{
 				LAssert(_Day < 1000 && _Month < 1000);
 				if (_Year >= 80)
 					_Year += 1900;
 				else
 					_Year += 2000;
 			}
 
 			Status = true;
 		}
 		else
 		{
 			// Fall back to fuzzy matching
 			auto T = LString(Str).SplitDelimit(" ,");
 			MonthHash Lut;
 			int FMonth = 0;
 			int FDay = 0;
 			int FYear = 0;
 			for (unsigned i=0; i<T.Length(); i++)
 			{
 				char *p = T[i];
 				if (IsDigit(*p))
 				{
 					int i = atoi(p);
 					if (i > 0)
 					{
 						if (i >= 1000)
 						{
 							FYear = i;
 						}
 						else if (i < 32)
 						{
 							FDay = i;
 						}
 					}
 				}
 				else
 				{
 					int i = Lut.Find(p);
 					if (i)
 						FMonth = i;
 				}
 			}
 			
 			if (FMonth && FDay)
 			{
 				Day(FDay);
 				Month(FMonth);
 			}
 			if (FYear)
 			{
 				Year(FYear);
 			}
 			else
 			{
 				LDateTime Now;
 				Now.SetNow();
 				Year(Now.Year());
 			}
 		}
 	}
 
 	return Status;
 }
 
 bool LDateTime::SetTime(const char *Str)
 {
 	if (!Str)
 		return false;
 
 	auto T = LString(Str).SplitDelimit(":.");
 	if (T.Length() < 2 || T.Length() > 4)
 		return false;
 
 	#define SetClamp(out, in, minVal, maxVal) \
 		out = (int)Atoi(in.Get(), 10, 0); \
 		if (out > maxVal) out = maxVal; \
 		else if (out < minVal) out = minVal
 
 	SetClamp(_Hours, T[0], 0, 23);
 	SetClamp(_Minutes, T[1], 0, 59);
 	SetClamp(_Seconds, T[2], 0, 59);
 	_Thousands = 0;
 
 	const char *s = T.Last();
 	if (s)
 	{
 		if (strchr(s, 'p') || strchr(s, 'P'))
 		{
 			if (_Hours != 12)
 				_Hours += 12;
 		}
 		else if (strchr(s, 'a') || strchr(s, 'A'))
 		{
 			if (_Hours == 12)
 				_Hours -= 12;
 		}
 	}
 
 	if (T.Length() > 3)
 	{
 		LString t = "0.";
 		t += s;
 		_Thousands = (int) (t.Float() * 1000);
 	}
 	return true;
 }
 
 int LDateTime::IsWeekDay(const char *s)
 {
 	for (unsigned n=0; n<CountOf(WeekdaysShort); n++)
 	{
 		if (!_stricmp(WeekdaysShort[n], s) ||
 			!_stricmp(WeekdaysLong[n], s))
 			return n;
 	}
 	return -1;
 }
 
 int LDateTime::IsMonth(const char *s)
 {
 	for (unsigned n=0; n<CountOf(MonthsShort); n++)
 	{
 		if (!_stricmp(MonthsShort[n], s) ||
 			!_stricmp(MonthsLong[n], s))
 			return n;
 	}
 	return -1;
 }
 
 bool LDateTime::Parse(LString s)
 {
 	LString::Array a = s.Split(" ");
 
 	Empty();
 
 	for (unsigned i=0; i<a.Length(); i++)
 	{
 		const char *c = a[i];
 		if (IsDigit(*c))
 		{
 			if (strchr(c, ':'))
 			{
 				LString::Array t = a[i].Split(":");
 				if (t.Length() == 3)
 				{
 					Hours((int)t[0].Int());
 					Minutes((int)t[1].Int());
 					Seconds((int)t[2].Int());
 				}
 			}
 			else if (strchr(c, '-') || strchr(c, '/'))
 			{
 				LString::Array t = a[i].SplitDelimit("-/");
 				if (t.Length() == 3)
 				{
 					// What order are they in?
 					if (t[0].Length() >= 4)
 					{
 						Year((int)t[0].Int());
 						Month((int)t[1].Int());
 						Day((int)t[2].Int());
 					}
 					else if (t[2].Length() >= 4)
 					{
 						Day((int)t[0].Int());
 						Month((int)t[1].Int());
 						Year((int)t[2].Int());
 					}
 					else
 					{
 						LAssert(!"Unknown date format?");
 						return false;
 					}
 				}
 			}
 			else if (a[i].Length() == 4)
 				Year((int)a[i].Int());
 			else if (!Day())
 				Day((int)a[i].Int());
 		}
 		else if (IsAlpha(*c))
 		{
 			int WkDay = IsWeekDay(c);
 			if (WkDay >= 0)
 				continue;
 				
 			int Mnth = IsMonth(c);
 			if (Mnth >= 0)
 				Month(Mnth + 1);
 		}
 		else if (*c == '-' || *c == '+')
 		{
 			c++;
 			if (strlen(c) == 4)
 			{
 				// Timezone..
 				int64 Tz = a[i].Int();
 				int Hrs = (int) (Tz / 100);
 				int Min = (int) (Tz % 100);
 				SetTimeZone(Hrs * 60 + Min, false);
 			}
 		}
 	}
 
 	return IsValid();
 }
 
 int LDateTime::Sizeof()
 {
 	return sizeof(int) * 7;
 }
 
 bool LDateTime::Serialize(LFile &f, bool Write)
 {
 	int32 i;
 
 	if (Write)
 	{
 		#define wf(fld) i = fld; f << i;
 		wf(_Day);
 		wf(_Month);
 		wf(_Year);
 		wf(_Thousands);
 		wf(_Seconds);
 		wf(_Minutes);
 		wf(_Hours);
 	}
 	else
 	{
 		#define rf(fld) f >> i; fld = i;
 		rf(_Day);
 		rf(_Month);
 		rf(_Year);
 		rf(_Thousands);
 		rf(_Seconds);
 		rf(_Minutes);
 		rf(_Hours);
 	}
 
 	return true;
 }
 
 /*
 bool LDateTime::Serialize(ObjProperties *Props, char *Name, bool Write)
 {
 	#ifndef LGI_STATIC
 	if (Props && Name)
 	{
 		struct _Date
 		{
 			uint8_t Day;
 			uint8_t Month;
 			int16_t Year;
 			uint8_t Hour;
 			uint8_t Minute;
 			uint16_t ThouSec;
 		};
 
 		LAssert(sizeof(_Date) == 8);
 
 		if (Write)
 		{
 			_Date d;
 
 			d.Day = _Day;
 			d.Month = _Month;
 			d.Year = _Year;
 			d.Hour = _Hours;
 			d.Minute = _Minutes;
 			d.ThouSec = (_Seconds * 1000) + _Thousands;
 
 			return Props->Set(Name, &d, sizeof(d));
 		}
 		else // Read
 		{
 			void *Ptr;
 			int Len;
 
 			if (Props->Get(Name, Ptr, Len) &&
 				sizeof(_Date) == Len)
 			{
 				_Date *d = (_Date*) Ptr;
 
 				_Day = d->Day;
 				_Month = d->Month;
 				_Year = d->Year;
 				_Hours = d->Hour;
 				_Minutes = d->Minute;
 				_Seconds = d->ThouSec / 1000;
 				_Thousands = d->ThouSec % 1000;
 
 				return true;
 			}
 		}
 	}
 	#endif
 
 	return false;
 }
 */
 
 int LDateTime::Compare(const LDateTime *Date) const
 {
 	// this - *Date
 	auto ThisTs = IsValid() ? Ts() : LTimeStamp();
 	auto DateTs = Date->IsValid() ? Date->Ts() : LTimeStamp();
 
 	if (ThisTs.Get() & 0x800000000000000)
 	{
 		Get(ThisTs);
 	}
 
 	// If these ever fire, the cast to int64_t will overflow
 	LAssert((ThisTs.Get() & 0x800000000000000) == 0);
 	LAssert((DateTs.Get() & 0x800000000000000) == 0);
 
 	auto Diff = ThisTs - DateTs;
 	if (Diff < 0)
 		return -1;
 
 	return Diff > 0 ? 1 : 0;
 }
 
 #define DATETIME_OP(op) \
 	bool LDateTime::operator op(const LDateTime &dt) const \
 	{ \
 		auto a = Ts(); \
 		auto b = dt.Ts(); \
 		return a op b; \
 	}
 DATETIME_OP(<)
 DATETIME_OP(<=)
 DATETIME_OP(>)
 DATETIME_OP(>=)
 
 bool LDateTime::operator ==(const LDateTime &dt) const
 {
 	return	_Year == dt._Year &&
 			_Month == dt._Month &&
 			_Day == dt._Day &&
 			_Hours == dt._Hours &&
 			_Minutes == dt._Minutes &&
 			_Seconds == dt._Seconds &&
 			_Thousands == dt._Thousands;
 }
 
 bool LDateTime::operator !=(const LDateTime &dt) const
 {
 	return	_Year != dt._Year ||
 			_Month != dt._Month ||
 			_Day != dt._Day ||
 			_Hours != dt._Hours ||
 			_Minutes != dt._Minutes ||
 			_Seconds != dt._Seconds ||
 			_Thousands != dt._Thousands;
 }
 
 int LDateTime::DiffMonths(const LDateTime &dt)
 {
 	int a = (Year() * 12) + Month();
 	int b = (dt.Year() * 12) + dt.Month();
 	return b - a;
 }
 
 LDateTime LDateTime::operator -(const LDateTime &dt)
 {
     LTimeStamp a, b;
     Get(a);
     dt.Get(b);
 
     /// Resolution of a second when using 64 bit timestamps
     int64 Sec = Second64Bit;
     int64 Min = 60 * Sec;
     int64 Hr = 60 * Min;
     int64 Day = 24 * Hr;
     
     int64 d = (int64)a.Get() - (int64)b.Get();
     LDateTime r;
     r._Day = (int16) (d / Day);
     d -= r._Day * Day;
     r._Hours = (int16) (d / Hr);
     d -= r._Hours * Hr;
     r._Minutes = (int16) (d / Min);
     d -= r._Minutes * Min;
     r._Seconds = (int16) (d / Sec);
 	#ifdef WIN32
     d -= r._Seconds * Sec;
     r._Thousands = (int16) (d / 10000);
 	#else
 	r._Thousands = 0;
 	#endif
 
 	return r;
 }
 
 LDateTime LDateTime::operator +(const LDateTime &dt)
 {
 	LDateTime s = *this;
 
 	s.AddMonths(dt.Month());
 	s.AddDays(dt.Day());
 	s.AddHours(dt.Hours());
 	s.AddMinutes(dt.Minutes());
 	// s.AddSeconds(dt.Seconds());
 
 	return s;
 }
 
 LDateTime &LDateTime::operator =(const LDateTime &t)
 {
 	_Day = t._Day;
 	_Year = t._Year;
 	_Thousands = t._Thousands;
 	_Month = t._Month;
 	_Seconds = t._Seconds;
 	_Minutes = t._Minutes;
 	_Hours = t._Hours;
 	_Tz = t._Tz;
 	_Format = t._Format;
 
 	return *this;
 }
 
 LDateTime &LDateTime::operator =(struct tm *time)
 {
 	if (time)
 	{
 		_Seconds = time->tm_sec;
 		_Minutes = time->tm_min;
 		_Hours = time->tm_hour;
 		_Day = time->tm_mday;
 		_Month = time->tm_mon + 1;
 		_Year = time->tm_year + 1900;
 	}
 	else Empty();
 
 	return *this;
 }
 
 bool LDateTime::IsSameDay(LDateTime &d) const
 {
 	return	Day() == d.Day() &&
 			Month() == d.Month() &&
 			Year() == d.Year();
 }
 
 bool LDateTime::IsSameMonth(LDateTime &d) const
 {
 	return	Day() == d.Day() &&
 			Month() == d.Month();
 }
 
 bool LDateTime::IsSameYear(LDateTime &d) const
 {
 	return Year() == d.Year();
 }
 
 LDateTime LDateTime::StartOfDay() const
 {
 	LDateTime dt = *this;
 	dt.Hours(0);
 	dt.Minutes(0);
 	dt.Seconds(0);
 	dt.Thousands(0);
 	return dt;
 }
 
 LDateTime LDateTime::EndOfDay() const
 {
 	LDateTime dt = *this;
 	dt.Hours(23);
 	dt.Minutes(59);
 	dt.Seconds(59);
 	dt.Thousands(999);
 	return dt;
 }
 
 bool LDateTime::IsLeapYear(int Year) const
 {
 	if (Year < 0)
 		Year = _Year;
 
 	if (Year % 4 != 0)
 		return false;
 
 	if (Year % 400 == 0)
 		return true;
 
 	if (Year % 100 == 0)
 		return false;
 
 	return true;
 }
 
 int LDateTime::DaysInMonth() const
 {
 	if (_Month == 2 &&
 		IsLeapYear())
 	{
 		return 29;
 	}
 
 	short DaysInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 	return _Month >= 1 && _Month <= 12 ? DaysInMonth[_Month-1] : 0;
 }
 
 void LDateTime::AddSeconds(int64 Seconds)
 {
 	LTimeStamp i;
 	if (Get(i))
 	{
 		i.Ref() += Seconds * Second64Bit;
 		Set(i);
 	}
 }
 
 void LDateTime::AddMinutes(int64 Minutes)
 {
 	LTimeStamp i;
 	if (Get(i))
 	{
 		int64 delta = Minutes * 60 * Second64Bit;
 		i.Ref() += delta;
 		Set(i);
 	}
 }
 
 void LDateTime::AddHours(int64 Hours)
 {
 	LTimeStamp i;
 	if (Get(i))
 	{
 		i.Ref() += Hours * HourLength * Second64Bit;
 		Set(i);
 	}
 }
 
 bool LDateTime::AddDays(int64 Days)
 {
 	if (!Days)
 		return true;
 
 	LTimeStamp Ts;
 	if (!Get(Ts))
 		return false;
 
 	Ts.Ref() += Days * LDateTime::DayLength * Second64Bit;
 	bool b = Set(Ts);
 	return b;
 }
 
 void LDateTime::AddMonths(int64 Months)
 {
 	int64 m = _Month + Months;
 
 	do
 	{
 		if (m < 1)
 		{
 			_Year--;
 			m += 12;
 		}
 		else if (m > 12)
 		{
 			_Year++;
 			m -= 12;
 		}
 		else
 		{
 			break;
 		}
 	}
 	while (1);
 
 	_Month = (int16) m;
 	if (_Day > DaysInMonth())
 		_Day = DaysInMonth();
 }
 
 LString LDateTime::DescribePeriod(double seconds)
 {
 	int mins = (int) (seconds / 60);
 	seconds -= mins * 60;
 	int hrs = mins / 60;
 	mins -= hrs * 60;
 	int days = hrs / 24;
 	hrs -= days * 24;
 	
 	LString s;
 	if (days > 0)
 		s.Printf("%id %ih %im %is", days, hrs, mins, (int)seconds);
 	else if (hrs > 0)
 		s.Printf("%ih %im %is", hrs, mins, (int)seconds);
 	else if (mins > 0)
 		s.Printf("%im %is", mins, (int)seconds);
 	else
 		s.Printf("%is", (int)seconds);
 	return s;
 }
 
 LString LDateTime::DescribePeriod(LDateTime to)
 {
 	auto ThisTs = Ts();
 	auto ToTs = to.Ts();
 	auto diff = ThisTs < ToTs ? ToTs - ThisTs : ThisTs - ToTs;
 
 	auto seconds = (double)diff / LDateTime::Second64Bit;
 	return DescribePeriod(seconds);
 }
 
 int LDateTime::MonthFromName(const char *Name)
 {
 	if (Name)
 	{
 		for (int m=0; m<12; m++)
 		{
 			if (strnicmp(Name, MonthsShort[m], strlen(MonthsShort[m])) == 0)
 			{
 				return m + 1;
 				break;
 			}
 		}
 	}
 	
 	return -1;
 }
 
 bool LDateTime::Decode(const char *In)
 {
 	// Test data:
 	//
 	//		Tue, 6 Dec 2005 1:25:32 -0800
 	Empty();
 
 	if (!In)
 	{
 		LAssert(0);
 		return false;
 	}
 
 	bool Status = false;
 
 	// Tokenize delimited by whitespace
 	LString::Array T = LString(In).SplitDelimit(", \t\r\n");
 	if (T.Length() < 2)
 	{
 		if (T[0].IsNumeric())
 		{
 			// Some sort of timestamp?
 			uint64_t Ts = Atoi(T[0].Get());
 			if (Ts > 0)
 			{
 				return SetUnix(Ts);
 			}
 			else return false;
 		}
 		else
 		{
 			// What now?
 			return false;
 		}
 	}
 	else
 	{
 		bool GotDate = false;
 
 		for (unsigned i=0; i<T.Length(); i++)
 		{
 			LString &s = T[i];
 				
 			LString::Array Date;
 			if (!GotDate)
 				Date = s.SplitDelimit(".-/\\");
 			if (Date.Length() == 3)
 			{
 				if (Date[0].Int() > 31)
 				{
 					// Y/M/D?
 					Year((int)Date[0].Int());
 					Day((int)Date[2].Int());
 				}
 				else if (Date[2].Int() > 31)
 				{
 					// D/M/Y?
 					Day((int)Date[0].Int());
 					Year((int)Date[2].Int());
 				}
 				else
 				{
 					// Ambiguous year...
 					bool YrFirst = true;
 					if (Date[0].Length() == 1)
 						YrFirst = false;
 					// else we really can't tell.. just go with year first
 					if (YrFirst)
 					{
 						Year((int)Date[0].Int());
 						Day((int)Date[2].Int());
 					}
 					else
 					{
 						Day((int)Date[0].Int());
 						Year((int)Date[2].Int());
 					}
 
 					LDateTime Now;
 					Now.SetNow();
 					if (Year() + 2000 <= Now.Year())
 						Year(2000 + Year());
 					else
 						Year(1900 + Year());
 				}
 
 				if (Date[1].IsNumeric())
 					Month((int)Date[1].Int());
 				else
 				{
 					int m = MonthFromName(Date[1]);
 					if (m > 0)
 						Month(m);
 				}
 						
 				GotDate = true;
 				Status = true;
 			}
 			else if (s.Find(":") >= 0)
 			{
 				// whole time
 
 				// Do some validation
 				bool Valid = true;
 				for (char *c = s; *c && Valid; c++)
 				{
 					if (!(IsDigit(*c) || *c == ':'))
 						Valid = false;
 				}
 
 				if (Valid)
 				{
 					LString::Array Time = s.Split(":");
 					if (Time.Length() == 2 ||
 						Time.Length() == 3)
 					{
 						// Hour
 						int i = (int) Time[0].Int();
 						if (i >= 0)
 							Hours(i);
 						if (s.Lower().Find("p") >= 0)
 						{
 							if (Hours() < 12)
 								Hours(Hours() + 12);
 						}
 
 						// Minute
 						i = (int) Time[1].Int();
 						if (i >= 0)
 							Minutes(i);
 
 						if (Time.Length() == 3)
 						{
 							// Second
 							i = (int) Time[2].Int();
 							if (i >= 0)
 								Seconds(i);
 						}
 						
 						Status = true;
 					}
 				}
 			}
 			else if (IsAlpha(s(0)))
 			{
 				// text
 				int m = MonthFromName(s);
 				if (m > 0)
 					Month(m);
 			}
 			else if (strchr("+-", *s))
 			{
 				// timezone
 				DoTimeZone:
 				LDateTime Now;
 				double OurTmz = (double)Now.SystemTimeZone() / 60;
 
 				if (s &&
 					strchr("-+", *s) &&
 					strlen(s) == 5)
 				{
 					#if 1
 
 					int i = atoi(s);
 					int hr = i / 100;
 					int min = i % 100;
 					SetTimeZone(hr * 60 + min, false);
 
 					#else
 
 					// adjust for timezone
 					char Buf[32];
 					memcpy(Buf, s, 3);
 					Buf[3] = 0;
 
 					double TheirTmz = atof(Buf);
 					memcpy(Buf+1, s + 3, 2);
 
 					TheirTmz += (atof(Buf) / 60);
 					if (Tz)
 					{
 						*Tz = TheirTmz;
 					}
 
 					double AdjustHours = OurTmz - TheirTmz;
 
 					AddMinutes((int) (AdjustHours * 60));
 
 					#endif
 				}
 				else
 				{
 					// assume GMT
 					AddMinutes((int) (OurTmz * 60));
 				}
 			}
 			else if (s.IsNumeric())
 			{
 				int Count = 0;
 				for (char *c = s; *c; c++)
 				{
 					if (!IsDigit(*c))
 						break;
 					Count++;
 				}
 					
 				if (Count <= 2)
 				{
 					if (Day())
 					{
 						// We already have a day... so this might be
 						// a 2 digit year...
 						LDateTime Now;
 						Now.SetNow();
 						int Yr = atoi(s);
 						if (2000 + Yr <= Now.Year())
 							Year(2000 + Yr);
 						else
 							Year(1900 + Yr);
 					}
 					else
 					{
 						// A day number (hopefully)?
 						Day((int)s.Int());
 					}
 				}
 				else if (Count == 4)
 				{
 					if (!Year())
 					{
 						// A year!
 						Year((int)s.Int());
 						Status = true;
 					}
 					else
 					{
 						goto DoTimeZone;
 					}
 						
 					// My one and only Y2K fix
 					// d.Year((Yr < 100) ? (Yr > 50) ? 1900+Yr : 2000+Yr : Yr);
 				}
 			}
 		}
 	}
 
 	return Status;
 }
 
 bool LDateTime::GetVariant(const char *Name, LVariant &Dst, char *Array)
 {
 	LDomProperty p = LStringToDomProp(Name);
 	switch (p)
 	{
 		case DateYear: // Type: Int32
 			Dst = Year();
 			break;
 		case DateMonth: // Type: Int32
 			Dst = Month();
 			break;
 		case DateDay: // Type: Int32
 			Dst = Day();
 			break;
 		case DateHour: // Type: Int32
 			Dst = Hours();
 			break;
 		case DateMinute: // Type: Int32
 			Dst = Minutes();
 			break;
 		case DateSecond: // Type: Int32
 			Dst = Seconds();
 			break;
 		case DateDate: // Type: String
 		{
 			char s[32];
 			GetDate(s, sizeof(s));
 			Dst = s;
 			break;
 		}
 		case DateTime: // Type: String
 		{
 			char s[32];
 			GetTime(s, sizeof(s));
 			Dst = s;
 			break;
 		}
 		case TypeString: // Type: String
 		case DateDateAndTime: // Type: String
 		{
 			char s[32];
 			Get(s, sizeof(s));
 			Dst = s;
 			break;
 		}
 		case TypeInt: // Type: Int64
 		case DateTimestamp: // Type: Int64
 		{
 			LTimeStamp i;
 			if (Get(i))
 				Dst = (int64)i.Get();
 			break;
 		}
 		case DateSecond64Bit:
 		{
 			Dst = Second64Bit;
 			break;
 		}
 		default:
 		{
 			return false;
 		}
 	}
 	return true;
 }
 
 bool LDateTime::SetVariant(const char *Name, LVariant &Value, char *Array)
 {
 	LDomProperty p = LStringToDomProp(Name);
 	switch (p)
 	{
 		case DateYear:
 			Year(Value.CastInt32());
 			break;
 		case DateMonth:
 			Month(Value.CastInt32());
 			break;
 		case DateDay:
 			Day(Value.CastInt32());
 			break;
 		case DateHour:
 			Hours(Value.CastInt32());
 			break;
 		case DateMinute:
 			Minutes(Value.CastInt32());
 			break;
 		case DateSecond:
 			Seconds(Value.CastInt32());
 			break;
 		case DateDate:
 			SetDate(Value.Str());
 			break;
 		case DateTime:
 			SetTime(Value.Str());
 			break;
 		case DateDateAndTime:
 			Set(Value.Str());
 			break;
 		case DateTimestamp:
 			Set((uint64)Value.CastInt64());
 			break;
 		default:
 			return false;
 	}
 	
 	return true;
 }
 
 bool LDateTime::CallMethod(const char *Name, LVariant *ReturnValue, LArray<LVariant*> &Args)
 {
 	switch (LStringToDomProp(Name))
 	{
 		case DateSetNow:
 			SetNow();
 			if (ReturnValue)
 				*ReturnValue = true;
 			break;
 		case DateSetStr:
 			if (Args.Length() < 1)
 				return false;
 
 			bool Status;
 			if (Args[0]->Type == GV_INT64)
 				Status = Set((uint64) Args[0]->Value.Int64);
 			else
 				Status = Set(Args[0]->Str());
 			if (ReturnValue)
 				*ReturnValue = Status;
 			break;
 		case DateGetStr:
 		{
 			char s[256] = "";
 			Get(s, sizeof(s));
 			if (ReturnValue)
 				*ReturnValue = s;
 			break;
 		}
 		default:
 			return false;
 	}
 
 	return true;
 }
 
 #ifdef _DEBUG
 #define DATE_ASSERT(i) \
 	if (!(i)) \
 	{ \
 		LAssert(!"LDateTime unit test failed."); \
 		return false; \
 	}
 
 bool LDateTime_Test()
 {
 	// Check 64bit get/set
 	LDateTime t("1/1/2017 0:0:0");
 	LTimeStamp i;
 	DATE_ASSERT(t.Get(i));
 	LgiTrace("Get='%s'\n", t.Get().Get());
 	auto i2 = i + (24ULL * 60 * 60 * LDateTime::Second64Bit);
 	LDateTime t2;
 	t2.SetFormat(GDTF_DAY_MONTH_YEAR);
 	t2.Set(i2);
 	LString s = t2.Get();
 	LgiTrace("Set='%s'\n", s.Get());
 	DATE_ASSERT(!stricmp(s, "2/1/2017 12:00:00a") ||
 				!stricmp(s, "2/01/2017 12:00:00a"));
 	
 	t.SetNow();
 	LgiTrace("Now.Local=%s Tz=%.2f\n", t.Get().Get(), t.GetTimeZoneHours());
 	t2 = t;
 	t2.ToUtc();
 	LgiTrace("Now.Utc=%s Tz=%.2f\n", t2.Get().Get(), t2.GetTimeZoneHours());
 	t2.ToLocal();
 	LgiTrace("Now.Local=%s Tz=%.2f\n", t2.Get().Get(), t2.GetTimeZoneHours());
 	DATE_ASSERT(t == t2);
 	
 	return true;
 }
 #endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 LTimeStamp &LTimeStamp::operator =(const time_t unixTime)
 {
 	#if defined(WINDOWS)
 	ts = (unixTime + SEC_TO_UNIX_EPOCH) * WINDOWS_TICK;
 	#else
 	ts = (unixTime + LDateTime::Offset1800) * LDateTime::Second64Bit;
 	#endif
 
 	return *this;
 }
 
 LTimeStamp &LTimeStamp::operator =(const LDateTime &dt)
 {
 	dt.Get(*this);
 	return *this;
 }
 
 time_t LTimeStamp::Unix() const
 {
 	#if defined(WINDOWS)
 	return (ts / WINDOWS_TICK) - SEC_TO_UNIX_EPOCH;
 	#else
 	return (ts / LDateTime::Second64Bit) - LDateTime::Offset1800;
 	#endif
 }
diff --git a/src/win/Lgi.natvis b/src/win/Lgi.natvis
--- a/src/win/Lgi.natvis
+++ b/src/win/Lgi.natvis
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="GString">
+  <Type Name="LString">
 	  <DisplayString Condition="Str == 0">(empty)</DisplayString>
 	  <DisplayString>{Str->Str,s} ({Str->Len})</DisplayString>
   </Type>
-  <Type Name="GAutoPtr&lt;char,1&gt;">
+  <Type Name="LAutoPtr&lt;char,1&gt;">
 	  <DisplayString Condition="Ptr == 0">(empty)</DisplayString>
 	  <DisplayString>{Ptr,s}</DisplayString>
   </Type>
-  <Type Name="GAutoPtr&lt;wchar_t,1&gt;">
+  <Type Name="LAutoPtr&lt;wchar_t,1&gt;">
 	  <DisplayString Condition="Ptr == 0">(empty)</DisplayString>
 	  <DisplayString>{Ptr,su}</DisplayString>
   </Type>
+  <Type Name="LDateTime">
+	  <DisplayString>datetime({_Year,su}/{_Month,su}/{_Day,su} {_Hours,su}:{_Minutes,su}:{_Seconds,su} tz:{_Tz,su})</DisplayString>
+  </Type>
 </AutoVisualizer>
diff --git a/win/Lgi_vs2019.vcxproj b/win/Lgi_vs2019.vcxproj
--- a/win/Lgi_vs2019.vcxproj
+++ b/win/Lgi_vs2019.vcxproj
@@ -1,625 +1,628 @@
 <?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>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v142</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)19\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi19x64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>..\Lib\</OutDir>
     <IntDir>$(Platform)$(Configuration)19\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi19x64d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimize|x64'">
     <OutDir>..\Lib\</OutDir>
     <IntDir>$(Platform)$(Configuration)19\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\CodeLib\libiconv-1.14\include</IncludePath>
     <TargetName>Lgi19x64nop</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;LGI_UNIT_TESTS;%(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\Lgi\ClipBoardCommon.cpp" />
     <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\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\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\SubProcess.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\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\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\Uri.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>
+    <Natvis Include="..\src\win\Lgi.natvis" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/win/Lgi_vs2019.vcxproj.filters b/win/Lgi_vs2019.vcxproj.filters
--- a/win/Lgi_vs2019.vcxproj.filters
+++ b/win/Lgi_vs2019.vcxproj.filters
@@ -1,1226 +1,1231 @@
 <?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="Header Files">
       <UniqueIdentifier>{5fe450b8-5fa9-440e-9fb0-03860b3548d0}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\win\Lgi\App.cpp">
       <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\AppCommon.cpp">
       <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Alert.cpp">
       <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Net\Base64.cpp">
       <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\win\Widgets\Button_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Widgets\CheckBox_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\CheckBox.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Font\Charset.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <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\win\Widgets\Combo_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</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\Widgets\Css</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\CssTools.cpp">
       <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\win\Lgi\DragAndDrop.cpp">
       <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\DragAndDropCommon.cpp">
       <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\DocView.cpp">
       <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\DropFiles.cpp">
       <Filter>Source Files\Core\Drag and Drop</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\Dialogs</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Font\Font.cpp">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\FontSelect.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\win\Gdc2\Gdc2.cpp">
       <Filter>Source Files\Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\GdcCommon.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\Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Input.cpp">
       <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\Layout.cpp">
       <Filter>Source Files\Core</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\Core\Libraries</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\LMsg.cpp">
       <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\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\Gdc2\Alpha.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\64Bit.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\48Bit.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\32Bit.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\16Bit.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\24Bit.cpp">
       <Filter>Source Files\Graphics\Applicators</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\15Bit.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\Lgi\MemStream.cpp">
       <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\Core\Menus</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\INet\MibAccess.cpp">
       <Filter>Source Files\Network</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\General</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\OptionsFile.cpp">
       <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\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Widgets\Progress_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\ProgressDlg.cpp">
       <Filter>Source Files\Widgets</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\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\Hash\sha1\sha1.c">
       <Filter>Source Files\General\Hash</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\General\ShowFileProp_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Widgets\Slider_Win.cpp">
       <Filter>Source Files\Widgets\Native Windows</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\StatusBar.cpp">
       <Filter>Source Files\Widgets</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\Graphics\Font</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Surface.cpp">
       <Filter>Source Files\Graphics\Surfaces</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\TextLabel.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\TextView3.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\TextView4.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\Thread.cpp">
       <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\ThreadCommon.cpp">
       <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\ThreadEvent.cpp">
       <Filter>Source Files\Core\Threads</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\Token.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\ToolBar.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\ToolTip.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\TrayIcon.cpp">
       <Filter>Source Files\Widgets</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Font\TypeFace.cpp">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\Unicode.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\UnicodeString.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Net\Uri.cpp">
       <Filter>Source Files\Network</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\Utf8.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\View.cpp">
       <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\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\WindowCommon.cpp">
       <Filter>Source Files\Core</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Text\XmlTree.cpp">
       <Filter>Source Files\Text</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Tree.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\Widgets\Box.cpp">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\TableLayout.cpp">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Splitter.cpp">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Slider.cpp">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Edit.cpp">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\Combo.cpp">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Widgets\TabView.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\Lgi\Mutex.cpp">
       <Filter>Source Files\Core\Mutex</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Stream.cpp">
       <Filter>Source Files\Core\Stream</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Variant.cpp">
       <Filter>Source Files\Core\Variant</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\Mru.cpp">
       <Filter>Source Files\General\Mru</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Tools\ColourReduce.cpp">
       <Filter>Source Files\Graphics\Colour Reduction</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Gdc2\Rect.cpp">
       <Filter>Source Files\Graphics\Rect/Region</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\Lgi\ClipBoardCommon.cpp">
       <Filter>Source Files\General\Clipboard</Filter>
     </ClCompile>
     <ClCompile Include="..\src\win\Lgi\SubProcess.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\Core\Process</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <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\AudioView.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\AutoPtr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Bits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Browser.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\Com.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Console.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\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\Dns.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DocApp.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\DrawListSurface.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\FileAssoc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FileTransferProgress.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\Ftp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Graph.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\Jpeg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Json.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\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\LgiUiBase.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\MemoryPool.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\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\Palette.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\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\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\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\Range.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Ranges.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\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\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\Ssh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Stat.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\StreamConcat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StringClass.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\TableDb.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\TextLog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Tnef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolTabBar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Undo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\UnrolledList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\vCard-vCal.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\WordStore.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="..\include\lgi\common\TextView4.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextView3.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Bitmap.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Button.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\CheckBox.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Panel.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Popup.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\PopupList.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ProgressDlg.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RadioGroup.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ScrollBar.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StatusBar.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TextLabel.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolBar.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ToolTip.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TrayIcon.h">
       <Filter>Source Files\Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Tree.h">
       <Filter>Source Files\Widgets\Container</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ListItemRadioBtn.h">
       <Filter>Source Files\Widgets\Container</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ListItemCheckBox.h">
       <Filter>Source Files\Widgets\Container</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\List.h">
       <Filter>Source Files\Widgets\Container</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Box.h">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TableLayout.h">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Splitter.h">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Slider.h">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Edit.h">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Combo.h">
       <Filter>Source Files\Widgets\Xp</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\TabView.h">
       <Filter>Source Files\Widgets\Layout</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Charset.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiString.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Token.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Unicode.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\UnicodeString.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\XmlTree.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\XmlTreeUi.h">
       <Filter>Source Files\Text</Filter>
     </ClInclude>
     <ClInclude Include="..\src\win\INet\MibAccess.h">
       <Filter>Source Files\Network</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Net.h">
       <Filter>Source Files\Network</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Uri.h">
       <Filter>Source Files\Network</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\App.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DocView.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ItemContainer.h">
       <Filter>Source Files\Widgets\Container</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Layout.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Printer.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\View.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Window.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DateTime.h">
       <Filter>Source Files\Core\DateTime</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DragAndDrop.h">
       <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DropFiles.h">
       <Filter>Source Files\Core\Drag and Drop</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\File.h">
       <Filter>Source Files\Core\File</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Library.h">
       <Filter>Source Files\Core\Libraries</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LibraryUtils.h">
       <Filter>Source Files\Core\Libraries</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Containers.h">
       <Filter>Source Files\Core\Memory Subsystem</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mem.h">
       <Filter>Source Files\Core\Memory Subsystem</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Menu.h">
       <Filter>Source Files\Core\Menus</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\MenuImpl.h">
       <Filter>Source Files\Core\Menus</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mutex.h">
       <Filter>Source Files\Core\Mutex</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SubProcess.h">
       <Filter>Source Files\Core\Process</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiRes.h">
       <Filter>Source Files\Core\Resources</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Res.h">
       <Filter>Source Files\Core\Resources</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SkinEngine.h">
       <Filter>Source Files\Core\Skin</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\SkinGel.h">
       <Filter>Source Files\Core\Skin</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Stream.h">
       <Filter>Source Files\Core\Stream</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Thread.h">
       <Filter>Source Files\Core\Threads</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ThreadEvent.h">
       <Filter>Source Files\Core\Threads</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Variant.h">
       <Filter>Source Files\Core\Variant</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\LgiClasses.h">
       <Filter>Source Files\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FileSelect.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FindReplaceDlg.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Input.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ClipBoard.h">
       <Filter>Source Files\General\Clipboard</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Growl.h">
       <Filter>Source Files\General\Growl</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\Hash\md5\md5.h">
       <Filter>Source Files\General\Hash</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\Hash\sha1\sha1.h">
       <Filter>Source Files\General\Hash</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Mru.h">
       <Filter>Source Files\General\Mru</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Base64.h">
       <Filter>Source Files\General</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\OptionsFile.h">
       <Filter>Source Files\General</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Password.h">
       <Filter>Source Files\General</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Filter.h">
       <Filter>Source Files\Graphics\Filters</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\DisplayString.h">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Font.h">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FontCache.h">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\FontSelect.h">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\StringLayout.h">
       <Filter>Source Files\Graphics\Font</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Rect.h">
       <Filter>Source Files\Graphics\Rect/Region</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\RectF.h">
       <Filter>Source Files\Graphics\Rect/Region</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Colour.h">
       <Filter>Source Files\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\ColourSpace.h">
       <Filter>Source Files\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Gdc2.h">
       <Filter>Source Files\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\GdcTools.h">
       <Filter>Source Files\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\GdiLeak.h">
       <Filter>Source Files\Graphics\Gdi Leak</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Path.h">
       <Filter>Source Files\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\include\lgi\common\Array.h">
       <Filter>Source Files\Core\Memory Subsystem</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="..\src\win\Lgi.natvis">
+      <Filter>Source Files</Filter>
+    </Natvis>
+  </ItemGroup>
 </Project>
\ No newline at end of file