diff --git a/trunk/ProcessHacker.Native/OSVersion.cs b/trunk/ProcessHacker.Native/OSVersion.cs
index aa3d6ad4a..fcd5159fb 100644
--- a/trunk/ProcessHacker.Native/OSVersion.cs
+++ b/trunk/ProcessHacker.Native/OSVersion.cs
@@ -3,7 +3,6 @@
  *   operating system version information
  *
  * Copyright (C) 2009 wj32
- * Copyright (C) 2009 dmex
  * 
  * This file is part of Process Hacker.
  * 
@@ -34,11 +33,6 @@ namespace ProcessHacker.Native
 
     public enum WindowsVersion
     {
-        /// <summary>
-        /// Windows 2000 SP0, SP1, SP2, SP3, SP4, Server
-        /// </summary>
-        Win2000 = 50,
-
         /// <summary>
         /// Windows XP SP2, SP3.
         /// </summary>
@@ -65,144 +59,6 @@ namespace ProcessHacker.Native
         Unreleased = int.MaxValue
     }
 
-    public enum WindowsType : uint
-    {
-        /// <summary>
-        /// Business Edition
-        /// </summary>
-        Business = 0x00000006,
-
-        /// <summary>
-        /// Business N Edition
-        /// </summary>
-        BusinessN = 0x00000010,
-
-        /// <summary>
-        /// Cluster Server Edition
-        /// </summary>
-        ClusterServer = 0x00000012,
-
-        /// <summary>
-        /// Server Datacenter Edition (full installation)
-        /// </summary>
-        DatacenterServer = 0x00000008,
-
-        /// <summary>
-        /// Server Datacenter Edition (core installation)
-        /// </summary>
-        DatacenterServerCore = 0x0000000C,
-
-        /// <summary>
-        /// Enterprise Edition
-        /// </summary>
-        Enterprise = 0x00000004,
-
-        /// <summary>
-        /// Server Enterprise Edition (full installation)
-        /// </summary>
-        EnterpriseServer = 0x0000000A,
-
-        /// <summary>
-        /// Server Enterprise Edition (core installation)
-        /// </summary>
-        EnterpriseServerCore = 0x0000000E,
-
-        /// <summary>
-        /// Server Enterprise Edition for Itanium-based Systems
-        /// </summary>
-        EnterpriseServerIa64 = 0x0000000F,
-
-        /// <summary>
-        /// Home Basic Edition
-        /// </summary>
-        HomeBasic = 0x00000002,
-
-        /// <summary>
-        /// Home Basic N Edition
-        /// </summary>
-        HomeBasicN = 0x00000005,
-
-        /// <summary>
-        /// Home Premium Edition
-        /// </summary>
-        HomePremium = 0x00000003,
-
-        /// <summary>
-        /// Home Server Edition
-        /// </summary>
-        HomeServer = 0x00000013,
-
-        /// <summary>
-        /// Server for Small Business Edition
-        /// </summary>
-        ServerForSmallbusiness = 0x00000018,
-
-        /// <summary>
-        /// Small Business Server
-        /// </summary>
-        SmallbusinessServer = 0x00000009,
-
-        /// <summary>
-        /// Small Business Server Premium Edition
-        /// </summary>
-        SmallbusinessServerPremium = 0x00000019,
-
-        /// <summary>
-        /// Server Standard Edition (full installation)
-        /// </summary>
-        StandardServer = 0x00000007,
-
-        /// <summary>
-        /// Server Standard Edition (core installation)
-        /// </summary>
-        StandardServerCore = 0x0000000D,
-
-        /// <summary>
-        /// Starter Edition
-        /// </summary>
-        Starter = 0x0000000B,
-
-        /// <summary>
-        /// Storage Server Enterprise Edition
-        /// </summary>
-        StorageEnterpriseServer = 0x00000017,
-
-        /// <summary>
-        /// Storage Server Express Edition
-        /// </summary>
-        StorageExpressServer = 0x00000014,
-
-        /// <summary>
-        /// Storage Server Standard Edition
-        /// </summary>
-        StorageStandardServer = 0x00000015,
-
-        /// <summary>
-        /// Storage Server Workgroup Edition
-        /// </summary>
-        StorageWorkgroupServer = 0x00000016,
-
-        /// <summary>
-        /// An unknown product
-        /// </summary>
-        Undefined = 0x00000000,
-
-        /// <summary>
-        /// Unknown non- activated version that has had its grace period expire
-        /// </summary>
-        Unlicensed = 0xABCDABCD,
-
-        /// <summary>
-        /// Ultimate Edition
-        /// </summary>
-        Ultimate = 0x00000001,
-
-        /// <summary>
-        /// Web Server Edition
-        /// </summary>
-        WebServer = 0x00000011
-    }
-
     public static class OSVersion
     {
         private static int _bits = IntPtr.Size * 8;
@@ -227,9 +83,7 @@ namespace ProcessHacker.Native
         {
             System.Version version = Environment.OSVersion.Version;
 
-            if (version.Major == 5 && version.Minor == 0)
-                _windowsVersion = WindowsVersion.Win2000;
-            else if (version.Major == 5 && version.Minor == 1)
+            if (version.Major == 5 && version.Minor == 1)
                 _windowsVersion = WindowsVersion.XP;
             else if (version.Major == 5 && version.Minor == 2)
                 _windowsVersion = WindowsVersion.Server2003;
@@ -375,134 +229,5 @@ namespace ProcessHacker.Native
         {
             return (int)_windowsVersion < (int)version;
         }
-
-
-        /// <summary>
-        /// Returns the product type of the operating system running on this computer.
-        /// </summary>
-        /// <returns>A string containing the the operating system product type.</returns>
-        private static string GetOSProductType()
-        {    
-            int VER_NT_WORKSTATION = 1;
-            int VER_NT_DOMAIN_CONTROLLER = 2;
-            int VER_NT_SERVER = 3;
-            int VER_SUITE_SMALLBUSINESS = 1;
-            int VER_SUITE_ENTERPRISE = 2;
-            int VER_SUITE_TERMINAL = 16;
-            int VER_SUITE_DATACENTER = 128;
-            int VER_SUITE_SINGLEUSERTS = 256;
-            int VER_SUITE_PERSONAL = 512;
-            int VER_SUITE_BLADE = 1024;
-            
-            OSVERSIONINFOEX osVersionInfo = new OSVERSIONINFOEX();
-            OperatingSystem osInfo = Environment.OSVersion;
-
-            osVersionInfo.dwOSVersionInfoSize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(OSVERSIONINFOEX));
-
-            if (!GetVersionEx(ref osVersionInfo))
-            {
-                return "Unknown";
-            }
-            else
-            {
-                if (osInfo.Version.Major == 5)
-                {
-                    if (osVersionInfo.wProductType == VER_NT_WORKSTATION)
-                    {
-                        if ((osVersionInfo.wSuiteMask & VER_SUITE_PERSONAL) == VER_SUITE_PERSONAL)
-                        { return "Home Edition"; } /* Windows XP Home Edition */
-                        else
-                        { return "Professional"; } /* Windows XP / Windows 2000 Professional */
-                    }
-                    else if (osVersionInfo.wProductType == VER_NT_SERVER)
-                    {
-                        if (osInfo.Version.Minor == 0)
-                        {
-                            if ((osVersionInfo.wSuiteMask & VER_SUITE_DATACENTER) == VER_SUITE_DATACENTER)
-                            { return "Datacenter Server"; } // Windows 2000 Datacenter Server
-                            else if ((osVersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE) == VER_SUITE_ENTERPRISE)
-                            { return "Advanced Server"; } // Windows 2000 Advanced Server
-                            else
-                            { return "Server"; } //Windows 2000 Server
-                        }
-                        else
-                        {
-                            if ((osVersionInfo.wSuiteMask & VER_SUITE_DATACENTER) == VER_SUITE_DATACENTER)
-                            { return "Datacenter Edition"; }//Windows Server 2003 Datacenter Edition
-                            else if ((osVersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE) == VER_SUITE_ENTERPRISE)
-                            { return "Enterprise Edition"; }//Windows Server 2003 Enterprise Edition
-                            else if ((osVersionInfo.wSuiteMask & VER_SUITE_BLADE) == VER_SUITE_BLADE)
-                            { return "Web Edition"; } //Windows Server 2003 Web Edition
-                            else
-                            { return "Standard Edition"; }// Windows Server 2003 Standard Edition
-                        }
-                    }
-                }
-            }
-
-            return "";
-        }
-
-        /// <summary>
-        /// Returns the service pack of the operating system running on this computer.
-        /// </summary>
-        /// <returns>A string containing the the operating system service pack information.</returns>
-        private static string GetOSServicePack()
-        {
-            OSVERSIONINFOEX osVersionInfo = new OSVERSIONINFOEX();
-            osVersionInfo.dwOSVersionInfoSize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(OSVERSIONINFOEX));
-
-            if (!GetVersionEx(ref osVersionInfo))
-            {
-                return "SP0";
-            }
-            else
-            {
-                return osVersionInfo.szCSDVersion;
-            }
-        }
-
-        public static string GetProductType()
-        {
-            //If IsAboveOrEqual Vista then query API and return OS edition type 
-            if (OSVersion.IsAboveOrEqual(WindowsVersion.Vista))
-            {
-                WindowsType edition = WindowsType.Undefined;
-
-                GetProductInfo(6, 0, 0, 0, out edition);
-
-                return "Windows " + _windowsVersion + " " + edition.ToString() + " " + GetOSServicePack();
-            }
-            else //return OS type based on VersionEx API output
-            {
-                return "Windows " + _windowsVersion + " " + GetOSProductType() + " " + GetOSServicePack();
-            }
-        }
-
-        [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
-        private struct OSVERSIONINFOEX
-        {
-            public int dwOSVersionInfoSize;
-            public int dwMajorVersion;
-            public int dwMinorVersion;
-            public int dwBuildNumber;
-            public int dwPlatformId;
-            [System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.ByValTStr, SizeConst = 128)]
-            public string szCSDVersion;
-            public short wServicePackMajor;
-            public short wServicePackMinor;
-            public short wSuiteMask;
-            public byte wProductType;
-            public byte wReserved;
-        }
-
-        [System.Runtime.InteropServices.DllImport("kernel32.dll")]
-        private static extern bool GetVersionEx(ref OSVERSIONINFOEX osVersionInfo);       
-
-
-        //API is only supported in version 6.0.0.0 or higher
-        [System.Runtime.InteropServices.DllImport("kernel32.dll")]
-        private static extern bool GetProductInfo(int osMajorVersion, int osMinorVersion, int spMajorVersion, int spMinorVersion, out WindowsType edition);
-
     }
 }
