diff --git a/installer/Subtitle_Edit_installer.iss b/installer/Subtitle_Edit_installer.iss
index 1c5538052..60df4719d 100644
--- a/installer/Subtitle_Edit_installer.iss
+++ b/installer/Subtitle_Edit_installer.iss
@@ -463,9 +463,12 @@ Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: str
 ; Add .ass (Advanced SubStation Alpha) to the SE-supported file types
 Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".ass"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
 ; Add video files to the SE-supported file types
-Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
-Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
-Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".avi"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".m2ts"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4";  ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv";  ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mks";  ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".avi";  ValueData: ""; Check: HklmKeyExists('{#keyApps}')
+Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".ts";   ValueData: ""; Check: HklmKeyExists('{#keyApps}')
 
 
 [Code]
diff --git a/libse/Dictionaries/OcrFixReplaceList.cs b/libse/Dictionaries/OcrFixReplaceList.cs
index 485f725a0..64c934f07 100644
--- a/libse/Dictionaries/OcrFixReplaceList.cs
+++ b/libse/Dictionaries/OcrFixReplaceList.cs
@@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
         private readonly Dictionary<string, string> _beginLineReplaceList;
         private readonly Dictionary<string, string> _endLineReplaceList;
         private readonly Dictionary<string, string> _wholeLineReplaceList;
-        private readonly Dictionary<string, string> _partialWordReplaceListAlways;
+        private readonly Dictionary<string, string> _partialWordAlwaysReplaceList;
         private readonly Dictionary<string, string> _partialWordReplaceList;
         private readonly Dictionary<string, string> _regExList;
         private readonly string _replaceListXmlFileName;
@@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
             _beginLineReplaceList = new Dictionary<string, string>();
             _endLineReplaceList = new Dictionary<string, string>();
             _wholeLineReplaceList = new Dictionary<string, string>();
-            _partialWordReplaceListAlways = new Dictionary<string, string>();
+            _partialWordAlwaysReplaceList = new Dictionary<string, string>();
             _partialWordReplaceList = new Dictionary<string, string>();
             _regExList = new Dictionary<string, string>();
 
@@ -46,10 +46,10 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
             var userDoc = LoadXmlReplaceListUserDocument();
 
             WordReplaceList = LoadReplaceList(doc, "WholeWords");
-            _partialWordReplaceListAlways = LoadReplaceList(doc, "PartialWordsAlways");
+            _partialWordAlwaysReplaceList = LoadReplaceList(doc, "PartialWordsAlways");
             _partialWordReplaceList = LoadReplaceList(doc, "PartialWords");
             PartialLineWordBoundaryReplaceList = LoadReplaceList(doc, "PartialLines");
-            _partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialAlwaysLines");
+            _partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialLinesAlways");
             _beginLineReplaceList = LoadReplaceList(doc, "BeginLines");
             _endLineReplaceList = LoadReplaceList(doc, "EndLines");
             _wholeLineReplaceList = LoadReplaceList(doc, "WholeLines");
@@ -427,9 +427,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
             }
 
             //always replace list
-            foreach (string letter in _partialWordReplaceListAlways.Keys)
+            foreach (string letter in _partialWordAlwaysReplaceList.Keys)
             {
-                word = word.Replace(letter, _partialWordReplaceListAlways[letter]);
+                word = word.Replace(letter, _partialWordAlwaysReplaceList[letter]);
             }
 
             string pre = string.Empty;
@@ -711,9 +711,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
             var word = input;
 
             //always replace list
-            foreach (string letter in _partialWordReplaceListAlways.Keys)
+            foreach (string letter in _partialWordAlwaysReplaceList.Keys)
             {
-                word = word.Replace(letter, _partialWordReplaceListAlways[letter]);
+                word = word.Replace(letter, _partialWordAlwaysReplaceList[letter]);
             }
 
             string pre = string.Empty;
diff --git a/src/Forms/Ocr/VobSubOcr.cs b/src/Forms/Ocr/VobSubOcr.cs
index 869455c4c..8f45e2053 100644
--- a/src/Forms/Ocr/VobSubOcr.cs
+++ b/src/Forms/Ocr/VobSubOcr.cs
@@ -1116,8 +1116,8 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
                         break;
                     }
 
-                    if (tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spannish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) ||
-                        tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase))
+                    if (tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spanish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) ||
+                        tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase))
                     {
                         comboBoxTesseractLanguages.SelectedIndex = i;
                         break;