fix xaml, merge latest Nvinspector changes

ColorControl/Services/NVIDIA/NvPanel.cs

@@ -4,6 +4,7 @@ using ColorControl.Shared.Contracts.NVIDIA;
 using ColorControl.Shared.Forms;
 using ColorControl.Shared.Native;
 using ColorControl.Shared.Services;
+using NLog;
 using novideo_srgb;
 using nspector;
 using nspector.Common;
@@ -27,7 +28,7 @@ namespace ColorControl.Services.NVIDIA
     {
         public static readonly int SHORTCUTID_NVQA = -200;
 
-        //private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private Config _config;
         private NvService _nvService;
@@ -897,6 +898,8 @@ namespace ColorControl.Services.NVIDIA
             }
             catch (Exception e)
             {
+                Logger.Error(e);
+
                 MessageForms.ErrorOk($"Error applying NVIDIA-preset ({e.TargetSite.Name}): {e.Message}");
                 return false;
             }

Nspector/Common/CustomSettings/CustomSetting.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Xml.Serialization;
 
 namespace nspector.Common.CustomSettings
@@ -15,6 +13,9 @@ namespace nspector.Common.CustomSettings
         public string GroupName { get; set; }
         public string OverrideDefault { get; set; }
         public float MinRequiredDriverVersion { get; set; }
+        public bool Hidden { get; set; }
+        public bool HasConstraints { get; set; }
+        public string DataType { get; set; }
 
         public List<CustomSettingValue> SettingValues { get; set; }
 

Nspector/Common/DrsDecrypterService.cs

@@ -86,7 +86,7 @@ namespace nspector.Common
 
         private string FormatInternalSettingKey(string profileName, uint settingId)
         {
-            return profileName + settingId.ToString("X8").ToLower();
+            return profileName + settingId.ToString("X8").ToLowerInvariant();
         }
 
         public bool IsInternalSetting(string profileName, uint settingId)

Nspector/Common/DrsScannerService.cs

@@ -215,7 +215,7 @@ namespace nspector.Common
 
         public string FindProfilesUsingApplication(string applicationName)
         {
-            string lowerApplicationName = applicationName.ToLower();
+            string lowerApplicationName = applicationName.ToLowerInvariant();
             string tmpfile = TempFile.GetTempFileName();
 
             try
@@ -236,7 +236,7 @@ namespace nspector.Common
                         string scope = m.Result("${scope}");
                         foreach (Match ms in Regex.Matches(scope, "Executable\\s\\\"(?<app>.*?)\\\"", RegexOptions.Singleline))
                         {
-                            if (ms.Result("${app}").ToLower() == lowerApplicationName)
+                            if (ms.Result("${app}").ToLowerInvariant() == lowerApplicationName)
                             {
                                 matchingProfiles.Add(m.Result("${profile}"));
                             }

Nspector/Common/DrsSettingsMetaService.cs

@@ -307,6 +307,8 @@ namespace nspector.Common
                 GroupName = groupName,
 
                 IsApiExposed = GetIsApiExposed(settingId),
+                IsSettingHidden = GetIsSettingHidden(settingId),
+                Description = GetDescription(settingId),
 
                 DefaultDwordValue =
                     settingType == NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE
@@ -410,5 +412,22 @@ namespace nspector.Common
             var driverMeta = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.DriverSettings);
             return (driverMeta != null && driverMeta.Service.GetSettingIds().Contains(settingId));
         }
+
+        private bool GetIsSettingHidden(uint settingId)
+        {
+            var csnMeta = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.CustomSettings);
+            return (csnMeta != null && ((CustomSettingMetaService)csnMeta.Service).IsSettingHidden(settingId));
+        }
+
+        private string GetDescription(uint settingId)
+        {
+            var csn = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.CustomSettings);
+            var csnDescription = csn != null ? ((CustomSettingMetaService)csn.Service).GetDescription(settingId) ?? "" : "";
+
+            var refs = MetaServices.FirstOrDefault(m => m.Service.Source == SettingMetaSource.ReferenceSettings);
+            var refsDescription = refs != null ? ((CustomSettingMetaService)refs.Service).GetDescription(settingId) ?? "" : "";
+
+            return !string.IsNullOrEmpty(csnDescription) ? csnDescription : refsDescription;
+        }
     }
 }

Nspector/Common/DrsSettingsService.cs

@@ -296,6 +296,39 @@ namespace nspector.Common
             removeFromModified = tmpRemoveFromModified;
         }
 
