diff --git a/Content.Benchmarks/DynamicTreeBenchmark.cs b/Content.Benchmarks/DynamicTreeBenchmark.cs
index 9b42061a1c..9dff449809 100644
--- a/Content.Benchmarks/DynamicTreeBenchmark.cs
+++ b/Content.Benchmarks/DynamicTreeBenchmark.cs
@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
@@ -7,7 +7,7 @@ namespace Content.Benchmarks
     [SimpleJob, MemoryDiagnoser]
     public class DynamicTreeBenchmark
     {
-        private static readonly Box2[] aabbs1 =
+        private static readonly Box2[] _aabbs1 =
         {
             ((Box2) default).Enlarged(1), //2x2 square
             ((Box2) default).Enlarged(2), //4x4 square
@@ -37,11 +37,11 @@ namespace Content.Benchmarks
         public void Setup()
         {
             _b2Tree = new B2DynamicTree<int>();
-            _tree = new DynamicTree<int>((in int value) => aabbs1[value], capacity: 16);
+            _tree = new DynamicTree<int>((in int value) => _aabbs1[value], capacity: 16);
 
-            for (var i = 0; i < aabbs1.Length; i++)
+            for (var i = 0; i < _aabbs1.Length; i++)
             {
-                var aabb = aabbs1[i];
+                var aabb = _aabbs1[i];
                 _b2Tree.CreateProxy(aabb, i);
                 _tree.Add(i);
             }
diff --git a/Content.Client/AI/ClientPathfindingDebugSystem.cs b/Content.Client/AI/ClientPathfindingDebugSystem.cs
index 1068bcae54..428fbeffeb 100644
--- a/Content.Client/AI/ClientPathfindingDebugSystem.cs
+++ b/Content.Client/AI/ClientPathfindingDebugSystem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.AI;
@@ -18,7 +18,6 @@ namespace Content.Client.AI
 #if DEBUG
     public class ClientPathfindingDebugSystem : EntitySystem
     {
-        [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
diff --git a/Content.Client/AME/UI/AMEWindow.xaml b/Content.Client/AME/UI/AMEWindow.xaml
index bc1e7d9ded..8769e3124e 100644
--- a/Content.Client/AME/UI/AMEWindow.xaml
+++ b/Content.Client/AME/UI/AMEWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ame-window-title'}"
             MinSize="250 250">
     <BoxContainer Orientation="Vertical">
@@ -43,4 +43,4 @@
             <Label Name="CoreCount" Text="0" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/AME/UI/AMEWindow.xaml.cs b/Content.Client/AME/UI/AMEWindow.xaml.cs
index 90c345faf7..83f7b354db 100644
--- a/Content.Client/AME/UI/AMEWindow.xaml.cs
+++ b/Content.Client/AME/UI/AMEWindow.xaml.cs
@@ -12,7 +12,7 @@ using static Content.Shared.AME.SharedAMEControllerComponent;
 namespace Content.Client.AME.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AMEWindow : SS14Window
+    public partial class AMEWindow : DefaultWindow
     {
         public AMEWindow(AMEControllerBoundUserInterface ui)
         {
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index b384e448fa..5c47218870 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="3">
@@ -27,4 +27,4 @@
 
         </GridContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index e835c7e6f7..c6be90059f 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -13,7 +13,7 @@ using static Content.Shared.Access.Components.SharedIdCardConsoleComponent;
 namespace Content.Client.Access.UI
 {
     [GenerateTypedNameReferences]
-    public partial class IdCardConsoleWindow : SS14Window
+    public partial class IdCardConsoleWindow : DefaultWindow
     {
         private readonly IdCardConsoleBoundUserInterface _owner;
 
diff --git a/Content.Client/Actions/UI/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs
index bb7f996ad0..dfce37feb8 100644
--- a/Content.Client/Actions/UI/ActionMenu.cs
+++ b/Content.Client/Actions/UI/ActionMenu.cs
@@ -27,7 +27,7 @@ namespace Content.Client.Actions.UI
     /// Action selection menu, allows filtering and searching over all possible
     /// actions and populating those actions into the hotbar.
     /// </summary>
-    public class ActionMenu : SS14Window
+    public class ActionMenu : DefaultWindow
     {
         private const string ItemTag = "item";
         private const string NotItemTag = "not item";
diff --git a/Content.Client/Administration/AdminVerbSystem.cs b/Content.Client/Administration/AdminVerbSystem.cs
index b787495844..6e8998cd7a 100644
--- a/Content.Client/Administration/AdminVerbSystem.cs
+++ b/Content.Client/Administration/AdminVerbSystem.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Verbs
     class AdminVerbSystem : EntitySystem
     {
         [Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
-        [Dependency] private readonly IViewVariablesManager _viewVariablesManager = default!;
         [Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
 
         public override void Initialize()
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
index 20c64f827d..bb5c29bc78 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     Title="{Loc 'admin-announce-title'}"
     MinWidth="500">
@@ -12,4 +12,4 @@
 
         <Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc 'Announce'}" HorizontalAlignment="Center"/>
     </GridContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
index 93f81ca807..94b373d87b 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Administration.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AdminAnnounceWindow : SS14Window
+    public partial class AdminAnnounceWindow : DefaultWindow
     {
         [Dependency] private readonly ILocalizationManager _localization = default!;
 
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml b/Content.Client/Administration/UI/AdminMenuWindow.xaml
index 4c5077cb95..f148f5c1be 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
     xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
@@ -13,4 +13,4 @@
         <tabs:ServerTab />
         <playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
     </TabContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index c84794b47e..76d12af176 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Administration.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AdminMenuWindow : SS14Window
+    public partial class AdminMenuWindow : DefaultWindow
     {
         [Dependency] private readonly IGameHud? _gameHud = default!;
 
diff --git a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
index eeeb214397..d4ec6e9fe7 100644
--- a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
@@ -7,13 +7,13 @@ namespace Content.Client.Administration.UI.CustomControls
     public class UICommandButton : CommandButton
     {
         public Type? WindowType { get; set; }
-        private SS14Window? _window;
+        private DefaultWindow? _window;
 
         protected override void Execute(ButtonEventArgs obj)
         {
             if (WindowType == null)
                 return;
-            _window = (SS14Window) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
+            _window = (DefaultWindow) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
             _window?.OpenCentered();
         }
     }
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
index 6e1f52a558..9f4234210d 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
@@ -1,7 +1,7 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:logs="clr-namespace:Content.Client.Administration.UI.Logs"
             Title="{Loc admin-logs-title}"
             MinWidth="1000"
             MinHeight="400">
     <logs:AdminLogsControl Name="Logs" Access="Public"/>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
index 765eb142bd..8743296815 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Administration.UI.Logs;
 
 [GenerateTypedNameReferences]
-public partial class AdminLogsWindow : SS14Window
+public partial class AdminLogsWindow : DefaultWindow
 {
     public AdminLogsWindow()
     {
diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml
index 248f992d07..943ecb536a 100644
--- a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml
+++ b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     SetSize="250 300"
     Margin="4 0"
     xmlns="https://spacestation14.io">
@@ -10,4 +10,4 @@
         <ItemList Name="ReagentList" SelectMode="Single" VerticalExpand="True"  Margin ="0 4"/>
         <Button Name="AddButton" HorizontalExpand="True" Margin ="0 4" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
index dbdff86b96..6a012ba70f 100644
--- a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
     ///     cref="EditSolutionsWindow"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class AddReagentWindow : SS14Window
+    public sealed partial class AddReagentWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
index 52aa96776b..2503a53a61 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     SetSize="300 300"
     Margin="4 0"
     xmlns="https://spacestation14.io">
@@ -20,4 +20,4 @@
         </ScrollContainer>
         <Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True"  Margin="0 4"/>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
index f5adecfd92..033f9de4d1 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
     ///     A simple window that displays solutions and their contained reagents. Allows you to edit the reagent quantities and add new reagents.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class EditSolutionsWindow : SS14Window
+    public sealed partial class EditSolutionsWindow : DefaultWindow
     {
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
index 4f088ff8a2..3073e925f8 100644
--- a/Content.Client/Administration/UI/PermissionsEui.cs
+++ b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -26,7 +26,7 @@ namespace Content.Client.Administration.UI
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
 
         private readonly Menu _menu;
-        private readonly List<SS14Window> _subWindows = new();
+        private readonly List<DefaultWindow> _subWindows = new();
 
         private Dictionary<int, PermissionsEuiState.AdminRankData> _ranks =
             new();
@@ -289,7 +289,7 @@ namespace Content.Client.Administration.UI
             OpenRankEditWindow(rank);
         }
 
-        private sealed class Menu : SS14Window
+        private sealed class Menu : DefaultWindow
         {
             private readonly PermissionsEui _ui;
             public readonly GridContainer AdminsList;
@@ -341,7 +341,7 @@ namespace Content.Client.Administration.UI
             protected override Vector2 ContentsMinimumSize => (600, 400);
         }
 
-        private sealed class EditAdminWindow : SS14Window
+        private sealed class EditAdminWindow : DefaultWindow
         {
             public readonly PermissionsEuiState.AdminData? SourceData;
             public readonly LineEdit? NameEdit;
@@ -522,7 +522,7 @@ namespace Content.Client.Administration.UI
             }
         }
 
-        private sealed class EditAdminRankWindow : SS14Window
+        private sealed class EditAdminRankWindow : DefaultWindow
         {
             public readonly int? SourceId;
             public readonly LineEdit NameEdit;
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
index efb831cd1b..823aa46e76 100644
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.45">
@@ -12,4 +12,4 @@
             <Button Name="ConfirmButton" HorizontalExpand="True" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
index 8139ca655f..4aa3ce0a93 100644
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Administration.UI.SetOutfit
 {
     [GenerateTypedNameReferences]
-    public partial class SetOutfitMenu : SS14Window
+    public partial class SetOutfitMenu : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
index 316c79ddf1..692305d42a 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
             Title="{Loc 'admin-shuttle-title'}"
             MinWidth="300">
@@ -11,4 +11,4 @@
         <cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'communicationsconsole-menu-recall-shuttle'}" HorizontalAlignment="Center"/>
     </BoxContainer>
 
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
index be81895f4d..48377196b9 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
@@ -11,7 +11,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
-    public partial class AdminShuttleWindow : SS14Window
+    public partial class AdminShuttleWindow : DefaultWindow
     {
         public AdminShuttleWindow()
         {
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
index 559fabba23..9eb60ec578 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Ban}" MinSize="425 325">
@@ -26,4 +26,4 @@
         <Control MinWidth="50" />
         <Button Name="SubmitButton" Text="{Loc Ban}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
index b1105f1399..c40b2369ef 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
@@ -13,7 +13,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class BanWindow : SS14Window
+    public partial class BanWindow : DefaultWindow
     {
         public BanWindow()
         {
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
index 8098f950fb..dcc1a05bb5 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
@@ -15,4 +15,4 @@
             <Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
index 041fc3dff3..bc9b246c17 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class PlayerActionsWindow : SS14Window
+    public partial class PlayerActionsWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
 
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index 380ee75ed4..8f27b17d2d 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
@@ -6,4 +6,4 @@
         <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
index c9ca5abdf7..267cbc1219 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class TeleportWindow : SS14Window
+    public partial class TeleportWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
 
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
index cf150fcdee..0ba2a38c4a 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io" Title="{Loc Events}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -10,4 +10,4 @@
         <Button Name="ResumeButton" Text="{Loc Resume}" Disabled="True" />
         <Button Name="SubmitButton" Text="{Loc Run}" Disabled="True" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
index 35655d938d..b69ff79758 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class StationEventsWindow : SS14Window
+    public partial class StationEventsWindow : DefaultWindow
     {
         private List<string>? _data;
 
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
index c2857cc733..4a1719cbf8 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -8,4 +8,4 @@
         </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Add Atmos}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index b7ecf9704f..820425e0b6 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class AddAtmosWindow : SS14Window
+    public partial class AddAtmosWindow : DefaultWindow
     {
         private IEnumerable<IMapGrid>? _data;
 
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
index 4b5f9d46e0..df1c7aee65 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -28,4 +28,4 @@
         </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Add Gas}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index 0549543d6e..a4c250d080 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class AddGasWindow : SS14Window
+    public partial class AddGasWindow : DefaultWindow
     {
         private IEnumerable<IMapGrid>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
index 715653236d..242fcf2b82 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io" Title="{Loc Fill Gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -18,4 +18,4 @@
         </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Fill Gas}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index f89863dd7b..86e13bfa43 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class FillGasWindow : SS14Window
+    public partial class FillGasWindow : DefaultWindow
     {
         private IEnumerable<IMapGrid>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
index da471f500e..dbc6577201 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io" Title="{Loc Set Temperature}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -23,4 +23,4 @@
         </BoxContainer>
         <Button Name="SubmitButton" Text="{Loc Set Temperature}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 72458fefdd..db4360ac28 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class SetTemperatureWindow : SS14Window
+    public partial class SetTemperatureWindow : DefaultWindow
     {
         private IEnumerable<IMapGrid>? _data;
 
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index fc979577bf..360306e6e7 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -18,7 +18,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Arcade
 {
-    public class BlockGameMenu : SS14Window
+    public class BlockGameMenu : DefaultWindow
     {
         private static readonly Color OverlayBackgroundColor = new(74,74,81,180);
         private static readonly Color OverlayShadowColor = new(0,0,0,83);
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index fb7517ed68..e8b400c1f1 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -7,7 +7,7 @@ using Vector2 = Robust.Shared.Maths.Vector2;
 
 namespace Content.Client.Arcade
 {
-    public class SpaceVillainArcadeMenu : SS14Window
+    public class SpaceVillainArcadeMenu : DefaultWindow
     {
         public SpaceVillainArcadeBoundUserInterface Owner { get; set; }
 
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index a75894647a..76a1a41cdb 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             MinSize="500 500" Title="Air Alarm">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
@@ -72,4 +72,4 @@
             <OptionButton Name="CModeButton" HorizontalExpand="True" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index dfbecf651a..76155762fc 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -16,7 +16,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Atmos.Monitor.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AirAlarmWindow : SS14Window
+    public partial class AirAlarmWindow : DefaultWindow
     {
         public event Action<string, IAtmosDeviceData>? AtmosDeviceDataChanged;
         public event Action<AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;
diff --git a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
index a0d3f76647..965211432e 100644
--- a/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
+++ b/Content.Client/Atmos/UI/GasAnalyzerMenu.cs
@@ -108,7 +108,7 @@ namespace Content.Client.Atmos.UI
                     },
                     (CloseButton = new TextureButton
                     {
-                        StyleClasses = {SS14Window.StyleClassWindowCloseButton},
+                        StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
                         VerticalAlignment = VAlignment.Center
                     })
                 }
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
index 69e2599523..36e9621d68 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="480 400" Title="Canister">
@@ -49,4 +49,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs b/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
index 7720007044..6f90db5df5 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a canister.
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class GasCanisterWindow : SS14Window
+    public partial class GasCanisterWindow : DefaultWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml b/Content.Client/Atmos/UI/GasFilterWindow.xaml
index b6ea716fb4..1fb2baa4ef 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="480 400" Title="Filter">
@@ -25,4 +25,4 @@
             <Button Name="SelectGasButton" Text="{Loc comp-gas-filter-ui-filter-gas-confirm}" HorizontalExpand="True" Disabled="True" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
index c1ad89d744..c02e195d4c 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas filter.
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class GasFilterWindow : SS14Window
+    public partial class GasFilterWindow : DefaultWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml b/Content.Client/Atmos/UI/GasMixerWindow.xaml
index 9d69d9bf4c..e43a44193a 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 200" Title="Gas Mixer">
@@ -35,4 +35,4 @@
             <Button Name="SetMixerPercentageButton" Text="{Loc comp-gas-mixer-ui-mixer-set}" HorizontalAlignment="Right" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
index af4408bd9d..1aefbf6cbf 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas mixer.
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class GasMixerWindow : SS14Window
+    public partial class GasMixerWindow : DefaultWindow
     {
         public bool MixerStatus = true;
 
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
index 94520a584d..d0a09cc824 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 120" Title="Pressure Pump">
@@ -20,4 +20,4 @@
             <Button Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" HorizontalAlignment="Right" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
index 05b3062aa6..2977091387 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas pressure pump.
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class GasPressurePumpWindow : SS14Window
+    public partial class GasPressurePumpWindow : DefaultWindow
     {
         public bool PumpStatus = true;
 
diff --git a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
index 17ac96d702..3b17792d98 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
             MinSize="200 120" Title="Volume Pump">
@@ -20,4 +20,4 @@
             <Button Name="SetTransferRateButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" HorizontalAlignment="Right" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs
index aea59971ab..dc0fc288bb 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas volume pump.
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class GasVolumePumpWindow : SS14Window
+    public partial class GasVolumePumpWindow : DefaultWindow
     {
         public bool PumpStatus = true;
 
diff --git a/Content.Client/Body/UI/BodyScannerDisplay.cs b/Content.Client/Body/UI/BodyScannerDisplay.cs
index c1bf89a198..04880094ec 100644
--- a/Content.Client/Body/UI/BodyScannerDisplay.cs
+++ b/Content.Client/Body/UI/BodyScannerDisplay.cs
@@ -11,7 +11,7 @@ using static Robust.Client.UserInterface.Controls.ItemList;
 
 namespace Content.Client.Body.UI
 {
-    public sealed class BodyScannerDisplay : SS14Window
+    public sealed class BodyScannerDisplay : DefaultWindow
     {
         private EntityUid? _currentEntity;
         private SharedBodyPartComponent? _currentBodyPart;
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index 2a8953ff2b..9b92e43091 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             SetSize="400 600"
             MinSize="400 600">
@@ -80,4 +80,4 @@
         </PanelContainer>
         <TextureButton VerticalExpand="True" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index 7af91d114d..82a1ea13b6 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -19,7 +19,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 namespace Content.Client.Cargo.UI
 {
     [GenerateTypedNameReferences]
-    public partial class CargoConsoleMenu : SS14Window
+    public partial class CargoConsoleMenu : DefaultWindow
     {
         public CargoConsoleBoundUserInterface Owner { get; private set; }
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
index 38b9da642b..7d0fbc61c5 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'cargo-console-order-menu-title'}">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
@@ -19,4 +19,4 @@
                 Text="{Loc 'cargo-console-order-menu-submit-button'}"
                 TextAlign="Center" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
index 00454b9f72..e098612937 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
 namespace Content.Client.Cargo.UI
 {
     [GenerateTypedNameReferences]
-    partial class CargoConsoleOrderMenu : SS14Window
+    partial class CargoConsoleOrderMenu : DefaultWindow
     {
         public CargoConsoleOrderMenu()
         {
diff --git a/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs b/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
index 64ba3e2975..d148d5586b 100644
--- a/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
+++ b/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Localization;
 
 namespace Content.Client.Cargo.UI
 {
-    public class GalacticBankSelectionMenu : SS14Window
+    public class GalacticBankSelectionMenu : DefaultWindow
     {
         private readonly ItemList _accounts;
         private int _accountCount;
diff --git a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
index 4b186faed5..bceb82bcc1 100644
--- a/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
@@ -329,7 +329,7 @@ namespace Content.Client.CharacterAppearance
         // ColorSlider
     }
 
-    public class MagicMirrorWindow : SS14Window
+    public class MagicMirrorWindow : DefaultWindow
     {
         private readonly HairStylePicker _hairStylePicker;
         private readonly HairStylePicker _facialHairStylePicker;
diff --git a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
index fe22791a62..fd3d7e96cf 100644
--- a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
@@ -29,7 +29,7 @@ namespace Content.Client.CharacterInterface
         /// <summary>
         /// A window that collects and shows all the individual character user interfaces
         /// </summary>
-        public class CharacterWindow : SS14Window
+        public class CharacterWindow : DefaultWindow
         {
             private readonly List<ICharacterUI> _windowComponents;
 
diff --git a/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs b/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
index 0d227bd80a..e6f22ef5b7 100644
--- a/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
@@ -52,7 +52,7 @@ namespace Content.Client.CharacterInterface
             {
                 SetSize = (545, 400)
             };
-            
+
             comp.Window.OnClose += () => _gameHud.CharacterButtonDown = false;
         }
 
@@ -122,7 +122,7 @@ namespace Content.Client.CharacterInterface
             }
         }
 
-        private void _setOpenValue(SS14Window menu, bool value)
+        private void _setOpenValue(DefaultWindow menu, bool value)
         {
             _gameHud.CharacterButtonDown = value;
             if (value)
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index 067166f009..57bdd1e805 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             MinSize="400 525"
@@ -115,4 +115,4 @@
             </PanelContainer>
         </PanelContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 8f166aee55..e8847b1e7c 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -26,7 +26,7 @@ namespace Content.Client.Chemistry.UI
     /// Client-side UI used to control a <see cref="SharedChemMasterComponent"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class ChemMasterWindow : SS14Window
+    public partial class ChemMasterWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         public event Action<string>? OnLabelEntered;
@@ -197,7 +197,7 @@ namespace Content.Client.Chemistry.UI
             if (!state.BufferReagents.Any())
             {
                 BufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
-                
+
                 return;
             }
 
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
index 448ee53b09..375bd70e7d 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             Title="{Loc 'reagent-dispenser-bound-user-interface-title'}"
             SetSize="590 450"
@@ -46,4 +46,4 @@
             </BoxContainer>
         </PanelContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
index 307a5bb0b2..a91e358eb9 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Chemistry.UI
     /// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class ReagentDispenserWindow : SS14Window
+    public partial class ReagentDispenserWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index eb0e18b12a..3d787c69c1 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ui-transfer-amount-title'}"
             Resizable="False">
 
@@ -8,4 +8,4 @@
         </BoxContainer>
         <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-transfer-amount-apply'}"/>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 8a25af5f29..8fc18dec06 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Chemistry.UI
 {
     [GenerateTypedNameReferences]
-    public partial class TransferAmountWindow : SS14Window
+    public partial class TransferAmountWindow : DefaultWindow
     {
         public TransferAmountWindow()
         {
diff --git a/Content.Client/Cloning/UI/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
index b37e693679..decca6cf5c 100644
--- a/Content.Client/Cloning/UI/AcceptCloningWindow.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
@@ -6,7 +6,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cloning.UI
 {
-    public sealed class AcceptCloningWindow : SS14Window
+    public sealed class AcceptCloningWindow : DefaultWindow
     {
         public readonly Button DenyButton;
         public readonly Button AcceptButton;
diff --git a/Content.Client/Cloning/UI/CloningPodWindow.cs b/Content.Client/Cloning/UI/CloningPodWindow.cs
index d9d333f653..31862d0a3e 100644
--- a/Content.Client/Cloning/UI/CloningPodWindow.cs
+++ b/Content.Client/Cloning/UI/CloningPodWindow.cs
@@ -13,7 +13,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Cloning.UI
 {
-    public sealed class CloningPodWindow : SS14Window
+    public sealed class CloningPodWindow : DefaultWindow
     {
         private Dictionary<int, string?> _scanManager;
 
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
index af12b76965..773086c3c7 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
@@ -10,7 +10,7 @@ using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Communications.UI
 {
-    public class CommunicationsConsoleMenu : SS14Window
+    public class CommunicationsConsoleMenu : DefaultWindow
     {
         private CommunicationsConsoleBoundUserInterface Owner { get; set; }
         private readonly CancellationTokenSource _timerCancelTokenSource = new();
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index 07ad8ecf99..218c1382b1 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -10,7 +10,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Configurable.UI
 {
-    public class ConfigurationMenu : SS14Window
+    public class ConfigurationMenu : DefaultWindow
     {
         public ConfigurationBoundUserInterface Owner { get; }
 
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index 193742e0e6..dd210d9729 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io">
+<DefaultWindow xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
             <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
@@ -29,4 +29,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index f149cfb36f..26e998ee3a 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -53,7 +53,7 @@ namespace Content.Client.Construction.UI
     }
 
     [GenerateTypedNameReferences]
-    public partial class ConstructionMenu : SS14Window, IConstructionMenuView
+    public partial class ConstructionMenu : DefaultWindow, IConstructionMenuView
     {
         public bool BuildButtonPressed
         {
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml b/Content.Client/Crayon/UI/CrayonWindow.xaml
index 0a16ab420f..6289150b6e 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'crayon-window-title'}"
             MinSize="250 300"
             SetSize="250 300">
@@ -10,4 +10,4 @@
             </GridContainer>
         </ScrollContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 90ce4b2523..f92f58951b 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -15,7 +15,7 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
 namespace Content.Client.Crayon.UI
 {
     [GenerateTypedNameReferences]
-    public partial class CrayonWindow : SS14Window
+    public partial class CrayonWindow : DefaultWindow
     {
         public CrayonBoundUserInterface Owner { get; }
 
diff --git a/Content.Client/Credits/CreditsWindow.xaml b/Content.Client/Credits/CreditsWindow.xaml
index 027a795cbb..2cb6f7ab92 100644
--- a/Content.Client/Credits/CreditsWindow.xaml
+++ b/Content.Client/Credits/CreditsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'credits-window-title'}"
             SetSize="650 650" >
     <TabContainer>
@@ -27,4 +27,4 @@
             </BoxContainer>
         </ScrollContainer>
     </TabContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 2cd65733e9..224a1007e1 100644
--- a/Content.Client/Credits/CreditsWindow.xaml.cs
+++ b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -21,7 +21,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 namespace Content.Client.Credits
 {
     [GenerateTypedNameReferences]
-    public sealed partial class CreditsWindow : SS14Window
+    public sealed partial class CreditsWindow : DefaultWindow
     {
         [Dependency] private readonly IResourceCache _resourceManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
index 3849082435..5ddcd72d31 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'disposal-router-window-title'}"
             MinSize="500 110"
             SetSize="500 110">
@@ -17,4 +17,4 @@
                     Text="{Loc 'disposal-router-window-tag-input-confirm-button'}" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
index eee479d05d..92c0e7324f 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Disposal.UI
     /// Client-side UI used to control a <see cref="SharedDisposalRouterComponent"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class DisposalRouterWindow : SS14Window
+    public partial class DisposalRouterWindow : DefaultWindow
     {
         public DisposalRouterWindow()
         {
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
index 0441b0f8f6..68cb049184 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'disposal-tagger-window-title'}"
             MinSize="500 110"
             SetSize="500 110">
@@ -16,4 +16,4 @@
                     Text="{Loc 'disposal-tagger-window-tag-confirm-button'}" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
index a7a8c98b78..4306636c59 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Disposal.UI
     /// Client-side UI used to control a <see cref="SharedDisposalTaggerComponent"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class DisposalTaggerWindow : SS14Window
+    public partial class DisposalTaggerWindow : DefaultWindow
     {
         public DisposalTaggerWindow()
         {
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
index f8776f7755..56a1dc89c3 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             MinSize="300 140"
             SetSize="300 140"
             Resizable="False">
@@ -38,4 +38,4 @@
                          StyleClasses="OpenLeft" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
index 9d39f54671..c9022cef99 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Disposal.UI
     /// Client-side UI used to control a <see cref="SharedDisposalUnitComponent"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class DisposalUnitWindow : SS14Window
+    public partial class DisposalUnitWindow : DefaultWindow
     {
         public DisposalUnitWindow()
         {
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index 14b99ca9cc..65d389fca7 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:changelog="clr-namespace:Content.Client.Changelog"
             xmlns:ui="clr-namespace:Content.Client.Voting.UI"
             Title="{Loc 'ui-escape-title'}"
@@ -12,4 +12,4 @@
         <Button Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
         <Button Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
index 2b40977117..5fae1da138 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
@@ -9,7 +9,7 @@ using Robust.Shared.GameObjects;
 namespace Content.Client.EscapeMenu.UI
 {
     [GenerateTypedNameReferences]
-    internal partial class EscapeMenu : SS14Window
+    internal partial class EscapeMenu : DefaultWindow
     {
         private readonly IClientConsoleHost _consoleHost;
 
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
index 84da16e1a1..5a38e4b0a3 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.EscapeMenu.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
@@ -7,4 +7,4 @@
         <tabs:KeyRebindTab />
         <tabs:AudioTab />
     </TabContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
index 2e408d445f..75eac722db 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.EscapeMenu.UI
 {
     [GenerateTypedNameReferences]
-    public partial class OptionsMenu : SS14Window
+    public partial class OptionsMenu : DefaultWindow
     {
         public OptionsMenu()
         {
diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 28a945a1cb..59da6841a1 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Content.Client.Lobby;
 using Content.Client.RoundEnd;
@@ -32,7 +32,7 @@ namespace Content.Client.GameTicking.Managers
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
         [ViewVariables] public TimeSpan StartTime { get; private set; }
-        [ViewVariables] public bool Paused { get; private set; }
+        [ViewVariables] public new bool Paused { get; private set; }
         [ViewVariables] public Dictionary<NetUserId, LobbyPlayerStatus> Status { get; private set; } = new();
         [ViewVariables] public IReadOnlyDictionary<StationId, Dictionary<string, int>> JobsAvailable => _jobsAvailable;
         [ViewVariables] public IReadOnlyDictionary<StationId, string> StationNames => _stationNames;
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml
index 786dd982a1..86bf1ddab3 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml
@@ -1,8 +1,8 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ghost-roles-window-title'}">
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True">
-        <RichTextLabel Name="Title" VerticalExpand="True"/>
+        <RichTextLabel Name="TopBanner" VerticalExpand="True"/>
         <Button Name="RequestButton"
                 Text="{Loc 'ghost-roles-window-request-role-button'}"
                 Disabled="True"
@@ -10,4 +10,4 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
index 307c47dded..51a1b08b82 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
@@ -11,13 +11,13 @@ using Robust.Shared.Utility;
 namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
-    public partial class GhostRoleRulesWindow : SS14Window
+    public partial class GhostRoleRulesWindow : DefaultWindow
     {
         private float _timer = 5.0f;
         public GhostRoleRulesWindow(string rules, Action<BaseButton.ButtonEventArgs> requestAction)
         {
             RobustXamlLoader.Load(this);
-            Title.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
+            TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
             RequestButton.OnPressed += requestAction;
         }
 
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
index 6e32db5fda..bc1a36a80b 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ghost-roles-window-title'}"
             MinSize="375 275">
     <Label Name="NoRolesMessage"
@@ -13,4 +13,4 @@
             <!-- Ghost role entries are added here by code -->
         </BoxContainer>
     </ScrollContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
index f1aeaecf0f..427435e7d9 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls;
 namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
-    public partial class GhostRolesWindow : SS14Window
+    public partial class GhostRolesWindow : DefaultWindow
     {
         public event Action<GhostRoleInfo>? RoleRequested;
 
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
index 76e50cee7a..eaff9c0946 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window Title="Make Ghost Role"
+<DefaultWindow Title="Make Ghost Role"
             xmlns="https://spacestation14.io">
 
     <BoxContainer Orientation="Vertical">
@@ -27,4 +27,4 @@
         </BoxContainer>
     </BoxContainer>
 
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
index 3f4c8a1421..6ebbc71947 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
@@ -7,7 +7,7 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
 namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
-    public partial class MakeGhostRoleWindow : SS14Window
+    public partial class MakeGhostRoleWindow : DefaultWindow
     {
         public delegate void MakeRole(EntityUid uid, string name, string description, string rules, bool makeSentient);
 
diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml b/Content.Client/Ghost/UI/GhostTargetWindow.xaml
index 1f694aae4f..1107657ac5 100644
--- a/Content.Client/Ghost/UI/GhostTargetWindow.xaml
+++ b/Content.Client/Ghost/UI/GhostTargetWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ghost-target-window-title'}"
             MinSize="300 450"
             SetSize="300 450">
@@ -11,4 +11,4 @@
             <!-- Target buttons get added here by code -->
         </BoxContainer>
     </ScrollContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs b/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
index d5e67a6ed0..a078b640ce 100644
--- a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
+++ b/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Ghost.UI
 {
     [GenerateTypedNameReferences]
-    public partial class GhostTargetWindow : SS14Window
+    public partial class GhostTargetWindow : DefaultWindow
     {
         private readonly IEntityNetworkManager _netManager;
 
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index 383d6c6a25..a20513a3a0 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Localization;
 
 namespace Content.Client.Info
 {
-    public sealed class RulesAndInfoWindow : SS14Window
+    public sealed class RulesAndInfoWindow : DefaultWindow
     {
         [Dependency] private readonly RulesManager _rulesManager = default!;
         [Dependency] private readonly IResourceCache _resourceManager = default!;
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
index 4a4c82590f..370c15cde8 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
     <BoxContainer Orientation="Vertical" SeparationOverride="5">
         <BoxContainer Orientation="Horizontal" VerticalExpand="True">
@@ -29,4 +29,4 @@
                StyleClasses="LabelBig"
                Text="{Loc instruments-component-menu-no-midi-support}" />
     </PanelContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index afc15ca9d8..dec051d601 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -19,7 +19,7 @@ using Range = Robust.Client.UserInterface.Controls.Range;
 namespace Content.Client.Instruments.UI
 {
     [GenerateTypedNameReferences]
-    public partial class InstrumentMenu : SS14Window
+    public partial class InstrumentMenu : DefaultWindow
     {
         [Dependency] private readonly IMidiManager _midiManager = default!;
         [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
diff --git a/Content.Client/Inventory/ClientInventoryComponent.cs b/Content.Client/Inventory/ClientInventoryComponent.cs
index 0caac5e11e..010ac12ff4 100644
--- a/Content.Client/Inventory/ClientInventoryComponent.cs
+++ b/Content.Client/Inventory/ClientInventoryComponent.cs
@@ -23,7 +23,7 @@ namespace Content.Client.Inventory
         public Control BottomRightButtons = default!;
         public Control TopQuickButtons = default!;
 
-        public SS14Window InventoryWindow = default!;
+        public DefaultWindow InventoryWindow = default!;
 
         public readonly Dictionary<string, List<ItemSlotButton>> SlotButtons = new();
 
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 3299ead78c..41e961b2bf 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -45,7 +45,7 @@ namespace Content.Client.Inventory
         /// Stores delegates used to create controls for a given <see cref="InventoryTemplatePrototype"/>.
         /// </summary>
         private readonly
-            Dictionary<string, Func<EntityUid, Dictionary<string, List<ItemSlotButton>>, (SS14Window window, Control bottomLeft, Control bottomRight, Control
+            Dictionary<string, Func<EntityUid, Dictionary<string, List<ItemSlotButton>>, (DefaultWindow window, Control bottomLeft, Control bottomRight, Control
                 topQuick)>>
             _uiGenerateDelegates = new();
 
@@ -226,7 +226,7 @@ namespace Content.Client.Inventory
             TryEquipActiveHandTo(uid, slot);
         }
 
-        private bool TryGetUIElements(EntityUid uid, [NotNullWhen(true)] out SS14Window? invWindow,
+        private bool TryGetUIElements(EntityUid uid, [NotNullWhen(true)] out DefaultWindow? invWindow,
             [NotNullWhen(true)] out Control? invBottomLeft, [NotNullWhen(true)] out Control? invBottomRight,
             [NotNullWhen(true)] out Control? invTopQuick, ClientInventoryComponent? component = null)
         {
@@ -245,7 +245,7 @@ namespace Content.Client.Inventory
             {
                 _uiGenerateDelegates[component.TemplateId] = genfunc = (entityUid, list) =>
                 {
-                    var window = new SS14Window()
+                    var window = new DefaultWindow()
                     {
                         Title = Loc.GetString("human-inventory-window-title"),
                         Resizable = false
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml b/Content.Client/Kitchen/UI/GrinderMenu.xaml
index 38fd6ee197..0c5880a498 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:ui="clr-namespace:Content.Client.Kitchen.UI"
             Title="{Loc grinder-menu-title}" MinSize="512 256" SetSize="512 256">
 <BoxContainer Orientation="Horizontal">
@@ -12,4 +12,4 @@
         <Control MinSize="8 0"/>
         <ui:LabelledContentBox Name="BeakerContentBox" LabelText="{Loc grinder-menu-beaker-content-box-label}" ButtonText="{Loc grinder-menu-beaker-content-box-button}" VerticalExpand="True" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
index 816af4797e..f8f40c1b8c 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
@@ -16,7 +16,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Kitchen.UI
 {
     [GenerateTypedNameReferences]
-    public partial class GrinderMenu : SS14Window
+    public partial class GrinderMenu : DefaultWindow
     {
         private readonly IEntityManager _entityManager;
         private readonly IPrototypeManager _prototypeManager ;
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index 03eceb6a31..a75beace74 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             Title="{Loc 'microwave-menu-title'}"
             SetSize="512 256"
@@ -80,4 +80,4 @@
             <gfx:StyleBoxFlat BackgroundColor="#00000099" />
         </PanelContainer.PanelOverride>
     </PanelContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index d816e458a5..476839444f 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Kitchen.UI
 {
     [GenerateTypedNameReferences]
-    public partial class MicrowaveMenu : SS14Window
+    public partial class MicrowaveMenu : DefaultWindow
     {
         public class MicrowaveCookTimeButton : Button
         {
diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml b/Content.Client/Labels/UI/HandLabelerWindow.xaml
index 1b09257a43..a998264775 100644
--- a/Content.Client/Labels/UI/HandLabelerWindow.xaml
+++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml
@@ -1,8 +1,8 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             Title="Hand Labeler">
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <Label Name="CurrentTextLabel" Text="{Loc 'hand-labeler-current-text-label'}" />
         <LineEdit Name="LabelLineEdit" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
index 1ab434f3a8..b3e93dc0a9 100644
--- a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
+++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Labels.UI
 {
     [GenerateTypedNameReferences]
-    public partial class HandLabelerWindow : SS14Window
+    public partial class HandLabelerWindow : DefaultWindow
     {
         public event Action<string>? OnLabelEntered;
 
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index c43acad0b6..d6b998cafc 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -21,7 +21,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.LateJoin
 {
-    public sealed class LateJoinGui : SS14Window
+    public sealed class LateJoinGui : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
diff --git a/Content.Client/Lathe/UI/LatheMenu.cs b/Content.Client/Lathe/UI/LatheMenu.cs
index 12c6872156..289bed1a37 100644
--- a/Content.Client/Lathe/UI/LatheMenu.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.cs
@@ -12,7 +12,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lathe.UI
 {
-    public class LatheMenu : SS14Window
+    public class LatheMenu : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
diff --git a/Content.Client/Lathe/UI/LatheQueueMenu.cs b/Content.Client/Lathe/UI/LatheQueueMenu.cs
index 7c5cbcc8fb..209d9ef4d1 100644
--- a/Content.Client/Lathe/UI/LatheQueueMenu.cs
+++ b/Content.Client/Lathe/UI/LatheQueueMenu.cs
@@ -9,7 +9,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lathe.UI
 {
-    public class LatheQueueMenu : SS14Window
+    public class LatheQueueMenu : DefaultWindow
     {
         public LatheBoundUserInterface Owner { get; set; }
 
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index 463626e352..7240b4ea21 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -27,7 +27,6 @@ namespace Content.Client.Lobby.UI
         private readonly IClientPreferencesManager _preferencesManager;
         private readonly IPrototypeManager _prototypeManager;
         private EntityUid? _previewDummy;
-        private string? _previewDummySpecies;
         private readonly Label _summaryLabel;
         private readonly BoxContainer _loaded;
         private readonly BoxContainer _viewBox;
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
index 4abdc245be..3fe8e83f57 100644
--- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <BoxContainer Orientation="Vertical">
@@ -10,4 +10,4 @@
             <cc:CommandButton  Command="observe" Name="ObserveButton" StyleClasses="Caution" Text="{Loc 'observe-confirm'}" SizeFlagsStretchRatio="1"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
index b1dd558206..2d37cb97df 100644
--- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
@@ -9,7 +9,7 @@ namespace Content.Client.Lobby.UI
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    internal sealed partial class ObserveWarningWindow : SS14Window
+    internal sealed partial class ObserveWarningWindow : DefaultWindow
     {
         public ObserveWarningWindow()
         {
diff --git a/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml b/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml
index cd78954b8c..719c9ec8c7 100644
--- a/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml
+++ b/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml
@@ -1,4 +1,4 @@
-<customControls:SS14Window xmlns:customControls="https://spacestation14.io"
+<customControls:DefaultWindow xmlns:customControls="https://spacestation14.io"
     Title="Port Selector" MinSize="200 200">
     <customControls:ItemList Name="ButtonContainer" VerticalExpand="True" HorizontalExpand="True" SelectMode="Button"/>
-</customControls:SS14Window>
+</customControls:DefaultWindow>
diff --git a/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml.cs b/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml.cs
index ce95e731a9..a8d6af1585 100644
--- a/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml.cs
+++ b/Content.Client/MachineLinking/UI/SignalPortSelectorMenu.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.MachineLinking.UI
 {
     [GenerateTypedNameReferences]
-    public partial class SignalPortSelectorMenu : SS14Window
+    public partial class SignalPortSelectorMenu : DefaultWindow
     {
         private SignalPortSelectorBoundUserInterface _bui;
 
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index d0d153f9d3..06d1f5883a 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'crew-monitoring-user-interface-title'}"
             MinSize="450 400">
     <ScrollContainer HorizontalExpand="True"
@@ -20,4 +20,4 @@
             <!-- Table rows are filled by code -->
         </GridContainer>
     </ScrollContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 1d5c13caf6..6961ac2d0a 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Medical.CrewMonitoring
 {
     [GenerateTypedNameReferences]
-    public partial class CrewMonitoringWindow : SS14Window
+    public partial class CrewMonitoringWindow : DefaultWindow
     {
         private List<Control> _rowsContent = new();
 
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
index 454812010a..54f33aa0f7 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             MinSize="250 100"
             SetSize="250 100">
     <BoxContainer Orientation="Vertical">
@@ -7,4 +7,4 @@
                 Text="{Loc 'medical-scanner-window-save-button-text'}" />
         <Label Name="Diagnostics" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
index fb7c928529..389826af22 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
@@ -14,7 +14,7 @@ using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
 namespace Content.Client.MedicalScanner.UI
 {
     [GenerateTypedNameReferences]
-    public partial class MedicalScannerWindow : SS14Window
+    public partial class MedicalScannerWindow : DefaultWindow
     {
         public MedicalScannerWindow()
         {
diff --git a/Content.Client/Nuke/NukeMenu.xaml b/Content.Client/Nuke/NukeMenu.xaml
index 3772d27501..227465341d 100644
--- a/Content.Client/Nuke/NukeMenu.xaml
+++ b/Content.Client/Nuke/NukeMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             Title="{Loc 'nuke-user-interface-title'}"
             MinSize="256 256"
@@ -43,4 +43,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Nuke/NukeMenu.xaml.cs b/Content.Client/Nuke/NukeMenu.xaml.cs
index 4c0e8b3500..c5d55f7e79 100644
--- a/Content.Client/Nuke/NukeMenu.xaml.cs
+++ b/Content.Client/Nuke/NukeMenu.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Nuke
 {
     [GenerateTypedNameReferences]
-    public partial class NukeMenu : SS14Window
+    public partial class NukeMenu : DefaultWindow
     {
         public event Action<int>? OnKeypadButtonPressed;
         public event Action? OnClearButtonPressed;
diff --git a/Content.Client/PDA/PDAMenu.xaml b/Content.Client/PDA/PDAMenu.xaml
index 5be5c1187b..7ed16b08c8 100644
--- a/Content.Client/PDA/PDAMenu.xaml
+++ b/Content.Client/PDA/PDAMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'comp-pda-ui-menu-title'}"
             MinSize="512 256"
             SetSize="512 256">
@@ -34,4 +34,4 @@
                     Text="{Loc 'pda-bound-user-interface-uplink-tab-title'}" />
         </BoxContainer>
     </TabContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/PDA/PDAMenu.xaml.cs b/Content.Client/PDA/PDAMenu.xaml.cs
index cb3977ff85..058c31d860 100644
--- a/Content.Client/PDA/PDAMenu.xaml.cs
+++ b/Content.Client/PDA/PDAMenu.xaml.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.PDA
 {
     [GenerateTypedNameReferences]
-    public partial class PDAMenu : SS14Window
+    public partial class PDAMenu : DefaultWindow
     {
         public PDAMenu()
         {
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml
index c4929fd4e6..f1b875c228 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml
+++ b/Content.Client/Paper/UI/PaperWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             MinSize="300 300"
             SetSize="300 300">
     <BoxContainer Orientation="Vertical">
@@ -7,4 +7,4 @@
                   Access="Public"
                   Visible="False" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index a35af8fd10..131585071a 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Utility;
 namespace Content.Client.Paper.UI
 {
     [GenerateTypedNameReferences]
-    public partial class PaperWindow : SS14Window
+    public partial class PaperWindow : DefaultWindow
     {
         public PaperWindow()
         {
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml b/Content.Client/Power/APC/UI/ApcMenu.xaml
index fbd0036df3..61b12083c5 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Name="APCMenu"
             Title="{Loc 'apc-menu-title'}"
             Resizable="False">
@@ -24,4 +24,4 @@
             <Label Name="ChargePercentage"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index 60b0cb1d22..cb592431b8 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Maths;
 namespace Content.Client.Power.APC.UI
 {
     [GenerateTypedNameReferences]
-    public partial class ApcMenu : SS14Window
+    public partial class ApcMenu : DefaultWindow
     {
         public ApcMenu(ApcBoundUserInterface owner)
         {
diff --git a/Content.Client/Power/SolarControlWindow.xaml b/Content.Client/Power/SolarControlWindow.xaml
index f492c97fed..e3a198c6bf 100644
--- a/Content.Client/Power/SolarControlWindow.xaml
+++ b/Content.Client/Power/SolarControlWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:power="clr-namespace:Content.Client.Power"
             Title="{Loc 'solar-control-window-title'}"
             Resizable="False">
@@ -28,5 +28,5 @@
         </GridContainer>
         <power:SolarControlNotARadar Name="NotARadar"/>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
 
diff --git a/Content.Client/Power/SolarControlWindow.xaml.cs b/Content.Client/Power/SolarControlWindow.xaml.cs
index 551cc12918..6b56bc0632 100644
--- a/Content.Client/Power/SolarControlWindow.xaml.cs
+++ b/Content.Client/Power/SolarControlWindow.xaml.cs
@@ -16,7 +16,7 @@ using Robust.Shared.Timing;
 namespace Content.Client.Power
 {
     [GenerateTypedNameReferences]
-    public sealed partial class SolarControlWindow : SS14Window, IComputerWindow<SolarControlConsoleBoundInterfaceState>
+    public sealed partial class SolarControlWindow : DefaultWindow, IComputerWindow<SolarControlConsoleBoundInterfaceState>
     {
         private SolarControlConsoleBoundInterfaceState _lastState = new(0, 0, 0, 0);
 
diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml
index a8ef2dc427..b8fec2f3be 100644
--- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml
+++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'research-client-server-selection-menu-title'}"
             MinSize="300 300"
             SetSize="300 300">
@@ -6,4 +6,4 @@
               SelectMode="Single">
         <!-- Servers are added here by code -->
     </ItemList>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
index 2ffad40961..980038e117 100644
--- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Localization;
 namespace Content.Client.Research.UI
 {
     [GenerateTypedNameReferences]
-    public partial class ResearchClientServerSelectionMenu : SS14Window
+    public partial class ResearchClientServerSelectionMenu : DefaultWindow
     {
         private int _serverCount;
         private string[] _serverNames = System.Array.Empty<string>();
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index af77597d05..df892b8820 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'research-console-menu-title'}"
             MinSize="800 400"
             SetSize="800 400">
@@ -84,4 +84,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index ef562430b1..75b5339a92 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Research.UI
 {
     [GenerateTypedNameReferences]
-    public partial class ResearchConsoleMenu : SS14Window
+    public partial class ResearchConsoleMenu : DefaultWindow
     {
         public ResearchConsoleBoundUserInterface Owner { get; }
 
diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index f1bb5b11a6..7958a414f9 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -9,7 +9,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.RoundEnd
 {
-    public sealed class RoundEndSummaryWindow : SS14Window
+    public sealed class RoundEndSummaryWindow : DefaultWindow
     {
 
         public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan, RoundEndMessageEvent.RoundEndPlayerInfo[] info)
diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs
index 5898535ec9..002b26a6f7 100644
--- a/Content.Client/Sandbox/SandboxManager.cs
+++ b/Content.Client/Sandbox/SandboxManager.cs
@@ -24,7 +24,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 namespace Content.Client.Sandbox
 {
     // Layout for the SandboxWindow
-    public class SandboxWindow : SS14Window
+    public class SandboxWindow : DefaultWindow
     {
         public readonly Button RespawnButton;
         public readonly Button SpawnEntitiesButton;
diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs
index 601c966719..706728e201 100644
--- a/Content.Client/Storage/ClientStorageComponent.cs
+++ b/Content.Client/Storage/ClientStorageComponent.cs
@@ -233,7 +233,7 @@ namespace Content.Client.Storage
         /// <summary>
         /// GUI class for client storage component
         /// </summary>
-        private class StorageWindow : SS14Window
+        private class StorageWindow : DefaultWindow
         {
             private Control _vBox;
             private readonly Label _information;
diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
index e284eea90f..18ea9aed7e 100644
--- a/Content.Client/Strip/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -7,7 +7,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Strip
 {
-    public class StrippingMenu : SS14Window
+    public class StrippingMenu : DefaultWindow
     {
         private readonly BoxContainer _vboxContainer;
 
diff --git a/Content.Client/Stylesheets/StyleBase.cs b/Content.Client/Stylesheets/StyleBase.cs
index 5804d39134..d8df98197e 100644
--- a/Content.Client/Stylesheets/StyleBase.cs
+++ b/Content.Client/Stylesheets/StyleBase.cs
@@ -164,7 +164,7 @@ namespace Content.Client.Stylesheets
 
                 // Window close button base texture.
                 new StyleRule(
-                    new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null,
+                    new SelectorElement(typeof(TextureButton), new[] {DefaultWindow.StyleClassWindowCloseButton}, null,
                         null),
                     new[]
                     {
@@ -173,7 +173,7 @@ namespace Content.Client.Stylesheets
                     }),
                 // Window close button hover.
                 new StyleRule(
-                    new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null,
+                    new SelectorElement(typeof(TextureButton), new[] {DefaultWindow.StyleClassWindowCloseButton}, null,
                         new[] {TextureButton.StylePseudoClassHover}),
                     new[]
                     {
@@ -181,7 +181,7 @@ namespace Content.Client.Stylesheets
                     }),
                 // Window close button pressed.
                 new StyleRule(
-                    new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null,
+                    new SelectorElement(typeof(TextureButton), new[] {DefaultWindow.StyleClassWindowCloseButton}, null,
                         new[] {TextureButton.StylePseudoClassPressed}),
                     new[]
                     {
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 8a344160b2..757cab829d 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Stylesheets
 {
     public static class ResCacheExtension
     {
-        public static Font notoStack(this IResourceCache resCache, string variation = "Regular", int size = 10, bool display = false)
+        public static Font NotoStack(this IResourceCache resCache, string variation = "Regular", int size = 10, bool display = false)
         {
             var ds = display ? "Display" : "";
             var sv = variation.StartsWith("Bold") ? "Bold" : "Regular";
@@ -109,19 +109,19 @@ namespace Content.Client.Stylesheets
 
         public StyleNano(IResourceCache resCache) : base(resCache)
         {
-            var notoSans10 = resCache.notoStack(size: 10);
-            var notoSansItalic10 = resCache.notoStack(variation: "Italic", size: 10);
-            var notoSans12 = resCache.notoStack(size: 12);
-            var notoSansItalic12 = resCache.notoStack(variation: "Italic", size: 12);
-            var notoSansBold12 = resCache.notoStack(variation: "Bold", size: 12);
-            var notoSansBoldItalic12 = resCache.notoStack(variation: "BoldItalic", size: 12);
-            var notoSansDisplayBold14 = resCache.notoStack(variation: "Bold", display: true, size: 14);
-            var notoSansDisplayBold16 = resCache.notoStack(variation: "Bold", display: true, size: 16);
-            var notoSans15 = resCache.notoStack(variation: "Regular", size: 15);
-            var notoSans16 = resCache.notoStack(variation: "Regular", size: 16);
-            var notoSansBold16 = resCache.notoStack(variation: "Bold", size: 16);
-            var notoSansBold18 = resCache.notoStack(variation: "Bold", size: 18);
-            var notoSansBold20 = resCache.notoStack(variation: "Bold", size: 20);
+            var notoSans10 = resCache.NotoStack(size: 10);
+            var notoSansItalic10 = resCache.NotoStack(variation: "Italic", size: 10);
+            var notoSans12 = resCache.NotoStack(size: 12);
+            var notoSansItalic12 = resCache.NotoStack(variation: "Italic", size: 12);
+            var notoSansBold12 = resCache.NotoStack(variation: "Bold", size: 12);
+            var notoSansBoldItalic12 = resCache.NotoStack(variation: "BoldItalic", size: 12);
+            var notoSansDisplayBold14 = resCache.NotoStack(variation: "Bold", display: true, size: 14);
+            var notoSansDisplayBold16 = resCache.NotoStack(variation: "Bold", display: true, size: 16);
+            var notoSans15 = resCache.NotoStack(variation: "Regular", size: 15);
+            var notoSans16 = resCache.NotoStack(variation: "Regular", size: 16);
+            var notoSansBold16 = resCache.NotoStack(variation: "Bold", size: 16);
+            var notoSansBold18 = resCache.NotoStack(variation: "Bold", size: 18);
+            var notoSansBold20 = resCache.NotoStack(variation: "Bold", size: 20);
             var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
@@ -453,7 +453,7 @@ namespace Content.Client.Stylesheets
             {
                 // Window title.
                 new StyleRule(
-                    new SelectorElement(typeof(Label), new[] {SS14Window.StyleClassWindowTitle}, null, null),
+                    new SelectorElement(typeof(Label), new[] {DefaultWindow.StyleClassWindowTitle}, null, null),
                     new[]
                     {
                         new StyleProperty(Label.StylePropertyFontColor, NanoGold),
@@ -469,7 +469,7 @@ namespace Content.Client.Stylesheets
                     }),
                 // Window background.
                 new StyleRule(
-                    new SelectorElement(null, new[] {SS14Window.StyleClassWindowPanel}, null, null),
+                    new SelectorElement(null, new[] {DefaultWindow.StyleClassWindowPanel}, null, null),
                     new[]
                     {
                         new StyleProperty(PanelContainer.StylePropertyPanel, windowBackground),
@@ -509,7 +509,7 @@ namespace Content.Client.Stylesheets
                     }),
                 // Window header.
                 new StyleRule(
-                    new SelectorElement(typeof(PanelContainer), new[] {SS14Window.StyleClassWindowHeader}, null, null),
+                    new SelectorElement(typeof(PanelContainer), new[] {DefaultWindow.StyleClassWindowHeader}, null, null),
                     new[]
                     {
                         new StyleProperty(PanelContainer.StylePropertyPanel, windowHeader),
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index 0a979ede9c..c89f9285d8 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -38,7 +38,7 @@ namespace Content.Client.Tabletop
         private float _timePassed; // Time passed since last update sent to the server.
         private EntityUid? _draggedEntity; // Entity being dragged
         private ScalingViewport? _viewport; // Viewport currently being used
-        private SS14Window? _window; // Current open tabletop window (only allow one at a time)
+        private DefaultWindow? _window; // Current open tabletop window (only allow one at a time)
         private EntityUid? _table; // The table entity of the currently open game session
 
         public override void Initialize()
diff --git a/Content.Client/Tabletop/UI/TabletopWindow.xaml b/Content.Client/Tabletop/UI/TabletopWindow.xaml
index 1e247b6a2b..4e89d1de1b 100644
--- a/Content.Client/Tabletop/UI/TabletopWindow.xaml
+++ b/Content.Client/Tabletop/UI/TabletopWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:viewport="clr-namespace:Content.Client.Viewport">
     <viewport:ScalingViewport Name="ScalingVp" MouseFilter="Stop" RenderScaleMode="CeilInt">
         <Button Name="FlipButton"
@@ -8,4 +8,4 @@
                 HorizontalAlignment="Right"
                 VerticalAlignment="Top" />
     </viewport:ScalingViewport>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs b/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
index 55e075062b..2d26cd87aa 100644
--- a/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
+++ b/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Maths;
 namespace Content.Client.Tabletop.UI
 {
     [GenerateTypedNameReferences]
-    public partial class TabletopWindow : SS14Window
+    public partial class TabletopWindow : DefaultWindow
     {
         public TabletopWindow(IEye? eye, Vector2i size)
         {
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
index 7e206881b9..9ea5e2869e 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             Title="{Loc 'uplink-user-interface-title'}"
             MinSize="512 512"
@@ -50,4 +50,4 @@
             </PanelContainer>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
index df026608ee..cc2966a5ee 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
@@ -16,7 +16,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Traitor.Uplink
 {
     [GenerateTypedNameReferences]
-    public partial class UplinkMenu : SS14Window
+    public partial class UplinkMenu : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
@@ -81,7 +81,7 @@ namespace Content.Client.Traitor.Uplink
             // should probably chunk these out instead. to-do if this clogs the internet tubes.
             // maybe read clients prototypes instead?
             ClearListings();
-            foreach (var item in listings) 
+            foreach (var item in listings)
             {
                 AddListingGui(item);
             }
diff --git a/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml b/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml
index 218c7a8cb9..92d94e112d 100644
--- a/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'uplink-user-interface-withdraw-title'}"
             MinSize="256 128">
     <BoxContainer Orientation="Vertical"
@@ -19,4 +19,4 @@
                     HorizontalExpand="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml.cs b/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml.cs
index 2af3223354..5f7d3525a5 100644
--- a/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkWithdrawWindow.xaml.cs
@@ -10,7 +10,7 @@ namespace Content.Client.Traitor.Uplink
     ///     Used as sub-window in Uplink UI
     /// </summary>
     [GenerateTypedNameReferences]
-    public partial class UplinkWithdrawWindow : SS14Window
+    public partial class UplinkWithdrawWindow : DefaultWindow
     {
         public event System.Action<int>? OnWithdrawAttempt;
 
diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
index 054015794a..9cf4b91b92 100644
--- a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
@@ -106,7 +106,7 @@ namespace Content.Client.UserInterface.Atmos.GasTank
                     }),
                     (btnClose = new TextureButton
                     {
-                        StyleClasses = {SS14Window.StyleClassWindowCloseButton},
+                        StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
                         VerticalAlignment = VAlignment.Center
                     })
                 }
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
index c6021e85ad..221baa36bb 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
@@ -1,6 +1,6 @@
-<SS14Window xmlns="https://spacestation14.io">
+<DefaultWindow xmlns="https://spacestation14.io">
     <ItemList Name="VendingContents"
               SizeFlagsStretchRatio="8"
               VerticalExpand="True">
     </ItemList>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index 576200a063..e32ad58194 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -14,7 +14,7 @@ using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
 namespace Content.Client.VendingMachines.UI
 {
     [GenerateTypedNameReferences]
-    public partial class VendingMachineMenu : SS14Window
+    public partial class VendingMachineMenu : DefaultWindow
     {
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index a61b578381..3793739ce4 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -184,7 +184,7 @@ namespace Content.Client.Wires.UI
                     }),
                     (CloseButton = new TextureButton
                     {
-                        StyleClasses = {SS14Window.StyleClassWindowCloseButton},
+                        StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
                         VerticalAlignment = VAlignment.Center
                     })
                 }
diff --git a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
index e3411f5ebb..7a8c6097c9 100644
--- a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
+++ b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
@@ -66,12 +66,12 @@ namespace Content.Server.AI.Operators.Combat.Melee
                 return Outcome.Success;
             }
 
-            if (!_entMan.TryGetComponent(_owner, out HandsComponent? hands) || hands.GetActiveHand == null)
+            if (!_entMan.TryGetComponent(_owner, out HandsComponent? hands) || hands.GetActiveHandItem == null)
             {
                 return Outcome.Failed;
             }
 
-            var meleeWeapon = hands.GetActiveHand.Owner;
+            var meleeWeapon = hands.GetActiveHandItem.Owner;
             _entMan.TryGetComponent(meleeWeapon, out MeleeWeaponComponent? meleeWeaponComponent);
 
             if ((_entMan.GetComponent<TransformComponent>(_target).Coordinates.Position - _entMan.GetComponent<TransformComponent>(_owner).Coordinates.Position).Length >
diff --git a/Content.Server/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/AI/Pathfinding/PathfindingSystem.cs
index ee64db37db..5e92900e6f 100644
--- a/Content.Server/AI/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/AI/Pathfinding/PathfindingSystem.cs
@@ -146,19 +146,19 @@ namespace Content.Server.AI.Pathfinding
         {
             var chunkX = (int) (Math.Floor((float) tile.X / PathfindingChunk.ChunkSize) * PathfindingChunk.ChunkSize);
             var chunkY = (int) (Math.Floor((float) tile.Y / PathfindingChunk.ChunkSize) * PathfindingChunk.ChunkSize);
-            var Vector2i = new Vector2i(chunkX, chunkY);
+            var vector2i = new Vector2i(chunkX, chunkY);
 
             if (_graph.TryGetValue(tile.GridIndex, out var chunks))
             {
-                if (!chunks.ContainsKey(Vector2i))
+                if (!chunks.ContainsKey(vector2i))
                 {
-                    CreateChunk(tile.GridIndex, Vector2i);
+                    CreateChunk(tile.GridIndex, vector2i);
                 }
 
-                return chunks[Vector2i];
+                return chunks[vector2i];
             }
 
-            var newChunk = CreateChunk(tile.GridIndex, Vector2i);
+            var newChunk = CreateChunk(tile.GridIndex, vector2i);
             return newChunk;
         }
 
diff --git a/Content.Server/AI/Utility/NpcBehaviorManager.cs b/Content.Server/AI/Utility/NpcBehaviorManager.cs
index f1760ef3e2..ef1513797c 100644
--- a/Content.Server/AI/Utility/NpcBehaviorManager.cs
+++ b/Content.Server/AI/Utility/NpcBehaviorManager.cs
@@ -28,7 +28,6 @@ namespace Content.Server.AI.Utility
     internal sealed class NpcBehaviorManager : INpcBehaviorManager
     {
         [Dependency] private readonly IDynamicTypeFactory _typeFactory = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private readonly NpcActionComparer _comparer = new();
 
diff --git a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
index 374bed44ac..4256c0b008 100644
--- a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
+++ b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
@@ -15,7 +15,7 @@ namespace Content.Server.AI.WorldState.States.Inventory
 
         public override EntityUid? GetValue()
         {
-            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(Owner)?.GetActiveHand?.Owner;
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(Owner)?.GetActiveHandItem?.Owner;
         }
     }
 }
diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs
index 913f0effe6..7e8b5035c0 100644
--- a/Content.Server/AME/Components/AMEControllerComponent.cs
+++ b/Content.Server/AME/Components/AMEControllerComponent.cs
@@ -132,7 +132,7 @@ namespace Content.Server.AME.Components
                 return;
             }
 
-            var activeHandEntity = hands.GetActiveHand?.Owner;
+            var activeHandEntity = hands.GetActiveHandItem?.Owner;
             if (activeHandEntity == null)
             {
                 UserInterface?.Open(actor.PlayerSession);
@@ -341,13 +341,13 @@ namespace Content.Server.AME.Components
                 return true;
             }
 
-            if (hands.GetActiveHand == null)
+            if (hands.GetActiveHandItem == null)
             {
                 Owner.PopupMessage(args.User, Loc.GetString("ame-controller-component-interact-using-nothing-in-hands-text"));
                 return false;
             }
 
-            var activeHandEntity = hands.GetActiveHand.Owner;
+            var activeHandEntity = hands.GetActiveHandItem.Owner;
             if (_entities.HasComponent<AMEFuelContainerComponent?>(activeHandEntity))
             {
                 if (HasJar)
diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
index 68d4d79d90..d37db732bc 100644
--- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
+++ b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs
@@ -167,7 +167,7 @@ namespace Content.Server.Atmos.Components
                 if (!_entities.TryGetComponent(playerEntity, out HandsComponent? handsComponent))
                     return;
 
-                if (handsComponent?.GetActiveHand?.Owner is not {Valid: true} activeHandEntity ||
+                if (handsComponent?.GetActiveHandItem?.Owner is not {Valid: true} activeHandEntity ||
                     !_entities.TryGetComponent(activeHandEntity, out GasAnalyzerComponent? gasAnalyzer))
                 {
                     return;
@@ -234,7 +234,7 @@ namespace Content.Server.Atmos.Components
                         return;
                     }
 
-                    if (handsComponent.GetActiveHand?.Owner is not {Valid: true} activeHandEntity ||
+                    if (handsComponent.GetActiveHandItem?.Owner is not {Valid: true} activeHandEntity ||
                         !_entities.TryGetComponent(activeHandEntity, out GasAnalyzerComponent? gasAnalyzer))
                     {
                         serverMsg.Session.AttachedEntity.Value.PopupMessage(Loc.GetString("gas-analyzer-component-need-gas-analyzer-in-hand-message"));
diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs
index 0d3d85a5e8..bd231a4ac4 100644
--- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs
+++ b/Content.Server/Atmos/Components/MovedByPressureComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Atmos;
 using Content.Shared.MobState.Components;
@@ -45,6 +45,8 @@ namespace Content.Server.Atmos.Components
         {
             if (!_entMan.TryGetComponent(Owner, out PhysicsComponent? physics))
                 return;
+            if (!_entMan.TryGetComponent(Owner, out FixturesComponent? fixtureComponent))
+                return;
 
             // TODO ATMOS stuns?
 
@@ -65,8 +67,7 @@ namespace Content.Server.Atmos.Components
                 if (_entMan.HasComponent<MobStateComponent>(physics.Owner))
                 {
                     physics.BodyStatus = BodyStatus.InAir;
-
-                    foreach (var fixture in physics.Fixtures)
+                    foreach (var fixture in fixtureComponent.Fixtures.Values)
                     {
                         fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
                     }
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 4199bcea69..ffee77a16c 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -14,7 +14,6 @@ namespace Content.Server.Atmos.EntitySystems
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-        [Dependency] private readonly SpreaderSystem _spreaderSystem = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs
index ee6c5ffb5f..cf79f2839b 100644
--- a/Content.Server/Botany/Components/PlantHolderComponent.cs
+++ b/Content.Server/Botany/Components/PlantHolderComponent.cs
@@ -428,7 +428,7 @@ namespace Content.Server.Botany.Components
             {
                 if (_entMan.TryGetComponent(user, out HandsComponent? hands))
                 {
-                    if (!Seed.CheckHarvest(user, hands.GetActiveHand?.Owner))
+                    if (!Seed.CheckHarvest(user, hands.GetActiveHandItem?.Owner))
                         return false;
                 }
                 else if (!Seed.CheckHarvest(user))
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index 2086594f98..41bd624542 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -89,7 +89,7 @@ namespace Content.Server.Chat.Commands
 
             // Held item suicide
             var handsComponent = _entities.GetComponent<HandsComponent>(owner);
-            var itemComponent = handsComponent.GetActiveHand;
+            var itemComponent = handsComponent.GetActiveHandItem;
             if (itemComponent != null)
             {
                 var suicide = _entities.GetComponents<ISuicideAct>(itemComponent.Owner).FirstOrDefault();
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index da4ebab6be..0484479817 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -407,7 +407,7 @@ namespace Content.Server.Chemistry.Components
                 return;
             }
 
-            var activeHandEntity = hands.GetActiveHand?.Owner;
+            var activeHandEntity = hands.GetActiveHandItem?.Owner;
             if (activeHandEntity == null)
             {
                 UserInterface?.Open(actor.PlayerSession);
diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
index 4de31b1bb9..ac9b846da5 100644
--- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
+++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
@@ -295,7 +295,7 @@ namespace Content.Server.Chemistry.Components
                 return;
             }
 
-            var activeHandEntity = hands.GetActiveHand?.Owner;
+            var activeHandEntity = hands.GetActiveHandItem?.Owner;
             if (activeHandEntity == null)
             {
                 UserInterface?.Open(actor.PlayerSession);
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index a7dac3c58b..2c15a28d6a 100644
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Coordinates.Helpers;
@@ -44,13 +44,6 @@ namespace Content.Server.Chemistry.ReactionEffects
         /// </summary>
         [DataField("reagentDilutionFactor")] private float _reagentDilutionFactor = 1f;
 
-        /// <summary>
-        /// Used to calculate concentration. Reagents get linearly more concentrated as the range goes from
-        /// _reagentDilutionStart to zero. When the range is zero the reagents volume gets multiplied by this.
-        /// </summary>
-        [DataField("reagentMaxConcentrationFactor")]
-        private float _reagentMaxConcentrationFactor = 2;
-
         /// <summary>
         /// How many seconds will the effect stay, counting after fully spreading.
         /// </summary>
diff --git a/Content.Server/Climbing/Components/ClimbableComponent.cs b/Content.Server/Climbing/Components/ClimbableComponent.cs
index 91bd34290d..6188b24f29 100644
--- a/Content.Server/Climbing/Components/ClimbableComponent.cs
+++ b/Content.Server/Climbing/Components/ClimbableComponent.cs
@@ -208,7 +208,7 @@ namespace Content.Server.Climbing.Components
 
             var result = await EntitySystem.Get<DoAfterSystem>().WaitDoAfter(doAfterEventArgs);
 
-            if (result != DoAfterStatus.Cancelled && _entities.TryGetComponent(user, out PhysicsComponent? body) && body.Fixtures.Count >= 1)
+            if (result != DoAfterStatus.Cancelled && _entities.TryGetComponent(user, out FixturesComponent? fixtureComp) && fixtureComp.Fixtures.Count >= 1)
             {
                 // TODO: Remove the copy-paste code
                 var userPos = _entities.GetComponent<TransformComponent>(user).WorldPosition;
diff --git a/Content.Server/Climbing/Components/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs
index 5be4761a88..997c64abd7 100644
--- a/Content.Server/Climbing/Components/ClimbingComponent.cs
+++ b/Content.Server/Climbing/Components/ClimbingComponent.cs
@@ -21,7 +21,7 @@ namespace Content.Server.Climbing.Components
             get => base.IsClimbing;
             set
             {
-                if (_isClimbing == value)
+                if (base.IsClimbing == value)
                     return;
 
                 base.IsClimbing = value;
@@ -102,7 +102,7 @@ namespace Content.Server.Climbing.Components
 
         public override ComponentState GetComponentState()
         {
-            return new ClimbModeComponentState(_isClimbing, OwnerIsTransitioning);
+            return new ClimbModeComponentState(base.IsClimbing, OwnerIsTransitioning);
         }
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 0a915b1283..093f132c91 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -400,7 +400,7 @@ namespace Content.Server.Construction
             }
 
             if (!Get<ActionBlockerSystem>().CanInteract(user)
-                || !EntityManager.TryGetComponent(user, out HandsComponent? hands) || hands.GetActiveHand == null
+                || !EntityManager.TryGetComponent(user, out HandsComponent? hands) || hands.GetActiveHandItem == null
                 || !user.InRangeUnobstructed(ev.Location, ignoreInsideBlocker:constructionPrototype.CanBuildInImpassable))
             {
                 Cleanup();
@@ -417,7 +417,7 @@ namespace Content.Server.Construction
 
             var valid = false;
 
-            if (hands.GetActiveHand?.Owner is not {Valid: true} holding)
+            if (hands.GetActiveHandItem?.Owner is not {Valid: true} holding)
             {
                 Cleanup();
                 return;
diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
index 4a5c5df272..875b971093 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
@@ -173,7 +173,7 @@ namespace Content.Server.Disposal.Tube.Components
                 return;
             }
 
-            var activeHandEntity = hands.GetActiveHand?.Owner;
+            var activeHandEntity = hands.GetActiveHandItem?.Owner;
             if (activeHandEntity == null)
             {
                 OpenUserInterface(actor);
diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
index 1c354acd59..6acc6caf37 100644
--- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
@@ -139,7 +139,7 @@ namespace Content.Server.Disposal.Tube.Components
                 return;
             }
 
-            var activeHandEntity = hands.GetActiveHand?.Owner;
+            var activeHandEntity = hands.GetActiveHandItem?.Owner;
             if (activeHandEntity == null)
             {
                 OpenUserInterface(actor);
diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs
index dc85e95dca..a2d6c0ad24 100644
--- a/Content.Server/DoAfter/DoAfter.cs
+++ b/Content.Server/DoAfter/DoAfter.cs
@@ -53,7 +53,7 @@ namespace Content.Server.DoAfter
             if (eventArgs.NeedHand && entityManager.TryGetComponent(eventArgs.User, out HandsComponent? handsComponent))
             {
                 _activeHand = handsComponent.ActiveHand;
-                _activeItem = handsComponent.GetActiveHand;
+                _activeItem = handsComponent.GetActiveHandItem;
             }
 
             Tcs = new TaskCompletionSource<DoAfterStatus>();
@@ -157,7 +157,7 @@ namespace Content.Server.DoAfter
                         return true;
                     }
 
-                    var currentItem = handsComponent.GetActiveHand;
+                    var currentItem = handsComponent.GetActiveHandItem;
                     if (_activeItem != currentItem)
                     {
                         return true;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 367a2bb88f..5a455c0d4a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -18,6 +18,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -142,7 +143,12 @@ namespace Content.Server.Explosion.EntitySystems
                     continue;
                 }
 
-                if (!EntityManager.TryGetComponent(entity, out PhysicsComponent? body) || body.Fixtures.Count < 1)
+                if (!EntityManager.TryGetComponent(entity, out FixturesComponent? fixturesComp) || fixturesComp.Fixtures.Count < 1)
+                {
+                    continue;
+                }
+
+                if (!EntityManager.TryGetComponent(entity, out PhysicsComponent? body))
                 {
                     continue;
                 }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index a282d38b30..ce20a1d209 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -39,7 +39,6 @@ namespace Content.Server.Explosion.EntitySystems
     {
         [Dependency] private readonly ExplosionSystem _explosions = default!;
         [Dependency] private readonly FlashSystem _flashSystem = default!;
-        [Dependency] private readonly AdminLogSystem _logSystem = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 0f7faa4beb..d1344c4c9c 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -25,7 +25,7 @@ namespace Content.Server.GameTicking
         private TimeSpan _pauseTime;
 
         [ViewVariables]
-        public bool Paused { get; set; }
+        public new bool Paused { get; set; }
 
         [ViewVariables]
         private bool _roundStartCountdownHasNotStartedYetDueToNoPlayers;
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index ec90a74bb6..91d42bd78c 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -20,7 +20,7 @@ public abstract class GameRuleSystem : EntitySystem
     ///     When the GameRule prototype with this ID is added, this system will be enabled.
     ///     When it gets removed, this system will be disabled.
     /// </summary>
-    public abstract string Prototype { get; }
+    public new abstract string Prototype { get; }
 
     public override void Initialize()
     {
diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs
index bce0b1f01a..0a7f45d544 100644
--- a/Content.Server/Hands/Components/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -149,7 +149,7 @@ namespace Content.Server.Hands.Components
         /// <summary>
         ///     Tries to get the ItemComponent off the entity in the active hand.
         /// </summary>
-        public SharedItemComponent? GetActiveHand
+        public SharedItemComponent? GetActiveHandItem
         {
             get
             {
diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index cee194a319..1a01c2a85d 100644
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -320,7 +320,7 @@ namespace Content.Server.Interaction
             // Verify user has a hand, and find what object they are currently holding in their active hand
             if (TryComp(user, out HandsComponent? hands))
             {
-                var item = hands.GetActiveHand?.Owner;
+                var item = hands.GetActiveHandItem?.Owner;
 
                 if (item != null && !Deleted(item.Value))
                 {
diff --git a/Content.Server/Inventory/ServerInventorySystem.cs b/Content.Server/Inventory/ServerInventorySystem.cs
index e5aaf831e5..c3cfb67268 100644
--- a/Content.Server/Inventory/ServerInventorySystem.cs
+++ b/Content.Server/Inventory/ServerInventorySystem.cs
@@ -36,7 +36,7 @@ namespace Content.Server.Inventory
             if (!TryComp<HandsComponent>(ev.Uid, out var hands) || !TryGetSlotEntity(ev.Uid, ev.Slot, out var itemUid))
                 return;
 
-            var activeHand = hands.GetActiveHand;
+            var activeHand = hands.GetActiveHandItem;
             if (activeHand != null)
             {
                 _interactionSystem.InteractUsing(ev.Uid, activeHand.Owner, itemUid.Value,
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 19858a4d28..22dd00a87d 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -243,7 +243,7 @@ namespace Content.Server.Kitchen.Components
                 return false;
             }
 
-            if (_entities.GetComponent<HandsComponent>(eventArgs.User).GetActiveHand?.Owner is not {Valid: true} itemEntity)
+            if (_entities.GetComponent<HandsComponent>(eventArgs.User).GetActiveHandItem?.Owner is not {Valid: true} itemEntity)
             {
                 eventArgs.User.PopupMessage(Loc.GetString("microwave-component-interact-using-no-active-hand"));
                 return false;
diff --git a/Content.Server/Lathe/Components/MaterialStorageComponent.cs b/Content.Server/Lathe/Components/MaterialStorageComponent.cs
index e6ac5313c9..58d466803b 100644
--- a/Content.Server/Lathe/Components/MaterialStorageComponent.cs
+++ b/Content.Server/Lathe/Components/MaterialStorageComponent.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.Lathe;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
@@ -40,28 +40,28 @@ namespace Content.Server.Lathe.Components
         /// <summary>
         ///     Checks if it can insert a material.
         /// </summary>
-        /// <param name="ID">Material ID</param>
+        /// <param name="id">Material ID</param>
         /// <param name="amount">How much to insert</param>
         /// <returns>Whether it can insert the material or not.</returns>
-        public bool CanInsertMaterial(string ID, int amount)
+        public bool CanInsertMaterial(string id, int amount)
         {
-            return (CanTakeAmount(amount) || StorageLimit < 0) && (!Storage.ContainsKey(ID) || Storage[ID] + amount >= 0);
+            return (CanTakeAmount(amount) || StorageLimit < 0) && (!Storage.ContainsKey(id) || Storage[id] + amount >= 0);
         }
 
         /// <summary>
         ///     Inserts material into the storage.
         /// </summary>
-        /// <param name="ID">Material ID</param>
+        /// <param name="id">Material ID</param>
         /// <param name="amount">How much to insert</param>
         /// <returns>Whether it inserted it or not.</returns>
-        public bool InsertMaterial(string ID, int amount)
+        public bool InsertMaterial(string id, int amount)
         {
-            if (!CanInsertMaterial(ID, amount)) return false;
+            if (!CanInsertMaterial(id, amount)) return false;
 
-            if (!Storage.ContainsKey(ID))
-                Storage.Add(ID, 0);
+            if (!Storage.ContainsKey(id))
+                Storage.Add(id, 0);
 
-            Storage[ID] += amount;
+            Storage[id] += amount;
 
             Dirty();
 
@@ -71,12 +71,12 @@ namespace Content.Server.Lathe.Components
         /// <summary>
         ///     Removes material from the storage.
         /// </summary>
-        /// <param name="ID">Material ID</param>
+        /// <param name="id">Material ID</param>
         /// <param name="amount">How much to remove</param>
         /// <returns>Whether it removed it or not.</returns>
-        public bool RemoveMaterial(string ID, int amount)
+        public bool RemoveMaterial(string id, int amount)
         {
-            return InsertMaterial(ID, -amount);
+            return InsertMaterial(id, -amount);
         }
     }
 }
diff --git a/Content.Server/MoMMI/MoMMILink.cs b/Content.Server/MoMMI/MoMMILink.cs
index a32841912e..febc032f89 100644
--- a/Content.Server/MoMMI/MoMMILink.cs
+++ b/Content.Server/MoMMI/MoMMILink.cs
@@ -26,7 +26,7 @@ namespace Content.Server.MoMMI
 
         void IPostInjectInit.PostInject()
         {
-            _statusHost.AddHandler(_handleChatPost);
+            _statusHost.AddHandler(HandleChatPost);
         }
 
         public async void SendOOCMessage(string sender, string message)
@@ -37,10 +37,10 @@ namespace Content.Server.MoMMI
                 Contents = message
             };
 
-            await _sendMessageInternal("ooc", sentMessage);
+            await SendMessageInternal("ooc", sentMessage);
         }
 
-        private async Task _sendMessageInternal(string type, object messageObject)
+        private async Task SendMessageInternal(string type, object messageObject)
         {
             var url = _configurationManager.GetCVar(CCVars.StatusMoMMIUrl);
             var password = _configurationManager.GetCVar(CCVars.StatusMoMMIPassword);
@@ -70,7 +70,7 @@ namespace Content.Server.MoMMI
             }
         }
 
-        private bool _handleChatPost(IStatusHandlerContext context)
+        private bool HandleChatPost(IStatusHandlerContext context)
         {
             if (context.RequestMethod != HttpMethod.Post || context.Url!.AbsolutePath != "/ooc")
             {
diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
index b45f716e4b..40dd699d07 100644
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Power.Components;
@@ -11,7 +11,6 @@ namespace Content.Server.Power.EntitySystems
 {
     public sealed class ExtensionCableSystem : EntitySystem
     {
-        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
index d88cb99cee..172aa6339d 100644
--- a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
@@ -118,7 +118,12 @@ namespace Content.Server.Shuttles.EntitySystems
 
             Disable(physicsComponent);
 
-            foreach (var fixture in physicsComponent.Fixtures)
+            if (!EntityManager.TryGetComponent(component.Owner, out FixturesComponent? fixturesComponent))
+            {
+                return;
+            }
+
+            foreach (var fixture in fixturesComponent.Fixtures.Values)
             {
                 fixture.Mass = 0f;
             }
diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs
index 92ae9d3ca2..4b905d4384 100644
--- a/Content.Server/Storage/Components/ServerStorageComponent.cs
+++ b/Content.Server/Storage/Components/ServerStorageComponent.cs
@@ -240,12 +240,12 @@ namespace Content.Server.Storage.Components
             EnsureInitialCalculated();
 
             if (!_entityManager.TryGetComponent(player, out HandsComponent? hands) ||
-                hands.GetActiveHand == null)
+                hands.GetActiveHandItem == null)
             {
                 return false;
             }
 
-            var toInsert = hands.GetActiveHand;
+            var toInsert = hands.GetActiveHandItem;
 
             if (!hands.Drop(toInsert.Owner))
             {
diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs
index fbb77386d3..8cf8acc606 100644
--- a/Content.Server/Strip/StrippableComponent.cs
+++ b/Content.Server/Strip/StrippableComponent.cs
@@ -83,7 +83,7 @@ namespace Content.Server.Strip
         private async void PlaceActiveHandItemInInventory(EntityUid user, string slot)
         {
             var userHands = _entities.GetComponent<HandsComponent>(user);
-            var item = userHands.GetActiveHand;
+            var item = userHands.GetActiveHandItem;
             var invSystem = EntitySystem.Get<InventorySystem>();
 
             bool Check()
@@ -149,7 +149,7 @@ namespace Content.Server.Strip
         {
             var hands = _entities.GetComponent<HandsComponent>(Owner);
             var userHands = _entities.GetComponent<HandsComponent>(user);
-            var item = userHands.GetActiveHand;
+            var item = userHands.GetActiveHandItem;
 
             bool Check()
             {
@@ -324,7 +324,7 @@ namespace Content.Server.Strip
                 !_entities.TryGetComponent(user, out HandsComponent? userHands))
                 return;
 
-            var placingItem = userHands.GetActiveHand != null;
+            var placingItem = userHands.GetActiveHandItem != null;
 
             switch (obj.Message)
             {
diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
index 1371c90216..c18a0fed80 100644
--- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
+++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
@@ -144,7 +144,7 @@ namespace Content.Server.Weapon.Ranged
         /// <param name="targetPos">Target position on the map to shoot at.</param>
         private void TryFire(EntityUid user, Vector2 targetPos)
         {
-            if (!_entMan.TryGetComponent(user, out HandsComponent? hands) || hands.GetActiveHand?.Owner != Owner)
+            if (!_entMan.TryGetComponent(user, out HandsComponent? hands) || hands.GetActiveHandItem?.Owner != Owner)
             {
                 return;
             }
diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs
index 4babcb9a19..5740d27424 100644
--- a/Content.Server/WireHacking/WiresComponent.cs
+++ b/Content.Server/WireHacking/WiresComponent.cs
@@ -425,7 +425,7 @@ namespace Content.Server.WireHacking
                     }
 
                     ToolComponent? tool = null;
-                    if (handsComponent.GetActiveHand?.Owner is EntityUid activeHandEntity)
+                    if (handsComponent.GetActiveHandItem?.Owner is EntityUid activeHandEntity)
                         _entities.TryGetComponent(activeHandEntity, out tool);
                     var toolSystem = EntitySystem.Get<ToolSystem>();
 
diff --git a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
index cd5499167a..10251271a8 100644
--- a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
@@ -156,7 +156,7 @@ namespace Content.Shared.Chemistry.Reaction
         ///     Perform a reaction on a solution. This assumes all reaction criteria are met.
         ///     Removes the reactants from the solution, then returns a solution with all products.
         /// </summary>
-        private Solution PerformReaction(Solution solution, EntityUid Owner, ReactionPrototype reaction, FixedPoint2 unitReactions)
+        private Solution PerformReaction(Solution solution, EntityUid owner, ReactionPrototype reaction, FixedPoint2 unitReactions)
         {
             // We do this so that ReagentEffect can have something to work with, even if it's
             // a little meaningless.
@@ -179,14 +179,14 @@ namespace Content.Shared.Chemistry.Reaction
             }
 
             // Trigger reaction effects
-            OnReaction(solution, reaction, randomReagent, Owner, unitReactions);
+            OnReaction(solution, reaction, randomReagent, owner, unitReactions);
 
             return products;
         }
 
-        protected virtual void OnReaction(Solution solution, ReactionPrototype reaction, ReagentPrototype randomReagent, EntityUid Owner, FixedPoint2 unitReactions)
+        protected virtual void OnReaction(Solution solution, ReactionPrototype reaction, ReagentPrototype randomReagent, EntityUid owner, FixedPoint2 unitReactions)
         {
-            var args = new ReagentEffectArgs(Owner, null, solution,
+            var args = new ReagentEffectArgs(owner, null, solution,
                 randomReagent,
                 unitReactions, EntityManager, null);
 
@@ -235,11 +235,11 @@ namespace Content.Shared.Chemistry.Reaction
         /// <summary>
         ///     Continually react a solution until no more reactions occur.
         /// </summary>
-        public void FullyReactSolution(Solution solution, EntityUid Owner)
+        public void FullyReactSolution(Solution solution, EntityUid owner)
         {
             for (var i = 0; i < MaxReactionIterations; i++)
             {
-                if (!ProcessReactions(solution, Owner, out var products))
+                if (!ProcessReactions(solution, owner, out var products))
                     return;
 
                 if (products.TotalVolume <= 0)
@@ -247,18 +247,18 @@ namespace Content.Shared.Chemistry.Reaction
 
                 solution.AddSolution(products);
             }
-            Logger.Error($"{nameof(Solution)} {Owner} could not finish reacting in under {MaxReactionIterations} loops.");
+            Logger.Error($"{nameof(Solution)} {owner} could not finish reacting in under {MaxReactionIterations} loops.");
         }
 
         /// <summary>
         ///     Continually react a solution until no more reactions occur, with a volume constraint.
         ///     If a reaction's products would exceed the max volume, some product is deleted.
         /// </summary>
-        public void FullyReactSolution(Solution solution, EntityUid Owner, FixedPoint2 maxVolume)
+        public void FullyReactSolution(Solution solution, EntityUid owner, FixedPoint2 maxVolume)
         {
             for (var i = 0; i < MaxReactionIterations; i++)
             {
-                if (!ProcessReactions(solution, Owner, out var products))
+                if (!ProcessReactions(solution, owner, out var products))
                     return;
 
                 if (products.TotalVolume <= 0)
@@ -274,7 +274,7 @@ namespace Content.Shared.Chemistry.Reaction
 
                 solution.AddSolution(products);
             }
-            Logger.Error($"{nameof(Solution)} {Owner} could not finish reacting in under {MaxReactionIterations} loops.");
+            Logger.Error($"{nameof(Solution)} {owner} could not finish reacting in under {MaxReactionIterations} loops.");
         }
     }
 }
diff --git a/Content.Shared/Climbing/SharedClimbingComponent.cs b/Content.Shared/Climbing/SharedClimbingComponent.cs
index 121472f8f1..f0931c5952 100644
--- a/Content.Shared/Climbing/SharedClimbingComponent.cs
+++ b/Content.Shared/Climbing/SharedClimbingComponent.cs
@@ -73,15 +73,15 @@ namespace Content.Shared.Climbing
             }
         }
 
-        protected bool _isClimbing;
+        private bool _isClimbing;
 
         // TODO: Layers need a re-work
         private void ToggleSmallPassable(bool value)
         {
             // Hope the mob has one fixture
-            if (!_entMan.TryGetComponent<PhysicsComponent>(Owner, out var physicsComponent) || physicsComponent.Deleted) return;
+            if (!_entMan.TryGetComponent<FixturesComponent>(Owner, out var fixturesComponent) || fixturesComponent.Deleted) return;
 
-            foreach (var fixture in physicsComponent.Fixtures)
+            foreach (var fixture in fixturesComponent.Fixtures.Values)
             {
                 if (value)
                 {
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index 54f4e58db3..1788298994 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Dynamics;
+using System.Linq;
 
 namespace Content.Shared.Throwing
 {
@@ -54,17 +55,19 @@ namespace Content.Shared.Throwing
 
         private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args)
         {
-            if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent) ||
-                physicsComponent.Fixtures.Count != 1) return;
+            if (!EntityManager.TryGetComponent(component.Owner, out FixturesComponent? fixturesComponent) ||
+                fixturesComponent.Fixtures.Count != 1) return;
+            if (!EntityManager.TryGetComponent(component.Owner, out PhysicsComponent? physicsComponent)) return;
 
-            if (_fixtures.GetFixtureOrNull(physicsComponent, ThrowingFixture) != null)
+            if (fixturesComponent.Fixtures.ContainsKey(ThrowingFixture))
             {
                 Logger.Error($"Found existing throwing fixture on {component.Owner}");
                 return;
             }
-
-            var shape = physicsComponent.Fixtures[0].Shape;
-            _fixtures.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
+            var fixture = fixturesComponent.Fixtures.Values.First();
+            var shape = fixture.Shape;
+            var throwingFixture = new Fixture(physicsComponent, shape) { CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture };
+            _fixtures.CreateFixture(physicsComponent, throwingFixture, manager: fixturesComponent);
         }
 
         private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args)