diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index db8dc4d11..9dd4736c2 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -1196,6 +1196,7 @@
     <None Include="Assets\StreamingAssets\JP\ks\nostay\nostay_ace\ace_no05.txt" />
     <None Include="Assets\StreamingAssets\JP\ks\stay\peter\pet_stay18.txt" />
     <None Include="Assets\StreamingAssets\EN\ks\com\com\com_no07.txt" />
+    <None Include="Assets\AddressableAssetsData\link.xml" />
     <None Include="Assets\StreamingAssets\JP\ks\nostay\nostay_gowland\gow_no05.txt" />
     <None Include="Assets\StreamingAssets\EN\ks\stay\elliot\ell_stay18.txt" />
     <None Include="Assets\StreamingAssets\EN\ks\op\op03_tow.txt" />
diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml
new file mode 100644
index 000000000..66763552e
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,25 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Localization.Locale" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
+    <type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Object" preserve="all" />
+  </assembly>
+</linker>
\ No newline at end of file
diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta
new file mode 100644
index 000000000..6e3d45dd3
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5818e9f5cc2c07147bf3fae620dae0c7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Assembly-CSharp/CMessageText.cs b/Assets/Scripts/Assembly-CSharp/CMessageText.cs
index 768137af3..fce904406 100644
--- a/Assets/Scripts/Assembly-CSharp/CMessageText.cs
+++ b/Assets/Scripts/Assembly-CSharp/CMessageText.cs
@@ -1,6 +1,7 @@
 using Qoo.Def;
 using Qoo.Game;
 using System.Collections.Generic;
+using System.Reflection.Emit;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
@@ -179,28 +180,40 @@ public class CMessageText
         int testWidth = 0;
         if (!UnityApp.PlatformApp.isJapanese)
         {
+			CMessageText.m_isHyphenation = true;
             for (int i = 0; i < szMsg.Length; i++)
             {
                 //Force diacritics to closest letter with no accent mark
                 if (Regex.IsMatch(szMsg[i].ToString(), "[À-ž]"))
                 {
                     szMsg = szMsg.Remove(i, 1).Insert(i, szMsg[i].ToString().Normalize(NormalizationForm.FormC).Normalize(NormalizationForm.FormD));
-                }
-                //Auto line breaker based on character widths
+				}
+
+
+				//Improved line breaker
+				//Work around existing code since there was not line breaker that didn't split in the middle of words
                 BMGlyph glyph = this.font.Font.GetGlyph((int)szMsg[i], true);
-                if (glyph != null)
-                {
-                    testWidth += glyph.width;
-                }
-                else
+                if (glyph == null)
                 {
                     break;
                 }
+                int nSize = FontDef.GetFontInfo(nFontType).nSize;
+                float num = (float)glyph.advance / (float)this.font.Font.charSize;
+                int num2 = (int)((float)nSize * num);
+                int num3 = (int)((float)nSize * ((float)glyph.height / (float)this.font.Font.charSize));
+                num2 = (int)((float)num2 * FontDef.GetFontInfo(nFontType).fStretch);
+                num3 = (int)((float)num3 * FontDef.GetFontInfo(nFontType).fStretch);
+
+				//Increase line width with each character added
+                    testWidth += num2;
+
+				//If there is a line break reset count
                 if (szMsg[i] == '\n')
                 {
                     testWidth = 0;
                 }
-                if (testWidth > 960)
+
+                if (testWidth > this.m_Clip.nCx)
                 {
                     for (int j = i; j >= 0; j--)
                     {
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig01.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig01.txt
index 025a0beff..c651355bd 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig01.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig01.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig02.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig02.txt
index 1d6288914..60d4a1b32 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig02.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig02.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig03.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig03.txt
index 0dbd80cb0..71dd7144f 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig03.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig03.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig04.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig04.txt
index 7e07baaf4..6dbb5bf19 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig04.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig04.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig05.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig05.txt
index 874f2aa4d..3449a011d 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig05.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig05.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig06.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig06.txt
index 5ab7b0203..13c7e7259 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig06.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig06.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig07.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig07.txt
index e4031c95c..1db5f6254 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig07.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig07.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig08.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig08.txt
index b5aaec7af..c1dfeefb7 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig08.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig08.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig09.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig09.txt
index 9a44846cb..1701642ef 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig09.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig09.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig10.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig10.txt
index 66c92fca8..77c26b314 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig10.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig10.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig11.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig11.txt
index 99936232f..61017c56f 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig11.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig11.txt differ
diff --git a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig12.txt b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig12.txt
index 82772609a..9b307b488 100644
Binary files a/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig12.txt and b/Assets/StreamingAssets/EN/ks/com/com_nightmare/nig12.txt differ
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index cdcc51f20..49ef1f73a 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -89,7 +89,7 @@ PlayerSettings:
   bakeCollisionMeshes: 0
   forceSingleInstance: 1
   useFlipModelSwapchain: 1
-  resizableWindow: 1
+  resizableWindow: 0
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 0
@@ -99,7 +99,7 @@ PlayerSettings:
   xboxEnableKinectAutoTracking: 0
   xboxEnableFitness: 0
   visibleInBackground: 0
-  allowFullscreenSwitch: 1
+  allowFullscreenSwitch: 0
   fullscreenMode: 3
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0