+        public void DeleteValue(string profileName, uint settingId, out bool removeFromModified)
+        {
+            var tmpRemoveFromModified = false;
+
+            DrsSession((hSession) =>
+            {
+                var hProfile = GetProfileHandle(hSession, profileName);
+
+                if (hProfile != IntPtr.Zero)
+                {
+                    int dropCount = 0;
+                    var settings = GetProfileSettings(hSession, hProfile);
+                    foreach (var setting in settings)
+                    {
+                        if (setting.settingId != settingId) continue;
+
+                        if (setting.settingLocation == NVDRS_SETTING_LOCATION.NVDRS_CURRENT_PROFILE_LOCATION)
+                        {
+                            if (nvw.DRS_DeleteProfileSetting(hSession, hProfile, setting.settingId) == NvAPI_Status.NVAPI_OK)
+                            {
+                                dropCount++;
+                                break;
+                            }
+                        }
+                    }
+                    tmpRemoveFromModified = (dropCount == 0);
+                    SaveSettings(hSession);
+                }
+            });
+
+            removeFromModified = tmpRemoveFromModified;
+        }
+
         public uint GetDwordValueFromProfile(string profileName, uint settingId, bool returnDefaultValue = false, bool forceDedicatedScope = false)
         {
             return DrsSession((hSession) =>

Nspector/Common/DrsUtil.cs

@@ -1,7 +1,5 @@
 using nspector.Common.Meta;
-using System;
 using System.Globalization;
-using System.Linq;
 
 namespace nspector.Common
 {
@@ -17,7 +15,7 @@ namespace nspector.Common
         public static uint ParseDwordByInputSafe(string input)
         {
             uint result = 0;
-            if (input.ToLower().StartsWith("0x"))
+            if (input.ToLowerInvariant().StartsWith("0x"))
             {
                 try
                 {
@@ -53,7 +51,7 @@ namespace nspector.Common
 
         internal static string ParseStringSettingValue(SettingMeta meta, string text)
         {
-            var valueByName = meta.StringValues.FirstOrDefault(x => x.ValueName != null && x.ValueName.Equals(text));
+            var valueByName = meta.StringValues?.FirstOrDefault(x => x.ValueName != null && x.ValueName.Equals(text));
             if (valueByName != null)
                 return valueByName.Value;
 
@@ -62,8 +60,7 @@ namespace nspector.Common
 
         internal static string GetStringSettingValueName(SettingMeta meta, string stringValue)
         {
-            var settingValue = meta.StringValues
-                       .FirstOrDefault(x => x.Value.Equals(stringValue));
+            var settingValue = meta.StringValues.FirstOrDefault(x => x.Value.Equals(stringValue));
 
             return settingValue == null ? stringValue : settingValue.ValueName;
         }

Nspector/Common/Helper/ShortcutResolver.cs

@@ -1,5 +1,4 @@
-using System.IO;
-using nspector.Native.WINAPI;
+using nspector.Native.WINAPI;
 
 namespace nspector.Common.Helper
 {
@@ -30,7 +29,7 @@ namespace nspector.Common.Helper
 
             try
             {
-                switch (fileInfo.Extension.ToLower())
+                switch (fileInfo.Extension.ToLowerInvariant())
                 {
                     case ".lnk": return ResolveFromShellLinkFile(fileInfo.FullName);
                     case ".url": return ResolveFromUrlFile(fileInfo.FullName);
@@ -54,7 +53,7 @@ namespace nspector.Common.Helper
             }
 
             var targetInfo = new FileInfo(shellLink.Target);
-            if (targetInfo.Name.ToLower() == SteamAppResolver.SteamExeName)
+            if (targetInfo.Name.ToLowerInvariant() == SteamAppResolver.SteamExeName)
             {
                 if (shellLink.Arguments.Contains(SteamAppResolver.SteamArgumentPattern))
                 {
@@ -63,7 +62,7 @@ namespace nspector.Common.Helper
                 }
             }
 
-            if (targetInfo.Extension.ToLower().Equals(".exe"))
+            if (targetInfo.Extension.ToLowerInvariant().Equals(".exe"))
             {
                 return targetInfo.Name;
             }

Nspector/Common/Meta/CustomSettingMetaService.cs

@@ -1,7 +1,5 @@
 using nspector.Common.CustomSettings;
 using nspector.Native.NVAPI2;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace nspector.Common.Meta
 {
@@ -105,5 +103,21 @@ namespace nspector.Common.Meta
         {
             get { return _source; }
         }
+
+        public bool IsSettingHidden(uint settingId)
+        {
+            var setting = customSettings.Settings
+               .FirstOrDefault(x => x.SettingId.Equals(settingId));
+
+            return setting?.Hidden ?? false;
+        }
+
+        public string GetDescription(uint settingId)
+        {
+            var setting = customSettings.Settings
+               .FirstOrDefault(x => x.SettingId.Equals(settingId));
+
+            return setting?.Description;
+        }
     }
 }

Nspector/Common/Meta/SettingMeta.cs

@@ -18,6 +18,10 @@ namespace nspector.Common.Meta
 
         public bool IsApiExposed { get; set; }
 
+        public bool IsSettingHidden { get; set; }
+
+        public string Description { get; set; }
+
         public List<SettingValue<string>> StringValues { get; set; }
 
         public List<SettingValue<uint>> DwordValues { get; set; }

Nspector/Common/SettingItem.cs

@@ -27,6 +27,8 @@
 
         public bool IsApiExposed { get; set; }
 
+        public bool IsSettingHidden { get; set; }
+
         public override string ToString()
         {
             return string.Format("{0}; 0x{1:X8}; {2}; {3}; {4};", State, SettingId, SettingText, ValueText, ValueRaw);

Nspector/Native/NVAPI/NvApiDriverSettings.h

@@ -84,6 +84,7 @@
 #define FXAA_ALLOW_STRING                          L"NVIDIA Predefined FXAA Usage"
 #define FXAA_ENABLE_STRING                         L"Enable FXAA"
 #define FXAA_INDICATOR_ENABLE_STRING               L"Enable FXAA Indicator"
+#define LATENCY_INDICATOR_AUTOALIGN_STRING         L"Autoalign flash indicator"
 #define MCSFRSHOWSPLIT_STRING                      L"SLI indicator"
 #define NV_QUALITY_UPSCALING_STRING                L"NVIDIA Quality upscaling"
 #define OPTIMUS_MAXAA_STRING                       L"Maximum AA samples allowed for a given application"
@@ -125,6 +126,7 @@
 #define MAXWELL_B_SAMPLE_INTERLEAVE_STRING         L"Enable sample interleaving (MFAA)"
 #define PRERENDERLIMIT_STRING                      L"Maximum pre-rendered frames"
 #define PS_SHADERDISKCACHE_STRING                  L"Shader Cache"
+#define PS_SHADERDISKCACHE_MAX_SIZE_STRING         L"Shader disk cache maximum size"
 #define PS_TEXFILTER_ANISO_OPTS2_STRING            L"Texture filtering - Anisotropic sample optimization"
 #define PS_TEXFILTER_BILINEAR_IN_ANISO_STRING      L"Texture filtering - Anisotropic filter optimization"
 #define PS_TEXFILTER_DISABLE_TRILIN_SLOPE_STRING   L"Texture filtering - Trilinear optimization"
@@ -182,6 +184,7 @@ enum ESetting {
     FXAA_ALLOW_ID = 0x1034CB89,
     FXAA_ENABLE_ID = 0x1074C972,
     FXAA_INDICATOR_ENABLE_ID = 0x1068FB9C,
+    LATENCY_INDICATOR_AUTOALIGN_ID = 0x1095F170,
     MCSFRSHOWSPLIT_ID = 0x10287051,
     NV_QUALITY_UPSCALING_ID = 0x10444444,
     OPTIMUS_MAXAA_ID = 0x10F9DC83,
@@ -223,6 +226,7 @@ enum ESetting {
     MAXWELL_B_SAMPLE_INTERLEAVE_ID = 0x0098C1AC,
     PRERENDERLIMIT_ID = 0x007BA09E,
     PS_SHADERDISKCACHE_ID = 0x00198FFF,
+    PS_SHADERDISKCACHE_MAX_SIZE_ID = 0x00AC8497,
     PS_TEXFILTER_ANISO_OPTS2_ID = 0x00E73211,
     PS_TEXFILTER_BILINEAR_IN_ANISO_ID = 0x0084CD70,
     PS_TEXFILTER_DISABLE_TRILIN_SLOPE_ID = 0x002ECAF2,
@@ -234,9 +238,9 @@ enum ESetting {
     SET_VAB_DATA_ID = 0x00AB8687,
     VSYNCMODE_ID = 0x00A879CF,
     VSYNCTEARCONTROL_ID = 0x005A375C,
-    TOTAL_DWORD_SETTING_NUM = 92,
+    TOTAL_DWORD_SETTING_NUM = 94,
     TOTAL_WSTRING_SETTING_NUM = 4,
-    TOTAL_SETTING_NUM = 96,
+    TOTAL_SETTING_NUM = 98,
     INVALID_SETTING_ID = 0xFFFFFFFF
 };
 
@@ -274,7 +278,7 @@ enum EValues_OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL {
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ZERO_SCANLINES = 0,
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ONE_FULL_FRAME_OF_SCANLINES = 100,
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_NUM_VALUES = 2,
-    OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_DEFAULT = 0
+    OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_DEFAULT = 0U
 };
 
 enum EValues_OGL_DEFAULT_SWAP_INTERVAL_SIGN {
@@ -368,7 +372,7 @@ enum EValues_OGL_THREAD_CONTROL {
     OGL_THREAD_CONTROL_ENABLE = 0x00000001,
     OGL_THREAD_CONTROL_DISABLE = 0x00000002,
     OGL_THREAD_CONTROL_NUM_VALUES = 2,
-    OGL_THREAD_CONTROL_DEFAULT = 0
+    OGL_THREAD_CONTROL_DEFAULT = 0U
 };
 
 enum EValues_OGL_TMON_LEVEL {
@@ -646,6 +650,13 @@ enum EValues_FXAA_INDICATOR_ENABLE {
     FXAA_INDICATOR_ENABLE_DEFAULT = FXAA_INDICATOR_ENABLE_OFF
 };
 
+enum EValues_LATENCY_INDICATOR_AUTOALIGN {
+    LATENCY_INDICATOR_AUTOALIGN_DISABLED = 0x0,
+    LATENCY_INDICATOR_AUTOALIGN_ENABLED = 0x1,
+    LATENCY_INDICATOR_AUTOALIGN_NUM_VALUES = 2,
+    LATENCY_INDICATOR_AUTOALIGN_DEFAULT = LATENCY_INDICATOR_AUTOALIGN_ENABLED
+};
+
 enum EValues_MCSFRSHOWSPLIT {
     MCSFRSHOWSPLIT_DISABLED = 0x34534064,
     MCSFRSHOWSPLIT_ENABLED = 0x24545582,
@@ -1022,7 +1033,14 @@ enum EValues_PS_SHADERDISKCACHE {
     PS_SHADERDISKCACHE_OFF = 0x00000000,
     PS_SHADERDISKCACHE_ON = 0x00000001,
     PS_SHADERDISKCACHE_NUM_VALUES = 2,
-    PS_SHADERDISKCACHE_DEFAULT = 0x1
+    PS_SHADERDISKCACHE_DEFAULT = PS_SHADERDISKCACHE_ON
+};
+
+enum EValues_PS_SHADERDISKCACHE_MAX_SIZE {
+    PS_SHADERDISKCACHE_MAX_SIZE_MIN = 0x0,
+    PS_SHADERDISKCACHE_MAX_SIZE_MAX = 0xffffffff,
+    PS_SHADERDISKCACHE_MAX_SIZE_NUM_VALUES = 2,
+    PS_SHADERDISKCACHE_MAX_SIZE_DEFAULT = 0x1000
 };
 
 enum EValues_PS_TEXFILTER_ANISO_OPTS2 {
@@ -1134,4 +1152,3 @@ typedef struct _SettingWSTRINGNameString {
 
 
 #endif // _NVAPI_DRIVER_SETTINGS_H_
-

Nspector/Native/NVAPI/NvapiDrsWrapper.cs

@@ -425,13 +425,17 @@ namespace nspector.Native.NVAPI2
             }
         }
 
-        private static void GetDelegate<T>(uint id, out T newDelegate) where T : class
+        private static void GetDelegate<T>(uint id, out T newDelegate, uint? fallbackId = null) where T : class
         {
             IntPtr ptr = nvapi_QueryInterface(id);
             if (ptr != IntPtr.Zero)
             {
                 newDelegate = Marshal.GetDelegateForFunctionPointer(ptr, typeof(T)) as T;
             }
+            else if (fallbackId.HasValue)
+            {
+                GetDelegate(fallbackId.Value, out newDelegate);
+            }
             else
             {
                 newDelegate = null;
@@ -587,18 +591,29 @@ namespace nspector.Native.NVAPI2
         public delegate NvAPI_Status DRS_FindApplicationByNameDelegate(IntPtr hSession, [MarshalAs(UnmanagedType.LPWStr, SizeConst = (int)NvapiDrsWrapper.NVAPI_UNICODE_STRING_MAX)] StringBuilder appName, ref IntPtr phProfile, ref NVDRS_APPLICATION_V3 pApplication);
         public static readonly DRS_FindApplicationByNameDelegate DRS_FindApplicationByName;
 
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate NvAPI_Status DRS_SetSettingDelegate(IntPtr hSession, IntPtr hProfile, ref NVDRS_SETTING pSetting);
-        public static readonly DRS_SetSettingDelegate DRS_SetSetting;
+        public static NvAPI_Status DRS_SetSetting(IntPtr hSession, IntPtr hProfile, ref NVDRS_SETTING pSetting)
+        {
+            return _DRS_SetSetting(hSession, hProfile, ref pSetting, 0, 0);
+        }
+
+        public static NvAPI_Status DRS_GetSetting(IntPtr hSession, IntPtr hProfile, uint settingId, ref NVDRS_SETTING pSetting)
+        {
+            uint x = 0;
+            return _DRS_GetSetting(hSession, hProfile, settingId, ref pSetting, ref x);
+        }
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate NvAPI_Status DRS_GetSettingDelegate(IntPtr hSession, IntPtr hProfile, uint settingId, ref NVDRS_SETTING pSetting);
-        public static readonly DRS_GetSettingDelegate DRS_GetSetting;
+        public delegate NvAPI_Status DRS_SetSettingDelegate(IntPtr hSession, IntPtr hProfile, ref NVDRS_SETTING pSetting, uint x, uint y);
+        private static readonly DRS_SetSettingDelegate _DRS_SetSetting;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvAPI_Status DRS_GetSettingDelegate(IntPtr hSession, IntPtr hProfile, uint settingId, ref NVDRS_SETTING pSetting, ref uint x);
+        private static readonly DRS_GetSettingDelegate _DRS_GetSetting;
+
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate NvAPI_Status DRS_EnumSettingsDelegate(IntPtr hSession, IntPtr hProfile, uint startIndex, ref uint settingsCount, IntPtr pSetting);
         private static readonly DRS_EnumSettingsDelegate DRS_EnumSettingsInternal;
-
         [ThreadStatic]
         private static IntPtr pSettings;
 
@@ -621,7 +636,6 @@ namespace nspector.Native.NVAPI2
             }
             return res;
         }
-
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate NvAPI_Status DRS_EnumAvailableSettingIdsDelegate(IntPtr pSettingIds, ref uint pMaxCount);
         public static readonly DRS_EnumAvailableSettingIdsDelegate DRS_EnumAvailableSettingIdsInternal;
@@ -630,7 +644,7 @@ namespace nspector.Native.NVAPI2
             NvAPI_Status res;
             var settingIdArray = new uint[maxCount];
             var pSettingIds = IntPtr.Zero;
-            NativeArrayHelper.SetArrayDataNative(settingIdArray, out pSettingIds);
+            NativeArrayHelper.SetArrayData(settingIdArray, out pSettingIds);
             try
             {
                 res = DRS_EnumAvailableSettingIdsInternal(pSettingIds, ref maxCount);
@@ -648,17 +662,9 @@ namespace nspector.Native.NVAPI2
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate NvAPI_Status DRS_EnumAvailableSettingValuesDelegate(uint settingId, ref uint pMaxNumValues, IntPtr pSettingValues);
         private static readonly DRS_EnumAvailableSettingValuesDelegate DRS_EnumAvailableSettingValuesInternal;
-
-        [ThreadStatic]
-        private static IntPtr pSettingValues;
-
         public static NvAPI_Status DRS_EnumAvailableSettingValues(uint settingId, ref uint pMaxNumValues, ref NVDRS_SETTING_VALUES settingValues)
         {
-            if (pSettingValues == IntPtr.Zero)
-            {
-                pSettingValues = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(NVDRS_SETTING_VALUES)));
-            }
-
+            var pSettingValues = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(NVDRS_SETTING_VALUES)));
             NvAPI_Status res;
             try
             {
@@ -669,7 +675,7 @@ namespace nspector.Native.NVAPI2
             }
             finally
             {
-                //Marshal.FreeHGlobal(pSettingValues);
+                Marshal.FreeHGlobal(pSettingValues);
             }
             return res;
         }
@@ -743,24 +749,23 @@ namespace nspector.Native.NVAPI2
                         GetDelegate(0xED1F8C69, out DRS_GetApplicationInfo);
                         GetDelegate(0x7FA2173A, out DRS_EnumApplicationsInternal);
                         GetDelegate(0xEEE566B2, out DRS_FindApplicationByName);
-                        GetDelegate(0x577DD202, out DRS_SetSetting);
-                        GetDelegate(0x73BF8338, out DRS_GetSetting);
-                        GetDelegate(0xAE3039DA, out DRS_EnumSettingsInternal);
-                        GetDelegate(0xF020614A, out DRS_EnumAvailableSettingIdsInternal);
+                        GetDelegate(0x8A2CF5F5, out _DRS_SetSetting, 0x577DD202);
+                        GetDelegate(0xEA99498D, out _DRS_GetSetting, 0x73BF8338);
+                        GetDelegate(0xCFD6983E, out DRS_EnumSettingsInternal, 0xAE3039DA);
+                        GetDelegate(0xE5DE48E5, out DRS_EnumAvailableSettingIdsInternal, 0xF020614A);
                         GetDelegate(0x2EC39F90, out DRS_EnumAvailableSettingValuesInternal);
                         GetDelegate(0xCB7309CD, out DRS_GetSettingIdFromName);
-                        GetDelegate(0xD61CBE6E, out DRS_GetSettingNameFromId);
-                        GetDelegate(0xE4A26362, out DRS_DeleteProfileSetting);
+                        GetDelegate(0x1EB13791, out DRS_GetSettingNameFromId, 0xD61CBE6E);
+                        GetDelegate(0xD20D29DF, out DRS_DeleteProfileSetting, 0xE4A26362);
                         GetDelegate(0x5927B094, out DRS_RestoreAllDefaults);
                         GetDelegate(0xFA5F6134, out DRS_RestoreProfileDefault);
-                        GetDelegate(0x53F0381E, out DRS_RestoreProfileDefaultSetting);
+                        GetDelegate(0x7DD5B261, out DRS_RestoreProfileDefaultSetting, 0x53F0381E);
                         GetDelegate(0xDA8466A0, out DRS_GetBaseProfile);
                         #endregion
-
                     }
                 }
             }
         }
     }
 
-}
+}

Nspector/frmBitEditor.Designer.cs

@@ -49,10 +49,10 @@
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClose.Location = new System.Drawing.Point(914, 806);
-            this.btnClose.Margin = new System.Windows.Forms.Padding(4);
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(731, 645);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(132, 29);
+            this.btnClose.Size = new System.Drawing.Size(106, 23);
             this.btnClose.TabIndex = 1;
             this.btnClose.Text = "Apply && Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -62,10 +62,9 @@
             // 
             this.lValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lValue.AutoSize = true;
-            this.lValue.Location = new System.Drawing.Point(21, 813);
-            this.lValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lValue.Location = new System.Drawing.Point(17, 650);
             this.lValue.Name = "lValue";
-            this.lValue.Size = new System.Drawing.Size(48, 17);
+            this.lValue.Size = new System.Drawing.Size(37, 13);
             this.lValue.TabIndex = 2;
             this.lValue.Text = "Value:";
             // 
@@ -73,31 +72,28 @@
             // 
             this.lFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lFilter.AutoSize = true;
-            this.lFilter.Location = new System.Drawing.Point(187, 813);
-            this.lFilter.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lFilter.Location = new System.Drawing.Point(150, 650);
             this.lFilter.Name = "lFilter";
-            this.lFilter.Size = new System.Drawing.Size(87, 17);
+            this.lFilter.Size = new System.Drawing.Size(64, 13);
             this.lFilter.TabIndex = 23;
             this.lFilter.Text = "Profile Filter:";
             // 
             // tbFilter
             // 
-            this.tbFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.tbFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbFilter.Location = new System.Drawing.Point(274, 809);
-            this.tbFilter.Margin = new System.Windows.Forms.Padding(4);
+            this.tbFilter.Location = new System.Drawing.Point(219, 647);
             this.tbFilter.Name = "tbFilter";
-            this.tbFilter.Size = new System.Drawing.Size(632, 22);
+            this.tbFilter.Size = new System.Drawing.Size(506, 20);
             this.tbFilter.TabIndex = 24;
             this.tbFilter.TextChanged += new System.EventHandler(this.tbFilter_TextChanged);
             // 
             // textBox1
             // 
             this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.textBox1.Location = new System.Drawing.Point(74, 809);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox1.Location = new System.Drawing.Point(59, 647);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(86, 22);
+            this.textBox1.Size = new System.Drawing.Size(70, 20);
             this.textBox1.TabIndex = 31;
             this.textBox1.Text = "0x00FF00FF";
             this.textBox1.Leave += new System.EventHandler(this.textBox1_Leave);
@@ -106,10 +102,9 @@
             // btnDirectApplyStart
             // 
             this.btnDirectApplyStart.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnDirectApplyStart.Location = new System.Drawing.Point(6, 19);
-            this.btnDirectApplyStart.Margin = new System.Windows.Forms.Padding(4);
+            this.btnDirectApplyStart.Location = new System.Drawing.Point(5, 15);
             this.btnDirectApplyStart.Name = "btnDirectApplyStart";
-            this.btnDirectApplyStart.Size = new System.Drawing.Size(105, 42);
+            this.btnDirectApplyStart.Size = new System.Drawing.Size(84, 34);
             this.btnDirectApplyStart.TabIndex = 32;
             this.btnDirectApplyStart.Text = "GO!";
             this.btnDirectApplyStart.UseVisualStyleBackColor = true;
@@ -117,17 +112,15 @@
             // 
             // gbDirectTest
             // 
-            this.gbDirectTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.gbDirectTest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbDirectTest.Controls.Add(this.btnBrowseGame);
             this.gbDirectTest.Controls.Add(this.tbGamePath);
             this.gbDirectTest.Controls.Add(this.lblGamePath);
             this.gbDirectTest.Controls.Add(this.btnDirectApplyStart);
-            this.gbDirectTest.Location = new System.Drawing.Point(18, 733);
-            this.gbDirectTest.Margin = new System.Windows.Forms.Padding(4);
+            this.gbDirectTest.Location = new System.Drawing.Point(14, 586);
             this.gbDirectTest.Name = "gbDirectTest";
-            this.gbDirectTest.Padding = new System.Windows.Forms.Padding(4);
-            this.gbDirectTest.Size = new System.Drawing.Size(1029, 66);
+            this.gbDirectTest.Size = new System.Drawing.Size(823, 53);
             this.gbDirectTest.TabIndex = 33;
             this.gbDirectTest.TabStop = false;
             this.gbDirectTest.Text = "Quick Bit Value Tester (stores this setting value to the current profile and imme" +
@@ -136,10 +129,9 @@
             // btnBrowseGame
             // 
             this.btnBrowseGame.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnBrowseGame.Location = new System.Drawing.Point(971, 24);
-            this.btnBrowseGame.Margin = new System.Windows.Forms.Padding(4);
+            this.btnBrowseGame.Location = new System.Drawing.Point(777, 19);
             this.btnBrowseGame.Name = "btnBrowseGame";
-            this.btnBrowseGame.Size = new System.Drawing.Size(41, 29);
+            this.btnBrowseGame.Size = new System.Drawing.Size(33, 23);
             this.btnBrowseGame.TabIndex = 35;
             this.btnBrowseGame.Text = "...";
             this.btnBrowseGame.UseVisualStyleBackColor = true;
@@ -147,28 +139,26 @@
             // 
             // tbGamePath
             // 
-            this.tbGamePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.tbGamePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbGamePath.Location = new System.Drawing.Point(218, 26);
-            this.tbGamePath.Margin = new System.Windows.Forms.Padding(4);
+            this.tbGamePath.Location = new System.Drawing.Point(174, 21);
             this.tbGamePath.Name = "tbGamePath";
-            this.tbGamePath.Size = new System.Drawing.Size(745, 22);
+            this.tbGamePath.Size = new System.Drawing.Size(597, 20);
             this.tbGamePath.TabIndex = 34;
             // 
             // lblGamePath
             // 
             this.lblGamePath.AutoSize = true;
-            this.lblGamePath.Location = new System.Drawing.Point(119, 29);
-            this.lblGamePath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGamePath.Location = new System.Drawing.Point(95, 23);
             this.lblGamePath.Name = "lblGamePath";
-            this.lblGamePath.Size = new System.Drawing.Size(98, 17);
+            this.lblGamePath.Size = new System.Drawing.Size(73, 13);
             this.lblGamePath.TabIndex = 33;
             this.lblGamePath.Text = "Game to start:";
             // 
             // clbBits
             // 
-            this.clbBits.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.clbBits.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.clbBits.CheckBoxes = true;
             this.clbBits.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -179,11 +169,13 @@
             this.clbBits.FullRowSelect = true;
             this.clbBits.GridLines = true;
             this.clbBits.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
-            this.clbBits.Location = new System.Drawing.Point(12, 12);
+            this.clbBits.HideSelection = false;
+            this.clbBits.Location = new System.Drawing.Point(10, 10);
+            this.clbBits.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.clbBits.MultiSelect = false;
             this.clbBits.Name = "clbBits";
             this.clbBits.ShowGroups = false;
-            this.clbBits.Size = new System.Drawing.Size(1035, 714);
+            this.clbBits.Size = new System.Drawing.Size(829, 572);
             this.clbBits.TabIndex = 34;
             this.clbBits.UseCompatibleStateImageBehavior = false;
             this.clbBits.View = System.Windows.Forms.View.Details;
@@ -209,9 +201,9 @@
             // 
             // frmBitEditor
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1059, 847);
+            this.ClientSize = new System.Drawing.Size(847, 678);
             this.Controls.Add(this.clbBits);
             this.Controls.Add(this.gbDirectTest);
             this.Controls.Add(this.textBox1);
@@ -220,8 +212,7 @@
             this.Controls.Add(this.lValue);
             this.Controls.Add(this.btnClose);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.MinimumSize = new System.Drawing.Size(854, 609);
+            this.MinimumSize = new System.Drawing.Size(686, 495);
             this.Name = "frmBitEditor";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Bit Value Editor";

Nspector/frmBitEditor.cs

@@ -1,13 +1,5 @@
-using System;
+using nspector.Common;
 using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using nspector.Common;
-using nspector.Common.CustomSettings;
 
 namespace nspector
 {
@@ -52,12 +44,14 @@ namespace nspector
             var referenceSettings = DrsServiceLocator.ReferenceSettings?.Settings.FirstOrDefault(s => s.SettingId == _Settingid);
 
             var settingsCache = DrsServiceLocator.ScannerService.CachedSettings.FirstOrDefault(x => x.SettingId == _Settingid);
-            if (settingsCache != null)
+
+            for (int bit = 0; bit < 32; bit++)
             {
-                for (int bit = 0; bit < 32; bit++)
+                string profileNames = "";
+                uint profileCount = 0;
+
+                if (settingsCache != null)
                 {
-                    string profileNames = "";
-                    uint profileCount = 0;
 
                     for (int i = 0; i < settingsCache.SettingValues.Count; i++)
                     {
@@ -74,7 +68,7 @@ namespace nspector
                                 {
                                     for (int f = 0; f < filters.Length; f++)
                                     {
-                                        if (settingProfileNames[p].ToLower().Contains(filters[f].ToLower()))
+                                        if (settingProfileNames[p].ToLowerInvariant().Contains(filters[f].ToLower()))
                                         {
                                             profileNames += settingProfileNames[p] + ",";
                                         }
@@ -84,31 +78,32 @@ namespace nspector
                             profileCount += settingsCache.SettingValues[i].ValueProfileCount;
                         }
                     }
-            
-                    uint mask = (uint)1 << bit;
-                    string maskStr="";
-                    
-                    if (referenceSettings != null)
+                }
+
+                uint mask = (uint)1 << bit;
+                string maskStr = "";
+
+                if (referenceSettings != null)
+                {
+                    var maskValue = referenceSettings.SettingValues.FirstOrDefault(v => v.SettingValue == mask);
+                    if (maskValue != null)
                     {
-                        var maskValue = referenceSettings.SettingValues.FirstOrDefault(v => v.SettingValue == mask);
-                        if (maskValue != null)
+                        maskStr = maskValue.UserfriendlyName;
+                        if (maskStr.Contains("("))
                         {
-                            maskStr = maskValue.UserfriendlyName;
-                            if (maskStr.Contains("("))
-                            {
-                                maskStr = maskStr.Substring(0, maskStr.IndexOf("(") - 1);
-                            }
+                            maskStr = maskStr.Substring(0, maskStr.IndexOf("(") - 1);
                         }
                     }
+                }
 
-                    clbBits.Items.Add(new ListViewItem(new string[] {
+                clbBits.Items.Add(new ListViewItem(new string[] {
                         string.Format("#{0:00}",bit),
                         maskStr,
                         profileCount.ToString(),
                         profileNames,
                     }));
-                    
-                }
+
+
             }
 
             SetValue(lastValue);
@@ -249,4 +244,4 @@ namespace nspector
         }
 
     }
-}
+}

Nspector/frmDrvSettings.Designer.cs

@@ -75,7 +75,10 @@
             this.chSettingID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.chSettingValue = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.chSettingValueHex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.tbSettingDescription = new System.Windows.Forms.TextBox();
+            this.pnlListview = new System.Windows.Forms.Panel();
             this.tsMain.SuspendLayout();
+            this.pnlListview.SuspendLayout();
             this.SuspendLayout();
             // 
             // ilListView
@@ -89,18 +92,18 @@
             // 
             // pbMain
             // 
-            this.pbMain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.pbMain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.pbMain.Location = new System.Drawing.Point(16, 585);
-            this.pbMain.Margin = new System.Windows.Forms.Padding(5);
+            this.pbMain.Location = new System.Drawing.Point(12, 475);
+            this.pbMain.Margin = new System.Windows.Forms.Padding(4);
             this.pbMain.Name = "pbMain";
-            this.pbMain.Size = new System.Drawing.Size(1120, 11);
+            this.pbMain.Size = new System.Drawing.Size(840, 9);
             this.pbMain.TabIndex = 19;
             // 
             // tsMain
             // 
             this.tsMain.AllowMerge = false;
-            this.tsMain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.tsMain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tsMain.AutoSize = false;
             this.tsMain.BackgroundImage = global::nspector.Properties.Resources.transparent16;
@@ -132,10 +135,10 @@
             this.tsSep6,
             this.tsbApplyProfile});
             this.tsMain.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
-            this.tsMain.Location = new System.Drawing.Point(16, 5);
+            this.tsMain.Location = new System.Drawing.Point(12, 4);
             this.tsMain.Name = "tsMain";
             this.tsMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.tsMain.Size = new System.Drawing.Size(1120, 31);
+            this.tsMain.Size = new System.Drawing.Size(840, 25);
             this.tsMain.TabIndex = 24;
             this.tsMain.Text = "toolStrip1";
             // 
@@ -144,7 +147,7 @@
             this.tslProfiles.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tslProfiles.Margin = new System.Windows.Forms.Padding(0, 5, 10, 2);
             this.tslProfiles.Name = "tslProfiles";
-            this.tslProfiles.Size = new System.Drawing.Size(61, 24);
+            this.tslProfiles.Size = new System.Drawing.Size(49, 18);
             this.tslProfiles.Text = "Profiles:";
             // 
             // cbProfiles
@@ -156,7 +159,7 @@
             this.cbProfiles.Margin = new System.Windows.Forms.Padding(1);
             this.cbProfiles.MaxDropDownItems = 50;
             this.cbProfiles.Name = "cbProfiles";
-            this.cbProfiles.Size = new System.Drawing.Size(385, 28);
+            this.cbProfiles.Size = new System.Drawing.Size(290, 23);
             this.cbProfiles.SelectedIndexChanged += new System.EventHandler(this.cbProfiles_SelectedIndexChanged);
             this.cbProfiles.TextChanged += new System.EventHandler(this.cbProfiles_TextChanged);
             // 
@@ -167,7 +170,7 @@
             this.tsbModifiedProfiles.Image = global::nspector.Properties.Resources.home_sm;
             this.tsbModifiedProfiles.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbModifiedProfiles.Name = "tsbModifiedProfiles";
-            this.tsbModifiedProfiles.Size = new System.Drawing.Size(39, 28);
+            this.tsbModifiedProfiles.Size = new System.Drawing.Size(36, 22);
             this.tsbModifiedProfiles.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay;
             this.tsbModifiedProfiles.ToolTipText = "Back to global profile (Home) / User modified profiles";
             this.tsbModifiedProfiles.ButtonClick += new System.EventHandler(this.tsbModifiedProfiles_ButtonClick);
@@ -176,7 +179,7 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
             // 
             // tsbRefreshProfile
             // 
@@ -184,7 +187,7 @@
             this.tsbRefreshProfile.Image = ((System.Drawing.Image)(resources.GetObject("tsbRefreshProfile.Image")));
             this.tsbRefreshProfile.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbRefreshProfile.Name = "tsbRefreshProfile";
-            this.tsbRefreshProfile.Size = new System.Drawing.Size(24, 28);
+            this.tsbRefreshProfile.Size = new System.Drawing.Size(24, 22);
             this.tsbRefreshProfile.Text = "Refresh current profile.";
             this.tsbRefreshProfile.Click += new System.EventHandler(this.tsbRefreshProfile_Click);
             // 
@@ -194,7 +197,7 @@
             this.tsbRestoreProfile.Image = ((System.Drawing.Image)(resources.GetObject("tsbRestoreProfile.Image")));
             this.tsbRestoreProfile.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbRestoreProfile.Name = "tsbRestoreProfile";
-            this.tsbRestoreProfile.Size = new System.Drawing.Size(24, 28);
+            this.tsbRestoreProfile.Size = new System.Drawing.Size(24, 22);
             this.tsbRestoreProfile.Text = "Restore current profile to NVIDIA defaults.";
             this.tsbRestoreProfile.Click += new System.EventHandler(this.tsbRestoreProfile_Click);
             // 
@@ -204,7 +207,7 @@
             this.tsbCreateProfile.Image = ((System.Drawing.Image)(resources.GetObject("tsbCreateProfile.Image")));
             this.tsbCreateProfile.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbCreateProfile.Name = "tsbCreateProfile";
-            this.tsbCreateProfile.Size = new System.Drawing.Size(24, 28);
+            this.tsbCreateProfile.Size = new System.Drawing.Size(24, 22);
             this.tsbCreateProfile.Text = "Create new profile";
             this.tsbCreateProfile.Click += new System.EventHandler(this.tsbCreateProfile_Click);
             // 
@@ -214,14 +217,14 @@
             this.tsbDeleteProfile.Image = global::nspector.Properties.Resources.ieframe_1_18212;
             this.tsbDeleteProfile.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbDeleteProfile.Name = "tsbDeleteProfile";
-            this.tsbDeleteProfile.Size = new System.Drawing.Size(24, 28);
+            this.tsbDeleteProfile.Size = new System.Drawing.Size(24, 22);
             this.tsbDeleteProfile.Text = "Delete current Profile";
             this.tsbDeleteProfile.Click += new System.EventHandler(this.tsbDeleteProfile_Click);
             // 
             // tsSep2
             // 
             this.tsSep2.Name = "tsSep2";
-            this.tsSep2.Size = new System.Drawing.Size(6, 31);
+            this.tsSep2.Size = new System.Drawing.Size(6, 25);
             // 
             // tsbAddApplication
             // 
@@ -229,7 +232,7 @@
             this.tsbAddApplication.Image = global::nspector.Properties.Resources.window_application_add;
             this.tsbAddApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbAddApplication.Name = "tsbAddApplication";
-            this.tsbAddApplication.Size = new System.Drawing.Size(24, 28);
+            this.tsbAddApplication.Size = new System.Drawing.Size(24, 22);
             this.tsbAddApplication.Text = "Add application to current profile.";
             this.tsbAddApplication.Click += new System.EventHandler(this.tsbAddApplication_Click);
             // 
@@ -239,7 +242,7 @@
             this.tssbRemoveApplication.Image = global::nspector.Properties.Resources.window_application_delete;
             this.tssbRemoveApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tssbRemoveApplication.Name = "tssbRemoveApplication";
-            this.tssbRemoveApplication.Size = new System.Drawing.Size(39, 28);
+            this.tssbRemoveApplication.Size = new System.Drawing.Size(36, 22);
             this.tssbRemoveApplication.Text = "Remove application from current profile";
             this.tssbRemoveApplication.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tssbRemoveApplication_DropDownItemClicked);
             this.tssbRemoveApplication.Click += new System.EventHandler(this.tssbRemoveApplication_Click);
