diff --git a/RobustTemplateSingleplayer.sln b/RobustTemplateSingleplayer.sln
index 65e332e..91524e5 100644
--- a/RobustTemplateSingleplayer.sln
+++ b/RobustTemplateSingleplayer.sln
@@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Generators", "Robust
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A7C80535-9577-4DE1-9544-A2CC4FB6511C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{83FB6E90-85D6-442E-B5A6-C5D303FCF737}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -278,6 +280,18 @@ Global
 		{A7C80535-9577-4DE1-9544-A2CC4FB6511C}.Release|x64.Build.0 = Release|Any CPU
 		{A7C80535-9577-4DE1-9544-A2CC4FB6511C}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7C80535-9577-4DE1-9544-A2CC4FB6511C}.Release|x86.Build.0 = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|x64.Build.0 = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Debug|x86.Build.0 = Debug|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x64.ActiveCfg = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x64.Build.0 = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x86.ActiveCfg = Release|Any CPU
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931}
@@ -301,5 +315,6 @@ Global
 		{D56D47F6-2C26-42D2-BA00-C39824CFAF55} = {F5F87A9D-C304-4833-B107-D666317F6931}
 		{62452255-1DE7-4D37-BB01-A690EC7E3156} = {F5F87A9D-C304-4833-B107-D666317F6931}
 		{A7C80535-9577-4DE1-9544-A2CC4FB6511C} = {F5F87A9D-C304-4833-B107-D666317F6931}
+		{83FB6E90-85D6-442E-B5A6-C5D303FCF737} = {F5F87A9D-C304-4833-B107-D666317F6931}
 	EndGlobalSection
 EndGlobal
diff --git a/RobustToolbox b/RobustToolbox
index 86d61f8..105aa13 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 86d61f8d0328438571e7a5bd1503f3796e9e0c7e
+Subproject commit 105aa13eb1054dc1debef88fc0b24621239100d8
diff --git a/Template.Game/Program.cs b/Template.Game/Program.cs
index a84a9a7..6411dc1 100644
--- a/Template.Game/Program.cs
+++ b/Template.Game/Program.cs
@@ -22,9 +22,6 @@ internal static class Program
             // Default window name. This can also be changed on runtime with the IClyde service.
             DefaultWindowTitle = "RobustToolbox Template Game",
                 
-            // This template is singleplayer-only, so we disable connecting to a server from program arguments.
-            DisableCommandLineConnect = true,
-                
             // Name of the folder where the user's data (config, etc) will be stored.
             UserDataDirectoryName = "Template Game",