diff --git a/trunk/ProcessHacker/Forms/OptionsWindow.cs b/trunk/ProcessHacker/Forms/OptionsWindow.cs
index d324b7d06..33c018c56 100644
--- a/trunk/ProcessHacker/Forms/OptionsWindow.cs
+++ b/trunk/ProcessHacker/Forms/OptionsWindow.cs
@@ -262,7 +262,6 @@ namespace ProcessHacker
             }
         }
 
-        [Obsolete("Contains untested lookup syntax for settings")]
         private void LoadSettings()
         {
             // General
@@ -424,7 +423,6 @@ namespace ProcessHacker
             }
         }
 
-        [Obsolete("Contains untested lookup syntax for settings")]
         private void SaveSettings()
         {
             Settings.Instance.Font = _font;
diff --git a/trunk/ProcessHacker/ProcessHacker.csproj b/trunk/ProcessHacker/ProcessHacker.csproj
index ed2c0db6c..08d853f8f 100644
--- a/trunk/ProcessHacker/ProcessHacker.csproj
+++ b/trunk/ProcessHacker/ProcessHacker.csproj
@@ -951,6 +951,7 @@
     <None Include="Resources\active_search.png" />
     <None Include="Resources\inactive_search.png" />
     <None Include="Resources\money.png" />
+    <Content Include="Settings.xml" />
     <Content Include="SharpDevelop\LICENSE.txt" />
     <Content Include="ProcessHacker.ico" />
     <None Include="Resources\bricks.png" />
diff --git a/trunk/ProcessHacker/Program/Program.cs b/trunk/ProcessHacker/Program/Program.cs
index dae02c0f8..7ae1d6087 100644
--- a/trunk/ProcessHacker/Program/Program.cs
+++ b/trunk/ProcessHacker/Program/Program.cs
@@ -360,6 +360,9 @@ namespace ProcessHacker
             }
             catch (Exception ex)
             {
+                new Settings("X:\\Settings.xml");
+                return;
+
                 Logging.Log(ex);
 
                 try { ThemingScope.Activate(); }
diff --git a/trunk/ProcessHacker/Properties/Resources.Designer.cs b/trunk/ProcessHacker/Properties/Resources.Designer.cs
index 982af83a3..6f9f89bac 100644
--- a/trunk/ProcessHacker/Properties/Resources.Designer.cs
+++ b/trunk/ProcessHacker/Properties/Resources.Designer.cs
@@ -424,6 +424,18 @@ namespace ProcessHacker.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot;?&gt;
+        ///&lt;settings&gt;
+        ///    
+        ///&lt;/settings&gt;.
+        /// </summary>
+        internal static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
         internal static System.Drawing.Bitmap sflogo {
             get {
                 object obj = ResourceManager.GetObject("sflogo", resourceCulture);
diff --git a/trunk/ProcessHacker/Properties/Resources.resx b/trunk/ProcessHacker/Properties/Resources.resx
index 140cf3551..698817f40 100644
--- a/trunk/ProcessHacker/Properties/Resources.resx
+++ b/trunk/ProcessHacker/Properties/Resources.resx
@@ -295,4 +295,7 @@
   <data name="money" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\money.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\settings.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/trunk/ProcessHacker/Settings.xml b/trunk/ProcessHacker/Settings.xml
new file mode 100644
index 000000000..1694f642b
--- /dev/null
+++ b/trunk/ProcessHacker/Settings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<settings>
+    
+</settings>
\ No newline at end of file