3 files changed, 147 insertions, 26 deletions
diff --git a/win/CS/HandBrakeWPF/Settings.StyleCop b/win/CS/HandBrakeWPF/Settings.StyleCop
index 1b0202d91..99c98c116 100644
--- a/win/CS/HandBrakeWPF/Settings.StyleCop
+++ b/win/CS/HandBrakeWPF/Settings.StyleCop
@@ -32,6 +32,11 @@
             <BooleanProperty Name="Enabled">True</BooleanProperty>
           </RuleSettings>
         </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">True</BooleanProperty>
+          </RuleSettings>
+        </Rule>
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 99c31b74a..9397a3e6c 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -14,37 +14,153 @@ namespace HandBrakeWPF
     /// </summary>
     public class UserSettingConstants
     {
-        public const string UpdateStatus = "updateStatus";
-        public const string TooltipEnable = "tooltipEnable";
-        public const string Skipversion = "skipversion";
-        public const string AutoNaming = "autoNaming";
-        public const string AutoNamePath = "autoNamePath";
+        #region Constants and Fields
+
+        /// <summary>
+        /// Add Only One Per Langage
+        /// </summary>
+        public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
+
+        /// <summary>
+        /// Appcast i686
+        /// </summary>
         public const string Appcast_i686 = "appcast_i686";
+
+        /// <summary>
+        /// Appcast 64
+        /// </summary>
         public const string Appcast_x64 = "appcast_x64";
+
+        /// <summary>
+        /// Auto name format
+        /// </summary>
         public const string AutoNameFormat = "autoNameFormat";
-        public const string VLC_Path = "VLC_Path";
-        public const string MainWindowMinimize = "MainWindowMinimize";
-        public const string PresetNotification = "presetNotification";
-        public const string TrayIconAlerts = "trayIconAlerts";
-        public const string LastUpdateCheckDate = "lastUpdateCheckDate";
-        public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
-        public const string UseM4v = "useM4v";
-        public const string NativeLanguage = "NativeLanguage";
-        public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
-        public const string DubMode = "DubMode";
-        public const string ClearOldLogs = "clearOldLogs";
-        public const string AutoNameTitleCase = "AutoNameTitleCase";
+
+        /// <summary>
+        /// Autoname path
+        /// </summary>
+        public const string AutoNamePath = "autoNamePath";
+
+        /// <summary>
+        /// Auto Name Remove underscore
+        /// </summary>
         public const string AutoNameRemoveUnderscore = "AutoNameRemoveUnderscore";
-        public const string ActivityWindowLastMode = "ActivityWindowLastMode";
-        public const string UseClosedCaption = "useClosedCaption";
-        public const string BatchMinDuration = "batchMinDuration";
-        public const string BatchMaxDuration = "batchMaxDuration";
+
+        /// <summary>
+        /// Auto Name Title Case
+        /// </summary>
+        public const string AutoNameTitleCase = "AutoNameTitleCase";
+
+        /// <summary>
+        /// Auto Naming
+        /// </summary>
+        public const string AutoNaming = "autoNaming";
+
+        /// <summary>
+        /// Clear old logs
+        /// </summary>
+        public const string ClearOldLogs = "clearOldLogs";
+
+        /// <summary>
+        /// Update check interval
+        /// </summary>
+        public const string DaysBetweenUpdateCheck = "daysBetweenUpdateCheck";
+
+        /// <summary>
+        /// Use Default Player
+        /// </summary>
         public const string DefaultPlayer = "defaultPlayer";
-        public const string SelectedLanguages = "SelectedLanguages";
+
+        /// <summary>
+        /// Dub mode
+        /// </summary>
+        public const string DubMode = "DubMode";
+
+        /// <summary>
+        /// Dub Mode Audio
+        /// </summary>
         public const string DubModeAudio = "DubModeAudio";
+
+        /// <summary>
+        /// Dub Mode Subs
+        /// </summary>
         public const string DubModeSubtitle = "DubModeSubtitle";
-        public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
+
+        /// <summary>
+        /// Last Update Check
+        /// </summary>
+        public const string LastUpdateCheckDate = "lastUpdateCheckDate";
+
+        /// <summary>
+        /// Main Window Minimise
+        /// </summary>
+        public const string MainWindowMinimize = "MainWindowMinimize";
+
+        /// <summary>
+        /// Min Title Length
+        /// </summary>
         public const string MinTitleLength = "MinTitleLength";
+
+        /// <summary>
+        /// Native Language Audio
+        /// </summary>
+        public const string NativeLanguage = "NativeLanguage";
+
+        /// <summary>
+        /// Native Language Subs
+        /// </summary>
+        public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
+
+        /// <summary>
+        /// Preset Notification
+        /// </summary>
+        public const string PresetNotification = "presetNotification";
+
+        /// <summary>
+        /// Selected Languages
+        /// </summary>
+        public const string SelectedLanguages = "SelectedLanguages";
+
+        /// <summary>
+        /// AUudio Passthru
+        /// </summary>
         public const string ShowAdvancedAudioPassthruOpts = "ShowAdvancedAudioPassthruOpts";
+
+        /// <summary>
+        /// Skip Version
+        /// </summary>
+        public const string Skipversion = "skipversion";
+
+        /// <summary>
+        /// Tooltip
+        /// </summary>
+        public const string TooltipEnable = "tooltipEnable";
+
+        /// <summary>
+        /// Tray Icon
+        /// </summary>
+        public const string TrayIconAlerts = "trayIconAlerts";
+
+        /// <summary>
+        /// Update Status
+        /// </summary>
+        public const string UpdateStatus = "updateStatus";
+
+        /// <summary>
+        /// Closed Captions
+        /// </summary>
+        public const string UseClosedCaption = "useClosedCaption";
+
+        /// <summary>
+        /// Use m4v
+        /// </summary>
+        public const string UseM4v = "useM4v";
+
+        /// <summary>
+        /// Vlc Path
+        /// </summary>
+        public const string VLC_Path = "VLC_Path";
+
+        #endregion
     }
-}
+}
+\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index ff5594975..2e9ec5e64 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1206,7 +1206,7 @@ namespace HandBrakeWPF.ViewModels
 
             if (!string.IsNullOrEmpty(filename))
             {
-                Preset preset = PlistPresetHandler.Import(filename);
+                Preset preset = PlistUtility.Import(filename);
                 if (this.presetService.CheckIfPresetExists(preset.Name))
                 {
                     if (!presetService.CanUpdatePreset(preset.Name))
@@ -1252,7 +1252,7 @@ namespace HandBrakeWPF.ViewModels
 
                 if (filename != null)
                 {
-                    PlistPresetHandler.Export(savefiledialog.FileName, this.selectedPreset);
+                    PlistUtility.Export(savefiledialog.FileName, this.selectedPreset);
                 }
             }
             else