@@ -247,7 +250,7 @@
             // tsSep3
             // 
             this.tsSep3.Name = "tsSep3";
-            this.tsSep3.Size = new System.Drawing.Size(6, 31);
+            this.tsSep3.Size = new System.Drawing.Size(6, 25);
             // 
             // tsbExportProfiles
             // 
@@ -260,35 +263,35 @@
             this.tsbExportProfiles.Image = global::nspector.Properties.Resources.export1;
             this.tsbExportProfiles.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbExportProfiles.Name = "tsbExportProfiles";
-            this.tsbExportProfiles.Size = new System.Drawing.Size(39, 28);
+            this.tsbExportProfiles.Size = new System.Drawing.Size(36, 22);
             this.tsbExportProfiles.Text = "Export user defined profiles";
             this.tsbExportProfiles.Click += new System.EventHandler(this.tsbExportProfiles_Click);
             // 
             // exportCurrentProfileOnlyToolStripMenuItem
             // 
             this.exportCurrentProfileOnlyToolStripMenuItem.Name = "exportCurrentProfileOnlyToolStripMenuItem";
-            this.exportCurrentProfileOnlyToolStripMenuItem.Size = new System.Drawing.Size(422, 26);
+            this.exportCurrentProfileOnlyToolStripMenuItem.Size = new System.Drawing.Size(343, 22);
             this.exportCurrentProfileOnlyToolStripMenuItem.Text = "Export current profile only";
             this.exportCurrentProfileOnlyToolStripMenuItem.Click += new System.EventHandler(this.exportCurrentProfileOnlyToolStripMenuItem_Click);
             // 
             // exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem
             // 
             this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem.Name = "exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem";
