2 files changed, 15 insertions, 9 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 06931ac3b..73ebfba70 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -26,6 +26,8 @@ namespace MediaBrowser.Model.Configuration
             TonemappingThreshold = 0.8;
             TonemappingPeak = 100;
             TonemappingParam = 0;
+            VppTonemappingBrightness = 0;
+            VppTonemappingContrast = 1.2;
             H264Crf = 23;
             H265Crf = 28;
             DeinterlaceDoubleRate = false;
@@ -39,7 +41,7 @@ namespace MediaBrowser.Model.Configuration
             EnableHardwareEncoding = true;
             AllowHevcEncoding = false;
             EnableSubtitleExtraction = true;
-            AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = Array.Empty<string>();
+            AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };
         }
 
@@ -89,6 +91,10 @@ namespace MediaBrowser.Model.Configuration
 
         public double TonemappingParam { get; set; }
 
+        public double VppTonemappingBrightness { get; set; }
+
+        public double VppTonemappingContrast { get; set; }
+
         public int H264Crf { get; set; }
 
         public int H265Crf { get; set; }
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 81359462c..94f354660 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -22,10 +22,10 @@ namespace MediaBrowser.Model.Configuration
             HidePlayedInLatest = true;
             PlayDefaultAudioTrack = true;
 
-            LatestItemsExcludes = Array.Empty<string>();
-            OrderedViews = Array.Empty<string>();
-            MyMediaExcludes = Array.Empty<string>();
-            GroupedFolders = Array.Empty<string>();
+            LatestItemsExcludes = Array.Empty<Guid>();
+            OrderedViews = Array.Empty<Guid>();
+            MyMediaExcludes = Array.Empty<Guid>();
+            GroupedFolders = Array.Empty<Guid>();
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Configuration
 
         public bool DisplayMissingEpisodes { get; set; }
 
-        public string[] GroupedFolders { get; set; }
+        public Guid[] GroupedFolders { get; set; }
 
         public SubtitlePlaybackMode SubtitleMode { get; set; }
 
@@ -56,11 +56,11 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableLocalPassword { get; set; }
 
-        public string[] OrderedViews { get; set; }
+        public Guid[] OrderedViews { get; set; }
 
-        public string[] LatestItemsExcludes { get; set; }
+        public Guid[] LatestItemsExcludes { get; set; }
 
-        public string[] MyMediaExcludes { get; set; }
+        public Guid[] MyMediaExcludes { get; set; }
 
         public bool HidePlayedInLatest { get; set; }