1 files changed, 39 insertions, 10 deletions

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index eb211050f..82a3ad2b7 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -149,10 +149,14 @@ namespace Emby.Naming.Common
 
             SubtitleFileExtensions = new[]
             {
+                ".ass",
+                ".smi",
+                ".sami",
                 ".srt",
                 ".ssa",
-                ".ass",
-                ".sub"
+                ".sub",
+                ".vtt",
+                ".mks"
             };
 
             SubtitleFlagDelimiters = new[]
@@ -246,6 +250,22 @@ namespace Emby.Naming.Common
                 ".mka"
             };
 
+            ExternalAudioFlagDelimiters = new[]
+            {
+                '.'
+            };
+
+            ExternalAudioForcedFlags = new[]
+            {
+                "foreign",
+                "forced"
+            };
+
+            ExternalAudioDefaultFlags = new[]
+            {
+                "default"
+            };
+
             EpisodeExpressions = new[]
             {
                 // *** Begin Kodi Standard Naming
@@ -648,9 +668,7 @@ namespace Emby.Naming.Common
                 @"^\s*(?<name>[^ ].*?)\s*$"
             };
 
-            var extensions = VideoFileExtensions.ToList();
-
-            extensions.AddRange(new[]
+            VideoFileExtensions = new[]
             {
                 ".mkv",
                 ".m2t",
@@ -681,11 +699,7 @@ namespace Emby.Naming.Common
                 ".m2v",
                 ".rec",
                 ".mxf"
-            });
-
-            VideoFileExtensions = extensions
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToArray();
+            };
 
             MultipleEpisodeExpressions = new[]
             {
@@ -718,6 +732,21 @@ namespace Emby.Naming.Common
         public string[] AudioFileExtensions { get; set; }
 
         /// <summary>
+        /// Gets or sets list of external audio flag delimiters.
+        /// </summary>
+        public char[] ExternalAudioFlagDelimiters { get; set; }
+
+        /// <summary>
+        /// Gets or sets list of external audio forced flags.
+        /// </summary>
+        public string[] ExternalAudioForcedFlags { get; set; }
+
+        /// <summary>
+        /// Gets or sets list of external audio default flags.
+        /// </summary>
+        public string[] ExternalAudioDefaultFlags { get; set; }
+
+        /// <summary>
         /// Gets or sets list of album stacking prefixes.
         /// </summary>
         public string[] AlbumStackingPrefixes { get; set; }