-            this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem.Size = new System.Drawing.Size(422, 26);
+            this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem.Size = new System.Drawing.Size(343, 22);
             this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem.Text = "Export current profile including predefined settings";
             this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem.Click += new System.EventHandler(this.exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem_Click);
             // 
             // exportUserdefinedProfilesToolStripMenuItem
             // 
             this.exportUserdefinedProfilesToolStripMenuItem.Name = "exportUserdefinedProfilesToolStripMenuItem";
-            this.exportUserdefinedProfilesToolStripMenuItem.Size = new System.Drawing.Size(422, 26);
+            this.exportUserdefinedProfilesToolStripMenuItem.Size = new System.Drawing.Size(343, 22);
             this.exportUserdefinedProfilesToolStripMenuItem.Text = "Export all customized profiles";
             this.exportUserdefinedProfilesToolStripMenuItem.Click += new System.EventHandler(this.exportUserdefinedProfilesToolStripMenuItem_Click);
             // 
             // exportAllProfilesNVIDIATextFormatToolStripMenuItem
             // 
             this.exportAllProfilesNVIDIATextFormatToolStripMenuItem.Name = "exportAllProfilesNVIDIATextFormatToolStripMenuItem";
-            this.exportAllProfilesNVIDIATextFormatToolStripMenuItem.Size = new System.Drawing.Size(422, 26);
+            this.exportAllProfilesNVIDIATextFormatToolStripMenuItem.Size = new System.Drawing.Size(343, 22);
             this.exportAllProfilesNVIDIATextFormatToolStripMenuItem.Text = "Export all driver profiles (NVIDIA Text Format)";
             this.exportAllProfilesNVIDIATextFormatToolStripMenuItem.Click += new System.EventHandler(this.exportAllProfilesNVIDIATextFormatToolStripMenuItem_Click);
             // 
@@ -301,28 +304,28 @@
             this.tsbImportProfiles.Image = global::nspector.Properties.Resources.import1;
             this.tsbImportProfiles.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbImportProfiles.Name = "tsbImportProfiles";
-            this.tsbImportProfiles.Size = new System.Drawing.Size(39, 28);
+            this.tsbImportProfiles.Size = new System.Drawing.Size(36, 22);
             this.tsbImportProfiles.Text = "Import user defined profiles";
             this.tsbImportProfiles.Click += new System.EventHandler(this.tsbImportProfiles_Click);
             // 
             // importProfilesToolStripMenuItem
             // 
             this.importProfilesToolStripMenuItem.Name = "importProfilesToolStripMenuItem";
-            this.importProfilesToolStripMenuItem.Size = new System.Drawing.Size(453, 26);
+            this.importProfilesToolStripMenuItem.Size = new System.Drawing.Size(363, 22);
             this.importProfilesToolStripMenuItem.Text = "Import profile(s)";
             this.importProfilesToolStripMenuItem.Click += new System.EventHandler(this.importProfilesToolStripMenuItem_Click);
             // 
             // importAllProfilesNVIDIATextFormatToolStripMenuItem
             // 
             this.importAllProfilesNVIDIATextFormatToolStripMenuItem.Name = "importAllProfilesNVIDIATextFormatToolStripMenuItem";
-            this.importAllProfilesNVIDIATextFormatToolStripMenuItem.Size = new System.Drawing.Size(453, 26);
+            this.importAllProfilesNVIDIATextFormatToolStripMenuItem.Size = new System.Drawing.Size(363, 22);
             this.importAllProfilesNVIDIATextFormatToolStripMenuItem.Text = "Import (replace) all driver profiles (NVIDIA Text Format)";
             this.importAllProfilesNVIDIATextFormatToolStripMenuItem.Click += new System.EventHandler(this.importAllProfilesNVIDIATextFormatToolStripMenuItem_Click);
             // 
             // tsSep4
             // 
             this.tsSep4.Name = "tsSep4";
-            this.tsSep4.Size = new System.Drawing.Size(6, 31);
+            this.tsSep4.Size = new System.Drawing.Size(6, 25);
             // 
             // tscbShowCustomSettingNamesOnly
             // 
@@ -331,14 +334,14 @@
             this.tscbShowCustomSettingNamesOnly.Image = global::nspector.Properties.Resources.filter_user;
             this.tscbShowCustomSettingNamesOnly.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tscbShowCustomSettingNamesOnly.Name = "tscbShowCustomSettingNamesOnly";
-            this.tscbShowCustomSettingNamesOnly.Size = new System.Drawing.Size(24, 28);
+            this.tscbShowCustomSettingNamesOnly.Size = new System.Drawing.Size(24, 22);
             this.tscbShowCustomSettingNamesOnly.Text = "Show the settings and values from CustomSettingNames file only.";
             this.tscbShowCustomSettingNamesOnly.CheckedChanged += new System.EventHandler(this.cbCustomSettingsOnly_CheckedChanged);
             // 
             // tsSep5
             // 
             this.tsSep5.Name = "tsSep5";
-            this.tsSep5.Size = new System.Drawing.Size(6, 31);
+            this.tsSep5.Size = new System.Drawing.Size(6, 25);
             // 
             // tscbShowScannedUnknownSettings
             // 
@@ -348,7 +351,7 @@
             this.tscbShowScannedUnknownSettings.Image = global::nspector.Properties.Resources.find_set2;
             this.tscbShowScannedUnknownSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tscbShowScannedUnknownSettings.Name = "tscbShowScannedUnknownSettings";
-            this.tscbShowScannedUnknownSettings.Size = new System.Drawing.Size(24, 28);
+            this.tscbShowScannedUnknownSettings.Size = new System.Drawing.Size(24, 22);
             this.tscbShowScannedUnknownSettings.Text = "Show unknown settings from NVIDIA predefined profiles";
             this.tscbShowScannedUnknownSettings.Click += new System.EventHandler(this.tscbShowScannedUnknownSettings_Click);
             // 
@@ -358,14 +361,14 @@
             this.tsbBitValueEditor.Image = global::nspector.Properties.Resources.text_binary;
             this.tsbBitValueEditor.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbBitValueEditor.Name = "tsbBitValueEditor";
-            this.tsbBitValueEditor.Size = new System.Drawing.Size(24, 28);
+            this.tsbBitValueEditor.Size = new System.Drawing.Size(24, 22);
             this.tsbBitValueEditor.Text = "Show bit value editor.";
             this.tsbBitValueEditor.Click += new System.EventHandler(this.tsbBitValueEditor_Click);
             // 
             // tsSep6
             // 
             this.tsSep6.Name = "tsSep6";
-            this.tsSep6.Size = new System.Drawing.Size(6, 31);
+            this.tsSep6.Size = new System.Drawing.Size(6, 25);
             // 
             // tsbApplyProfile
             // 
@@ -374,7 +377,7 @@
             this.tsbApplyProfile.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbApplyProfile.Name = "tsbApplyProfile";
             this.tsbApplyProfile.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
-            this.tsbApplyProfile.Size = new System.Drawing.Size(130, 28);
+            this.tsbApplyProfile.Size = new System.Drawing.Size(109, 22);
             this.tsbApplyProfile.Text = "Apply changes";
             this.tsbApplyProfile.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.tsbApplyProfile.Click += new System.EventHandler(this.tsbApplyProfile_Click);
@@ -384,25 +387,25 @@
             this.btnResetValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnResetValue.Enabled = false;
             this.btnResetValue.Image = global::nspector.Properties.Resources.nv_btn;
-            this.btnResetValue.Location = new System.Drawing.Point(976, 215);
+            this.btnResetValue.Location = new System.Drawing.Point(732, 175);
             this.btnResetValue.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.btnResetValue.Name = "btnResetValue";
