diff --git a/RobustTemplateSingleplayer.sln b/RobustTemplateSingleplayer.sln
index c93f1ce..6458084 100644
--- a/RobustTemplateSingleplayer.sln
+++ b/RobustTemplateSingleplayer.sln
@@ -53,6 +53,16 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linguini", "Linguini", "{583E0C7C-27ED-4932-8E87-6EDECCFF4D02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Bundle", "RobustToolbox\Linguini\Linguini.Bundle\Linguini.Bundle.csproj", "{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Shared", "RobustToolbox\Linguini\Linguini.Shared\Linguini.Shared.csproj", "{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Syntax", "RobustToolbox\Linguini\Linguini.Syntax\Linguini.Syntax.csproj", "{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralRules.Generator", "RobustToolbox\Linguini\PluralRules.Generator\PluralRules.Generator.csproj", "{B8841793-F428-4244-9A91-40C2CF69CA95}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -294,6 +304,54 @@ 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
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|x64.Build.0 = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Debug|x86.Build.0 = Debug|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|x64.ActiveCfg = Release|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|x64.Build.0 = Release|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|x86.ActiveCfg = Release|Any CPU
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A}.Release|x86.Build.0 = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|x64.Build.0 = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Debug|x86.Build.0 = Debug|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|x64.ActiveCfg = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|x64.Build.0 = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|x86.ActiveCfg = Release|Any CPU
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D}.Release|x86.Build.0 = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|x64.Build.0 = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Debug|x86.Build.0 = Debug|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|x64.ActiveCfg = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|x64.Build.0 = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|x86.ActiveCfg = Release|Any CPU
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0}.Release|x86.Build.0 = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|x64.Build.0 = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8841793-F428-4244-9A91-40C2CF69CA95}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931}
@@ -319,5 +377,10 @@ 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}
+		{583E0C7C-27ED-4932-8E87-6EDECCFF4D02} = {F5F87A9D-C304-4833-B107-D666317F6931}
+		{06A6E3B2-4BBF-4DC9-A557-D5A653D8F80A} = {583E0C7C-27ED-4932-8E87-6EDECCFF4D02}
+		{7787AC86-8CE7-48A7-A6DA-62DE9BAD279D} = {583E0C7C-27ED-4932-8E87-6EDECCFF4D02}
+		{17C94BF2-150B-46F9-8A02-AAD155F3FAD0} = {583E0C7C-27ED-4932-8E87-6EDECCFF4D02}
+		{B8841793-F428-4244-9A91-40C2CF69CA95} = {583E0C7C-27ED-4932-8E87-6EDECCFF4D02}
 	EndGlobalSection
 EndGlobal
diff --git a/RobustToolbox b/RobustToolbox
index 6506171..986ec3e 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6506171ea04a9c4a4781fa3991f630e9cb35981b
+Subproject commit 986ec3ef062bd6977cedf357c77d049e4e18a017