diff --git a/Content.Replay/Program.cs b/Content.Replay/Program.cs
index c1ea61ac75b..a5e90ab7989 100644
--- a/Content.Replay/Program.cs
+++ b/Content.Replay/Program.cs
@@ -12,8 +12,8 @@ public static void Main(string[] args)
             ContentModulePrefix = "Content.",
             ContentBuildDirectory = "Content.Replay",
             DefaultWindowTitle = "SS14 Replay",
-            UserDataDirectoryName = "Space Station 14",
-            ConfigFileName = "replay.toml"
+            UserDataDirectoryName = Environment.GetEnvironmentVariable("SS14_LAUNCHER_DATADIR") ?? "SimpleStation14",
+            ConfigFileName = "replay.toml",
         });
     }
 }
diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs
index 25cc7714686..be11432a1c5 100644
--- a/Content.Server/Administration/PlayerLocator.cs
+++ b/Content.Server/Administration/PlayerLocator.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -101,7 +102,7 @@ public PlayerLocator()
                 return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
-            var authServer = _configurationManager.GetCVar(CVars.AuthServer);
+            var authServer = AuthServer.FromStringList(_configurationManager.GetCVar(CVars.AuthServers)).First().AuthUrl;
             var requestUri = $"{authServer}api/query/name?name={WebUtility.UrlEncode(playerName)}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
@@ -120,7 +121,7 @@ public PlayerLocator()
                 return ReturnForPlayerRecord(record);
 
             // If all else fails, ask the auth server.
-            var authServer = _configurationManager.GetCVar(CVars.AuthServer);
+            var authServer = AuthServer.FromStringList(_configurationManager.GetCVar(CVars.AuthServers)).First().AuthUrl;
             var requestUri = $"{authServer}api/query/userid?userid={WebUtility.UrlEncode(userId.UserId.ToString())}";
             using var resp = await _httpClient.GetAsync(requestUri, cancel);
 
diff --git a/README.md b/README.md
index 43ba351c049..fdc7b3bf850 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-w
 Our founding organization is based on a democratic system whereby our mutual contributors and downstreams have a say in what code goes into their own upstream.
 If you are a representative of a former downstream of Delta-V, we would like to invite you to contact us for an opportunity to represent your fork in this new upstream.
 
-Space Station 14 is inspired heavily by Space Station 13 and runs on [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), a homegrown engine written in C#.
+Space Station 14 is inspired heavily by Space Station 13 and runs on the [Supermatter Engine](Simple-Station/SupermatterEngine), a homegrown engine written in C#.
 
 As a hard fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported.
 All code present in this repository is subject to change as desired by the council of maintainers.
diff --git "a/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/icon.png" b/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/icon.png
similarity index 100%
rename from "Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/icon.png"
rename to Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/icon.png
diff --git "a/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/inhand-left.png" b/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/inhand-left.png
similarity index 100%
rename from "Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/inhand-left.png"
rename to Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/inhand-left.png
diff --git "a/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/inhand-right.png" b/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/inhand-right.png
similarity index 100%
rename from "Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/inhand-right.png"
rename to Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/inhand-right.png
diff --git "a/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/meta.json" b/Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/meta.json
similarity index 100%
rename from "Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadow_sha\321\201kles.rsi/meta.json"
rename to Resources/Textures/WhiteDream/BloodCult/Entities/Items/shadowkin_shackles.rsi/meta.json
diff --git a/RobustToolbox b/RobustToolbox
index 9d1b15ab4b7..fc637003d9b 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 9d1b15ab4b79d441fb215d1c5069f3a15e3ca675
+Subproject commit fc637003d9b4f1d0977cfc9f11db777cb1886fc1