-            this.btnResetValue.Size = new System.Drawing.Size(33, 23);
+            this.btnResetValue.Size = new System.Drawing.Size(25, 19);
             this.btnResetValue.TabIndex = 7;
             this.btnResetValue.UseVisualStyleBackColor = true;
             this.btnResetValue.Click += new System.EventHandler(this.btnResetValue_Click);
             // 
             // lblApplications
             // 
-            this.lblApplications.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.lblApplications.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblApplications.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(185)))), ((int)(((byte)(0)))));
             this.lblApplications.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.lblApplications.ForeColor = System.Drawing.Color.White;
-            this.lblApplications.Location = new System.Drawing.Point(16, 39);
-            this.lblApplications.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.lblApplications.Location = new System.Drawing.Point(12, 32);
+            this.lblApplications.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblApplications.Name = "lblApplications";
-            this.lblApplications.Size = new System.Drawing.Size(1120, 21);
+            this.lblApplications.Size = new System.Drawing.Size(840, 17);
             this.lblApplications.TabIndex = 25;
             this.lblApplications.Text = "fsagame.exe, bond.exe, herozero.exe";
             // 
@@ -440,10 +443,10 @@
             // 
             this.cbValues.BackColor = System.Drawing.SystemColors.Window;
             this.cbValues.FormattingEnabled = true;
-            this.cbValues.Location = new System.Drawing.Point(699, 215);
-            this.cbValues.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.cbValues.Location = new System.Drawing.Point(524, 175);
+            this.cbValues.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cbValues.Name = "cbValues";
-            this.cbValues.Size = new System.Drawing.Size(95, 24);
+            this.cbValues.Size = new System.Drawing.Size(72, 21);
             this.cbValues.TabIndex = 5;
             this.cbValues.Visible = false;
             this.cbValues.SelectedValueChanged += new System.EventHandler(this.cbValues_SelectedValueChanged);
@@ -451,62 +454,61 @@
             // 
             // lblWidth96
             // 
-            this.lblWidth96.Location = new System.Drawing.Point(103, 287);
-            this.lblWidth96.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.lblWidth96.Location = new System.Drawing.Point(77, 233);
+            this.lblWidth96.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblWidth96.Name = "lblWidth96";
-            this.lblWidth96.Size = new System.Drawing.Size(128, 22);
+            this.lblWidth96.Size = new System.Drawing.Size(96, 18);
             this.lblWidth96.TabIndex = 77;
             this.lblWidth96.Text = "96";
             this.lblWidth96.Visible = false;
             // 
             // lblWidth330
             // 
-            this.lblWidth330.Location = new System.Drawing.Point(103, 258);
-            this.lblWidth330.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.lblWidth330.Location = new System.Drawing.Point(77, 210);
+            this.lblWidth330.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblWidth330.Name = "lblWidth330";
-            this.lblWidth330.Size = new System.Drawing.Size(440, 27);
+            this.lblWidth330.Size = new System.Drawing.Size(330, 22);
             this.lblWidth330.TabIndex = 78;
             this.lblWidth330.Text = "330 (Helper Labels for DPI Scaling)";
             this.lblWidth330.Visible = false;
             // 
             // lblWidth16
             // 
-            this.lblWidth16.Location = new System.Drawing.Point(103, 331);
-            this.lblWidth16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.lblWidth16.Location = new System.Drawing.Point(77, 269);
+            this.lblWidth16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblWidth16.Name = "lblWidth16";
-            this.lblWidth16.Size = new System.Drawing.Size(21, 22);
+            this.lblWidth16.Size = new System.Drawing.Size(16, 18);
             this.lblWidth16.TabIndex = 79;
             this.lblWidth16.Text = "16";
             this.lblWidth16.Visible = false;
             // 
             // lblWidth30
             // 
-            this.lblWidth30.Location = new System.Drawing.Point(103, 309);
-            this.lblWidth30.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.lblWidth30.Location = new System.Drawing.Point(77, 251);
+            this.lblWidth30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblWidth30.Name = "lblWidth30";
-            this.lblWidth30.Size = new System.Drawing.Size(40, 22);
+            this.lblWidth30.Size = new System.Drawing.Size(30, 18);
             this.lblWidth30.TabIndex = 80;
             this.lblWidth30.Text = "30";
             this.lblWidth30.Visible = false;
             // 
             // lvSettings
             // 
-            this.lvSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.lvSettings.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.chSettingID,
             this.chSettingValue,
             this.chSettingValueHex});
+            this.lvSettings.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lvSettings.FullRowSelect = true;
             this.lvSettings.GridLines = true;
             this.lvSettings.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-            this.lvSettings.Location = new System.Drawing.Point(16, 63);
-            this.lvSettings.Margin = new System.Windows.Forms.Padding(5);
+            this.lvSettings.HideSelection = false;
+            this.lvSettings.Location = new System.Drawing.Point(0, 0);
+            this.lvSettings.Margin = new System.Windows.Forms.Padding(4);
             this.lvSettings.MultiSelect = false;
             this.lvSettings.Name = "lvSettings";
             this.lvSettings.ShowItemToolTips = true;
-            this.lvSettings.Size = new System.Drawing.Size(1119, 514);
+            this.lvSettings.Size = new System.Drawing.Size(840, 372);
             this.lvSettings.SmallImageList = this.ilListView;
             this.lvSettings.TabIndex = 2;
             this.lvSettings.UseCompatibleStateImageBehavior = false;
@@ -514,8 +516,8 @@
             this.lvSettings.ColumnWidthChanging += new System.Windows.Forms.ColumnWidthChangingEventHandler(this.lvSettings_ColumnWidthChanging);
             this.lvSettings.SelectedIndexChanged += new System.EventHandler(this.lvSettings_SelectedIndexChanged);
             this.lvSettings.DoubleClick += new System.EventHandler(this.lvSettings_DoubleClick);
-            this.lvSettings.Resize += new System.EventHandler(this.lvSettings_Resize);
             this.lvSettings.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvSettings_KeyDown);
+            this.lvSettings.Resize += new System.EventHandler(this.lvSettings_Resize);
             // 
             // chSettingID
             // 
@@ -532,23 +534,47 @@
             this.chSettingValueHex.Text = "SettingValueHex";
             this.chSettingValueHex.Width = 96;
             // 
+            // tbSettingDescription
+            // 
+            this.tbSettingDescription.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tbSettingDescription.Location = new System.Drawing.Point(0, 372);
+            this.tbSettingDescription.Multiline = true;
+            this.tbSettingDescription.Name = "tbSettingDescription";
+            this.tbSettingDescription.ReadOnly = true;
+            this.tbSettingDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.tbSettingDescription.Size = new System.Drawing.Size(840, 44);
+            this.tbSettingDescription.TabIndex = 81;
+            this.tbSettingDescription.Visible = false;
+            // 
+            // pnlListview
+            // 
+            this.pnlListview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlListview.Controls.Add(this.lvSettings);
+            this.pnlListview.Controls.Add(this.tbSettingDescription);
+            this.pnlListview.Location = new System.Drawing.Point(12, 52);
+            this.pnlListview.Name = "pnlListview";
+            this.pnlListview.Size = new System.Drawing.Size(840, 416);
+            this.pnlListview.TabIndex = 82;
+            // 
             // frmDrvSettings
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1152, 606);
+            this.ClientSize = new System.Drawing.Size(864, 492);
+            this.Controls.Add(this.pnlListview);
             this.Controls.Add(this.lblWidth30);
             this.Controls.Add(this.lblWidth16);
             this.Controls.Add(this.lblWidth330);
             this.Controls.Add(this.lblWidth96);
-            this.Controls.Add(this.lvSettings);
             this.Controls.Add(this.lblApplications);
             this.Controls.Add(this.tsMain);
             this.Controls.Add(this.pbMain);
             this.Controls.Add(this.btnResetValue);
             this.Controls.Add(this.cbValues);
-            this.Margin = new System.Windows.Forms.Padding(5);
-            this.MinimumSize = new System.Drawing.Size(1167, 417);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MinimumSize = new System.Drawing.Size(879, 346);
             this.Name = "frmDrvSettings";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "nSpector - Driver Profile Settings";
@@ -558,6 +584,8 @@
             this.Shown += new System.EventHandler(this.frmDrvSettings_Shown);
             this.tsMain.ResumeLayout(false);
             this.tsMain.PerformLayout();
+            this.pnlListview.ResumeLayout(false);
+            this.pnlListview.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -609,5 +637,7 @@
         private System.Windows.Forms.Label lblWidth16;
         private System.Windows.Forms.Label lblWidth30;
         private System.Windows.Forms.ToolStripMenuItem exportCurrentProfileIncludingPredefinedSettingsToolStripMenuItem;
+        private System.Windows.Forms.TextBox tbSettingDescription;
+        private System.Windows.Forms.Panel pnlListview;
     }
 }

Nspector/frmDrvSettings.cs

@@ -5,7 +5,6 @@ using nspector.Native.WINAPI;
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
-using System.Security.Principal;
 using System.Text;
 
 namespace nspector
@@ -32,7 +31,7 @@ namespace nspector
 
         public string _CurrentProfile = "";
 
-        private bool _highlightUnexposedSettings;
+        private bool isDevMode = false;
 
         protected override void WndProc(ref Message m)
         {
@@ -71,9 +70,12 @@ namespace nspector
         {
             var group = FindOrCreateGroup(setting.GroupName);
 
-            var item = new ListViewItem(setting.SettingText);
+            var settingName = isDevMode ? $"0x{setting.SettingId:X8} {setting.SettingText}" : setting.SettingText;
+
+            var item = new ListViewItem(settingName);
             item.Tag = setting.SettingId;
             item.Group = group;
+
             item.SubItems.Add(setting.ValueText);
             item.SubItems.Add(setting.ValueRaw);
 
@@ -145,8 +147,10 @@ namespace nspector
 
                 foreach (var settingItem in _currentProfileSettingItems)
                 {
+                    if (settingItem.IsSettingHidden) continue;
+
                     var itm = lvSettings.Items.Add(CreateListViewItem(settingItem));
-                    if (_highlightUnexposedSettings && !settingItem.IsApiExposed)
+                    if (Debugger.IsAttached && !settingItem.IsApiExposed)
                     {
                         itm.ForeColor = Color.LightCoral;
                     }
@@ -205,6 +209,8 @@ namespace nspector
 
                     cbValues.BeginUpdate();
 
+                    tsbBitValueEditor.Enabled = false;
+
                     cbValues.Items.Clear();
                     cbValues.Tag = lvSettings.SelectedItems[0].Tag;
                     uint settingid = (uint)lvSettings.SelectedItems[0].Tag;
@@ -226,6 +232,10 @@ namespace nspector
                                 cbValues.Items.Add(itm);
 
                             }
+
+                            tsbBitValueEditor.Enabled = valueNames.Count > 0;
+
+
                         }
 
                         if (settingMeta.SettingType == Native.NVAPI2.NVDRS_SETTING_TYPE.NVDRS_WSTRING_TYPE && settingMeta.StringValues != null)
@@ -241,13 +251,6 @@ namespace nspector
                             foreach (string v in valueNames)
                                 cbValues.Items.Add(v);
                         }
-
-                        var scannedCount = settingMeta?.DwordValues?
-                            .Where(x => x.ValueSource == Common.Meta.SettingMetaSource.ScannedSettings)
-                            .Count();
-
-                        tsbBitValueEditor.Enabled = scannedCount > 0;
-
                     }
 
                     if (cbValues.Items.Count < 1)
@@ -257,6 +260,21 @@ namespace nspector
                     }
 
 
+                    var referenceSettings = DrsServiceLocator.ReferenceSettings?.Settings.FirstOrDefault(s => s.SettingId == settingid);
+
+                    if (string.IsNullOrEmpty(settingMeta.Description) && !(referenceSettings?.HasConstraints ?? false))
+                    {
+                        tbSettingDescription.Text = "";
+                        tbSettingDescription.Visible = false;
+                        tbSettingDescription.BackColor = SystemColors.Control;
+                    }
+                    else
+                    {
+                        tbSettingDescription.Text = settingMeta.Description;
+                        tbSettingDescription.Visible = true;
+                        tbSettingDescription.BackColor = (referenceSettings?.HasConstraints ?? false) ? Color.LightCoral : SystemColors.Control;
+                    }
+
                     cbValues.Text = lvSettings.SelectedItems[0].SubItems[1].Text;
                     cbValues.EndUpdate();
 
@@ -308,12 +326,7 @@ namespace nspector
 
         private void UpdateItemByComboValue()
         {
-            if (cbValues.Tag == null)
-            {
-                return;
-            }
             var settingId = (uint)cbValues.Tag;
-
             var activeImages = new[] { 0, 2 };
 
             int idx = GetListViewIndexOfSetting(settingId);
@@ -335,6 +348,7 @@ namespace nspector
                     valueHasChanged = currentProfileItem.ValueRaw != stringBehind;
                 }
 
