diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs
index b94e7f4f24..696e58b3ac 100644
--- a/Content.Client/Parallax/ParallaxManager.cs
+++ b/Content.Client/Parallax/ParallaxManager.cs
@@ -44,7 +44,7 @@ namespace Content.Client.Parallax
                     return;
                 }
 
-                using (var reader = new StreamReader(configStream, Encoding.UTF8))
+                using (var reader = new StreamReader(configStream, EncodingHelpers.UTF8))
                 {
                     contents = reader.ReadToEnd();
                 }
@@ -53,7 +53,7 @@ namespace Content.Client.Parallax
                 {
                     bool match;
                     using (var data = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Open))
-                    using (var reader = new StreamReader(data, Encoding.UTF8))
+                    using (var reader = new StreamReader(data, EncodingHelpers.UTF8))
                     {
                         match = reader.ReadToEnd() == contents;
                     }
@@ -89,7 +89,7 @@ namespace Content.Client.Parallax
             }
 
             using (var stream = _resourceCache.UserData.Open(ParallaxConfigOld, FileMode.Create))
-            using (var writer = new StreamWriter(stream, Encoding.UTF8))
+            using (var writer = new StreamWriter(stream, EncodingHelpers.UTF8))
             {
                 writer.Write(contents);
             }
diff --git a/RobustToolbox b/RobustToolbox
index 1b72be9923..506d9a8c22 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 1b72be9923af88e932a6c01eccfbbcda5846af3d
+Subproject commit 506d9a8c22ad2def55f285cf2eb68909baa2bd23
diff --git a/SpaceStation14Content.sln.DotSettings b/SpaceStation14Content.sln.DotSettings
index 22b6980c06..1d69c5e9a0 100644
--- a/SpaceStation14Content.sln.DotSettings
+++ b/SpaceStation14Content.sln.DotSettings
@@ -7,6 +7,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PNG/@EntryIndexedValue">PNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSI/@EntryIndexedValue">RSI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UTF/@EntryIndexedValue">UTF</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=BYOND/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean>