diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 267e3a8..59cc052 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -1,4 +1,5 @@
 using Robust.Client;
+using Robust.Client.Graphics;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -31,12 +32,17 @@ namespace Content.Client
 
             IoCManager.BuildGraph();
 
+            factory.GenerateNetIds();
+
             // DEVNOTE: This is generally where you'll be setting up the IoCManager further.
         }
 
         public override void PostInit()
         {
             base.PostInit();
+            
+            // DEVNOTE: The line below will disable lighting, so you can see in-game sprites without the need for lights
+            //IoCManager.Resolve<ILightManager>().Enabled = false;
 
             // DEVNOTE: Further setup...
             var client = IoCManager.Resolve<IBaseClient>();
diff --git a/Content.Client/Program.cs b/Content.Client/Program.cs
index ad7f607..37d0b41 100644
--- a/Content.Client/Program.cs
+++ b/Content.Client/Program.cs
@@ -1,4 +1,5 @@
 using Robust.Client;
+using Robust.Shared.Utility;
 
 namespace Content.Client
 {
@@ -9,15 +10,18 @@ namespace Content.Client
             ContentStart.Start(args);
             
             /*
-             // DEVNOTE: If you want to use RobustToolbox as a library, use the method below instead.
-             // Keep in mind, this will make your game ineligible from appearing on the SS14 hub, specially if you
-             // disable sandboxing.
+            // DEVNOTE: If you want to use RobustToolbox as a library, use the method below instead.
+            // Keep in mind, this will make your game ineligible from appearing on the SS14 hub, specially if you
+            // disable sandboxing.
             ContentStart.StartLibrary(args, new GameControllerOptions()
             {
                 // DEVNOTE: Your options here.
                 Sandboxing = false,
-            });
-            */
+                SplashLogo = new ResourcePath("/path/to/splash/logo.png"),
+                // Check "RobustToolbox/Resources/Textures/Logo/icon" for an example window icon set.
+                WindowIconSet = new ResourcePath("/path/to/folder/with/window/icon/set"),
+                DefaultWindowTitle = "Robust Template"
+            });*/
         }
     }
 }
\ No newline at end of file
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 09fb4e8..5f62deb 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -24,6 +24,8 @@ namespace Content.Server
             ServerContentIoC.Register();
 
             IoCManager.BuildGraph();
+            
+            factory.GenerateNetIds();
 
             // DEVNOTE: This is generally where you'll be setting up the IoCManager further.
         }
diff --git a/RobustToolbox b/RobustToolbox
index 986ec3e..4ba5654 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 986ec3ef062bd6977cedf357c77d049e4e18a017
+Subproject commit 4ba56542531c4d810556455d2891a3ed82a53f86