+
                 if (valueHasChanged || activeImages.Contains(lvItem.ImageIndex))
                 {
                     lvItem.ForeColor = SystemColors.ControlText;
@@ -422,6 +436,22 @@ namespace nspector
             }
         }
 
+        private void DeleteSelectedValue()
+        {
+            if (lvSettings.SelectedItems != null && lvSettings.SelectedItems.Count > 0)
+            {
+                var settingId = (uint)lvSettings.SelectedItems[0].Tag;
+
+                bool removeFromModified;
+                _drs.DeleteValue(_CurrentProfile, settingId, out removeFromModified);
+
+                if (removeFromModified)
+                    RemoveFromModifiedProfiles(_CurrentProfile);
+
+                RefreshCurrentProfile();
+            }
+        }
+
         private void InitTaskbarList()
         {
             if (Environment.OSVersion.Version.Major >= 6 && Environment.OSVersion.Version.Minor >= 1)
@@ -479,7 +509,7 @@ namespace nspector
         }
 
         public frmDrvSettings() : this(false, false) { }
-        public frmDrvSettings(bool showCsnOnly, bool skipScan)
+        internal frmDrvSettings(bool showCsnOnly, bool skipScan)
         {
             _skipScan = skipScan;
             InitializeComponent();
@@ -492,8 +522,12 @@ namespace nspector
             Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
         }
 
+        public static double ScaleFactor = 1;
+
         private void SetupDpiAdjustments()
         {
+            ScaleFactor = lblWidth330.Width / 330;
+
             chSettingID.Width = lblWidth330.Width;
             chSettingValueHex.Width = lblWidth96.Width;
         }
@@ -540,8 +574,6 @@ namespace nspector
 
         private void frmDrvSettings_Load(object sender, EventArgs e)
         {
-            _highlightUnexposedSettings = !IsAdministrator() && !_drs.ExternalApplySettings;
-
             SetupLayout();
             SetTitleVersion();
             LoadSettings();
@@ -580,7 +612,10 @@ namespace nspector
 
         private void btnResetValue_Click(object sender, EventArgs e)
         {
-            ResetSelectedValue();
+            if (Control.ModifierKeys == Keys.Control)
+                DeleteSelectedValue();
+            else
+                ResetSelectedValue();
         }
 
         private void ChangeCurrentProfile(string profileName)
@@ -1115,7 +1150,7 @@ namespace nspector
             if (files.Length == 1)
             {
                 var fileInfo = new FileInfo(files[0]);
-                if (fileInfo.Extension.ToLower().Equals(".nip"))
+                if (fileInfo.Extension.ToLowerInvariant().Equals(".nip"))
                 {
                     ImportProfiles(fileInfo.FullName);
                     return;
@@ -1151,11 +1186,12 @@ namespace nspector
 
         private void lvSettings_DoubleClick(object sender, EventArgs e)
         {
-            if (Debugger.IsAttached && lvSettings.SelectedItems != null && lvSettings.SelectedItems.Count == 1)
+            if (isDevMode && lvSettings.SelectedItems != null && lvSettings.SelectedItems.Count == 1)
             {
                 var settingId = ((uint)lvSettings.SelectedItems[0].Tag);
                 var settingName = lvSettings.SelectedItems[0].Text;
-                Clipboard.SetText(string.Format($"0x{settingId:X8} {settingName}"));
+                //Clipboard.SetText(string.Format($"0x{settingId:X8} {settingName}"));
+                Clipboard.SetText(string.Format($"{settingName}"));
             }
         }
 
@@ -1222,8 +1258,116 @@ namespace nspector
             {
                 CopyModifiedSettingsToClipBoard();
             }
+
+            if (e.Control && e.Alt && e.KeyCode == Keys.D)
+            {
+                EnableDevmode();
+            }
+
+            if (Debugger.IsAttached && e.Control && e.KeyCode == Keys.T)
+            {
+                TestStoreSettings();
+            }
+
+            if (e.Control && e.KeyCode == Keys.F)
+            {
+                SearchSetting();
+            }
+
+            if (e.KeyCode == Keys.Escape)
+            {
+                RefreshCurrentProfile();
+            }
+
+
         }
 
+        private void SearchSetting()
+        {
+            string inputString = "";
+            if (InputBox.Show("Search Setting", "Please enter setting name:", ref inputString, new List<string>(), "", 2048) == System.Windows.Forms.DialogResult.OK)
+            {
+                var lowerInput = inputString.Trim().ToLowerInvariant();
+                lvSettings.BeginUpdate();
+                foreach (ListViewItem itm in lvSettings.Items)
+                {
+                    if (!itm.Text.ToLowerInvariant().Contains(lowerInput))
+                    {
+                        itm.Remove();
+                    }
+                }
+                lvSettings.EndUpdate();
+            }
+
+        }
+
+        private void EnableDevmode()
+        {
+            isDevMode = true;
+            lvSettings.Font = new Font("Consolas", 9);
+            cbValues.Font = new Font("Consolas", 9);
+            lvSettings.HeaderStyle = ColumnHeaderStyle.Nonclickable;
+            RefreshCurrentProfile();
+        }
+
+        private void TestStoreSettings()
+        {
+            var sbSettings = new StringBuilder();
+            sbSettings.AppendFormat("{0,-40} {1}\r\n", "### Inspector Store Failed ###", _CurrentProfile);
+
+            pbMain.Minimum = 0;
+            pbMain.Maximum = lvSettings.Items.Count;
+            int cntIndex = 0;
+
+            foreach (ListViewGroup group in lvSettings.Groups)
+            {
+                bool groupTitleAdded = false;
+                foreach (ListViewItem item in group.Items)
+                {
+
+                    try
+                    {
+                        pbMain.Value = cntIndex++;
+
+                        var settingId = (uint)item.Tag;
+                        var meta = _meta.GetSettingMeta(settingId);
+                        if (meta.SettingType != NVDRS_SETTING_TYPE.NVDRS_DWORD_TYPE) continue;
+
+                        var wasNotSet = new int[] { 1, 2, 3 }.Contains(item.ImageIndex);
+
+                        if (wasNotSet)
+                        {
+                            _drs.SetDwordValueToProfile(_CurrentProfile, settingId, 0x0);
+                            _drs.ResetValue(_CurrentProfile, settingId, out var rm);
+                        }
+                        else
+                        {
+                            var tmpValue = _drs.GetDwordValueFromProfile(_CurrentProfile, settingId);
+                            _drs.SetDwordValueToProfile(_CurrentProfile, settingId, 0x0);
+                            _drs.SetDwordValueToProfile(_CurrentProfile, settingId, tmpValue);
+                        }
+
+                    }
+                    catch (NvapiException ne)
+                    {
+                        if (!groupTitleAdded)
+                        {
+                            sbSettings.AppendFormat("\r\n[{0}]\r\n", group.Header);
+                            groupTitleAdded = true;
+                        }
+                        sbSettings.AppendFormat("{0,-40} SettingId: {1} Failed: {2}\r\n", item.Text, DrsUtil.GetDwordString((uint)item.Tag), ne.Status);
+                    }
+                }
+            }
+
+            pbMain.Value = 0;
+
+            Clipboard.SetText(sbSettings.ToString());
+            MessageBox.Show("Failed Settings Stored to Clipboard");
+
+        }
+
+
         private void CopyModifiedSettingsToClipBoard()
         {
             var sbSettings = new StringBuilder();
@@ -1248,16 +1392,5 @@ namespace nspector
             Clipboard.SetText(sbSettings.ToString());
 
         }
-
-        private static bool IsAdministrator()
-        {
-            return (new WindowsPrincipal(WindowsIdentity.GetCurrent()))
-                      .IsInRole(WindowsBuiltInRole.Administrator);
-        }
     }
 }
-
-
-
-
-

