diff --git a/PCK-Studio/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs
index 82b317e3..464bbe09 100644
--- a/PCK-Studio/Forms/Editor/LOCEditor.cs
+++ b/PCK-Studio/Forms/Editor/LOCEditor.cs
@@ -143,7 +143,8 @@ namespace PckStudio.Forms.Editor
 		{
             using (var ms = new MemoryStream())
             {
-                LOCFileWriter.Write(ms, currentLoc);
+				var writer = new LOCFileWriter(currentLoc, 2);
+                writer.WriteToStream(ms);
                 _file.SetData(ms.ToArray());
             }
 			DialogResult = DialogResult.OK;
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 61e09012..6e708d47 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -1226,7 +1226,8 @@ namespace PckStudio
 				var locFile = new LOCFile();
 				locFile.InitializeDefault(packName);
 				using var stream = new MemoryStream();
-				LOCFileWriter.Write(stream, locFile);
+				var writer = new LOCFileWriter(locFile, 2);
+                writer.WriteToStream(stream);
 				return stream.ToArray();
             });
 
@@ -1592,7 +1593,8 @@ namespace PckStudio
 			{
 				using (var stream = new MemoryStream())
 				{
-					LOCFileWriter.Write(stream, locFile);
+					var writer = new LOCFileWriter(locFile, 2);
+                    writer.WriteToStream(stream);
 					locdata.SetData(stream.ToArray());
 				}
 				return true;
diff --git a/Vendor/OMI-Lib b/Vendor/OMI-Lib
index 77ae65c6..9b991f6d 160000
--- a/Vendor/OMI-Lib
+++ b/Vendor/OMI-Lib
@@ -1 +1 @@
-Subproject commit 77ae65c68dfb7612d9883094210c0d572f425705
+Subproject commit 9b991f6d1a3591b92693aaff8a39fbe68803f7db