Nspector/frmDrvSettings.resx

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
+	<!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -59,230 +59,227 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ilListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>115, 17</value>
-  </metadata>
-  <data name="ilListView.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADI
-        DAAAAk1TRnQBSQFMAgEBBAEAAagBBwGoAQcBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABIAMAAQEBAAEYBgABGP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/ADMAAcgBvQGvAacBkQF5BgAD/iEA
-        A+QD2gYAA/4hAAGXAcMBqwFMAZwBcAYAA/4hAAOmA2gGAAP+FQAB8gHxAfABqQGPAXQBzwHHAbwD/wG6
-        AaUBjAGuAZQBeAHxAe8B7QHvAe0B6wGhAYgBbQHkAeAB2xIAA/UD3QPmA/8D4APeA/QD8wPaA+4SAAHt
-        AfIB7wE3AaEBZgGlAcwBtwP/AVgBsQGAATUBpgFoAekB8AHsAecB7wHqATwBlQFkAdQB4gHaEgAD7gNi
-        A7UD/wN6A2QD7APqA1oD2BIAAfMB8QHvAbwBoQGGAb4BogGHAb4BpQGIAbsBogGFAbwBogGEAagBlQGB
-        Aa0BlgF/Aa4BkgF3AegB5QHhEgAD9QnjBuIJ3gPwEgAB6wHyAe4BOgG1AXEBPAG2AXQBPgG3AXMBOgG1
-        AXEBOgG1AXEBNwGmAWoBOAGoAWsBNAGkAWcB2QHnAd8SAAPuA3MDdgN0A3EDbwNxA20DZAPeDAAB9AHz
-        AfIB7wHsAekB6AHiAdwByQGyAZcB0wHCAa4BzgG8AaYBzAG6AaUBzAG5AaMBywG3AaIBygG3AaIBvgGn
-        AY8BxgG1AaMB5AHgAdsB4wHeAdoD/wMAA/YD8wPvA+cD7AbqCekG5AbuA/8DAAHvAfQB8QHiAe4B5wHM
-        AeYB1wFCAcMBfAFUAckBiQFOAccBhQFLAcYBggFLAcYBggFJAcUBgQFJAcUBgQE8AbsBdQF7Ab8BmgHT
-        AeIB2gHTAeAB2QP/AwAD8QPnA9cDhAOgA5cDlgmTA34DlgPYA9cD/wMAAcYBswGdAb4BqAGPAcwBtQGa
-        AdMBvwGrAdUBxQGyAccBsAGXAcMBrAGNAb8BpgGMAb8BpwGMAcUBrwGXAcYBswGdAbsBowGJAaIBiwFx
-        AY0BcwFXAeEB3QHYAwAD5QPkA+gD7APtA+cD5APiA+QG5wPjA9sD1APtAwABXQHCAYoBPAG7AXUBSAHE
-        AYEBVAHJAYkBWAHKAYsBQgHDAXwBQAG+AXgBQAG5AXYBOwG5AXQBQAHCAXsBQwHDAX0BOgG2AXIBMQGb
-        AWEBLAGAAVEB0QHeAdcDAAOOA30DhwOdA6UDhQN3A3gDeQOGA40DdwNfA0MD1QMAAekB5AHeAcYBrgGU
-        AdUBxAGtAc0BuQGlAcoBsAGYAeUB3gHXAfgB9wH2A/oB6AHiAdwBwQGpAY4BwAGoAY4BxAGuAZUBsQGZ
-        AYABzwHGAb0D+wMAA+8D5gPsA+oD5gPtA/kD+wPvBuQD5gPgA+cD/AMAAc4B5wHaAUABwgF8AVUByQGJ
-        AUwBxgGDAUcBxAF/AcMB4wHRAfQB9wH2AfkC+gHOAeYB2QFFAbkBeQE8AbwBdgE9AcEBeQE3AawBbAGt
-        AcsBuwH6AvsDAAPZA4IDnQOXA4YD0QP2A/oD2AN6A3wDgwNuA7YD+wMAAfcB9gH1AcgBsAGVAd4BzAG2
-        AcsBtQGcAdQByQG6DAAB4gHdAdoBtwGgAY4BwwGwAaEBpQGSAYAB8AHuAewGAAP4A+cD7wboDAAD7gPj
-        A+gD3gPzBgAB8gH2AfQBQgHCAX0BYAHNAZEBRgHEAX8BmgHRAbMMAAHIAeMB1AE6AbYBcgFFAcQBfgE2
-        AaMBaAHnAe8B6gYAA/QDggOnA4oDsQwAA9gDgQOWA3ID6gMAAc0BuQGiAcsBtAGZAeMBzQG3AecB1gHD
-        AbsBoQGFA/oMAAP6Ab8BpgGMAcwBuQGjAbwBogGEAa4BlAF4AacBkQF5A+cD6APwA/ID4QP7DAAD+wPi
-        A+kD4gPeA9oBXgHJAY4BRQHEAX4BYwHOAZMBbAHQAZkBPAG0AXMB+QL6DAAB+QL6AUABuQF2AUsBxgGC
-        AToBtQFxATUBpgFoAUwBnAFwA5IDhgOnA7YDcwP5DAAD+gN4A5MDbwNkA2gB1wHJAbgBzwG4AaIB5gHR
-        Ab0B7AHbAcoBugGhAYUC+QH4DAAB+AH3AfYBwwGsAY0BzAG6AaUBuwGiAYUBugGlAYwByAG9Aa8D6QPn
-        A/ED9APhA/oMAAP5A+QD6gPiA+AD5AGKAdMBqwFXAccBigFoAc8BlgFyAdIBnQE8AbIBcAH4AfkB+AwA
-        AfQB9wH2AUABvgF4AUsBxgGCAToBtQFxAVgBsQGAAZcBwwGrA6wDkgOvA74DcQP4DAAD9gN3A5YDcQN6
-        A6YDAAP7AdwByQGzAewB3AHLAccBswGaAc4BxAG5DAAB5QHeAdcBxwGwAZcBzgG8AaYBvgGlAYgD/wYA
-        A/sD7QP0A+cD5QwAA+0D5wPqA+MD/wYAAfoC+wFeAcwBjwFyAdIBnQFCAcMBfAGoAckBtgwAAcMB4wHR
-        AUIBwwF8AU4BxwGFAT4BtwFzA/8GAAP7A6MDvwOIA7IMAAPRA4UDlwN0A/8GAAHxAe8B7AHZAcQBrQHv
-        Ad8BzgHfAc0BuwG2AaEBhQHOAcQBuQL5AfgD+gHUAckBugHKAbABmAHVAcUBsgHTAcIBrgG+AaIBhwHP
-        AccBvAYAA/QD7QP1A/AD4QPlA/oD+wPoA+YD7QPsA+MD5gYAAeUB8QHqAVkBygGNAXcB1AGhAWMBzgGT
-        ATwBsQFwAagByQG2AfgB+QH4AfkC+gGaAdEBswFHAcQBfwFYAcoBiwFUAckBiQE8AbYBdAGlAcwBtwYA
-        A+oDmwPCA64DcQOyA/gD+QOxA4YDpQOgA3YDtQYAAdYBxgGyAdABuAGdAdsBxQGwAfIB4gHSAeABzwG8
-        AccBswGaAboBoQGFAbsBoQGFAcsBtQGcAc0BuQGlAdMBvwGrAckBsgGXAbwBoQGGAakBjwF0BgAD6APp
-        A+wD9gPwA+cG4QPoA+oD7APnA+MD3QYAAXsB0QGhAUkBxQGBAV0BywGOAXsB1QGkAWQBzgGUAUIBwwF8
-        ATwBsgFwATwBtAFzAUYBxAF/AUwBxgGDAVQByQGJAUIBwwF8AToBtQFxATcBoQFmBgADowOKA6ADxwOv
-        A4gDcQNzA4oDlwOdA4QDcwNiBgAB8wHxAe8B8AHtAeoB8QHuAesB4gHOAboB7gHfAc0B7AHcAcsB7AHb
-        AcoB5wHWAcMB3gHMAbYB1QHEAa0BzAG1AZoB6AHiAdwB8wHxAe8B8gHxAfAGAAP1A/ID8wPwA/UG9APy
-        A+8D7APoA+8G9QYAAeoB8wHuAeEB7wHnAeMB8AHoAWQBzgGUAXUB0wGfAXIB0gGdAXIB0gGdAWwB0AGZ
-        AWABzQGRAVUByQGJAUgBxAGBAcwB5gHXAesB8gHuAe0B8gHvBgAD7gPoA+kDrAPAA78DvgO2A6cDnQOH
-        A9cG7gwAAfQB8wHxAdUBwAGnAdkBwwGqAdwByQGzAeYB0QG9AeMBzQG3AcgBsAGVAcYBrgGUAb4BqAGP
-        Ae8B7AHpEgAD9gPrA+wD7QPxA/AD5wPmA+QD8xIAAe0B9AHwAVIByAGHAVcByQGJAV4BzAGPAWgBzwGW
-        AWMBzgGTAUIBwgF9AUABwgF8ATwBuwF1AeIB7gHnEgAD8AOVA5gDowOvA6cGggN9A+cSAAH1AfQB8gHQ
-        Ab0BpAHgAdYBzAP7Ac8BuAGiAcsBtAGZAfcB9gH1AekB5AHeAcYBswGdAfQB8wHyEgAD9gPpA+sD+wPn
-        A+gD+APvA+UD9hIAAe4B9QHxAVsByQGNAasB3QHCAfoC+wFXAccBigFFAcQBfgHyAfYB9AHOAecB2gFd
-        AcIBigHvAfQB8RIAA/EDkgPEA/sDkgOGA/QD2QOOA/EVAAH9AvwD/gMAAdcByQG4Ac0BuQGiIQAD/QP+
-        AwAD6QPnIQAD/AP+AwABigHTAasBXgHJAY4hAAP8A/4DAAOsA5IVAAFCAU0BPgcAAT4DAAEoAwABQAMA
-        ASADAAEBAQABAQYAAQEWAAP/gQAB/gFvAf4BbwH+AW8B/gFvAeABBwHgAQcB4AEHAeABBwHgAQcB4AEH
-        AeABBwHgAQcBgAEAAYABAAGAAQABgAEAAYABAAGAAQABgAEAAYABAAGAAQABgAEAAYABAAGAAQABgwHB
-        AYMBwQGDAcEBgwHBAQMBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABgwHBAYMBwQGDAcEBgwHB
-        AYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAeABBwHgAQcB4AEH
-        AeABBwHgAQcB4AEHAeABBwHgAQcB8gF/AfIBfwHyAX8B8gF/Cw==
-</value>
-  </data>
-  <metadata name="pbMain.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>217, 17</value>
-  </metadata>
-  <metadata name="tsMain.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="tsbRefreshProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPrZPLSsNAFIb7BoKP4Upw5UoQBHfmMrG1olCa
-        pFoExY2KiHcRERFEwYUKglSQesFeQK2rFkFr0Y26MRAKpa2+QS+/MzGpaS114wdhQv7/nDknZ8bx7xDi
-        a+FFeYvnFU2QFHCcRxdEOcQTmTctjWHB4UgM2Wwe5XIZ+fwnko/PWF3bhiAqJzRRp2mtD0/U7oWlTbAK
-        Bj1jYO/vmo5SqYR44gG9fcPgiNpu2uvDkrCVEG+zIMkqcfqQuEuiWCwidhsHJ8qHhtEOLX2H9cxW81MF
-        nni7XP1+5PIfKBQKmJlbR1UrVnAul0O9JJa+fxAwPJehqx+fPdh6apPU6nZfY9Gk4SaWGDwN09FlsUfL
-        rIg2LB/z/NI5SW4bHZ9FJpPBy+sbnG4//Unfk7BjJalNbsBGEzwLIZ1OIxK9AXGqdCdZlSS1iel/HiB2
-        OCTXEM4vItB1nc79HpPTK3APjBiHamJquXp09eCI0sGJyvH84gat4hqp1BM0TUMymcJRIEhLV3ZNa2ME
-        4nXSCxQ1LhLrmVbAgnskudW0/BcOxxdQeE7WHAMG/AAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="tsbRestoreProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFcSURBVDhP3VFNK0RhFL4/wNbM3PdcCgsfsbHDgkJKWPgD
-        ilJGNN73XEs/gbKUmvITuPc9d5iwYKfZyULZ26BkhTjnnXs1TWTNqafOx/M895z3ev84FsrwigQfvyGl
-        1yNM1IyO4cQNrUKdqGFj1awmuGgWZnDC9Wouz8U1xnATkj+oE78HLVyWKPeAlH9EUkOa1FyzWOAxeVIS
-        JuxtRoVeERhS51zviLlsIHNjYRltW1ejWOChDdbqhEIfRoVbE0PZbXXoP3G/ygZFNyeYZ4xlwgzC9fAI
-        7rmomUrQL01TyXekPUfSVo3zSSVXW3Ug75PNnEEpau+Uglff5XsnOH9D8reZuBJamOa6JvPQqkXhF89a
-        W9jw+MtAIiTVjRE88+AKY3/E5fKVGO74jC3hbMTBAPf2XT+FEzcGb7BqrH/KWNIUTLk34LX5V740Cn80
-        yGKU4P07QTNS+t8Nz/sEkToIpLSWKNoAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="tsbCreateProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhP3Y/PKwRhHIf3f5g/wMWUlIuDUk5y5MCB3Dk4
-        7EUbBwdXJ3EXsksjidlk2x27NrXt5kdjlTQXbSFK2iaGaX7s491Zjppx5FNP7/et9/n0fmP/PFwu8JGd
-        5OsaLdxpNIyVQPL1GcyDwWDmVsEx1sLLGvdHeLtduKVh/GIPTlbGPRvF3mmjXm0Vh8a9SEBGAl1gCMoS
-        j2p/uOyX5/AK4/i5bqgI8UrQPFUJO9mOr43gHk/9XOToy9QLCd4O+yAvxCb7gg0JK9WJqcWxTubDf+Kd
-        x0ERYkqwLliVeE8PRNufWhpnUxY7j2Fu92IlO3jOT+AqMk+lxfAS+6HI6/VW8NA5neVlb6g11zLcVNRo
-        v/gO1SXM3PTvpL+WWOwT04jC5H73kgIAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="btnResetValue.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lblApplications.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="ilCombo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="cbValues.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lblWidth96.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lblWidth330.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lblWidth16.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lblWidth30.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lvSettings.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="metadata">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" />
+							</xsd:sequence>
+							<xsd:attribute name="name" use="required" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+							<xsd:attribute ref="xml:space" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="assembly">
+						<xsd:complexType>
+							<xsd:attribute name="alias" type="xsd:string" />
+							<xsd:attribute name="name" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+							<xsd:attribute ref="xml:space" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>2.0</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<metadata name="ilListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>115, 17</value>
+	</metadata>
+	<data name="ilListView.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+		<value>
+			AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+			LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+			ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADI
+			DAAAAk1TRnQBSQFMAgEBBAEAAcABBwHAAQcBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+			AwABIAMAAQEBAAEYBgABGP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/ADMAAcgBvQGvAacBkQF5BgAD/iEA
+			A+QD2gYAA/4hAAGXAcMBqwFMAZwBcAYAA/4hAAOmA2gGAAP+FQAB8gHxAfABqQGPAXQBzwHHAbwD/wG6
+			AaUBjAGuAZQBeAHxAe8B7QHvAe0B6wGhAYgBbQHkAeAB2xIAA/UD3QPmA/8D4APeA/QD8wPaA+4SAAHt
+			AfIB7wE3AaEBZgGlAcwBtwP/AVgBsQGAATUBpgFoAekB8AHsAecB7wHqATwBlQFkAdQB4gHaEgAD7gNi
+			A7UD/wN6A2QD7APqA1oD2BIAAfMB8QHvAbwBoQGGAb4BogGHAb4BpQGIAbsBogGFAbwBogGEAagBlQGB
+			Aa0BlgF/Aa4BkgF3AegB5QHhEgAD9QnjBuIJ3gPwEgAB6wHyAe4BOgG1AXEBPAG2AXQBPgG3AXMBOgG1
+			AXEBOgG1AXEBNwGmAWoBOAGoAWsBNAGkAWcB2QHnAd8SAAPuA3MDdgN0A3EDbwNxA20DZAPeDAAB9AHz
+			AfIB7wHsAekB6AHiAdwByQGyAZcB0wHCAa4BzgG8AaYBzAG6AaUBzAG5AaMBywG3AaIBygG3AaIBvgGn
+			AY8BxgG1AaMB5AHgAdsB4wHeAdoD/wMAA/YD8wPvA+cD7AbqCekG5AbuA/8DAAHvAfQB8QHiAe4B5wHM
+			AeYB1wFCAcMBfAFUAckBiQFOAccBhQFLAcYBggFLAcYBggFJAcUBgQFJAcUBgQE8AbsBdQF7Ab8BmgHT
+			AeIB2gHTAeAB2QP/AwAD8QPnA9cDhAOgA5cDlgmTA34DlgPYA9cD/wMAAcYBswGdAb4BqAGPAcwBtQGa
+			AdMBvwGrAdUBxQGyAccBsAGXAcMBrAGNAb8BpgGMAb8BpwGMAcUBrwGXAcYBswGdAbsBowGJAaIBiwFx
+			AY0BcwFXAeEB3QHYAwAD5QPkA+gD7APtA+cD5APiA+QG5wPjA9sD1APtAwABXQHCAYoBPAG7AXUBSAHE
+			AYEBVAHJAYkBWAHKAYsBQgHDAXwBQAG+AXgBQAG5AXYBOwG5AXQBQAHCAXsBQwHDAX0BOgG2AXIBMQGb
+			AWEBLAGAAVEB0QHeAdcDAAOOA30DhwOdA6UDhQN3A3gDeQOGA40DdwNfA0MD1QMAAekB5AHeAcYBrgGU
+			AdUBxAGtAc0BuQGlAcoBsAGYAeUB3gHXAfgB9wH2A/oB6AHiAdwBwQGpAY4BwAGoAY4BxAGuAZUBsQGZ
+			AYABzwHGAb0D+wMAA+8D5gPsA+oD5gPtA/kD+wPvBuQD5gPgA+cD/AMAAc4B5wHaAUABwgF8AVUByQGJ
+			AUwBxgGDAUcBxAF/AcMB4wHRAfQB9wH2AfkC+gHOAeYB2QFFAbkBeQE8AbwBdgE9AcEBeQE3AawBbAGt
+			AcsBuwH6AvsDAAPZA4IDnQOXA4YD0QP2A/oD2AN6A3wDgwNuA7YD+wMAAfcB9gH1AcgBsAGVAd4BzAG2
+			AcsBtQGcAdQByQG6DAAB4gHdAdoBtwGgAY4BwwGwAaEBpQGSAYAB8AHuAewGAAP4A+cD7wboDAAD7gPj
+			A+gD3gPzBgAB8gH2AfQBQgHCAX0BYAHNAZEBRgHEAX8BmgHRAbMMAAHIAeMB1AE6AbYBcgFFAcQBfgE2
+			AaMBaAHnAe8B6gYAA/QDggOnA4oDsQwAA9gDgQOWA3ID6gMAAc0BuQGiAcsBtAGZAeMBzQG3AecB1gHD
+			AbsBoQGFA/oMAAP6Ab8BpgGMAcwBuQGjAbwBogGEAa4BlAF4AacBkQF5A+cD6APwA/ID4QP7DAAD+wPi
+			A+kD4gPeA9oBXgHJAY4BRQHEAX4BYwHOAZMBbAHQAZkBPAG0AXMB+QL6DAAB+QL6AUABuQF2AUsBxgGC
+			AToBtQFxATUBpgFoAUwBnAFwA5IDhgOnA7YDcwP5DAAD+gN4A5MDbwNkA2gB1wHJAbgBzwG4AaIB5gHR
+			Ab0B7AHbAcoBugGhAYUC+QH4DAAB+AH3AfYBwwGsAY0BzAG6AaUBuwGiAYUBugGlAYwByAG9Aa8D6QPn
+			A/ED9APhA/oMAAP5A+QD6gPiA+AD5AGKAdMBqwFXAccBigFoAc8BlgFyAdIBnQE8AbIBcAH4AfkB+AwA
+			AfQB9wH2AUABvgF4AUsBxgGCAToBtQFxAVgBsQGAAZcBwwGrA6wDkgOvA74DcQP4DAAD9gN3A5YDcQN6
+			A6YDAAP7AdwByQGzAewB3AHLAccBswGaAc4BxAG5DAAB5QHeAdcBxwGwAZcBzgG8AaYBvgGlAYgD/wYA
+			A/sD7QP0A+cD5QwAA+0D5wPqA+MD/wYAAfoC+wFeAcwBjwFyAdIBnQFCAcMBfAGoAckBtgwAAcMB4wHR
+			AUIBwwF8AU4BxwGFAT4BtwFzA/8GAAP7A6MDvwOIA7IMAAPRA4UDlwN0A/8GAAHxAe8B7AHZAcQBrQHv
+			Ad8BzgHfAc0BuwG2AaEBhQHOAcQBuQL5AfgD+gHUAckBugHKAbABmAHVAcUBsgHTAcIBrgG+AaIBhwHP
+			AccBvAYAA/QD7QP1A/AD4QPlA/oD+wPoA+YD7QPsA+MD5gYAAeUB8QHqAVkBygGNAXcB1AGhAWMBzgGT
+			ATwBsQFwAagByQG2AfgB+QH4AfkC+gGaAdEBswFHAcQBfwFYAcoBiwFUAckBiQE8AbYBdAGlAcwBtwYA
+			A+oDmwPCA64DcQOyA/gD+QOxA4YDpQOgA3YDtQYAAdYBxgGyAdABuAGdAdsBxQGwAfIB4gHSAeABzwG8
+			AccBswGaAboBoQGFAbsBoQGFAcsBtQGcAc0BuQGlAdMBvwGrAckBsgGXAbwBoQGGAakBjwF0BgAD6APp
+			A+wD9gPwA+cG4QPoA+oD7APnA+MD3QYAAXsB0QGhAUkBxQGBAV0BywGOAXsB1QGkAWQBzgGUAUIBwwF8
+			ATwBsgFwATwBtAFzAUYBxAF/AUwBxgGDAVQByQGJAUIBwwF8AToBtQFxATcBoQFmBgADowOKA6ADxwOv
+			A4gDcQNzA4oDlwOdA4QDcwNiBgAB8wHxAe8B8AHtAeoB8QHuAesB4gHOAboB7gHfAc0B7AHcAcsB7AHb
+			AcoB5wHWAcMB3gHMAbYB1QHEAa0BzAG1AZoB6AHiAdwB8wHxAe8B8gHxAfAGAAP1A/ID8wPwA/UG9APy
+			A+8D7APoA+8G9QYAAeoB8wHuAeEB7wHnAeMB8AHoAWQBzgGUAXUB0wGfAXIB0gGdAXIB0gGdAWwB0AGZ
+			AWABzQGRAVUByQGJAUgBxAGBAcwB5gHXAesB8gHuAe0B8gHvBgAD7gPoA+kDrAPAA78DvgO2A6cDnQOH
+			A9cG7gwAAfQB8wHxAdUBwAGnAdkBwwGqAdwByQGzAeYB0QG9AeMBzQG3AcgBsAGVAcYBrgGUAb4BqAGP
+			Ae8B7AHpEgAD9gPrA+wD7QPxA/AD5wPmA+QD8xIAAe0B9AHwAVIByAGHAVcByQGJAV4BzAGPAWgBzwGW
+			AWMBzgGTAUIBwgF9AUABwgF8ATwBuwF1AeIB7gHnEgAD8AOVA5gDowOvA6cGggN9A+cSAAH1AfQB8gHQ
+			Ab0BpAHgAdYBzAP7Ac8BuAGiAcsBtAGZAfcB9gH1AekB5AHeAcYBswGdAfQB8wHyEgAD9gPpA+sD+wPn
+			A+gD+APvA+UD9hIAAe4B9QHxAVsByQGNAasB3QHCAfoC+wFXAccBigFFAcQBfgHyAfYB9AHOAecB2gFd
+			AcIBigHvAfQB8RIAA/EDkgPEA/sDkgOGA/QD2QOOA/EVAAH9AvwD/gMAAdcByQG4Ac0BuQGiIQAD/QP+
+			AwAD6QPnIQAD/AP+AwABigHTAasBXgHJAY4hAAP8A/4DAAOsA5IVAAFCAU0BPgcAAT4DAAEoAwABQAMA
+			ASADAAEBAQABAQYAAQEWAAP/gQAB/gFvAf4BbwH+AW8B/gFvAeABBwHgAQcB4AEHAeABBwHgAQcB4AEH
+			AeABBwHgAQcBgAEAAYABAAGAAQABgAEAAYABAAGAAQABgAEAAYABAAGAAQABgAEAAYABAAGAAQABgwHB
+			AYMBwQGDAcEBgwHBAQMBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABgwHBAYMBwQGDAcEBgwHB
+			AYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAeABBwHgAQcB4AEH
+			AeABBwHgAQcB4AEHAeABBwHgAQcB8gF/AfIBfwHyAX8B8gF/Cw==
+		</value>
+	</data>
+	<metadata name="pbMain.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>217, 17</value>
+	</metadata>
+	<metadata name="tsMain.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	<data name="tsbRefreshProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+			iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+			YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPrZPLSsNAFIb7BoKP4Upw5UoQBHfmMrG1olCa
+			pFoExY2KiHcRERFEwYUKglSQesFeQK2rFkFr0Y26MRAKpa2+QS+/MzGpaS114wdhQv7/nDknZ8bx7xDi
+			a+FFeYvnFU2QFHCcRxdEOcQTmTctjWHB4UgM2Wwe5XIZ+fwnko/PWF3bhiAqJzRRp2mtD0/U7oWlTbAK
+			Bj1jYO/vmo5SqYR44gG9fcPgiNpu2uvDkrCVEG+zIMkqcfqQuEuiWCwidhsHJ8qHhtEOLX2H9cxW81MF
+			nni7XP1+5PIfKBQKmJlbR1UrVnAul0O9JJa+fxAwPJehqx+fPdh6apPU6nZfY9Gk4SaWGDwN09FlsUfL
+			rIg2LB/z/NI5SW4bHZ9FJpPBy+sbnG4//Unfk7BjJalNbsBGEzwLIZ1OIxK9AXGqdCdZlSS1iel/HiB2
+			OCTXEM4vItB1nc79HpPTK3APjBiHamJquXp09eCI0sGJyvH84gat4hqp1BM0TUMymcJRIEhLV3ZNa2ME
+			4nXSCxQ1LhLrmVbAgnskudW0/BcOxxdQeE7WHAMG/AAAAABJRU5ErkJggg==
+		</value>
+	</data>
+	<data name="tsbRestoreProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+			iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+			YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFcSURBVDhP3VFNK0RhFL4/wNbM3PdcCgsfsbHDgkJKWPgD
+			ilJGNN73XEs/gbKUmvITuPc9d5iwYKfZyULZ26BkhTjnnXs1TWTNqafOx/M895z3ev84FsrwigQfvyGl
+			1yNM1IyO4cQNrUKdqGFj1awmuGgWZnDC9Wouz8U1xnATkj+oE78HLVyWKPeAlH9EUkOa1FyzWOAxeVIS
+			JuxtRoVeERhS51zviLlsIHNjYRltW1ejWOChDdbqhEIfRoVbE0PZbXXoP3G/ygZFNyeYZ4xlwgzC9fAI
+			7rmomUrQL01TyXekPUfSVo3zSSVXW3Ug75PNnEEpau+Uglff5XsnOH9D8reZuBJamOa6JvPQqkXhF89a
+			W9jw+MtAIiTVjRE88+AKY3/E5fKVGO74jC3hbMTBAPf2XT+FEzcGb7BqrH/KWNIUTLk34LX5V740Cn80
+			yGKU4P07QTNS+t8Nz/sEkToIpLSWKNoAAAAASUVORK5CYII=
+		</value>
+	</data>
+	<data name="tsbCreateProfile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+			iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+			YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhP3Y/PKwRhHIf3f5g/wMWUlIuDUk5y5MCB3Dk4
+			7EUbBwdXJ3EXsksjidlk2x27NrXt5kdjlTQXbSFK2iaGaX7s491Zjppx5FNP7/et9/n0fmP/PFwu8JGd
+			5OsaLdxpNIyVQPL1GcyDwWDmVsEx1sLLGvdHeLtduKVh/GIPTlbGPRvF3mmjXm0Vh8a9SEBGAl1gCMoS
+			j2p/uOyX5/AK4/i5bqgI8UrQPFUJO9mOr43gHk/9XOToy9QLCd4O+yAvxCb7gg0JK9WJqcWxTubDf+Kd
+			x0ERYkqwLliVeE8PRNufWhpnUxY7j2Fu92IlO3jOT+AqMk+lxfAS+6HI6/VW8NA5neVlb6g11zLcVNRo
+			v/gO1SXM3PTvpL+WWOwT04jC5H73kgIAAAAASUVORK5CYII=
+		</value>
+	</data>
+	<metadata name="btnResetValue.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="lblApplications.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+			iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+			YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+			YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+			0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+			bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+			VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+			c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+			Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+			mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+			kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+			TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+		</value>
+	</data>
+	<data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+			iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+			YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+			YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+			0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+			bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+			VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+			c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+			Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+			mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+			kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+			TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+		</value>
+	</data>
+	<metadata name="ilCombo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>17, 17</value>
+	</metadata>
+	<metadata name="cbValues.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="lblWidth96.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="lblWidth330.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="lblWidth16.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
+	<metadata name="lblWidth30.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</metadata>
 </root>

Shared/Themes/DarkTheme.xaml

@@ -2103,7 +2103,6 @@
         <Setter Property="Foreground" Value="{StaticResource ControlDefaultForeground}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinHeight" Value="16" />
-        <Setter Property="Height" Value="20" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
@@ -2116,7 +2115,7 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Background="{TemplateBinding Background}" CornerRadius="6"
-                                HorizontalAlignment="Center" VerticalAlignment="Center"
+                                HorizontalAlignment="Center" VerticalAlignment="Top"
                                 Height="16" Width="16">
                             <Grid x:Name="markGrid" Margin="2">
                                 <Ellipse x:Name="optionMark" Fill="{StaticResource ControlGlythColour}" MinWidth="6" MinHeight="6" Opacity="0" />

novideo_srgb/AdvancedWindow.xaml

@@ -37,7 +37,7 @@
                         <ComboBoxItem>BT.2020</ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
-                <RadioButton IsChecked="{Binding UseEdid}" Margin="0,0,0, 6">
+                <RadioButton IsChecked="{Binding UseEdid}" Margin="0,0,0,6">
                     <StackPanel IsEnabled="{Binding UseEdid}">
                         <TextBlock Text="Use EDID primaries" Margin="0,0,0,0" />
                         <Grid>