diff --git a/Content.Client/_Wega/Android/AndroidSystem.cs b/Content.Client/_Wega/Android/AndroidSystem.cs
index 31688ebe36..7a942edd39 100644
--- a/Content.Client/_Wega/Android/AndroidSystem.cs
+++ b/Content.Client/_Wega/Android/AndroidSystem.cs
@@ -1,6 +1,6 @@
-using Content.Shared._Wega.Android;
+using Content.Shared.Android;
 
-namespace Content.Client._Wega.Android;
+namespace Content.Client.Android;
 
 public sealed class AndroidSystem : SharedAndroidSystem
 {
diff --git a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs
index f79cb99300..1ce2472b15 100644
--- a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs
+++ b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.Blood.Cult.Components;
 using Content.Shared.StatusIcon.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Blood.Cult
@@ -13,6 +14,8 @@ namespace Content.Client.Blood.Cult
     {
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SpriteSystem _sprite = default!;
 
         public override void Initialize()
         {
@@ -28,26 +31,18 @@ namespace Content.Client.Blood.Cult
 
         private void OnRuneAppearanceChanged(Entity<BloodRuneComponent> entity, ref AppearanceChangeEvent args)
         {
-            if (args.Sprite == null)
-                return;
-
-            var sprite = args.Sprite;
             if (!_appearance.TryGetData(entity, RuneColorVisuals.Color, out Color color))
                 return;
 
-            sprite.Color = color;
+            _sprite.SetColor(entity.Owner, color);
         }
 
         private void OnRuneAppearanceChanged(Entity<BloodRitualDimensionalRendingComponent> entity, ref AppearanceChangeEvent args)
         {
-            if (args.Sprite == null)
-                return;
-
-            var sprite = args.Sprite;
             if (!_appearance.TryGetData(entity, RuneColorVisuals.Color, out Color color))
                 return;
 
-            sprite.Color = color;
+            _sprite.SetColor(entity.Owner, color);
         }
 
         private void GetCultistIcons(Entity<BloodCultistComponent> ent, ref GetStatusIconsEvent args)
@@ -61,48 +56,48 @@ namespace Content.Client.Blood.Cult
             if (!TryComp<SpriteComponent>(uid, out var sprite))
                 return;
 
-            if (sprite.LayerMapTryGet(PentagramKey.Halo, out _))
+            if (_sprite.LayerMapTryGet(uid, PentagramKey.Halo, out _, true))
                 return;
 
-            var haloVariant = new Random().Next(1, 6);
+            var haloVariant = _random.Next(1, 6);
             var haloState = $"halo{haloVariant}";
 
-            var adj = sprite.Bounds.Height / 2 + 1.0f / 32 * 6.0f;
-            var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath("_Wega/Interface/Misc/bloodcult_halo.rsi"), haloState));
-            sprite.LayerMapSet(PentagramKey.Halo, layer);
+            var bounds = _sprite.GetLocalBounds((uid, sprite));
+            var adj = bounds.Height / 2 + 1.0f / 32 * 6.0f;
 
-            sprite.LayerSetOffset(layer, new Vector2(0.0f, adj));
-            sprite.LayerSetShader(layer, "unshaded");
+            var layerData = new PrototypeLayerData
+            {
+                Shader = "unshaded",
+                RsiPath = "_Wega/Interface/Misc/bloodcult_halo.rsi",
+                State = haloState,
+                Offset = new Vector2(0.0f, adj)
+            };
+
+            var layer = _sprite.AddLayer(uid, layerData, null);
+            _sprite.LayerMapSet(uid, PentagramKey.Halo, layer);
         }
 
         private void RemoveHalo(EntityUid uid, PentagramDisplayComponent component, ComponentShutdown args)
         {
-            if (!TryComp<SpriteComponent>(uid, out var sprite))
-                return;
-
-            if (sprite.LayerMapTryGet(PentagramKey.Halo, out var layer))
+            if (_sprite.LayerMapTryGet(uid, PentagramKey.Halo, out var layer, true))
             {
-                sprite.RemoveLayer(layer);
+                _sprite.RemoveLayer(uid, layer);
             }
         }
 
         private void OnSoulStoneAppearanceChanged(EntityUid uid, StoneSoulComponent component, ref AppearanceChangeEvent args)
         {
-            if (args.Sprite == null)
-                return;
-
-            var sprite = args.Sprite;
             if (!_appearance.TryGetData(uid, StoneSoulVisuals.HasSoul, out bool hasSoul))
                 hasSoul = false;
 
-            sprite.LayerSetVisible(StoneSoulVisualLayers.Soul, hasSoul);
+            _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Soul, hasSoul);
             if (!hasSoul)
             {
-                sprite.LayerSetVisible(StoneSoulVisualLayers.Base, true);
+                _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Base, true);
             }
             else
             {
-                sprite.LayerSetVisible(StoneSoulVisualLayers.Base, false);
+                _sprite.LayerSetVisible(uid, StoneSoulVisualLayers.Base, false);
             }
         }
 
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs
index be5201ae3e..81c261e10f 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodConstructMenu.xaml.cs
@@ -14,7 +14,6 @@ public sealed partial class BloodConstructMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectConstruct;
-    public bool IsDisposed { get; private set; }
     private NetEntity _constructUid;
     private NetEntity _mindUid;
 
@@ -47,14 +46,4 @@ public sealed partial class BloodConstructMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new BloodConstructMenuClosedEvent(netEntity, _constructUid, _mindUid, constructName));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
-
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs
index db1cb049fd..94dad53fe3 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodConstructUIController.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Select.Construct.UI
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private BloodConstructMenu? _menu;
-        private bool _menuDisposed = false;
 
         public override void Initialize()
         {
@@ -27,10 +26,9 @@ namespace Content.Client.Select.Construct.UI
 
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<BloodConstructMenu>();
-                    _menu.OnClose += OnMenuClosed;
 
                     _menu.SetData(args.ConstructUid, args.Mind);
 
@@ -43,18 +41,12 @@ namespace Content.Client.Select.Construct.UI
 
                 Timer.Spawn(30000, () =>
                 {
-                    if (_menu != null && !_menuDisposed)
+                    if (_menu != null)
                     {
                         _menu.Close();
                     }
                 });
             }
         }
-
-        private void OnMenuClosed()
-        {
-            _menuDisposed = true;
-            _menu = null;
-        }
     }
 }
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs
index 64cdc2ece0..c18c4038fc 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodMagicMenu.xaml.cs
@@ -14,7 +14,6 @@ public sealed partial class BloodMagicMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectSpell;
-    public bool IsDisposed { get; private set; }
 
     public BloodMagicMenu()
     {
@@ -45,14 +44,5 @@ public sealed partial class BloodMagicMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new BloodMagicMenuClosedEvent(netEntity, spellName));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
 
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs
index 130b8d071c..49721973ff 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodMagicUIController.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Blood.Magic.UI
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private BloodMagicMenu? _menu;
-        private bool _menuDisposed = false;
 
         public override void Initialize()
         {
@@ -25,7 +24,7 @@ namespace Content.Client.Blood.Magic.UI
             var userEntity = _entityManager.GetEntity(args.Uid);
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<BloodMagicMenu>();
                     _menu.OnClose += OnMenuClosed;
@@ -40,7 +39,6 @@ namespace Content.Client.Blood.Magic.UI
 
         private void OnMenuClosed()
         {
-            _menuDisposed = true;
             _menu = null;
         }
     }
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs
index 22bbcca667..1d6f22ead8 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodRitesMenu.xaml.cs
@@ -14,7 +14,6 @@ public sealed partial class BloodRitesMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectRites;
-    public bool IsDisposed { get; private set; }
 
     public BloodRitesMenu()
     {
@@ -39,14 +38,5 @@ public sealed partial class BloodRitesMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new BloodRitesMenuClosedEvent(netEntity, ritesName));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
 
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs
index 20bed19af1..104175b056 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodRitesUIController.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Blood.Rites.UI
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private BloodRitesMenu? _menu;
-        private bool _menuDisposed = false;
 
         public override void Initialize()
         {
@@ -25,7 +24,7 @@ namespace Content.Client.Blood.Rites.UI
             var userEntity = _entityManager.GetEntity(args.Uid);
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<BloodRitesMenu>();
                     _menu.OnClose += OnMenuClosed;
@@ -40,7 +39,6 @@ namespace Content.Client.Blood.Rites.UI
 
         private void OnMenuClosed()
         {
-            _menuDisposed = true;
             _menu = null;
         }
     }
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs
index cbfb0cba46..6ed14c0591 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs
@@ -19,7 +19,6 @@ public sealed partial class BloodStructureMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectItem;
-    public bool IsDisposed { get; private set; }
     private NetEntity _structure;
 
     public BloodStructureMenu()
@@ -80,14 +79,4 @@ public sealed partial class BloodStructureMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new BloodStructureMenuClosedEvent(netEntity, name, _structure));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
-
diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs
index e00d801010..7807859b33 100644
--- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureUIController.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Structure.UI
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private BloodStructureMenu? _menu;
-        private bool _menuDisposed = false;
 
         public override void Initialize()
         {
@@ -26,7 +25,7 @@ namespace Content.Client.Structure.UI
             var userEntity = _entityManager.GetEntity(args.Uid);
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<BloodStructureMenu>();
                     _menu.OnClose += OnMenuClosed;
@@ -42,7 +41,7 @@ namespace Content.Client.Structure.UI
 
                 Timer.Spawn(30000, () =>
                 {
-                    if (_menu != null && !_menuDisposed)
+                    if (_menu != null)
                     {
                         _menu.Close();
                     }
@@ -52,7 +51,6 @@ namespace Content.Client.Structure.UI
 
         private void OnMenuClosed()
         {
-            _menuDisposed = true;
             _menu = null;
         }
     }
diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs
index 1e1b0bbc3d..33213acbcd 100644
--- a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs
@@ -78,7 +78,6 @@ public sealed partial class EmpoweringRuneMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectSpell;
-    public bool IsDisposed { get; private set; }
 
     public EmpoweringRuneMenu()
     {
@@ -109,15 +108,6 @@ public sealed partial class EmpoweringRuneMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new EmpoweringRuneMenuClosedEvent(netEntity, spellName));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
 
 public sealed partial class SummoningRunePanelMenu : DefaultWindow
@@ -138,13 +128,11 @@ public sealed partial class SummoningRunePanelMenu : DefaultWindow
 
     private void InitializeButtons()
     {
-        foreach (var cultist in _entityManager.EntityQuery<BloodCultistComponent>())
+        var cultistQuery = _entityManager.EntityQueryEnumerator<BloodCultistComponent, MetaDataComponent>();
+        while (cultistQuery.MoveNext(out var uid, out _, out var metaData))
         {
-            if (_entityManager.TryGetComponent<MetaDataComponent>(cultist.Owner, out var metaData))
-            {
-                var entityName = metaData.EntityName;
-                AddCultistButton(entityName, cultist.Owner);
-            }
+            var entityName = metaData.EntityName;
+            AddCultistButton(entityName, uid);
         }
     }
 
diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs
index b2ba2faa8a..3d57eea8c1 100644
--- a/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs
+++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenuUIController.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Runes.Panel.Ui
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private RunesPanelMenu? _panel;
-        private bool _panelDisposed = false;
 
         public override void Initialize()
         {
@@ -42,7 +41,6 @@ namespace Content.Client.Runes.Panel.Ui
 
         private void OnMenuClosed()
         {
-            _panelDisposed = true;
             _panel = null;
         }
     }
@@ -68,7 +66,7 @@ namespace Content.Client.Runes.Panel.Ui
             var userEntity = _entityManager.GetEntity(args.Uid);
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<EmpoweringRuneMenu>();
                     _menu.OnClose += OnMenuClosed;
@@ -103,7 +101,6 @@ namespace Content.Client.Runes.Panel.Ui
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private SummoningRunePanelMenu? _panel;
-        private bool _panelDisposed = false;
 
         public override void Initialize()
         {
@@ -131,7 +128,7 @@ namespace Content.Client.Runes.Panel.Ui
 
                 Timer.Spawn(30000, () =>
                 {
-                    if (_panel != null && !_panelDisposed)
+                    if (_panel != null)
                     {
                         _panel.Close();
                     }
@@ -141,7 +138,6 @@ namespace Content.Client.Runes.Panel.Ui
 
         private void OnMenuClosed()
         {
-            _panelDisposed = true;
             _panel = null;
         }
     }
diff --git a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 07cc6cb1c5..cdab60e977 100644
--- a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -62,7 +62,7 @@
             <!-- Chat header -->
             <PanelContainer StyleClasses="AngleRect">
                 <PanelContainer.PanelOverride>
-                    <graphics:StyleBoxFlat BackgroundColor="#878787" />
+                    <graphics:StyleBoxFlat BackgroundColor="#131313" />
                 </PanelContainer.PanelOverride>
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 4">
                     <Label Name="ChatTitle" StyleClasses="LabelHeading" Margin="4 0 0 0" VerticalAlignment="Center" HorizontalExpand="True"/>
@@ -77,9 +77,6 @@
 
             <!-- Messages area -->
             <PanelContainer StyleClasses="AngleRect" VerticalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <graphics:StyleBoxFlat BackgroundColor="#bdbdbd" />
-                </PanelContainer.PanelOverride>
                 <ScrollContainer Name="MessagesScroll" HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True">
                     <BoxContainer Name="MessagesContainer" Orientation="Vertical" Margin="4"/>
                 </ScrollContainer>
diff --git a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index cea4c07033..75df2835e9 100644
--- a/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/_Wega/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -92,8 +92,8 @@ public sealed partial class NanoChatUiFragment : BoxContainer
 
         ChatTypeTabs.OnTabChanged += _ => OnTabChanged();
 
-        EmojiButton.AddStyleClass(StyleNano.ButtonOpenBoth);
-        SendButton.AddStyleClass(StyleNano.ButtonOpenLeft);
+        EmojiButton.AddStyleClass(StyleClass.ButtonOpenBoth);
+        SendButton.AddStyleClass(StyleClass.ButtonOpenLeft);
 
         UpdateUiState();
     }
diff --git a/Content.Client/_Wega/DetailExaminable/DetailExaminableWindow.xaml.cs b/Content.Client/_Wega/DetailExaminable/DetailExaminableWindow.xaml.cs
index dd1cc333a3..f8917d9f08 100644
--- a/Content.Client/_Wega/DetailExaminable/DetailExaminableWindow.xaml.cs
+++ b/Content.Client/_Wega/DetailExaminable/DetailExaminableWindow.xaml.cs
@@ -65,7 +65,7 @@ public sealed partial class DetailExaminableWindow : FancyWindow
         {
             Text = text,
             VerticalExpand = true,
-            StyleClasses = { StyleNano.StyleClassLabelBig },
+            StyleClasses = { StyleClass.LabelHeading },
             FontColorOverride = color
         };
 
@@ -131,7 +131,7 @@ public sealed partial class DetailExaminableWindow : FancyWindow
             ToolTip = Loc.GetString("humanoid-profile-editor-link-tooltip", ("url", url)),
             HorizontalExpand = true,
             HorizontalAlignment = HAlignment.Center,
-            StyleClasses = { StyleNano.ButtonOpenBoth }
+            StyleClasses = { StyleClass.ButtonOpenBoth }
         };
 
         button.OnPressed += _ => OpenLink(url);
diff --git a/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs b/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs
index d831aee507..0d4d635dc1 100644
--- a/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs
+++ b/Content.Client/_Wega/Disease/DiseaseMachineSystem.cs
@@ -18,12 +18,13 @@ namespace Content.Client.Disease
                 && AppearanceSystem.TryGetData<bool>(uid, DiseaseMachineVisuals.IsRunning, out var isRunning, args.Component))
             {
                 var state = isRunning ? component.RunningState : component.IdleState;
-                args.Sprite.LayerSetVisible(DiseaseMachineVisualLayers.IsOn, isOn);
-                args.Sprite.LayerSetState(DiseaseMachineVisualLayers.IsRunning, state);
+                SpriteSystem.LayerSetVisible(uid, DiseaseMachineVisualLayers.IsOn, isOn);
+                SpriteSystem.LayerSetRsiState(uid, DiseaseMachineVisualLayers.IsRunning, state);
             }
         }
     }
 }
+
 public enum DiseaseMachineVisualLayers : byte
 {
     IsOn,
diff --git a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs
index 0193b10a89..adde11b1db 100644
--- a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs
+++ b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs
@@ -13,6 +13,7 @@ public sealed class DizzyOverlay : Overlay
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
+    private static readonly ProtoId<ShaderPrototype> Dizzy = "Dizzy";
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
     private readonly ShaderInstance _dizzyShader;
@@ -27,7 +28,7 @@ public sealed class DizzyOverlay : Overlay
     public DizzyOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _dizzyShader = _prototypeManager.Index<ShaderPrototype>("Dizzy").InstanceUnique();
+        _dizzyShader = _prototypeManager.Index(Dizzy).InstanceUnique();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs b/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs
index f72f2e540e..5da4806f38 100644
--- a/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs
+++ b/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs
@@ -620,7 +620,7 @@ public sealed partial class DnaModifierWindow : FancyWindow
     }
 
     #region Initilize U.I.
-    private void InitilizeUniqueIdentifiers(UniqueIdentifiersPrototype unique)
+    private void InitilizeUniqueIdentifiers(UniqueIdentifiersData unique)
     {
         _initializedUi = true;
         var blocks = new List<(string BlockName, string[] Values)>
@@ -701,7 +701,6 @@ public sealed partial class DnaModifierWindow : FancyWindow
         {
             Text = blockName,
             MinWidth = 25,
-            StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
         };
 
         blockContainer.AddChild(blockLabel);
@@ -804,7 +803,6 @@ public sealed partial class DnaModifierWindow : FancyWindow
         {
             Text = blockName,
             MinWidth = 25,
-            StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
         };
 
         blockContainer.AddChild(blockLabel);
@@ -937,8 +935,7 @@ public sealed partial class DnaModifierWindow : FancyWindow
                 new Label { Text = $"{info.DisplayName}: " },
                 new Label
                 {
-                    Text = $"{info.CurrentVolume}/{info.MaxVolume}",
-                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                    Text = $"{info.CurrentVolume}/{info.MaxVolume}"
                 }
             }
         });
@@ -977,8 +974,7 @@ public sealed partial class DnaModifierWindow : FancyWindow
                 new Label { Text = $"{name}: " },
                 new Label
                 {
-                    Text = $"{quantity}u",
-                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                    Text = $"{quantity}u"
                 },
                 new Control { HorizontalExpand = true },
                 new PanelContainer
diff --git a/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs b/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs
index c6793f8402..030e7e8ba6 100644
--- a/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs
+++ b/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs
@@ -26,14 +26,11 @@ public sealed partial class MindCommunicationPanel : DefaultWindow
 
     private void InitializeTargets()
     {
-        foreach (var actor in _entityManager.EntityQuery<ActorComponent>())
+        var actorQuery = _entityManager.EntityQueryEnumerator<ActorComponent, MetaDataComponent, HumanoidAppearanceComponent>();
+        while (actorQuery.MoveNext(out var uid, out _, out var metaData, out _))
         {
-            if (_entityManager.TryGetComponent<MetaDataComponent>(actor.Owner, out var metaData)
-                && _entityManager.HasComponent<HumanoidAppearanceComponent>(actor.Owner))
-            {
-                var entityName = metaData.EntityName;
-                AddTargetButton(entityName, actor.Owner);
-            }
+            var entityName = metaData.EntityName;
+            AddTargetButton(entityName, uid);
         }
     }
 
diff --git a/Content.Client/_Wega/Height/HeightSystem.cs b/Content.Client/_Wega/Height/HeightSystem.cs
index 5bfb6545ba..09cd814f80 100644
--- a/Content.Client/_Wega/Height/HeightSystem.cs
+++ b/Content.Client/_Wega/Height/HeightSystem.cs
@@ -10,6 +10,8 @@ namespace Content.Client.Height
 {
     public sealed class HeightSystem : EntitySystem
     {
+        [Dependency] private readonly SpriteSystem _sprite = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -24,11 +26,7 @@ namespace Content.Client.Height
             if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid) && CheckSpeciesEntity(humanoid))
                 return;
 
-            if (TryComp<SpriteComponent>(ent, out var sprite))
-            {
-                sprite.Scale = new Vector2(0.85f, 0.85f);
-                Dirty(ent, sprite);
-            }
+            _sprite.LayerSetScale(ent.Owner, 0, new Vector2(0.85f, 0.85f));
         }
 
         private void OnBigHeightComponentStartup(Entity<BigHeightComponent> ent, ref ComponentStartup args)
@@ -36,35 +34,23 @@ namespace Content.Client.Height
             if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid) && CheckSpeciesEntity(humanoid))
                 return;
 
-            if (TryComp<SpriteComponent>(ent, out var sprite))
-            {
-                sprite.Scale = new Vector2(1.2f, 1.2f);
-                Dirty(ent, sprite);
-            }
+            _sprite.LayerSetScale(ent.Owner, 0, new Vector2(1.2f, 1.2f));
         }
 
         private void OnSmallHeightComponentShutdown(Entity<SmallHeightComponent> ent, ref ComponentShutdown args)
         {
             if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid) && CheckSpeciesEntity(humanoid))
                 return;
-        
-            if (TryComp<SpriteComponent>(ent, out var sprite))
-            {
-                sprite.Scale = new Vector2(1.0f, 1.0f);
-                Dirty(ent, sprite);
-            }
+
+            _sprite.LayerSetScale(ent.Owner, 0, new Vector2(1.0f, 1.0f));
         }
 
         private void OnBigHeightComponentShutdown(Entity<BigHeightComponent> ent, ref ComponentShutdown args)
         {
             if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid) && CheckSpeciesEntity(humanoid))
                 return;
-        
-            if (TryComp<SpriteComponent>(ent, out var sprite))
-            {
-                sprite.Scale = new Vector2(1.0f, 1.0f);
-                Dirty(ent, sprite);
-            }
+
+            _sprite.LayerSetScale(ent.Owner, 0, new Vector2(1.0f, 1.0f));
         }
 
         private bool CheckSpeciesEntity(HumanoidAppearanceComponent humanoid)
diff --git a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs
index ff62763309..7bbcdb980e 100644
--- a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs
+++ b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs
@@ -4,6 +4,7 @@ using Robust.Client.GameObjects;
 public sealed class InjectorFabticatorSystem : EntitySystem
 {
     [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
     {
@@ -17,10 +18,9 @@ public sealed class InjectorFabticatorSystem : EntitySystem
         if (args.Sprite == null)
             return;
 
-        var sprite = args.Sprite;
         if (!_appearance.TryGetData<bool>(uid, InjectorFabticatorVisuals.IsRunning, out var isRunning, args.Component))
             return;
 
-        sprite.LayerSetVisible(InjectorFabticatorVisuals.IsRunning, isRunning);
+        _sprite.LayerSetVisible(uid, InjectorFabticatorVisuals.IsRunning, isRunning);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs
index 70d4540f60..e3f2bc993c 100644
--- a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs
+++ b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorBoundUserInterface.cs
@@ -48,8 +48,10 @@ public sealed class InjectorFabticatorBoundUserInterface : BoundUserInterface
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-        if (!disposing) return;
+        if (!disposing)
+            return;
 
-        _window?.Dispose();
+        _window?.Close();
+        _window = null;
     }
 }
diff --git a/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs b/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs
index 1314cc631c..b1640107e2 100644
--- a/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs
+++ b/Content.Client/_Wega/Mining/MiningServerVisualizerSystem.cs
@@ -34,7 +34,7 @@ namespace Content.Client.Mining.Visualizers
                 };
             }
 
-            args.Sprite.LayerSetState(MiningServerVisualLayers.Main, state);
+            SpriteSystem.LayerSetRsiState(uid, MiningServerVisualLayers.Main, state);
         }
     }
 
diff --git a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs
index 1bf7df59dd..40c8cd131a 100644
--- a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs
+++ b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs
@@ -12,6 +12,7 @@ public sealed class ColourblindnessOverlay : Overlay
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
+    private static readonly ProtoId<ShaderPrototype> Colourblindness = "Colourblindness";
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
     public override bool RequestScreenTexture => true;
     private readonly ShaderInstance _desaturationShader;
@@ -19,7 +20,7 @@ public sealed class ColourblindnessOverlay : Overlay
     public ColourblindnessOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _desaturationShader = _prototypeManager.Index<ShaderPrototype>("Colourblindness").InstanceUnique();
+        _desaturationShader = _prototypeManager.Index(Colourblindness).InstanceUnique();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs
index 1f4b4d7af1..5cd49c9b95 100644
--- a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs
+++ b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs
@@ -24,8 +24,8 @@ public sealed class ListenUpOverlay : Overlay
 
     private Texture _texture;
 
-    protected float Radius;
-    protected SpriteSpecifier Sprite;
+    private float _radius;
+    private SpriteSpecifier _sprite;
 
     public override bool RequestScreenTexture => true;
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -39,10 +39,10 @@ public sealed class ListenUpOverlay : Overlay
         _entityLookup = _entity.System<EntityLookupSystem>();
         _gameTiming = IoCManager.Resolve<IGameTiming>();
 
-        Radius = radius;
-        Sprite = sprite;
+        _radius = radius;
+        _sprite = sprite;
 
-        _texture = _spriteSystem.GetFrame(Sprite, _gameTiming.CurTime);
+        _texture = _spriteSystem.GetFrame(_sprite, _gameTiming.CurTime);
 
 
         ZIndex = -1;
@@ -55,15 +55,15 @@ public sealed class ListenUpOverlay : Overlay
             || (!_entity.TryGetComponent<TransformComponent>(_players.LocalEntity, out var playerTransform)))
             return;
 
-        _texture = _spriteSystem.GetFrame(Sprite, _gameTiming.CurTime);
+        _texture = _spriteSystem.GetFrame(_sprite, _gameTiming.CurTime);
 
         var handle = args.WorldHandle;
         var eye = args.Viewport.Eye;
         var eyeRot = eye?.Rotation ?? default;
 
-        var entities = _entityLookup.GetEntitiesInRange<MobStateComponent>(playerTransform.Coordinates, Radius);
+        var entities = _entityLookup.GetEntitiesInRange<MobStateComponent>(playerTransform.Coordinates, _radius);
 
-        foreach (var (uid, stateComp) in entities)
+        foreach (var (uid, _) in entities)
         {
 
             if (!_entity.TryGetComponent<SpriteComponent>(uid, out var sprite)
@@ -91,6 +91,6 @@ public sealed class ListenUpOverlay : Overlay
         var rotation = Angle.Zero;
 
         handle.SetTransform(position, rotation);
-        handle.DrawTexture(_texture, new System.Numerics.Vector2(-0.5f));
+        handle.DrawTexture(_texture, new Vector2(-0.5f));
     }
 }
diff --git a/Content.Client/_Wega/Overlays/ListenUpSystem.cs b/Content.Client/_Wega/Overlays/ListenUpSystem.cs
index 103e018a3c..cce6454bab 100644
--- a/Content.Client/_Wega/Overlays/ListenUpSystem.cs
+++ b/Content.Client/_Wega/Overlays/ListenUpSystem.cs
@@ -1,12 +1,8 @@
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Content.Shared._Wega.Resomi.Abilities.Hearing;
-using Content.Shared.Actions;
-using Content.Shared.DoAfter;
+using Content.Shared.Resomi.Abilities.Hearing;
 using Robust.Shared.Utility;
 using Robust.Shared.Player;
-using Content.Shared.GameTicking;
-using Content.Shared.Actions.Components;
 
 namespace Content.Client._Wega.Overlays;
 
@@ -15,10 +11,6 @@ public sealed class ListenUpSystem : SharedListenUpSkillSystem
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
 
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-
-    private Entity<ActionComponent> action;
-
     private ListenUpOverlay _listenUpOverlay = default!;
 
     public override void Initialize()
diff --git a/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs b/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs
index 6a1c0010f5..54bf39f460 100644
--- a/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs
+++ b/Content.Client/_Wega/Shader/NaturalNightVisionOverlay.cs
@@ -12,6 +12,7 @@ public sealed class NaturalNightVisionOverlay : Overlay
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
+    private static readonly ProtoId<ShaderPrototype> NaturalNightVision = "NaturalNightVision";
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
 
@@ -25,7 +26,7 @@ public sealed class NaturalNightVisionOverlay : Overlay
     public NaturalNightVisionOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _nightVisionShader = _prototypeManager.Index<ShaderPrototype>("NaturalNightVision").InstanceUnique();
+        _nightVisionShader = _prototypeManager.Index(NaturalNightVision).InstanceUnique();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/_Wega/Shader/NightVisionOverlay.cs b/Content.Client/_Wega/Shader/NightVisionOverlay.cs
index a861b30795..a16ced7e43 100644
--- a/Content.Client/_Wega/Shader/NightVisionOverlay.cs
+++ b/Content.Client/_Wega/Shader/NightVisionOverlay.cs
@@ -15,6 +15,7 @@ public sealed class NightVisionOverlay : Overlay
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
 
+    private static readonly ProtoId<ShaderPrototype> NightVision = "NightVision";
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
     private readonly ShaderInstance _baseShader;
@@ -28,7 +29,7 @@ public sealed class NightVisionOverlay : Overlay
     public NightVisionOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _baseShader = _prototypeManager.Index<ShaderPrototype>("NightVision").Instance();
+        _baseShader = _prototypeManager.Index(NightVision).Instance();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs
index 2a6b8e9d1a..5f2d3ea9b7 100644
--- a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs
+++ b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs
@@ -12,6 +12,7 @@ public sealed class NoirVisionOverlay : Overlay
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
+    private static readonly ProtoId<ShaderPrototype> Noir = "Noir";
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
     private readonly ShaderInstance _redHighlightShader;
@@ -22,7 +23,7 @@ public sealed class NoirVisionOverlay : Overlay
     public NoirVisionOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _redHighlightShader = _prototypeManager.Index<ShaderPrototype>("Noir").InstanceUnique();
+        _redHighlightShader = _prototypeManager.Index(Noir).InstanceUnique();
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/_Wega/Surgery/Ui/BodyScannerWindow.xaml.cs b/Content.Client/_Wega/Surgery/Ui/BodyScannerWindow.xaml.cs
index 9274fc5bc5..7647353bd0 100644
--- a/Content.Client/_Wega/Surgery/Ui/BodyScannerWindow.xaml.cs
+++ b/Content.Client/_Wega/Surgery/Ui/BodyScannerWindow.xaml.cs
@@ -36,7 +36,6 @@ namespace Content.Client._Wega.Surgery.Ui
                 DamagesContainer.AddChild(new Label
                 {
                     Text = Loc.GetString("body-scanner-no-damages"),
-                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
                 });
                 return;
             }
@@ -56,7 +55,7 @@ namespace Content.Client._Wega.Surgery.Ui
                 damageHeader.AddChild(new Label
                 {
                     Text = damage.DamageName,
-                    StyleClasses = { StyleNano.StyleClassLabelBig }
+                    StyleClasses = { StyleClass.LabelHeading }
                 });
 
                 damageContainer.AddChild(damageHeader);
@@ -65,7 +64,6 @@ namespace Content.Client._Wega.Surgery.Ui
                 {
                     Text = Loc.GetString("body-scanner-affected-parts",
                         ("parts", string.Join(", ", damage.AffectedParts.Select(p => Loc.GetString($"body-scanner-part-{p}"))))),
-                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
                 };
 
                 damageContainer.AddChild(partsLabel);
diff --git a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs
index 2928443c9e..1003737025 100644
--- a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs
+++ b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs
@@ -58,6 +58,9 @@ public sealed class TapeRecorderBoundUserInterface(EntityUid owner, Enum uiKey)
     {
         base.Dispose(disposing);
         if (disposing)
-            _window?.Dispose();
+        {
+            _window?.Close();
+            _window = null;
+        }
     }
 }
diff --git a/Content.Client/_Wega/Vampire/Ui/SelectClassMenu.xaml.cs b/Content.Client/_Wega/Vampire/Ui/SelectClassMenu.xaml.cs
index 00ccd93b6b..8c3ea0dec3 100644
--- a/Content.Client/_Wega/Vampire/Ui/SelectClassMenu.xaml.cs
+++ b/Content.Client/_Wega/Vampire/Ui/SelectClassMenu.xaml.cs
@@ -14,7 +14,6 @@ public sealed partial class SelectClassMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     public event Action<string>? OnSelectClass;
-    public bool IsDisposed { get; private set; }
 
     public SelectClassMenu()
     {
@@ -40,14 +39,5 @@ public sealed partial class SelectClassMenu : RadialMenu
         _entityNetworkManager.SendSystemNetworkMessage(new VampireSelectClassMenuClosedEvent(netEntity, className));
         Close();
     }
-
-    public new void Close()
-    {
-        if (!IsDisposed)
-        {
-            IsDisposed = true;
-            Dispose();
-        }
-    }
 }
 
diff --git a/Content.Client/_Wega/Vampire/Ui/SelectClassUIController.cs b/Content.Client/_Wega/Vampire/Ui/SelectClassUIController.cs
index 7b60390225..88f5982b7e 100644
--- a/Content.Client/_Wega/Vampire/Ui/SelectClassUIController.cs
+++ b/Content.Client/_Wega/Vampire/Ui/SelectClassUIController.cs
@@ -12,7 +12,6 @@ namespace Content.Client.UserInterface.Systems.Select.Class
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private SelectClassMenu? _menu;
-        private bool _menuDisposed = false;
 
         public override void Initialize()
         {
@@ -26,7 +25,7 @@ namespace Content.Client.UserInterface.Systems.Select.Class
             var userEntity = _entityManager.GetEntity(args.Uid);
             if (session?.AttachedEntity.HasValue == true && session.AttachedEntity.Value == userEntity)
             {
-                if (_menu is null || _menu.IsDisposed)
+                if (_menu is null)
                 {
                     _menu = _uiManager.CreateWindow<SelectClassMenu>();
                     _menu.OnClose += OnMenuClosed;
@@ -41,7 +40,6 @@ namespace Content.Client.UserInterface.Systems.Select.Class
 
         private void OnMenuClosed()
         {
-            _menuDisposed = true;
             _menu = null;
         }
     }
diff --git a/Content.Client/_Wega/Vampire/VampireSystem.cs b/Content.Client/_Wega/Vampire/VampireSystem.cs
index 57d13090b6..20f0de4159 100644
--- a/Content.Client/_Wega/Vampire/VampireSystem.cs
+++ b/Content.Client/_Wega/Vampire/VampireSystem.cs
@@ -3,6 +3,7 @@ using Content.Client.Movement.Systems;
 using Content.Shared.StatusIcon.Components;
 using Content.Shared.Vampire;
 using Content.Shared.Vampire.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 
@@ -14,6 +15,7 @@ public sealed class VampireSystem : SharedVampireSystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly ContentEyeSystem _contentEye = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
     {
@@ -53,10 +55,9 @@ public sealed class VampireSystem : SharedVampireSystem
         if (args.Alert.ID != ent.Comp.BloodAlert)
             return;
 
-        var sprite = args.SpriteViewEnt.Comp;
         var blood = Math.Clamp(ent.Comp.CurrentBlood.Int(), 0, 999);
-        sprite.LayerSetState(VampireVisualLayers.Digit1, $"{(blood / 100) % 10}");
-        sprite.LayerSetState(VampireVisualLayers.Digit2, $"{(blood / 10) % 10}");
-        sprite.LayerSetState(VampireVisualLayers.Digit3, $"{blood % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.Owner, VampireVisualLayers.Digit1, $"{(blood / 100) % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.Owner, VampireVisualLayers.Digit2, $"{(blood / 10) % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.Owner, VampireVisualLayers.Digit3, $"{blood % 10}");
     }
 }
diff --git a/Content.Client/_Wega/Vehicle/VehicleSystem.cs b/Content.Client/_Wega/Vehicle/VehicleSystem.cs
index b72b6d6bfc..d8f13699e3 100644
--- a/Content.Client/_Wega/Vehicle/VehicleSystem.cs
+++ b/Content.Client/_Wega/Vehicle/VehicleSystem.cs
@@ -6,6 +6,8 @@ namespace Content.Client.Vehicle;
 
 public sealed class VehicleSystem : SharedVehicleSystem
 {
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -20,17 +22,17 @@ public sealed class VehicleSystem : SharedVehicleSystem
 
         if (component.HideRider
             && Appearance.TryGetData<bool>(uid, VehicleVisuals.HideRider, out var hide, args.Component)
-            && TryComp<SpriteComponent>(component.LastRider, out var riderSprite))
-            riderSprite.Visible = !hide;
+            && HasComp<SpriteComponent>(component.LastRider))
+            _sprite.SetVisible(component.LastRider.Value, !hide);
 
         // First check is for the sprite itself
         if (Appearance.TryGetData<int>(uid, VehicleVisuals.DrawDepth, out var drawDepth, args.Component))
-            args.Sprite.DrawDepth = drawDepth;
+            _sprite.SetDrawDepth(uid, drawDepth);
 
         // Set vehicle layer to animated or not (i.e. are the wheels turning or not)
         if (component.AutoAnimate
             && Appearance.TryGetData<bool>(uid, VehicleVisuals.AutoAnimate, out var autoAnimate, args.Component))
-            args.Sprite.LayerSetAutoAnimated(VehicleVisualLayers.AutoAnimate, autoAnimate);
+            _sprite.LayerSetAutoAnimated(uid, VehicleVisualLayers.AutoAnimate, autoAnimate);
     }
 }
 
diff --git a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs
index 155692ee35..32f36b1556 100644
--- a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs
+++ b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs
@@ -7,6 +7,8 @@ namespace Content.Client._Wega.Xenobiology;
 
 public sealed class CellVisualsSystem : SharedCellVisualsSystem
 {
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -29,6 +31,6 @@ public sealed class CellVisualsSystem : SharedCellVisualsSystem
         if (color is null)
             return;
 
-        args.Sprite?.LayerSetColor(CellContainerVisuals.DishLayer, color.Value);
+        _sprite.LayerSetColor(ent.Owner, CellContainerVisuals.DishLayer, color.Value);
     }
 }
diff --git a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs
index 25b0977540..1b53f63a96 100644
--- a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs
+++ b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs
@@ -9,6 +9,7 @@ namespace Content.Client._Wega.Xenobiology;
 public sealed class SlimeVisualSystem : SharedSlimeVisualSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
     {
@@ -30,7 +31,7 @@ public sealed class SlimeVisualSystem : SharedSlimeVisualSystem
             ? $"{type.ToString().ToLower()}_baby_slime"
             : $"{type.ToString().ToLower()}_adult_slime";
 
-        args.Sprite.LayerSetState(0, state);
+        _sprite.LayerSetRsiState(ent.Owner, 0, state);
         UpdateDamageVisuals(ent.Owner, stage, type);
     }
 
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 2eadb4fb46..ae9dd54a83 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -105,6 +105,8 @@ public sealed partial class AdminVerbSystem
     private readonly EntProtoId _siliconMindRole = "MindRoleSiliconBrain";
     private const string SiliconLawBoundUserInterface = "SiliconLawBoundUserInterface";
 
+    private static readonly ProtoId<DiseasePrototype> StageIIIALungCancer = "StageIIIALungCancer"; // Corvax-Wega-Disease
+
     // All smite verbs have names so invokeverb works.
     private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
     {
@@ -208,7 +210,8 @@ public sealed partial class AdminVerbSystem
         args.Verbs.Add(monkey);
 
         // Corvax-Wega-Disease-start
-        if (TryComp<DiseaseCarrierComponent>(args.Target, out var carrier))
+        if (TryComp<DiseaseCarrierComponent>(args.Target, out var carrier)
+            && _prototypeManager.TryIndex(StageIIIALungCancer, out var disease))
         {
             Verb lungCancer = new()
             {
@@ -217,7 +220,7 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Species/Human/organs.rsi"), "lung-l"),
                 Act = () =>
                 {
-                    _diseaseSystem.TryInfect(carrier, _prototypeManager.Index<DiseasePrototype>("StageIIIALungCancer"),
+                    _diseaseSystem.TryInfect(args.Target, carrier, disease,
                         1.0f, true);
                 },
                 Impact = LogImpact.Extreme,
diff --git a/Content.Server/_Wega/Android/AndroidSystem.cs b/Content.Server/_Wega/Android/AndroidSystem.cs
index d02ac1a75f..7ab249bad8 100644
--- a/Content.Server/_Wega/Android/AndroidSystem.cs
+++ b/Content.Server/_Wega/Android/AndroidSystem.cs
@@ -2,9 +2,8 @@ using Content.Server.Actions;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Server.Stunnable;
-using Content.Shared._Wega.Android;
+using Content.Shared.Android;
 using Content.Shared.Alert;
-using Content.Shared.Damage.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Item.ItemToggle;
@@ -25,7 +24,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server._Wega.Android;
+namespace Content.Server.Android;
 
 public sealed partial class AndroidSystem : SharedAndroidSystem
 {
diff --git a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs
index ed738f7928..47bb53ba93 100644
--- a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs
+++ b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs
@@ -13,7 +13,7 @@ public sealed class CoreTempChangeSystem : EntitySystem
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<CoreTempChangeComponent , TransformComponent>();
+        var query = EntityQueryEnumerator<CoreTempChangeComponent, TransformComponent>();
         while (query.MoveNext(out var ent, out var comp, out var xform))
         {
             var grid = xform.GridUid;
diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs
index 5bdbdd7236..3d0ab3177a 100644
--- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs
+++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs
@@ -183,26 +183,20 @@ public sealed partial class BloodCultSystem
                 var senderName = Name(uid) ?? "Unknown";
                 var popupMessage = Loc.GetString("cult-commune-massage", ("name", senderName), ("massage", finalMessage));
 
-                var cultistQuery = EntityQuery<ActorComponent, BloodCultistComponent>(true);
-                foreach (var (actorComp, cultistComp) in cultistQuery)
+                var cultistQuery = EntityQueryEnumerator<ActorComponent, BloodCultistComponent>();
+                while (cultistQuery.MoveNext(out var cultistUid, out var actorComp, out var cultistComp))
                 {
                     if (actorComp == playerActor) continue;
 
-                    if (!TryComp<ActorComponent>(actorComp.Owner, out var cultistActor))
-                        continue;
-
-                    _prayerSystem.SendSubtleMessage(cultistActor.PlayerSession, cultistActor.PlayerSession, string.Empty, popupMessage);
+                    _prayerSystem.SendSubtleMessage(actorComp.PlayerSession, actorComp.PlayerSession, string.Empty, popupMessage);
                 }
 
-                var constructQuery = EntityQuery<ActorComponent, BloodCultConstructComponent>(true);
-                foreach (var (actorComp, constructComp) in constructQuery)
+                var constructQuery = EntityQueryEnumerator<ActorComponent, BloodCultConstructComponent>();
+                while (constructQuery.MoveNext(out var constructUid, out var actorComp, out var constructComp))
                 {
                     if (actorComp == playerActor) continue;
 
-                    if (!TryComp<ActorComponent>(actorComp.Owner, out var constructActor))
-                        continue;
-
-                    _prayerSystem.SendSubtleMessage(constructActor.PlayerSession, constructActor.PlayerSession, string.Empty, popupMessage);
+                    _prayerSystem.SendSubtleMessage(actorComp.PlayerSession, actorComp.PlayerSession, string.Empty, popupMessage);
                 }
 
                 _admin.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(uid):user} saying the: {finalMessage} in cult commune");
@@ -684,7 +678,7 @@ public sealed partial class BloodCultSystem
                             var coords = Transform(target).Coordinates;
                             if (stackPrototype.ID is "Steel" && stack.Count >= 30)
                             {
-                                _stack.SetCount(target, stack.Count - 30);
+                                _stack.ReduceCount(target, 30);
                                 if (stack.Count > 0)
                                 {
                                     _entityManager.SpawnEntity("BloodCultConstruct", coords);
@@ -702,7 +696,7 @@ public sealed partial class BloodCultSystem
                                 _entityManager.DeleteEntity(target);
                                 if (TryComp<StackComponent>(runeSteel, out var newStack))
                                 {
-                                    _stack.SetCount(runeSteel, count);
+                                    _stack.SetCount((runeSteel, newStack), count);
                                 }
                             }
 
@@ -887,20 +881,25 @@ public sealed partial class BloodCultSystem
             return;
 
         _entityManager.DeleteEntity(args.Used);
-        var runes = EntityQuery<BloodRuneComponent>(true)
-            .Where(runeEntity =>
-                TryComp<BloodRuneComponent>(runeEntity.Owner, out var runeComp) && runeComp.Prototype == "teleport")
-            .ToList();
+
+        var runes = new List<EntityUid>();
+        var runeQuery = EntityQueryEnumerator<BloodRuneComponent>();
+
+        while (runeQuery.MoveNext(out var runeUid, out var runeComp))
+        {
+            if (runeComp.Prototype == "teleport")
+                runes.Add(runeUid);
+        }
 
         if (runes.Count > 0)
         {
-            var randomRune = runes[new Random().Next(runes.Count)];
-            var runeTransform = _entityManager.GetComponent<TransformComponent>(randomRune.Owner);
+            var randomRune = runes[_random.Next(runes.Count)];
+            var runeTransform = _entityManager.GetComponent<TransformComponent>(randomRune);
             var targetCoords = Transform(args.Target.Value).Coordinates;
             _entityManager.SpawnEntity("BloodCultOutEffect", targetCoords);
             _transform.SetCoordinates(args.Target.Value, runeTransform.Coordinates);
             _entityManager.SpawnEntity("BloodCultInEffect", runeTransform.Coordinates);
-            _entityManager.DeleteEntity(randomRune.Owner);
+            _entityManager.DeleteEntity(randomRune);
         }
     }
 
diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs
index 407128945e..f535231d1e 100644
--- a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs
+++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs
@@ -32,6 +32,7 @@ using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -372,16 +373,16 @@ public sealed partial class BloodCultSystem : SharedBloodCultSystem
             if (!_firstTriggered)
             {
                 var actorFilter = Filter.Empty();
-                var actorQuery = EntityQuery<ActorComponent>();
-                foreach (var actor in actorQuery)
+                var actorQuery = EntityQueryEnumerator<ActorComponent, BloodCultistComponent>();
+                while (actorQuery.MoveNext(out var actorUid, out var actor, out _))
                 {
-                    if (actor.Owner != EntityUid.Invalid && HasComp<BloodCultistComponent>(actor.Owner))
+                    if (actorUid != EntityUid.Invalid)
                     {
                         actorFilter.AddPlayer(actor.PlayerSession);
-                        _popup.PopupEntity(Loc.GetString("blood-cult-first-warning"), actor.Owner, actor.Owner, PopupType.SmallCaution);
+                        _popup.PopupEntity(Loc.GetString("blood-cult-first-warning"), actorUid, actorUid, PopupType.SmallCaution);
                     }
                 }
-                _audio.PlayGlobal("/Audio/_Wega/Ambience/Antag/bloodcult_eyes.ogg", actorFilter, true);
+                _audio.PlayGlobal(new SoundPathSpecifier("/Audio/_Wega/Ambience/Antag/bloodcult_eyes.ogg"), actorFilter, true);
                 _firstTriggered = true;
             }
         }
@@ -399,16 +400,16 @@ public sealed partial class BloodCultSystem : SharedBloodCultSystem
             if (!_secondTriggered)
             {
                 var actorFilter = Filter.Empty();
-                var actorQuery = EntityQuery<ActorComponent>();
-                foreach (var actor in actorQuery)
+                var actorQuery = EntityQueryEnumerator<ActorComponent, BloodCultistComponent>();
+                while (actorQuery.MoveNext(out var actorUid, out var actor, out _))
                 {
-                    if (actor.Owner != EntityUid.Invalid && HasComp<BloodCultistComponent>(actor.Owner))
+                    if (actorUid != EntityUid.Invalid)
                     {
                         actorFilter.AddPlayer(actor.PlayerSession);
-                        _popup.PopupEntity(Loc.GetString("blood-cult-second-warning"), actor.Owner, actor.Owner, PopupType.SmallCaution);
+                        _popup.PopupEntity(Loc.GetString("blood-cult-second-warning"), actorUid, actorUid, PopupType.SmallCaution);
                     }
                 }
-                _audio.PlayGlobal("/Audio/_Wega/Ambience/Antag/bloodcult_halos.ogg", actorFilter, true);
+                _audio.PlayGlobal(new SoundPathSpecifier("/Audio/_Wega/Ambience/Antag/bloodcult_halos.ogg"), actorFilter, true);
                 _secondTriggered = true;
             }
         }
@@ -835,8 +836,8 @@ public sealed partial class BloodCultSystem : SharedBloodCultSystem
         structureComp.ActivateTime = currentTime + TimeSpan.FromMinutes(4);
 
         var item = _entityManager.SpawnEntity(args.Item, Transform(structure).Coordinates);
-        if (structureComp.Sound != string.Empty)
-            _audio.PlayPvs(structureComp.Sound, structure);
+        _audio.PlayPvs(structureComp.Sound, structure);
+
         var cultistPosition = _transform.GetWorldPosition(user);
         var structurePosition = _transform.GetWorldPosition(structure);
         var distance = (structurePosition - cultistPosition).Length();
diff --git a/Content.Server/_Wega/BloodCult/RuneSystem.cs b/Content.Server/_Wega/BloodCult/RuneSystem.cs
index 0bc3125208..bdd5cb1b31 100644
--- a/Content.Server/_Wega/BloodCult/RuneSystem.cs
+++ b/Content.Server/_Wega/BloodCult/RuneSystem.cs
@@ -19,7 +19,6 @@ using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Content.Shared.Maps;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mindshield.Components;
@@ -32,11 +31,13 @@ using Content.Shared.Standing;
 using Content.Shared.Surgery.Components;
 using Content.Shared.Timing;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -47,12 +48,12 @@ public sealed partial class BloodCultSystem
     [Dependency] private readonly BloodCultSystem _bloodCult = default!;
     [Dependency] private readonly IConsoleHost _consoleHost = default!;
     [Dependency] private readonly FlammableSystem _flammable = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly IMapManager _mapMan = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly RejuvenateSystem _rejuvenate = default!;
+    [Dependency] private readonly SharedGhostSystem _ghost = default!;
 
+    private static readonly EntProtoId ActionComms = "ActionBloodCultComms";
     private const string BloodCultObserver = "MobObserverIfrit";
     private static int _offerings = 3;
     private bool _isRitualRuneUnlocked = false;
@@ -104,7 +105,7 @@ public sealed partial class BloodCultSystem
         else if (selectedRune == "BloodRuneRitualDimensionalRending" && _isRitualRuneUnlocked)
         {
             var xform = Transform(uid);
-            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid) || !HasComp<BecomesStationComponent>(grid.Owner))
+            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid) || !HasComp<BecomesStationComponent>(xform.GridUid.Value))
             {
                 _popup.PopupEntity(Loc.GetString("rune-ritual-failed"), uid, uid, PopupType.MediumCaution);
                 return;
@@ -336,16 +337,17 @@ public sealed partial class BloodCultSystem
                 }
                 break;
             case "teleport":
-                var runes = EntityQuery<BloodRuneComponent>(true)
-                    .Where(runeEntity =>
-                        TryComp<BloodRuneComponent>(runeEntity.Owner, out var runeComp) &&
-                        runeComp.Prototype == "teleport" && runeEntity.Owner != rune)
-                    .ToList();
+                var runes = new List<EntityUid>();
+                var runeQuery = EntityQueryEnumerator<BloodRuneComponent>();
+                while (runeQuery.MoveNext(out var runeUid, out var runeCompQ))
+                {
+                    if (runeCompQ.Prototype == "teleport" && runeUid != rune)
+                        runes.Add(runeUid);
+                }
 
                 if (runes.Any() && CheckRuneActivate(coords, 1))
                 {
-                    var randomRuneComponent = runes[new Random().Next(runes.Count)];
-                    var randomRuneEntity = randomRuneComponent.Owner;
+                    var randomRuneEntity = runes[_random.Next(runes.Count)];
                     var runeTransform = _entityManager.GetComponent<TransformComponent>(randomRuneEntity);
                     var runeCoords = runeTransform.Coordinates;
                     SendCultistMessage(cultist, "teleport");
@@ -428,18 +430,12 @@ public sealed partial class BloodCultSystem
                                 );
                             _consoleHost.ExecuteCommand(formattedCommand);
                         }
-                        else if (HasComp<BodyComponent>(target) && !HasComp<BloodCultistComponent>(target)
-                            && currentState is MobState.Dead && !HasComp<BorgChassisComponent>(target) && !HasComp<BloodCultObjectComponent>(target))
+                        else if (HasComp<BodyComponent>(target) && !HasComp<BloodCultistComponent>(target) && currentState is MobState.Dead
+                            && !HasComp<BorgChassisComponent>(target) && !HasComp<BloodCultObjectComponent>(target)
+                            && !HasComp<HumanoidAppearanceComponent>(target)/*Stop killing humanoid this way*/)
                         {
                             SendCultistMessage(cultist, "revive");
 
-                            if (HasComp<HumanoidAppearanceComponent>(target))
-                            {
-                                var soulStone = _entityManager.SpawnEntity("BloodCultSoulStone", Transform(target).Coordinates);
-                                if (TryComp<MindContainerComponent>(target, out var mindContainer) && mindContainer.Mind != null)
-                                    _mind.TransferTo(mindContainer.Mind.Value, soulStone);
-                            }
-
                             // Gib
                             var damage = new DamageSpecifier { DamageDict = { { "Blunt", 1000 } } };
                             _damage.TryChangeDamage(target, damage, true);
@@ -472,6 +468,7 @@ public sealed partial class BloodCultSystem
                         Entity<BloodRuneComponent>? randomRune = nearbyRunes.Any()
                             ? nearbyRunes[new Random().Next(nearbyRunes.Count)]
                             : null;
+
                         if (randomRune != null)
                         {
                             var randomRuneUid = randomRune.Value;
@@ -498,10 +495,14 @@ public sealed partial class BloodCultSystem
                             }
                         }
 
-                        var barrierRunes = EntityQuery<BloodRuneComponent>(true)
-                        .Where(runeEntity =>
-                            TryComp<BloodRuneComponent>(runeEntity.Owner, out var runeComp) && runeComp.Prototype == "barrier")
-                        .ToList();
+                        var barrierRunes = new List<EntityUid>();
+                        var barrierRuneQuery = EntityQueryEnumerator<BloodRuneComponent>();
+
+                        while (barrierRuneQuery.MoveNext(out var runeUid, out var runeCompQ))
+                        {
+                            if (runeCompQ.Prototype == "barrier")
+                                barrierRunes.Add(runeUid);
+                        }
 
                         var damageFormula = 2 * barrierRunes.Count;
                         var damage = new DamageSpecifier { DamageDict = { { "Slash", damageFormula } } };
@@ -635,8 +636,8 @@ public sealed partial class BloodCultSystem
 
                         var comp = _entityManager.GetComponent<GhostComponent>(ghost);
                         _action.RemoveAction(ghost, comp.ToggleGhostBarActionEntity); // Ghost-Bar-Block
-                        _action.AddAction(ghost, "ActionBloodCultComms");
-                        _entityManager.System<SharedGhostSystem>().SetCanReturnToBody(comp, canReturn);
+                        _action.AddAction(ghost, ActionComms);
+                        _ghost.SetCanReturnToBody((ghost, comp), canReturn);
                         break;
                     }
                     else
@@ -660,7 +661,7 @@ public sealed partial class BloodCultSystem
         var msg = Loc.GetString("blood-ritual-activate-warning",
             ("location", FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString((rune, xform)))));
         _chat.DispatchGlobalAnnouncement(msg, playSound: false, colorOverride: Color.Red);
-        _audio.PlayGlobal("/Audio/_Wega/Ambience/Antag/bloodcult_scribe.ogg", Filter.Broadcast(), true);
+        _audio.PlayGlobal(new SoundPathSpecifier("/Audio/_Wega/Ambience/Antag/bloodcult_scribe.ogg"), Filter.Broadcast(), true);
         Timer.Spawn(TimeSpan.FromSeconds(45), () =>
         {
             if (runeComp.Activate)
diff --git a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs
index bf44f9a39c..8261142f7f 100644
--- a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs
+++ b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs
@@ -130,8 +130,13 @@ namespace Content.Server.WashingMachine
                     _dirt.CleanDirt(entity, 100f);
 
                 // This is to clean the switchable clothes
-                var attachedClothing = EntityManager.EntityQuery<AttachedClothingComponent>()
-                    .Where(ac => ac.AttachedUid == entity).Select(ac => ac.Owner).ToList();
+                var attachedClothing = new List<EntityUid>();
+                var attachedClothingQuery = EntityQueryEnumerator<AttachedClothingComponent>();
+                while (attachedClothingQuery.MoveNext(out var clothingUid, out var ac))
+                {
+                    if (ac.AttachedUid == entity)
+                        attachedClothing.Add(clothingUid);
+                }
 
                 foreach (var clothing in attachedClothing)
                 {
diff --git a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs
index 6bc0c19ef0..0516a73b6a 100644
--- a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs
+++ b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs
@@ -76,7 +76,8 @@ namespace Content.Server.Disease
 
             _removeQueue.Clear();
 
-            foreach (var (_, diseaseMachine) in EntityQuery<DiseaseMachineRunningComponent, DiseaseMachineComponent>())
+            var query = EntityQueryEnumerator<DiseaseMachineRunningComponent, DiseaseMachineComponent>();
+            while (query.MoveNext(out var uid, out _, out var diseaseMachine))
             {
                 diseaseMachine.Accumulator += frameTime;
 
@@ -84,8 +85,8 @@ namespace Content.Server.Disease
                 {
                     diseaseMachine.Accumulator -= diseaseMachine.Delay;
                     var ev = new DiseaseMachineFinishedEvent(diseaseMachine);
-                    RaiseLocalEvent(diseaseMachine.Owner, ev);
-                    _removeQueue.Enqueue(diseaseMachine.Owner);
+                    RaiseLocalEvent(uid, ev);
+                    _removeQueue.Enqueue(uid);
                 }
             }
         }
@@ -344,9 +345,12 @@ namespace Content.Server.Disease
 
                 var known = false;
 
-                foreach (var server in EntityQuery<DiseaseServerComponent>(true))
+                var serverQuery = EntityQueryEnumerator<DiseaseServerComponent>();
+                var currentStation = _stationSystem.GetOwningStation(uid);
+
+                while (serverQuery.MoveNext(out var serverUid, out var server))
                 {
-                    if (_stationSystem.GetOwningStation(server.Owner) != _stationSystem.GetOwningStation(uid))
+                    if (_stationSystem.GetOwningStation(serverUid) != currentStation)
                         continue;
 
                     if (ServerHasDisease(server, args.Machine.Disease))
diff --git a/Content.Server/_Wega/Disease/DiseaseSystem.cs b/Content.Server/_Wega/Disease/DiseaseSystem.cs
index 86b3791fac..61c889e6dd 100644
--- a/Content.Server/_Wega/Disease/DiseaseSystem.cs
+++ b/Content.Server/_Wega/Disease/DiseaseSystem.cs
@@ -56,7 +56,7 @@ namespace Content.Server.Disease
             SubscribeLocalEvent<DiseaseVaccineComponent, VaccineDoAfterEvent>(OnDoAfter);
         }
 
-        private Queue<(DiseaseCarrierComponent carrier, DiseasePrototype disease)> _cureQueue = new();
+        private Queue<(EntityUid uid, DiseaseCarrierComponent carrier, DiseasePrototype disease)> _cureQueue = new();
 
         /// <summary>
         /// First, adds or removes diseased component from the queues and clears them.
@@ -66,30 +66,31 @@ namespace Content.Server.Disease
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            foreach (var entity in _addQueue)
+            foreach (var entity in AddQueue)
             {
                 EnsureComp<DiseasedComponent>(entity);
             }
 
-            _addQueue.Clear();
+            AddQueue.Clear();
 
             foreach (var tuple in _cureQueue)
             {
                 if (tuple.carrier.Diseases.Count == 1) //This is reliable unlike testing Count == 0 right after removal for reasons I don't quite get
-                    RemComp<DiseasedComponent>(tuple.carrier.Owner);
+                    RemComp<DiseasedComponent>(tuple.uid);
                 tuple.carrier.PastDiseases.Add(tuple.disease);
                 tuple.carrier.Diseases.Remove(tuple.disease);
             }
             _cureQueue.Clear();
 
-            foreach (var (_, carrierComp, mobState) in EntityQuery<DiseasedComponent, DiseaseCarrierComponent, MobStateComponent>())
+            var query = EntityQueryEnumerator<DiseasedComponent, DiseaseCarrierComponent, MobStateComponent>();
+            while (query.MoveNext(out var uid, out var diseased, out var carrierComp, out var mobState))
             {
                 DebugTools.Assert(carrierComp.Diseases.Count > 0);
 
-                if (_mobStateSystem.IsDead(mobState.Owner, mobState))
+                if (_mobStateSystem.IsDead(uid, mobState))
                 {
                     if (_random.Prob(0.005f * frameTime)) //Mean time to remove is 200 seconds per disease
-                        CureDisease(carrierComp, _random.Pick(carrierComp.Diseases));
+                        CureDisease(uid, carrierComp, _random.Pick(carrierComp.Diseases));
 
                     continue;
                 }
@@ -104,7 +105,7 @@ namespace Content.Server.Disease
 
                     // if the disease is on the silent disease list, don't do effects
                     var doEffects = carrierComp.CarrierDiseases?.Contains(disease.ID) != true;
-                    var args = new DiseaseEffectArgs(carrierComp.Owner, disease, EntityManager);
+                    var args = new DiseaseEffectArgs(uid, disease, EntityManager);
                     disease.Accumulator -= disease.TickTime;
 
                     int stage = 0; //defaults to stage 0 because you should always have one
@@ -122,7 +123,7 @@ namespace Content.Server.Disease
                     foreach (var cure in disease.Cures)
                     {
                         if (cure.Stages.AsSpan().Contains(stage) && cure.Cure(args))
-                            CureDisease(carrierComp, disease);
+                            CureDisease(uid, carrierComp, disease);
                     }
 
                     if (doEffects)
@@ -155,7 +156,7 @@ namespace Content.Server.Disease
                     component.PastDiseases.Add(disease);
                 else
                 {
-                    Logger.Error($"Failed to index disease prototype {immunity} for {uid}");
+                    Log.Error($"Failed to index disease prototype {immunity} for {uid}");
                 }
             }
         }
@@ -174,12 +175,12 @@ namespace Content.Server.Disease
                     return;
                 if (cureProb > 1)
                 {
-                    CureDisease(component, disease);
+                    CureDisease(uid, component, disease);
                     return;
                 }
                 if (_random.Prob(cureProb))
                 {
-                    CureDisease(component, disease);
+                    CureDisease(uid, component, disease);
                     return;
                 }
             }
@@ -230,11 +231,11 @@ namespace Content.Server.Disease
         /// so it can be safely queued up to be removed from the target
         /// and added to past disease history (for immunity)
         /// </summary>
-        private void CureDisease(DiseaseCarrierComponent carrier, DiseasePrototype disease)
+        private void CureDisease(EntityUid uid, DiseaseCarrierComponent carrier, DiseasePrototype disease)
         {
-            var сureTuple = (carrier, disease);
-            _cureQueue.Enqueue(сureTuple);
-            _popupSystem.PopupEntity(Loc.GetString("disease-cured"), carrier.Owner, carrier.Owner);
+            var cureTuple = (uid, carrier, disease);
+            _cureQueue.Enqueue(cureTuple);
+            _popupSystem.PopupEntity(Loc.GetString("disease-cured"), uid, uid);
         }
 
         public void CureAllDiseases(EntityUid uid, DiseaseCarrierComponent? carrier = null)
@@ -244,7 +245,7 @@ namespace Content.Server.Disease
 
             foreach (var disease in carrier.Diseases)
             {
-                CureDisease(carrier, disease);
+                CureDisease(uid, carrier, disease);
             }
         }
 
@@ -331,7 +332,7 @@ namespace Content.Server.Disease
                 return;
 
             var disease = _random.Pick(diseasedCarrier.Diseases);
-            TryInfect(carrier, disease, 0.4f);
+            TryInfect(target, carrier, disease, 0.4f);
         }
 
         /// <summary>
@@ -340,11 +341,12 @@ namespace Content.Server.Disease
         /// rolls the dice to see if they get
         /// the disease.
         /// </summary>
+        /// <param name="uid">The target entity UID</param>
         /// <param name="carrier">The target of the disease</param>
         /// <param name="disease">The disease to apply</param>
         /// <param name="chance">% chance of the disease being applied, before considering resistance</param>
         /// <param name="forced">Bypass the disease's infectious trait.</param>
-        public void TryInfect(DiseaseCarrierComponent carrier, DiseasePrototype? disease, float chance = 0.7f, bool forced = false)
+        public void TryInfect(EntityUid uid, DiseaseCarrierComponent carrier, DiseasePrototype? disease, float chance = 0.7f, bool forced = false)
         {
             if (disease == null || !forced && !disease.Infectious)
                 return;
@@ -352,15 +354,15 @@ namespace Content.Server.Disease
             if (infectionChance <= 0)
                 return;
             if (_random.Prob(infectionChance))
-                TryAddDisease(carrier.Owner, disease, carrier);
+                TryAddDisease(uid, disease, carrier);
         }
 
-        public void TryInfect(DiseaseCarrierComponent carrier, string? disease, float chance = 0.7f, bool forced = false)
+        public void TryInfect(EntityUid uid, DiseaseCarrierComponent carrier, string? disease, float chance = 0.7f, bool forced = false)
         {
             if (disease == null || !_prototypeManager.TryIndex<DiseasePrototype>(disease, out var d))
                 return;
 
-            TryInfect(carrier, d, chance, forced);
+            TryInfect(uid, carrier, d, chance, forced);
         }
 
         /// <summary>
@@ -371,7 +373,8 @@ namespace Content.Server.Disease
         /// </summary>
         public bool SneezeCough(EntityUid uid, DiseasePrototype? disease, string emoteId, bool airTransmit = true, TransformComponent? xform = null)
         {
-            if (!Resolve(uid, ref xform)) return false;
+            if (!Resolve(uid, ref xform))
+                return false;
 
             if (_mobStateSystem.IsDead(uid)) return false;
 
@@ -391,12 +394,12 @@ namespace Content.Server.Disease
 
             var carrierQuery = GetEntityQuery<DiseaseCarrierComponent>();
 
-            foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, 2f))
+            foreach (var entity in _lookup.GetEntitiesInRange(xform.Coordinates, 2f))
             {
                 if (!carrierQuery.TryGetComponent(entity, out var carrier) ||
                     !_interactionSystem.InRangeUnobstructed(uid, entity)) continue;
 
-                TryInfect(carrier, disease, 0.3f);
+                TryInfect(entity, carrier, disease, 0.3f);
             }
             return true;
         }
diff --git a/Content.Server/_Wega/Disease/Effects/DiseasePolymorph.cs b/Content.Server/_Wega/Disease/Effects/DiseasePolymorph.cs
index 9815b7cf8c..23f04e3931 100644
--- a/Content.Server/_Wega/Disease/Effects/DiseasePolymorph.cs
+++ b/Content.Server/_Wega/Disease/Effects/DiseasePolymorph.cs
@@ -33,9 +33,7 @@ namespace Content.Server.Disease.Effects
             if (PolymorphSound != null && polyUid != null)
             {
                 var audioSystem = args.EntityManager.System<SharedAudioSystem>();
-                var soundPath = audioSystem.GetSound(PolymorphSound);
-
-                audioSystem.PlayGlobal(soundPath, Filter.Pvs(polyUid.Value), true, AudioParams.Default);
+                audioSystem.PlayGlobal(PolymorphSound, Filter.Pvs(polyUid.Value), true, AudioParams.Default);
             }
 
             if (PolymorphMessage != null && polyUid != null)
diff --git a/Content.Server/_Wega/Disease/Effects/DiseaseSnough.cs b/Content.Server/_Wega/Disease/Effects/DiseaseSnough.cs
index 931882f039..cfeb457e11 100644
--- a/Content.Server/_Wega/Disease/Effects/DiseaseSnough.cs
+++ b/Content.Server/_Wega/Disease/Effects/DiseaseSnough.cs
@@ -16,7 +16,7 @@ namespace Content.Server.Disease
         /// Emote to play when snoughing
         /// </summary>
         [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-        public string EmoteId = String.Empty;
+        public string EmoteId = string.Empty;
 
         /// <summary>
         /// Whether to spread the disease through the air
diff --git a/Content.Server/_Wega/FriendlyFaction/FriendlyFactionSystem.cs b/Content.Server/_Wega/FriendlyFaction/FriendlyFactionSystem.cs
index 94a6910a32..e39b321056 100644
--- a/Content.Server/_Wega/FriendlyFaction/FriendlyFactionSystem.cs
+++ b/Content.Server/_Wega/FriendlyFaction/FriendlyFactionSystem.cs
@@ -12,7 +12,6 @@ namespace Content.Server.Friendly.Faction
             base.Initialize();
 
             SubscribeLocalEvent<FriendlyFactionComponent, MeleeHitEvent>(OnMeleeHit);
-
         }
 
         private void OnMeleeHit(EntityUid uid, FriendlyFactionComponent component, MeleeHitEvent args)
diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs
index e936640996..7c5bc1ffa0 100644
--- a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs
@@ -20,15 +20,13 @@ public sealed class HulkGenSystem : EntitySystem
     [Dependency] private readonly SharedActionsSystem _action = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly DamageableSystem _damage = default!;
-
     [Dependency] private readonly DnaModifierSystem _dnaModifier = default!;
     [Dependency] private readonly PhysicsSystem _physics = default!;
     [Dependency] private readonly PolymorphSystem _polymorph = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
 
-    [ValidatePrototypeId<StructuralEnzymesPrototype>]
-    private const string HulkGen = "GeneticsHulkBasic";
+    private static readonly ProtoId<StructuralEnzymesPrototype> HulkGen = "GeneticsHulkBasic";
 
     public override void Initialize()
     {
diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs
index 83aeab8052..61b7dc025b 100644
--- a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs
@@ -91,7 +91,7 @@ public sealed class MatterEaterSystem : EntitySystem
             return;
 
         if (TryComp<StackComponent>(ent, out var stack) && stack.Count > 1)
-            _stack.SetCount(ent.Owner, stack.Count - 1);
+            _stack.ReduceCount(ent.Owner, 1);
         else
         {
             if (TryComp<StorageComponent>(ent, out var storage))
diff --git a/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs
index 03539d51d2..3948234f5d 100644
--- a/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.Genetics;
 using Content.Shared.Interaction;
 using Robust.Server.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Genetics.System;
 
@@ -13,8 +14,7 @@ public sealed partial class DnaModifierSystem
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
 
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string Damage = "Poison";
+    private static readonly ProtoId<DamageTypePrototype> Damage = "Poison";
 
     private void InitializeInjector()
     {
@@ -24,7 +24,7 @@ public sealed partial class DnaModifierSystem
         SubscribeLocalEvent<DnaModifierCleanRandomizeComponent, ComponentStartup>(OnCleanRandomize);
     }
 
-    public void OnFillingInjector(EntityUid injector, UniqueIdentifiersPrototype? uniqueIdentifiers, List<EnzymesPrototypeInfo>? enzymesPrototypes)
+    public void OnFillingInjector(EntityUid injector, UniqueIdentifiersData? uniqueIdentifiers, List<EnzymesPrototypeInfo>? enzymesPrototypes)
     {
         if (!TryComp(injector, out DnaModifierInjectorComponent? comp))
             return;
diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs
index dc9e01385a..510fe4d616 100644
--- a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs
@@ -52,10 +52,8 @@ namespace Content.Server.Genetics.System
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
-        [ValidatePrototypeId<EntityPrototype>]
-        private const string Injector = "DnaInjector";
-        [ValidatePrototypeId<DamageTypePrototype>]
-        private const string RadDamage = "Radiation";
+        private static readonly EntProtoId Injector = "DnaInjector";
+        private static readonly ProtoId<DamageTypePrototype> RadDamage = "Radiation";
 
         public override void Initialize()
         {
@@ -229,7 +227,7 @@ namespace Content.Server.Genetics.System
             bool scannerInRange = ent.Comp.GeneticScannerInRange;
 
             EnzymeInfo? enzyme = null;
-            UniqueIdentifiersPrototype? uniqueIdentifiers = null;
+            UniqueIdentifiersData? uniqueIdentifiers = null;
             List<EnzymesPrototypeInfo>? enzymesPrototypes = null;
 
             var currentTime = _timing.CurTime;
@@ -317,7 +315,7 @@ namespace Content.Server.Genetics.System
                 buffer,
                 currentTime < injectorCooldown ? injectorCooldown - currentTime : TimeSpan.Zero,
                 currentTime < subjectInjectCooldown ? subjectInjectCooldown - currentTime : TimeSpan.Zero
-                );
+            );
         }
 
         private string GetStatus(MobState mobState)
@@ -740,7 +738,7 @@ namespace Content.Server.Genetics.System
             UpdateUserInterface(GetEntity(args.Uid), console);
         }
 
-        private void ModifyUniqueIdentifiers(UniqueIdentifiersPrototype uniqueIdentifiers, string block, int value, float intensity)
+        private void ModifyUniqueIdentifiers(UniqueIdentifiersData uniqueIdentifiers, string block, int value, float intensity)
         {
             var fields = new List<(string[] Field, string Name)>
             {
@@ -834,7 +832,7 @@ namespace Content.Server.Genetics.System
             field[value] = GenerateRandomHexValue(field[value], intensity, 1.0f);
         }
 
-        private void ModifyUniqueIdentifiers(UniqueIdentifiersPrototype uniqueIdentifiers, float intensity, float duration)
+        private void ModifyUniqueIdentifiers(UniqueIdentifiersData uniqueIdentifiers, float intensity, float duration)
         {
             var fields = new List<(string[] Field, string Name)>
             {
diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs
index 1b0dd988b5..76bca1f0c5 100644
--- a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs
+++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs
@@ -1,11 +1,11 @@
 using Content.Shared.GameTicking;
-using Robust.Shared.Map;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Genetics.System;
 
 public sealed partial class DnaModifierSystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly MapSystem _map = default!;
 
     public EntityUid? PausedMap { get; private set; }
 
@@ -27,8 +27,6 @@ public sealed partial class DnaModifierSystem
         if (PausedMap != null && Exists(PausedMap))
             return;
 
-        var newmap = _mapManager.CreateMap();
-        _mapManager.SetMapPaused(newmap, true);
-        PausedMap = _mapManager.GetMapEntityId(newmap);
+        PausedMap = _map.CreateMap(false);
     }
 }
diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs
index b83f21de62..c735f562aa 100644
--- a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
@@ -48,6 +49,8 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    private static readonly ProtoId<EmotePrototype> Scream = "Scream";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -144,12 +147,12 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
     }
 
     #region Deep Cloning
-    public UniqueIdentifiersPrototype? CloneUniqueIdentifiers(UniqueIdentifiersPrototype? source)
+    public UniqueIdentifiersData? CloneUniqueIdentifiers(UniqueIdentifiersData? source)
     {
         if (source == null)
             return null;
 
-        return (UniqueIdentifiersPrototype)source.Clone();
+        return source.Clone(source);
     }
 
     public List<EnzymesPrototypeInfo>? CloneEnzymesPrototypes(List<EnzymesPrototypeInfo>? source)
@@ -166,7 +169,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
     {
         if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
         {
-            var uniqueIdentifiers = new UniqueIdentifiersPrototype
+            var uniqueIdentifiers = new UniqueIdentifiersData
             {
                 ID = $"UniqueIdentifiers{uid}",
             };
@@ -407,7 +410,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
         else
         {
             var empty = new[] { "0", "0", "0" };
-            var uniqueIdentifiers = new UniqueIdentifiersPrototype
+            var uniqueIdentifiers = new UniqueIdentifiersData
             {
                 ID = $"StructuralEnzymes{uid}",
                 HairColorR = GenerateRandomHexValues(),
@@ -583,7 +586,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
 
             _damage.TryChangeDamage(uid, damage, true);
 
-            _chat.TryEmoteWithoutChat(uid, _prototype.Index<EmotePrototype>("Scream"), true);
+            _chat.TryEmoteWithoutChat(uid, _prototype.Index(Scream), true);
             _popup.PopupEntity(Loc.GetString("dna-instability-stage-two"), uid, uid, PopupType.SmallCaution);
         }
     }
@@ -596,7 +599,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
 
             _damage.TryChangeDamage(uid, damage, true);
 
-            _chat.TryEmoteWithoutChat(uid, _prototype.Index<EmotePrototype>("Scream"), true);
+            _chat.TryEmoteWithoutChat(uid, _prototype.Index(Scream), true);
             _popup.PopupEntity(Loc.GetString("dna-instability-stage-three"), uid, uid, PopupType.LargeCaution);
         }
     }
@@ -647,10 +650,10 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
         Dirty(ent, humanoid);
     }
 
-    private void UpdateSkin(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersPrototype uniqueIdentifiers)
+    private void UpdateSkin(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersData uniqueIdentifiers)
     {
-        var speciesProto = _prototype.Index<SpeciesPrototype>(humanoid.Comp.Species);
-        var skinColorationProto = _prototype.Index<SkinColorationPrototype>(speciesProto.SkinColoration);
+        var speciesProto = _prototype.Index(humanoid.Comp.Species);
+        var skinColorationProto = _prototype.Index(speciesProto.SkinColoration);
 
         switch (skinColorationProto.Strategy.InputType)
         {
@@ -678,7 +681,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
         }
     }
 
-    private void UpdateMarkings(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersPrototype uniqueIdentifiers)
+    private void UpdateMarkings(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersData uniqueIdentifiers)
     {
         var markingSet = humanoid.Comp.MarkingSet;
         var markingPrototypes = _markingIndexer.GetAllMarkingPrototypes();
@@ -691,7 +694,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
         _ensureMarking.UpdateMarkingCategory(humanoid, markingSet, MarkingCategories.Tail, uniqueIdentifiers.TailMarkingColorR, uniqueIdentifiers.TailMarkingColorG, uniqueIdentifiers.TailMarkingColorB, uniqueIdentifiers.TailMarkingStyle, humanoid.Comp.Species, markingPrototypes);
     }
 
-    private void UpdateEyeColor(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersPrototype uniqueIdentifiers)
+    private void UpdateEyeColor(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersData uniqueIdentifiers)
     {
         string redHex = uniqueIdentifiers.EyeColorR[0] + uniqueIdentifiers.EyeColorR[1];
         string greenHex = uniqueIdentifiers.EyeColorG[0] + uniqueIdentifiers.EyeColorG[1];
@@ -710,7 +713,7 @@ public sealed partial class DnaModifierSystem : SharedDnaModifierSystem
         humanoid.Comp.EyeColor = eyeColor;
     }
 
-    private void UpdateGender(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersPrototype uniqueIdentifiers)
+    private void UpdateGender(Entity<HumanoidAppearanceComponent> humanoid, UniqueIdentifiersData uniqueIdentifiers)
     {
         int[] values = uniqueIdentifiers.Gender
             .Select(hex => Convert.ToInt32(hex, 16))
diff --git a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs
index a782df8120..1f7b1e2b93 100644
--- a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Genetics;
 using Content.Shared.Genetics.Systems;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Genetics.System;
 
@@ -11,8 +12,7 @@ public sealed class EnsureMarkingSystem : EntitySystem
 {
     [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
 
-    [ValidatePrototypeId<MarkingPrototype>]
-    public const string DefaultHorns = "LizardHornsDemonic";
+    public static readonly ProtoId<MarkingPrototype> DefaultHorns = "LizardHornsDemonic";
 
     public override void Initialize()
     {
diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs
index 1b6c465727..72e57048ba 100644
--- a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Genetics;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Genetics.System;
 
@@ -9,10 +9,8 @@ public sealed class RegenerationGenSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damage = default!;
 
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string BluntDamage = "Blunt";
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string HeatDamage = "Heat";
+    private static readonly ProtoId<DamageTypePrototype> BluntDamage = "Blunt";
+    private static readonly ProtoId<DamageTypePrototype> HeatDamage = "Heat";
 
     public override void Update(float frameTime)
     {
diff --git a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs
index 6c44b52422..c7eca99361 100644
--- a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs
+++ b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs
@@ -16,7 +16,7 @@ public sealed class HeatResistanceGenSystem : EntitySystem
 
     private void OnInit(Entity<HeatResistanceGenComponent> ent, ref ComponentInit args)
     {
-        if (TryComp<FlammableComponent>(ent, out _))
+        if (HasComp<FlammableComponent>(ent))
         {
             RemComp<FlammableComponent>(ent);
             ent.Comp.RemFlammable = true;
diff --git a/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs b/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs
index 03250abbc9..ee83595099 100644
--- a/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs
+++ b/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Server.Hallucinations;
 
+// TODO: Full refactor this shit
 public sealed partial class HallucinationsSystem : EntitySystem
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
diff --git a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs
index fd14a0b456..6156e6c15b 100644
--- a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs
+++ b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs
@@ -2,9 +2,8 @@ using Content.Server.Body.Systems;
 using Content.Shared._Wega.Implants.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
-using NetCord.Gateway;
 
-namespace Content.Shared._Wega.Implants
+namespace Content.Server.Implants
 {
     public sealed class BodyPartImplantSystem : EntitySystem
     {
@@ -22,7 +21,7 @@ namespace Content.Shared._Wega.Implants
 
         private void OnMapInit(EntityUid uid, BodyPartImplantComponent component, ref MapInitEvent args)
         {
-            if (!TryComp<BodyPartComponent>(uid, out var bodyPart))
+            if (!TryComp<BodyPartComponent>(uid, out _))
                 return;
 
             foreach (var connection in component.Connections)
diff --git a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs
index a6bf38fc06..60f83bd327 100644
--- a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs
+++ b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs
@@ -7,7 +7,7 @@ using Robust.Server.Audio;
 using Robust.Server.Containers;
 using Robust.Shared.Containers;
 
-namespace Content.Server._Wega.Implants;
+namespace Content.Server.Implants;
 
 public sealed class HandItemImplantSystem : EntitySystem
 {
diff --git a/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs b/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs
index d3dd340a49..291b6dce1e 100644
--- a/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs
+++ b/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs
@@ -1,10 +1,9 @@
-using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Martial.Arts;
 using Content.Shared.Martial.Arts.Components;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
diff --git a/Content.Server/_Wega/MartialArts/Styles/KravMagaStyle.cs b/Content.Server/_Wega/MartialArts/Styles/KravMagaStyle.cs
index fa35a1e496..22de3112b9 100644
--- a/Content.Server/_Wega/MartialArts/Styles/KravMagaStyle.cs
+++ b/Content.Server/_Wega/MartialArts/Styles/KravMagaStyle.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Martial.Arts;
 using Content.Shared.Martial.Arts.Components;
-using Content.Shared.Speech.Muting;
 using Content.Shared.Standing;
 
 namespace Content.Server.Martial.Arts;
@@ -59,7 +58,7 @@ public sealed partial class MartialArtsSystem
 
     private void HandleNeckChop(EntityUid target)
     {
-        _statusEffect.TryAddStatusEffect<MutedComponent>(target, "Muted", TimeSpan.FromSeconds(20f), true);
+        _statusEffect.TryAddStatusEffectDuration(target, "Muted", TimeSpan.FromSeconds(20f));
 
         var damage = new DamageSpecifier { DamageDict = { { "Blunt", 15 } } };
         _damage.TryChangeDamage(target, damage);
diff --git a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs
index 6e2edae3d6..a188850d0a 100644
--- a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs
+++ b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs
@@ -137,8 +137,11 @@ public sealed class MiningConsoleSystem : EntitySystem
 
     private EntityUid? EnsureAccount()
     {
-        var account = EntityQuery<MiningAccountComponent>().FirstOrDefault();
-        return account?.Owner ?? null;
+        var query = EntityQueryEnumerator<MiningAccountComponent>();
+        if (query.MoveNext(out var uid, out _))
+            return uid;
+
+        return null;
     }
 
     public void SwitchGlobalMode(EntityUid console, MiningMode mode)
diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs
index 137897c3d1..ccb98f8e6c 100644
--- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs
+++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs
@@ -26,24 +26,22 @@ public sealed partial class SlimeFindFoodOperator : HTNOperator
         if (!_entMan.TryGetComponent<TransformComponent>(owner, out var ownerTransform))
             return (false, null);
 
-        var food = _entMan.EntityQuery<SlimeFoodComponent>()
-            .Select(x => x.Owner)
-            .Where(x =>
-            {
-                if (!_entMan.TryGetComponent<TransformComponent>(x, out var xform))
-                    return false;
+        EntityUid food = default;
+        float minDistance = float.MaxValue;
 
-                return xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist) &&
-                        dist <= range;
-            })
-            .OrderBy(x =>
+        var query = _entMan.EntityQueryEnumerator<SlimeFoodComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var xform))
+        {
+            if (!xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist) ||
+                dist > range)
+                continue;
+
+            if (dist < minDistance)
             {
-                var xform = _entMan.GetComponent<TransformComponent>(x);
-                return xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist)
-                    ? dist
-                    : float.MaxValue;
-            })
-            .FirstOrDefault();
+                minDistance = dist;
+                food = uid;
+            }
+        }
 
         if (food == default)
             return (false, null);
diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs
index b63e8ddb67..cfd0e0cc20 100644
--- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs
+++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs
@@ -29,32 +29,30 @@ public sealed partial class SlimeFindTargetOperator : HTNOperator
         if (!_entMan.TryGetComponent<TransformComponent>(owner, out var ownerTransform))
             return (false, null);
 
-        var target = _entMan.EntityQuery<HumanoidAppearanceComponent>()
-            .Select(x => x.Owner)
-            .Where(x =>
+        EntityUid target = default;
+        float minDistance = float.MaxValue;
+
+        var query = _entMan.EntityQueryEnumerator<HumanoidAppearanceComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var xform))
+        {
+            if (_entMan.TryGetComponent<SlimeSocialComponent>(owner, out var social) &&
+                social.Friends.Contains(uid))
+                continue;
+
+            if (_entMan.TryGetComponent<MobStateComponent>(uid, out var mobState) &&
+                mobState.CurrentState == MobState.Dead)
+                continue;
+
+            if (!xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist) ||
+                dist > range)
+                continue;
+
+            if (dist < minDistance)
             {
-                if (!_entMan.TryGetComponent<TransformComponent>(x, out var xform))
-                    return false;
-
-                if (_entMan.TryGetComponent<SlimeSocialComponent>(owner, out var social))
-                    if (social.Friends.Contains(x))
-                        return false;
-
-                if (_entMan.TryGetComponent<MobStateComponent>(x, out var mobState) &&
-                    mobState.CurrentState == MobState.Dead)
-                    return false;
-
-                return xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist) &&
-                        dist <= range;
-            })
-            .OrderBy(x =>
-            {
-                var xform = _entMan.GetComponent<TransformComponent>(x);
-                return xform.Coordinates.TryDistance(_entMan, ownerTransform.Coordinates, out var dist)
-                    ? dist
-                    : float.MaxValue;
-            })
-            .FirstOrDefault();
+                minDistance = dist;
+                target = uid;
+            }
+        }
 
         if (target == default)
             return (false, null);
diff --git a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs
index 6dc08f8a90..76485c7aa9 100644
--- a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs
+++ b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs
@@ -43,10 +43,11 @@ public sealed class NightLightningSystem : EntitySystem
 
     private void UpdateNightLights(EntityUid uid, NightLightningComponent comp)
     {
-        if (!_cfg.GetCVar(WegaCVars.NightLightEnabled) || !TryComp<TransformComponent>(uid, out var transform))
+        if (!_cfg.GetCVar(WegaCVars.NightLightEnabled))
             return;
 
         var station = Name(uid);
+        var transform = Transform(uid);
         if (IsNightTime() && !comp.IsNight)
         {
             var lightEntities = _lookup.GetEntitiesInRange<PointLightComponent>(transform.Coordinates, 500f);
diff --git a/Content.Server/_Wega/Pain/PainSystem.cs b/Content.Server/_Wega/Pain/PainSystem.cs
index 87eb3c9cba..a609500c92 100644
--- a/Content.Server/_Wega/Pain/PainSystem.cs
+++ b/Content.Server/_Wega/Pain/PainSystem.cs
@@ -46,7 +46,7 @@ public sealed class PainSystem : EntitySystem
 
     private void OnInit(EntityUid uid, PainComponent component, ComponentInit args)
     {
-        if (!_proto.TryIndex<PainProfilePrototype>(component.Profile, out var profile))
+        if (!_proto.TryIndex(component.Profile, out var profile))
             return;
 
         foreach (var (type, level) in profile.PainTypes)
diff --git a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs
index 6294945961..47237e4421 100644
--- a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs
+++ b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs
@@ -1,25 +1,23 @@
 using Content.Shared.Actions;
-using Content.Shared.Alert;
-using Content.Shared.Maps;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Content.Shared._Wega.Resomi;
+using Content.Shared.Resomi;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
-using Content.Shared._Wega.Resomi.Abilities;
+using Content.Shared.Resomi.Abilities;
 using Content.Shared.Damage.Components;
-using Robust.Shared.Physics;
 using Content.Shared.Actions.Components;
+using Content.Server.Damage.Systems;
+using Content.Server.Popups;
 
-namespace Content.Server._Wega.Resomi.Abilities;
+namespace Content.Server.Resomi.Abilities;
 
 public sealed class AgillitySkillSystem : SharedAgillitySkillSystem
 {
-    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly StaminaSystem _stamina = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
-    private Entity<ActionComponent> action;
+    private Entity<ActionComponent> _action;
 
     public override void Initialize()
     {
@@ -31,26 +29,26 @@ public sealed class AgillitySkillSystem : SharedAgillitySkillSystem
 
     private void OnComponentInit(Entity<AgillitySkillComponent> ent, ref ComponentInit args)
     {
-        _actionsSystem.AddAction(ent.Owner, ref ent.Comp.SwitchAgilityActionEntity, ent.Comp.SwitchAgilityAction, ent.Owner);
+        _actions.AddAction(ent.Owner, ref ent.Comp.SwitchAgilityActionEntity, ent.Comp.SwitchAgilityAction, ent.Owner);
     }
 
     private void SwitchAgility(Entity<AgillitySkillComponent> ent, ref SwitchAgillityActionEvent args)
     {
-        action = args.Action;
+        _action = args.Action;
 
         if (!ent.Comp.Active)
         {
-            ActivateAgility(ent, action);
+            ActivateAgility(ent, _action);
         }
         else
         {
-            DeactivateAgility(ent.Owner, ent.Comp, action);
+            DeactivateAgility(ent.Owner, ent.Comp, _action);
         }
     }
 
     private void ActivateAgility(Entity<AgillitySkillComponent> ent, Entity<ActionComponent> action)
     {
-        if (!TryComp<MovementSpeedModifierComponent>(ent.Owner, out var comp))
+        if (!HasComp<MovementSpeedModifierComponent>(ent.Owner))
             return;
 
         _popup.PopupEntity(Loc.GetString("agility-activated-massage"), ent.Owner, ent.Owner);
@@ -66,7 +64,7 @@ public sealed class AgillitySkillSystem : SharedAgillitySkillSystem
 
     private void DeactivateAgility(EntityUid uid, AgillitySkillComponent component, Entity<ActionComponent> action)
     {
-        if (!TryComp<MovementSpeedModifierComponent>(uid, out var comp))
+        if (!HasComp<MovementSpeedModifierComponent>(uid))
             return;
 
         _popup.PopupEntity(Loc.GetString("agility-deactivated-massage"), uid, uid);
@@ -103,7 +101,7 @@ public sealed class AgillitySkillSystem : SharedAgillitySkillSystem
 
             _stamina.TryTakeStamina(uid, resomiComp.StaminaDamagePassive);
             if (stamina.StaminaDamage > stamina.CritThreshold * 0.50f)
-                DeactivateAgility(uid, resomiComp, action);
+                DeactivateAgility(uid, resomiComp, _action);
         }
     }
 }
diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs
index dbf8f8cd0f..74dd5cb6fb 100644
--- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs
+++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs
@@ -1,14 +1,18 @@
-using Content.Shared._Wega.Resomi.Abilities.Hearing;
+using Content.Server.Actions;
+using Content.Shared.Resomi.Abilities.Hearing;
 
-namespace Content.Server._Wega.Resomi.Abilities;
+namespace Content.Server.Resomi.Abilities;
 
 public sealed class ListenUpSkillSystem : SharedListenUpSkillSystem
 {
+    [Dependency] private readonly ActionsSystem _actionsSystem = default!;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<ListenUpSkillComponent, ComponentInit>(OnComponentInit);
     }
+
     private void OnComponentInit(Entity<ListenUpSkillComponent> ent, ref ComponentInit args)
     {
         _actionsSystem.AddAction(ent.Owner, ref ent.Comp.SwitchListenUpActionEntity, ent.Comp.SwitchListenUpAction, ent.Owner);
diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs
index e880742bfe..a8667fb0f0 100644
--- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs
+++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs
@@ -1,19 +1,18 @@
-using Content.Shared._Wega.Resomi.Abilities.Hearing;
-using Content.Shared.Actions;
-using Content.Shared.DoAfter;
-using Content.Shared.Movement.Events;
+using Content.Shared.Resomi.Abilities.Hearing;
 using Content.Shared.Popups;
 using Content.Shared.IdentityManagement;
 
-namespace Content.Server._Wega.Resomi.Abilities;
+namespace Content.Server.Resomi.Abilities;
 
 public sealed class ListenUpSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
     public override void Initialize()
     {
         SubscribeLocalEvent<ListenUpComponent, ComponentStartup>(OnListenStartup);
     }
+
     private void OnListenStartup(Entity<ListenUpComponent> ent, ref ComponentStartup args)
     {
         _popup.PopupEntity(Loc.GetString("listen-up-activated-massage", ("name", Identity.Entity(ent.Owner, EntityManager))), ent.Owner);
diff --git a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs
index 8283c42303..8df70344e7 100644
--- a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs
+++ b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs
@@ -14,6 +14,7 @@ using Content.Server.Hands.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Shadow;
 
@@ -31,8 +32,7 @@ public sealed class PhotophobiaSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _speed = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [ValidatePrototypeId<DamageTypePrototype>]
-    private const string Damage = "Heat";
+    private static readonly ProtoId<DamageTypePrototype> Damage = "Heat";
 
     // private readonly List<EntityUid> _scratchLights = new();
 
diff --git a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs
index 60233cd0ad..1397bf33ab 100644
--- a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs
+++ b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs
@@ -7,9 +7,22 @@ namespace Content.Server._Wega.Speech.EntitySystems;
 
 public sealed class ResomiAccentSystem : EntitySystem
 {
-
     [Dependency] private readonly IRobustRandom _random = default!;
 
+    private static readonly Regex RegexSh = new("ш+", RegexOptions.Compiled);
+    private static readonly Regex RegexShUpper = new("Ш+", RegexOptions.Compiled);
+    private static readonly Regex RegexCh = new("ч+", RegexOptions.Compiled);
+    private static readonly Regex RegexChUpper = new("Ч+", RegexOptions.Compiled);
+    private static readonly Regex RegexR = new("р+", RegexOptions.Compiled);
+    private static readonly Regex RegexRUpper = new("Р+", RegexOptions.Compiled);
+
+    private static readonly List<string> ShReplacements = new() { "шш", "шшш" };
+    private static readonly List<string> ShUpperReplacements = new() { "ШШ", "ШШШ" };
+    private static readonly List<string> ChReplacements = new() { "щщ", "щщщ" };
+    private static readonly List<string> ChUpperReplacements = new() { "ЩЩ", "ЩЩЩ" };
+    private static readonly List<string> RReplacements = new() { "рр", "ррр" };
+    private static readonly List<string> RUpperReplacements = new() { "РР", "РРР" };
+
     public override void Initialize()
     {
         base.Initialize();
@@ -20,42 +33,13 @@ public sealed class ResomiAccentSystem : EntitySystem
     {
         var message = args.Message;
 
-        // ш => шшш
-        message = Regex.Replace(
-            message,
-            "ш+",
-            _random.Pick(new List<string>() { "шш", "шшш" })
-        );
-        // Ш => ШШШ
-        message = Regex.Replace(
-            message,
-            "Ш+",
-            _random.Pick(new List<string>() { "ШШ", "ШШШ" })
-        );
-        // ч => щщщ
-        message = Regex.Replace(
-            message,
-            "ч+",
-            _random.Pick(new List<string>() { "щщ", "щщщ" })
-        );
-        // Ч => ЩЩЩ
-        message = Regex.Replace(
-            message,
-            "Ч+",
-            _random.Pick(new List<string>() { "ЩЩ", "ЩЩЩ" })
-        );
-        // р => ррр
-        message = Regex.Replace(
-            message,
-            "р+",
-            _random.Pick(new List<string>() { "рр", "ррр" })
-        );
-        // Р => РРР
-        message = Regex.Replace(
-            message,
-            "Р+",
-            _random.Pick(new List<string>() { "РР", "РРР" })
-        );
+        message = RegexSh.Replace(message, _random.Pick(ShReplacements));
+        message = RegexShUpper.Replace(message, _random.Pick(ShUpperReplacements));
+        message = RegexCh.Replace(message, _random.Pick(ChReplacements));
+        message = RegexChUpper.Replace(message, _random.Pick(ChUpperReplacements));
+        message = RegexR.Replace(message, _random.Pick(RReplacements));
+        message = RegexRUpper.Replace(message, _random.Pick(RUpperReplacements));
+
         args.Message = message;
     }
 }
diff --git a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs
index 4418710045..382b1955aa 100644
--- a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs
+++ b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs
@@ -27,11 +27,13 @@ public sealed class DiseaseOutbreakRule : StationEventSystem<DiseaseOutbreakRule
         base.Started(uid, component, gameRule, args);
 
         HashSet<EntityUid> stationsToNotify = new();
-        List<DiseaseCarrierComponent> aliveList = new();
-        foreach (var (carrier, mobState) in EntityQuery<DiseaseCarrierComponent, MobStateComponent>())
+        List<Entity<DiseaseCarrierComponent>> aliveList = new();
+
+        var query = EntityQueryEnumerator<DiseaseCarrierComponent, MobStateComponent>();
+        while (query.MoveNext(out var entity, out var carrier, out var mobState))
         {
-            if (!_mobStateSystem.IsDead(mobState.Owner, mobState))
-                aliveList.Add(carrier);
+            if (!_mobStateSystem.IsDead(entity, mobState))
+                aliveList.Add((entity, carrier));
         }
         RobustRandom.Shuffle(aliveList);
 
@@ -44,14 +46,14 @@ public sealed class DiseaseOutbreakRule : StationEventSystem<DiseaseOutbreakRule
             return;
 
         // Now we give it to people in the list of living disease carriers earlier
-        foreach (var target in aliveList)
+        foreach (var (entity, target) in aliveList)
         {
             if (toInfect-- == 0)
                 break;
 
-            _diseaseSystem.TryAddDisease(target.Owner, disease, target);
+            _diseaseSystem.TryAddDisease(entity, disease, target);
 
-            var station = StationSystem.GetOwningStation(target.Owner);
+            var station = StationSystem.GetOwningStation(entity);
             if (station == null) continue;
             stationsToNotify.Add((EntityUid)station);
         }
diff --git a/Content.Server/_Wega/Strangulation/StrangulationSystem.cs b/Content.Server/_Wega/Strangulation/StrangulationSystem.cs
index cd76f52734..ecdbbaa32e 100644
--- a/Content.Server/_Wega/Strangulation/StrangulationSystem.cs
+++ b/Content.Server/_Wega/Strangulation/StrangulationSystem.cs
@@ -3,7 +3,6 @@ using Content.Shared.DoAfter;
 using Content.Shared.Verbs;
 using Content.Shared.Strangulation;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Hands.Components;
 using Content.Shared.Hands;
 using Content.Shared.Popups;
 using Content.Shared.Garrotte;
@@ -21,8 +20,8 @@ using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.StatusEffect;
 using Content.Shared.Speech.Muting;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Server.Strangulation
 {
@@ -108,7 +107,7 @@ namespace Content.Server.Strangulation
                 return;
 
             var target = args.Target ?? default;
-            _statusEffect.TryAddStatusEffect<MutedComponent>(target, "Muted", TimeSpan.FromSeconds(3f), true);
+            _statusEffect.TryAddStatusEffectDuration(target, "Muted", TimeSpan.FromSeconds(3f));
 
             if (args.Cancelled)
             {
diff --git a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs
index bc797d548b..5dd12f7355 100644
--- a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs
+++ b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs
@@ -139,7 +139,7 @@ namespace Content.Server.Medical.Surgery
             var damages = new List<BodyScannerDamageInfo>();
             foreach (var (damageId, bodyParts) in operated.InternalDamages)
             {
-                if (!_prototypeManager.TryIndex<InternalDamagePrototype>(damageId, out var damageProto))
+                if (!_prototypeManager.TryIndex(damageId, out var damageProto))
                     continue;
 
                 damages.Add(new BodyScannerDamageInfo(
diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs b/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs
index 5794d21395..106f903403 100644
--- a/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs
+++ b/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs
@@ -115,7 +115,7 @@ public sealed partial class SurgerySystem
 
             // For stacks
             if (TryComp<StackComponent>(item, out var stack) && stack.Count > 1)
-                _stack.SetCount(item, stack.Count - 1);
+                _stack.ReduceCount(item, 1);
 
             bool foundMatch = false;
             float successModifier = 1f;
diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs b/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs
index 5c0822e617..60225334ba 100644
--- a/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs
+++ b/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs
@@ -5,7 +5,6 @@ using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Systems;
-using Content.Shared.Chat.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Damage;
 using Content.Shared.Database;
diff --git a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs
index 675971e154..ad10fc180f 100644
--- a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs
+++ b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs
@@ -46,7 +46,7 @@ public sealed class TapeRecorderSystem : SharedTapeRecorderSystem
             voice.NameOverride = message.Name ?? ent.Comp.DefaultName;
             // TODO: mimic the exact string chosen when the message was recorded
             var verb = message.Verb ?? SharedChatSystem.DefaultSpeechVerb;
-            speech.SpeechVerb = _proto.Index<SpeechVerbPrototype>(verb);
+            speech.SpeechVerb = _proto.Index(verb);
             //Play the message
             _chat.TrySendInGameICMessage(ent, message.Message, InGameICChatType.Speak, false);
         }
@@ -113,7 +113,7 @@ public sealed class TapeRecorderSystem : SharedTapeRecorderSystem
         foreach (var message in cassette.Comp.RecordedData)
         {
             var name = message.Name ?? ent.Comp.DefaultName;
-            var time = TimeSpan.FromSeconds((double)message.Timestamp);
+            var time = TimeSpan.FromSeconds(message.Timestamp);
 
             text.AppendLine(Loc.GetString("tape-recorder-print-message-text",
                 ("time", time.ToString(@"hh\:mm\:ss")),
diff --git a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughComponent.cs b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughComponent.cs
index 018ec4be33..ea852de4a2 100644
--- a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughComponent.cs
+++ b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Traits.Assorted;
 public sealed partial class UncontrollableCoughComponent : Component
 {
     [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId = String.Empty;
+    public string EmoteId = string.Empty;
 
     [DataField("timeBetweenIncidents", required: true)]
     public Vector2 TimeBetweenIncidents { get; set; }
diff --git a/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs b/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs
index 34017dfbbc..2c00015afe 100644
--- a/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs
+++ b/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs
@@ -10,7 +10,6 @@ using Content.Server.Prayer;
 using Content.Server.Pinpointer;
 using Content.Shared.Actions.Components;
 using Content.Shared.Body.Components;
-using Content.Shared.Chat.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Clothing;
 using Content.Shared.CombatMode;
@@ -34,7 +33,6 @@ using Content.Shared.Prying.Components;
 using Content.Shared.Roles;
 using Content.Shared.Stealth;
 using Content.Shared.Stealth.Components;
-using Content.Shared.StatusEffect;
 using Content.Shared.Standing;
 using Content.Shared.Vampire;
 using Content.Shared.Vampire.Components;
@@ -55,6 +53,7 @@ using Content.Shared.Damage.Systems;
 using Content.Shared.Flash.Components;
 using Content.Shared.NullRod.Components;
 using Content.Shared.Surgery.Components;
+using Content.Shared.StatusEffectNew;
 
 namespace Content.Server.Vampire;
 
@@ -80,6 +79,8 @@ public sealed partial class VampireSystem
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
 
+    private static readonly EntProtoId RejuvenateAdvanced = "ActionVampireRejuvenateAdvanced";
+
     private void InitializePowers()
     {
         //Select Class
@@ -196,7 +197,7 @@ public sealed partial class VampireSystem
                             _action.RemoveAction(uid, actionId);
                             _container.Remove(actionId, container);
 
-                            _action.AddAction(uid, "ActionVampireRejuvenateAdvanced");
+                            _action.AddAction(uid, RejuvenateAdvanced);
                             break;
                         }
                     }
@@ -256,7 +257,7 @@ public sealed partial class VampireSystem
         if (HasComp<BibleUserComponent>(target) && !component.TruePowerActive)
         {
             _stun.TryUpdateParalyzeDuration(vampire, TimeSpan.FromSeconds(5f));
-            _chat.TryEmoteWithoutChat(vampire, _prototypeManager.Index<EmotePrototype>("Scream"), true);
+            _chat.TryEmoteWithoutChat(vampire, _prototypeManager.Index(Scream), true);
             _damage.TryChangeDamage(vampire, VampireComponent.HolyDamage);
             return;
         }
@@ -1465,13 +1466,10 @@ public sealed partial class VampireSystem
     #endregion
 
     #region Other Methods
-    public void RemoveKnockdown(EntityUid uid, StatusEffectsComponent? status = null)
+    public void RemoveKnockdown(EntityUid uid)
     {
-        if (!Resolve(uid, ref status, false))
-            return;
-
-        _statusEffect.TryRemoveStatusEffect(uid, "KnockedDown", status);
-        _statusEffect.TryRemoveStatusEffect(uid, "Stun", status);
+        _statusEffect.TryRemoveStatusEffect(uid, "KnockedDown");
+        _statusEffect.TryRemoveStatusEffect(uid, "Stun");
     }
 
     private void CoolSurroundingAtmosphere(EntityUid uid)
diff --git a/Content.Server/_Wega/Vampire/VampireSystem.cs b/Content.Server/_Wega/Vampire/VampireSystem.cs
index 13e6d83db3..7564adfcc4 100644
--- a/Content.Server/_Wega/Vampire/VampireSystem.cs
+++ b/Content.Server/_Wega/Vampire/VampireSystem.cs
@@ -72,6 +72,8 @@ public sealed partial class VampireSystem : SharedVampireSystem
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
 
+    private static readonly ProtoId<EmotePrototype> Scream = "Scream";
+
     private readonly Dictionary<EntityUid, Dictionary<EntityUid, FixedPoint2>> _bloodConsumedTracker = new();
     private bool _isDamageBeingHandled = false;
 
@@ -143,7 +145,7 @@ public sealed partial class VampireSystem : SharedVampireSystem
                     {
                         flammable.FireStacks = flammable.MaximumFireStacks;
                         _flammable.Ignite(vampire.Owner, uid);
-                        _chat.TryEmoteWithoutChat(vampire, _prototypeManager.Index<EmotePrototype>("Scream"), true);
+                        _chat.TryEmoteWithoutChat(vampire, _prototypeManager.Index(Scream), true);
                         _popup.PopupEntity(Loc.GetString("vampire-holy-point"), vampire.Owner, vampire.Owner, PopupType.LargeCaution);
                     }
                 }
diff --git a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs
index f2cfee0ee2..da121d23ab 100644
--- a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs
+++ b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs
@@ -19,6 +19,7 @@ using Content.Shared.Construction.Components;
 using Content.Shared.Xenobiology;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Body.Components;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Xenobiology
 {
@@ -122,7 +123,7 @@ namespace Content.Server.Xenobiology
 
             if (_random.Prob(0.15f))
             {
-                _audio.PlayPvs("/Audio/Voice/Slime/slime_squish.ogg", uid);
+                _audio.PlayPvs(new SoundPathSpecifier("/Audio/Voice/Slime/slime_squish.ogg"), uid);
             }
         }
 
@@ -200,7 +201,7 @@ namespace Content.Server.Xenobiology
             component.Reinforced = slimeGrowth.Reinforced;
 
             _jittering.AddJitter(extractor, -10, 100);
-            _audio.PlayPvs("/Audio/Machines/reclaimer_startup.ogg", extractor);
+            _audio.PlayPvs(new SoundPathSpecifier("/Audio/Machines/reclaimer_startup.ogg"), extractor);
             _ambient.SetAmbience(extractor, true);
 
             if (TryComp<BloodstreamComponent>(slime, out var bloodstream))
diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs
index 3e99846262..2b2ce17a11 100644
--- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs
+++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs
@@ -12,8 +12,7 @@ public sealed class SlimeGrowthSystem : SharedSlimeGrowthSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultSlime = "MobXenoSlimeGray";
+    private static readonly EntProtoId DefaultSlime = "MobXenoSlimeGray";
 
     public override void Initialize()
     {
diff --git a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs
index 3641215cba..0003b6ccf8 100644
--- a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs
+++ b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs
@@ -101,13 +101,13 @@ public sealed class SlimeAnalyzerSystem : EntitySystem
 
     private void OnInsertedIntoContainer(Entity<SlimeAnalyzerComponent> analyzer, ref EntGotInsertedIntoContainerMessage args)
     {
-        if (analyzer.Comp.ScannedEntity is { } target)
+        if (analyzer.Comp.ScannedEntity is { } _)
             _toggle.TryDeactivate(analyzer.Owner);
     }
 
     private void OnDropped(Entity<SlimeAnalyzerComponent> analyzer, ref DroppedEvent args)
     {
-        if (analyzer.Comp.ScannedEntity is { } target)
+        if (analyzer.Comp.ScannedEntity is { } _)
             _toggle.TryDeactivate(analyzer.Owner);
     }
 
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index e5f3b2e3e0..6076265abd 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -24,7 +24,7 @@ using Content.Shared.Wieldable.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Timing;
-using Content.Shared._Wega.Resomi.Abilities;
+using Content.Shared.Resomi.Abilities; // Corvax-Wega-Resomi
 
 namespace Content.Shared.Wieldable;
 
diff --git a/Content.Shared/_Wega/Android/AndroidComponent.cs b/Content.Shared/_Wega/Android/AndroidComponent.cs
index d08b008b07..849669cc3c 100644
--- a/Content.Shared/_Wega/Android/AndroidComponent.cs
+++ b/Content.Shared/_Wega/Android/AndroidComponent.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Actions;
 using Content.Shared.Alert;
 using Robust.Shared.Audio;
-using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-namespace Content.Shared._Wega.Android;
+
+namespace Content.Shared.Android;
 
 public sealed partial class ToggleLockActionEvent : InstantActionEvent;
 
diff --git a/Content.Shared/_Wega/Android/SharedAndroidSystem.cs b/Content.Shared/_Wega/Android/SharedAndroidSystem.cs
index 137764171f..beb1c554a0 100644
--- a/Content.Shared/_Wega/Android/SharedAndroidSystem.cs
+++ b/Content.Shared/_Wega/Android/SharedAndroidSystem.cs
@@ -5,7 +5,7 @@ using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Wires;
 
-namespace Content.Shared._Wega.Android;
+namespace Content.Shared.Android;
 
 public abstract partial class SharedAndroidSystem : EntitySystem
 {
@@ -45,10 +45,7 @@ public abstract partial class SharedAndroidSystem : EntitySystem
         if (!TryComp<WiresPanelComponent>(uid, out var panel))
             return true;
 
-        if (!panel.Open)
-            return false;
-
-        if (user != null && user == uid)
+        if (!panel.Open || user != null && user == uid)
             return false;
 
         return true;
diff --git a/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs b/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs
index f47f5c8525..2e7f6b7401 100644
--- a/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs
+++ b/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs
@@ -1,4 +1,5 @@
 using Content.Shared.StatusIcon;
+using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -29,20 +30,11 @@ public sealed partial class BloodCultistComponent : Component
     [DataField]
     public int Empowering = 0;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string CultObjective = "ActionBloodCultObjective";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string CultCommunication = "ActionBloodCultComms";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string BloodMagic = "ActionBloodMagic";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string RecallBloodDagger = "ActionRecallBloodDagger";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string RecallBloodSpear = "RecallBloodCultSpear";
+    public static readonly EntProtoId CultObjective = "ActionBloodCultObjective";
+    public static readonly EntProtoId CultCommunication = "ActionBloodCultComms";
+    public static readonly EntProtoId BloodMagic = "ActionBloodMagic";
+    public static readonly EntProtoId RecallBloodDagger = "ActionRecallBloodDagger";
+    public static readonly EntProtoId RecallBloodSpear = "RecallBloodCultSpear";
 
     [DataField("cultistStatusIcon")]
     public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "BloodCultistFaction";
@@ -102,11 +94,11 @@ public sealed partial class BloodStructureComponent : Component
     [ViewVariables(VVAccess.ReadOnly), DataField]
     public TimeSpan ActivateTime = TimeSpan.Zero;
 
-    [DataField("fixture", required: true)]
+    [DataField("fixture")]
     public string FixtureId = string.Empty;
 
     [DataField]
-    public string Sound = string.Empty;
+    public SoundSpecifier? Sound { get; private set; }
 
     [DataField]
     public bool CanInteract = true;
diff --git a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs
index e8d7172a39..55aab5bddc 100644
--- a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs
+++ b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs
@@ -28,10 +28,10 @@ public abstract class SharedBloodCultSystem : EntitySystem
                     continue;
 
                 var protoId = meta.EntityPrototype?.ID;
-                if (protoId == BloodCultistComponent.CultObjective
-                    || protoId == BloodCultistComponent.CultCommunication
-                    || protoId == BloodCultistComponent.BloodMagic
-                    || protoId == BloodCultistComponent.RecallBloodDagger)
+                if (protoId == BloodCultistComponent.CultObjective.Id
+                    || protoId == BloodCultistComponent.CultCommunication.Id
+                    || protoId == BloodCultistComponent.BloodMagic.Id
+                    || protoId == BloodCultistComponent.RecallBloodDagger.Id)
                 {
                     _action.RemoveAction(cultist, actionId);
                 }
diff --git a/Content.Shared/_Wega/Body/Systems/HeartSystem.cs b/Content.Shared/_Wega/Body/Systems/HeartSystem.cs
index c7ba76f3d7..28eb5c2a57 100644
--- a/Content.Shared/_Wega/Body/Systems/HeartSystem.cs
+++ b/Content.Shared/_Wega/Body/Systems/HeartSystem.cs
@@ -11,7 +11,6 @@ namespace Content.Shared.Body.Systems;
 public sealed class HeartSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
diff --git a/Content.Shared/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs b/Content.Shared/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
index 139b885dd0..ff806fef42 100644
--- a/Content.Shared/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
+++ b/Content.Shared/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
@@ -3,7 +3,6 @@ using Robust.Shared.Audio;
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
 [RegisterComponent, AutoGenerateComponentPause]
-// [Access(typeof(SharedNanoChatCartridgeSystem))]
 public sealed partial class NanoChatCartridgeComponent : Component
 {
     [DataField]
diff --git a/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs b/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs
index 59c3d188fe..f77caf6496 100644
--- a/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs
+++ b/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs
@@ -58,13 +58,12 @@ public sealed class SharedDirtSystem : EntitySystem
         float dirtPercentage = Math.Clamp(entity.Comp.CurrentDirtLevel.Float() / MaxDirtLevel * 100f, 0f, 100f);
         string colorHex = entity.Comp.DirtColor.ToHex();
 
-        string dirtLevel;
-        if (dirtPercentage < 30)
-            dirtLevel = Loc.GetString("dirt-examined-level-low");
-        else if (dirtPercentage < 70)
-            dirtLevel = Loc.GetString("dirt-examined-level-medium");
-        else
-            dirtLevel = Loc.GetString("dirt-examined-level-high");
+        string dirtLevel = dirtPercentage switch
+        {
+            < 30 => Loc.GetString("dirt-examined-level-low"),
+            < 70 => Loc.GetString("dirt-examined-level-medium"),
+            _ => Loc.GetString("dirt-examined-level-high")
+        };
 
         args.PushMarkup(
             Loc.GetString("dirt-examined-message", ("color", colorHex), ("percentage", (int)dirtPercentage), ("level", dirtLevel))
diff --git a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs
index 593f950e2b..db5f332d82 100644
--- a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs
+++ b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs
@@ -9,7 +9,7 @@ public abstract class SharedDiseaseSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ISerializationManager _serializationManager = default!;
 
-    public Queue<EntityUid> _addQueue = new();
+    public Queue<EntityUid> AddQueue = new();
 
     /// <summary>
     /// Adds a disease to a target
@@ -20,7 +20,7 @@ public abstract class SharedDiseaseSystem : EntitySystem
     /// </summary>
     public void TryAddDisease(EntityUid host, DiseasePrototype addedDisease, DiseaseCarrierComponent? target = null)
     {
-        if (!Resolve(host, ref target, false))
+        if (!Resolve(host, ref target))
             return;
 
         foreach (var disease in target.AllDiseases)
@@ -30,11 +30,11 @@ public abstract class SharedDiseaseSystem : EntitySystem
         }
 
         var freshDisease = _serializationManager.CreateCopy(addedDisease);
-
-        if (freshDisease == null) return;
+        if (freshDisease == null)
+            return;
 
         target.Diseases.Add(freshDisease);
-        _addQueue.Enqueue(target.Owner);
+        AddQueue.Enqueue(host);
     }
 
     public void TryAddDisease(EntityUid host, string? addedDisease, DiseaseCarrierComponent? target = null)
diff --git a/Content.Shared/_Wega/ERP/ERPComponents.cs b/Content.Shared/_Wega/ERP/ERPComponents.cs
index 48d22ad6ba..eb98403bd9 100644
--- a/Content.Shared/_Wega/ERP/ERPComponents.cs
+++ b/Content.Shared/_Wega/ERP/ERPComponents.cs
@@ -4,7 +4,6 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.ERP.Components
 {
     [RegisterComponent]
-    [ComponentProtoName("SexToy")]
     public sealed partial class SexToyComponent : Component
     {
         [DataField]
@@ -12,13 +11,11 @@ namespace Content.Shared.ERP.Components
     }
 
     [RegisterComponent]
-    [ComponentProtoName("Vibrator")]
     public sealed partial class VibratorComponent : Component
     {
     }
 
     [RegisterComponent]
-    [ComponentProtoName("Strapon")]
     public sealed partial class StraponComponent : Component
     {
     }
diff --git a/Content.Shared/_Wega/Flash/Components/ImpulseFlashComponent.cs b/Content.Shared/_Wega/Flash/Components/ImpulseFlashComponent.cs
index 5c3ff8639a..2d9fd9a357 100644
--- a/Content.Shared/_Wega/Flash/Components/ImpulseFlashComponent.cs
+++ b/Content.Shared/_Wega/Flash/Components/ImpulseFlashComponent.cs
@@ -11,10 +11,10 @@ public sealed partial class ImpulseFlashComponent : Component
 {
     [DataField]
     public float Range = 1.0f;
-	
-	[DataField]
+
+    [DataField]
     public float FlashCharge = 100f;
-	
+
     [DataField]
     public EntProtoId FlashAction = "ActionToggleFlashHelm";
 
@@ -26,7 +26,7 @@ public sealed partial class ImpulseFlashComponent : Component
 
     [DataField]
     public float Probability = 1.0f;
-	
-	[DataField]
+
+    [DataField]
     public float SlowTo = 0.5f;
 }
diff --git a/Content.Shared/_Wega/Genetics/Components/Basic/HulkGenComponent.cs b/Content.Shared/_Wega/Genetics/Components/Basic/HulkGenComponent.cs
index 9d8643681c..444d50df4a 100644
--- a/Content.Shared/_Wega/Genetics/Components/Basic/HulkGenComponent.cs
+++ b/Content.Shared/_Wega/Genetics/Components/Basic/HulkGenComponent.cs
@@ -6,8 +6,7 @@ namespace Content.Shared.Genetics;
 [RegisterComponent]
 public sealed partial class HulkComponent : Component
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public readonly string[] ActionPrototypes = new[]
+    public readonly EntProtoId[] ActionPrototypes = new EntProtoId[]
     {
         "ActionHulkCharge"
     };
@@ -18,14 +17,13 @@ public sealed partial class HulkComponent : Component
 [RegisterComponent]
 public sealed partial class HulkGenComponent : Component
 {
-    [ValidatePrototypeId<EntityPrototype>]
-    public readonly string ActionPrototype = "ActionHulkTransformation";
+    public readonly EntProtoId ActionPrototype = "ActionHulkTransformation";
 
     public EntityUid? ActionEntity { get; set; }
 
-    [DataField, ValidatePrototypeId<PolymorphPrototype>]
-    public string PolymorphProto = "HulkPolymorph";
+    [DataField]
+    public ProtoId<PolymorphPrototype> PolymorphProto = "HulkPolymorph";
 
-    [DataField, ValidatePrototypeId<PolymorphPrototype>]
-    public string PolymorphAltProto = "HulkPolymorphAlt";
+    [DataField]
+    public ProtoId<PolymorphPrototype> PolymorphAltProto = "HulkPolymorphAlt";
 }
diff --git a/Content.Shared/_Wega/Genetics/Components/DnaModifierComponent.cs b/Content.Shared/_Wega/Genetics/Components/DnaModifierComponent.cs
index 3697dba777..03b4b80e10 100644
--- a/Content.Shared/_Wega/Genetics/Components/DnaModifierComponent.cs
+++ b/Content.Shared/_Wega/Genetics/Components/DnaModifierComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Genetics;
 public sealed partial class DnaModifierComponent : Component
 {
     [ViewVariables(VVAccess.ReadOnly), DataField("uniqueIdentifiers"), AutoNetworkedField]
-    public UniqueIdentifiersPrototype? UniqueIdentifiers { get; set; } = default!;
+    public UniqueIdentifiersData? UniqueIdentifiers { get; set; } = default!;
 
     [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
     public List<EnzymesPrototypeInfo>? EnzymesPrototypes { get; set; } = default!;
@@ -16,9 +16,9 @@ public sealed partial class DnaModifierComponent : Component
     [ViewVariables(VVAccess.ReadOnly), DataField("instability")]
     public int Instability { get; set; } = 0;
 
-    [ValidatePrototypeId<EntityPrototype>, ViewVariables(VVAccess.ReadOnly), DataField]
-    public string Upper = string.Empty;
+    [ViewVariables(VVAccess.ReadOnly), DataField]
+    public EntProtoId? Upper = default!;
 
-    [ValidatePrototypeId<EntityPrototype>, ViewVariables(VVAccess.ReadOnly), DataField]
-    public string Lowest = string.Empty;
+    [ViewVariables(VVAccess.ReadOnly), DataField]
+    public EntProtoId? Lowest = default!;
 }
diff --git a/Content.Shared/_Wega/Genetics/Components/DnaModifierInjectorComponents.cs b/Content.Shared/_Wega/Genetics/Components/DnaModifierInjectorComponents.cs
index 422c265755..072bf27d0c 100644
--- a/Content.Shared/_Wega/Genetics/Components/DnaModifierInjectorComponents.cs
+++ b/Content.Shared/_Wega/Genetics/Components/DnaModifierInjectorComponents.cs
@@ -9,7 +9,7 @@ public sealed partial class DnaModifierInjectorComponent : Component
 {
 
     [ViewVariables(VVAccess.ReadOnly), DataField("uniqueIdentifiers")]
-    public UniqueIdentifiersPrototype? UniqueIdentifiers { get; set; } = default!;
+    public UniqueIdentifiersData? UniqueIdentifiers { get; set; } = default!;
 
     [ViewVariables(VVAccess.ReadOnly)]
     public List<EnzymesPrototypeInfo>? EnzymesPrototypes { get; set; } = default!;
diff --git a/Content.Shared/_Wega/Genetics/Enzymes.cs b/Content.Shared/_Wega/Genetics/Enzymes.cs
index f7d877f5bd..151cc0fd59 100644
--- a/Content.Shared/_Wega/Genetics/Enzymes.cs
+++ b/Content.Shared/_Wega/Genetics/Enzymes.cs
@@ -7,17 +7,16 @@ namespace Content.Shared.Genetics;
 public sealed class EnzymeInfo
 {
     public string SampleName { get; set; } = string.Empty;
-    public UniqueIdentifiersPrototype? Identifier { get; set; }
+    public UniqueIdentifiersData? Identifier { get; set; }
     public List<EnzymesPrototypeInfo>? Info { get; set; }
 
     public object Clone()
     {
         return new EnzymeInfo
         {
-            SampleName = this.SampleName,
-            Identifier = this.Identifier != null
-                ? (UniqueIdentifiersPrototype)this.Identifier.Clone() : null,
-            Info = this.Info?.Select(e => (EnzymesPrototypeInfo)e.Clone()).ToList()
+            SampleName = SampleName,
+            Identifier = Identifier != null ? Identifier.Clone(Identifier) : null,
+            Info = Info?.Select(e => (EnzymesPrototypeInfo)e.Clone()).ToList()
         };
     }
 }
@@ -33,9 +32,9 @@ public sealed class EnzymesPrototypeInfo
     {
         return new EnzymesPrototypeInfo
         {
-            EnzymesPrototypeId = this.EnzymesPrototypeId,
-            HexCode = (string[])this.HexCode.Clone(),
-            Order = this.Order
+            EnzymesPrototypeId = EnzymesPrototypeId,
+            HexCode = (string[])HexCode.Clone(),
+            Order = Order
         };
     }
 }
diff --git a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs
index 1c8e51c6e2..3285cef8bb 100644
--- a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs
+++ b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs
@@ -4,6 +4,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared.Genetics.Systems;
 
+// TODO: ref this
 public sealed class DizzySystem : EntitySystem
 {
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
diff --git a/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs b/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs
index 661e11c9c1..515ef23948 100644
--- a/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs
+++ b/Content.Shared/_Wega/Genetics/Ui/DnaModifier.cs
@@ -15,7 +15,7 @@ public sealed class SharedDnaModifier
 public sealed class DnaModifierBoundUserInterfaceState : BoundUserInterfaceState
 {
     public readonly NetEntity Console;
-    public readonly UniqueIdentifiersPrototype? Unique;
+    public readonly UniqueIdentifiersData? Unique;
     public readonly List<EnzymesPrototypeInfo>? Enzymes;
     public readonly EnzymeInfo? Enzyme;
     public readonly string? ScannerBodyInfo;
@@ -32,7 +32,7 @@ public sealed class DnaModifierBoundUserInterfaceState : BoundUserInterfaceState
     public readonly TimeSpan SubjectInjectCooldownRemaining;
     public DnaModifierBoundUserInterfaceState(
         NetEntity console,
-        UniqueIdentifiersPrototype?
+        UniqueIdentifiersData?
         unique, List<EnzymesPrototypeInfo>?
         enzymes, EnzymeInfo? enzyme,
         string? scannerBodyInfo,
diff --git a/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs b/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs
new file mode 100644
index 0000000000..71e3fc22d0
--- /dev/null
+++ b/Content.Shared/_Wega/Genetics/UniqueIdentifiersData.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Genetics.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Genetics;
+
+[Serializable, NetSerializable]
+[Access(typeof(SharedDnaModifierSystem), typeof(EnzymeInfo))]
+public sealed class UniqueIdentifiersData
+{
+    public string ID { get; set; } = string.Empty;
+    public string[] HairColorR { get; set; } = Array.Empty<string>();
+    public string[] HairColorG { get; set; } = Array.Empty<string>();
+    public string[] HairColorB { get; set; } = Array.Empty<string>();
+    public string[] SecondaryHairColorR { get; set; } = Array.Empty<string>();
+    public string[] SecondaryHairColorG { get; set; } = Array.Empty<string>();
+    public string[] SecondaryHairColorB { get; set; } = Array.Empty<string>();
+    public string[] BeardColorR { get; set; } = Array.Empty<string>();
+    public string[] BeardColorG { get; set; } = Array.Empty<string>();
+    public string[] BeardColorB { get; set; } = Array.Empty<string>();
+    public string[] SkinTone { get; set; } = new[] { "0", "0", "0" };
+    public string[] FurColorR { get; set; } = new[] { "0", "0", "0" };
+    public string[] FurColorG { get; set; } = new[] { "0", "0", "0" };
+    public string[] FurColorB { get; set; } = new[] { "0", "0", "0" };
+    public string[] HeadAccessoryColorR { get; set; } = Array.Empty<string>();
+    public string[] HeadAccessoryColorG { get; set; } = Array.Empty<string>();
+    public string[] HeadAccessoryColorB { get; set; } = Array.Empty<string>();
+    public string[] HeadMarkingColorR { get; set; } = Array.Empty<string>();
+    public string[] HeadMarkingColorG { get; set; } = Array.Empty<string>();
+    public string[] HeadMarkingColorB { get; set; } = Array.Empty<string>();
+    public string[] BodyMarkingColorR { get; set; } = Array.Empty<string>();
+    public string[] BodyMarkingColorG { get; set; } = Array.Empty<string>();
+    public string[] BodyMarkingColorB { get; set; } = Array.Empty<string>();
+    public string[] TailMarkingColorR { get; set; } = Array.Empty<string>();
+    public string[] TailMarkingColorG { get; set; } = Array.Empty<string>();
+    public string[] TailMarkingColorB { get; set; } = Array.Empty<string>();
+    public string[] EyeColorR { get; set; } = Array.Empty<string>();
+    public string[] EyeColorG { get; set; } = Array.Empty<string>();
+    public string[] EyeColorB { get; set; } = Array.Empty<string>();
+    public string[] Gender { get; set; } = Array.Empty<string>();
+    public string[] HairStyle { get; set; } = Array.Empty<string>();
+    public string[] BeardStyle { get; set; } = Array.Empty<string>();
+    public string[] HeadAccessoryStyle { get; set; } = Array.Empty<string>();
+    public string[] HeadMarkingStyle { get; set; } = Array.Empty<string>();
+    public string[] BodyMarkingStyle { get; set; } = Array.Empty<string>();
+    public string[] TailMarkingStyle { get; set; } = Array.Empty<string>();
+
+    public UniqueIdentifiersData Clone(UniqueIdentifiersData data)
+    {
+        var newData = new UniqueIdentifiersData()
+        {
+            ID = data.ID,
+            HairColorR = (string[])data.HairColorR.Clone(),
+            HairColorG = (string[])data.HairColorG.Clone(),
+            HairColorB = (string[])data.HairColorB.Clone(),
+            SecondaryHairColorR = (string[])data.SecondaryHairColorR.Clone(),
+            SecondaryHairColorG = (string[])data.SecondaryHairColorG.Clone(),
+            SecondaryHairColorB = (string[])data.SecondaryHairColorB.Clone(),
+            BeardColorR = (string[])data.BeardColorR.Clone(),
+            BeardColorG = (string[])data.BeardColorG.Clone(),
+            BeardColorB = (string[])data.BeardColorB.Clone(),
+            SkinTone = (string[])data.SkinTone.Clone(),
+            FurColorR = (string[])data.FurColorR.Clone(),
+            FurColorG = (string[])data.FurColorG.Clone(),
+            FurColorB = (string[])data.FurColorB.Clone(),
+            HeadAccessoryColorR = (string[])data.HeadAccessoryColorR.Clone(),
+            HeadAccessoryColorG = (string[])data.HeadAccessoryColorG.Clone(),
+            HeadAccessoryColorB = (string[])data.HeadAccessoryColorB.Clone(),
+            HeadMarkingColorR = (string[])data.HeadMarkingColorR.Clone(),
+            HeadMarkingColorG = (string[])data.HeadMarkingColorG.Clone(),
+            HeadMarkingColorB = (string[])data.HeadMarkingColorB.Clone(),
+            BodyMarkingColorR = (string[])data.BodyMarkingColorR.Clone(),
+            BodyMarkingColorG = (string[])data.BodyMarkingColorG.Clone(),
+            BodyMarkingColorB = (string[])data.BodyMarkingColorB.Clone(),
+            TailMarkingColorR = (string[])data.TailMarkingColorR.Clone(),
+            TailMarkingColorG = (string[])data.TailMarkingColorG.Clone(),
+            TailMarkingColorB = (string[])data.TailMarkingColorB.Clone(),
+            EyeColorR = (string[])data.EyeColorR.Clone(),
+            EyeColorG = (string[])data.EyeColorG.Clone(),
+            EyeColorB = (string[])data.EyeColorB.Clone(),
+            Gender = (string[])data.Gender.Clone(),
+            BeardStyle = (string[])data.BeardStyle.Clone(),
+            HairStyle = (string[])data.HairStyle.Clone(),
+            HeadAccessoryStyle = (string[])data.HeadAccessoryStyle.Clone(),
+            HeadMarkingStyle = (string[])data.HeadMarkingStyle.Clone(),
+            BodyMarkingStyle = (string[])data.BodyMarkingStyle.Clone(),
+            TailMarkingStyle = (string[])data.TailMarkingStyle.Clone()
+        };
+
+        return newData;
+    }
+}
diff --git a/Content.Shared/_Wega/Genetics/UniqueIdentifiersPrototype.cs b/Content.Shared/_Wega/Genetics/UniqueIdentifiersPrototype.cs
deleted file mode 100644
index 0065549f9f..0000000000
--- a/Content.Shared/_Wega/Genetics/UniqueIdentifiersPrototype.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using Content.Shared.Genetics.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Genetics;
-
-[Prototype, Access(typeof(SharedDnaModifierSystem), typeof(EnzymeInfo))]
-[Serializable, NetSerializable]
-public sealed class UniqueIdentifiersPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; set; } = string.Empty;
-
-    // Блок 1: RGB значения цвета волос (R)
-    [DataField("hairColorR")]
-    public string[] HairColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 2: RGB значения цвета волос (G)
-    [DataField("hairColorG")]
-    public string[] HairColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 3: RGB значения цвета волос (B)
-    [DataField("hairColorB")]
-    public string[] HairColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 4: RGB значения вторичного цвета волос (R)
-    [DataField("secondaryHairColorR")]
-    public string[] SecondaryHairColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 5: RGB значения вторичного цвета волос (G)
-    [DataField("secondaryHairColorG")]
-    public string[] SecondaryHairColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 6: RGB значения вторичного цвета волос (B)
-    [DataField("secondaryHairColorB")]
-    public string[] SecondaryHairColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 7: RGB значения цвета бороды (R)
-    [DataField("beardColorR")]
-    public string[] BeardColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 8: RGB значения цвета бороды (G)
-    [DataField("beardColorG")]
-    public string[] BeardColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 9: RGB значения цвета бороды (B)
-    [DataField("beardColorB")]
-    public string[] BeardColorB { get; set; } = new[] { "0", "0", "0" };
-
-    /* Этого блока пока быть не должно
-    // Блок 10: RGB значения цвета вторичной бороды (R)
-    [DataField("secondaryBeardColorR")]
-    public string[] SecondaryBeardColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 11: RGB значения цвета вторичной бороды (G)
-    [DataField("secondaryBeardColorG")]
-    public string[] SecondaryBeardColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 12: RGB значения цвета вторичной бороды (B)
-    [DataField("secondaryBeardColorB")]
-    public string[] SecondaryBeardColorB { get; set; } = new[] { "0", "0", "0" };
-    */
-
-    // Блок 13: Тон кожи (1-220)
-    [DataField("skinTone")]
-    public string[] SkinTone { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 14: RGB значения цвета меха (R)
-    [DataField("furColorR")]
-    public string[] FurColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 15: RGB значения цвета меха (G)
-    [DataField("furColorG")]
-    public string[] FurColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 16: RGB значения цвета меха (B)
-    [DataField("furColorB")]
-    public string[] FurColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 17: RGB значения головного аксессуара (R)
-    [DataField("headAccessoryColorR")]
-    public string[] HeadAccessoryColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 18: RGB значения головного аксессуара (G)
-    [DataField("headAccessoryColorG")]
-    public string[] HeadAccessoryColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 19: RGB значения головного аксессуара (B)
-    [DataField("headAccessoryColorB")]
-    public string[] HeadAccessoryColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 20: RGB значения разметки головы (R)
-    [DataField("headMarkingColorR")]
-    public string[] HeadMarkingColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 21: RGB значения разметки головы (G)
-    [DataField("headMarkingColorG")]
-    public string[] HeadMarkingColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 22: RGB значения разметки головы (B)
-    [DataField("headMarkingColorB")]
-    public string[] HeadMarkingColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 23: RGB значения маркировки тела (R)
-    [DataField("bodyMarkingColorR")]
-    public string[] BodyMarkingColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 24: RGB значения маркировки тела (G)
-    [DataField("bodyMarkingColorG")]
-    public string[] BodyMarkingColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 25: RGB значения маркировки тела (B)
-    [DataField("bodyMarkingColorB")]
-    public string[] BodyMarkingColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 26: RGB значения маркировки хвоста (R)
-    [DataField("tailMarkingColorR")]
-    public string[] TailMarkingColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 27: RGB значения маркировки хвоста (G)
-    [DataField("tailMarkingColorG")]
-    public string[] TailMarkingColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 28: RGB значения маркировки хвоста (B)
-    [DataField("tailMarkingColorB")]
-    public string[] TailMarkingColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 29: RGB значения цвета глаз (R)
-    [DataField("eyeColorR")]
-    public string[] EyeColorR { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 30: RGB значения цвета глаз (G)
-    [DataField("eyeColorG")]
-    public string[] EyeColorG { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 31: RGB значения цвета глаз (B)
-    [DataField("eyeColorB")]
-    public string[] EyeColorB { get; set; } = new[] { "0", "0", "0" };
-
-    // Блок 32: Пол
-    [DataField("gender")]
-    public string[] Gender { get; set; } = new[] { "5", "7", "3" }; // По умолчанию женщина
-
-    // Блок 33: Стиль бороды
-    [DataField("beardStyle")]
-    public string[] BeardStyle { get; set; } = default!;
-
-    // Блок 34: Стиль волос
-    [DataField("hairStyle")]
-    public string[] HairStyle { get; set; } = default!;
-
-    // Блок 35: Стиль аксессуаров для головы
-    [DataField("headAccessoryStyle")]
-    public string[] HeadAccessoryStyle { get; set; } = default!;
-
-    // Блок 36: Стиль маркировки головы
-    [DataField("headMarkingStyle")]
-    public string[] HeadMarkingStyle { get; set; } = default!;
-
-    // Блок 37: Стиль маркировки тела
-    [DataField("bodyMarkingStyle")]
-    public string[] BodyMarkingStyle { get; set; } = default!;
-
-    // Блок 38: Стиль маркировки хвоста
-    [DataField("tailMarkingStyle")]
-    public string[] TailMarkingStyle { get; set; } = default!;
-
-    public object Clone()
-    {
-        var clone = new UniqueIdentifiersPrototype
-        {
-            ID = this.ID,
-            HairColorR = (string[])this.HairColorR.Clone(),
-            HairColorG = (string[])this.HairColorG.Clone(),
-            HairColorB = (string[])this.HairColorB.Clone(),
-            SecondaryHairColorR = (string[])this.SecondaryHairColorR.Clone(),
-            SecondaryHairColorG = (string[])this.SecondaryHairColorG.Clone(),
-            SecondaryHairColorB = (string[])this.SecondaryHairColorB.Clone(),
-            BeardColorR = (string[])this.BeardColorR.Clone(),
-            BeardColorG = (string[])this.BeardColorG.Clone(),
-            BeardColorB = (string[])this.BeardColorB.Clone(),
-            SkinTone = (string[])this.SkinTone.Clone(),
-            FurColorR = (string[])this.FurColorR.Clone(),
-            FurColorG = (string[])this.FurColorG.Clone(),
-            FurColorB = (string[])this.FurColorB.Clone(),
-            HeadAccessoryColorR = (string[])this.HeadAccessoryColorR.Clone(),
-            HeadAccessoryColorG = (string[])this.HeadAccessoryColorG.Clone(),
-            HeadAccessoryColorB = (string[])this.HeadAccessoryColorB.Clone(),
-            HeadMarkingColorR = (string[])this.HeadMarkingColorR.Clone(),
-            HeadMarkingColorG = (string[])this.HeadMarkingColorG.Clone(),
-            HeadMarkingColorB = (string[])this.HeadMarkingColorB.Clone(),
-            BodyMarkingColorR = (string[])this.BodyMarkingColorR.Clone(),
-            BodyMarkingColorG = (string[])this.BodyMarkingColorG.Clone(),
-            BodyMarkingColorB = (string[])this.BodyMarkingColorB.Clone(),
-            TailMarkingColorR = (string[])this.TailMarkingColorR.Clone(),
-            TailMarkingColorG = (string[])this.TailMarkingColorG.Clone(),
-            TailMarkingColorB = (string[])this.TailMarkingColorB.Clone(),
-            EyeColorR = (string[])this.EyeColorR.Clone(),
-            EyeColorG = (string[])this.EyeColorG.Clone(),
-            EyeColorB = (string[])this.EyeColorB.Clone(),
-            Gender = (string[])this.Gender.Clone(),
-            BeardStyle = (string[])this.BeardStyle.Clone(),
-            HairStyle = (string[])this.HairStyle.Clone(),
-            HeadAccessoryStyle = (string[])this.HeadAccessoryStyle.Clone(),
-            HeadMarkingStyle = (string[])this.HeadMarkingStyle.Clone(),
-            BodyMarkingStyle = (string[])this.BodyMarkingStyle.Clone(),
-            TailMarkingStyle = (string[])this.TailMarkingStyle.Clone()
-        };
-
-        return clone;
-    }
-}
diff --git a/Content.Shared/_Wega/Implants/Components/HandItemImplantComponent.cs b/Content.Shared/_Wega/Implants/Components/HandItemImplantComponent.cs
index 636b26926f..be9a5b0e1f 100644
--- a/Content.Shared/_Wega/Implants/Components/HandItemImplantComponent.cs
+++ b/Content.Shared/_Wega/Implants/Components/HandItemImplantComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared._Wega.Implants.Components;
 
diff --git a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs
index 5eb1197a0f..c00a89e635 100644
--- a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs
+++ b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs
@@ -1,7 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
@@ -19,14 +16,11 @@ public sealed class SharedInternalStorageSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _action = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string ToothImplantAction = "ActionToothImplant";
+    private static readonly EntProtoId ToothImplantAction = "ActionToothImplant";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs b/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs
index 444f597e45..bb71af5674 100644
--- a/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs
+++ b/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs
@@ -22,15 +22,12 @@ public sealed partial class RCDUpgradeKitSystem : EntitySystem
         if (!args.CanReach)
             return;
 
-        if (!TryComp<RCDComponent>(args.Target, out var RCD))
-            return;
-
-        if (RCD.Reinforced)
+        if (!TryComp<RCDComponent>(args.Target, out var rcd) || rcd.Reinforced)
             return;
 
         _audio.PlayPredicted(ent.Comp.UpgradeSound, args.Target.Value, args.User);
 
-        RCD.Reinforced = true;
+        rcd.Reinforced = true;
         QueueDel(ent);
 
         args.Handled = true;
diff --git a/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpComponent.cs b/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpComponent.cs
index 17aafde1d6..4e8da06364 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpComponent.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Utility;
 
-namespace Content.Shared._Wega.Resomi.Abilities.Hearing;
+namespace Content.Shared.Resomi.Abilities.Hearing;
 
 [RegisterComponent]
 public sealed partial class ListenUpComponent : Component
diff --git a/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpSkillComponent.cs b/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpSkillComponent.cs
index b02334a4fb..4ebbbc3e28 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpSkillComponent.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/Hearing/ListenUpSkillComponent.cs
@@ -1,8 +1,7 @@
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared._Wega.Resomi.Abilities.Hearing;
+namespace Content.Shared.Resomi.Abilities.Hearing;
 
 [RegisterComponent]
 public sealed partial class ListenUpSkillComponent : Component
@@ -15,8 +14,8 @@ public sealed partial class ListenUpSkillComponent : Component
     public EntityUid? SwitchListenUpActionEntity;
 
     [DataField]
-    public bool toggled = false;
+    public bool Toggled = false;
 
     [DataField]
-    public float prepareTime = 3f;
+    public float PrepareTime = 3f;
 }
diff --git a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs
index ad64615049..1a3a66360c 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs
@@ -3,23 +3,24 @@ using Content.Shared.DoAfter;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
 
-namespace Content.Shared._Wega.Resomi.Abilities.Hearing;
+namespace Content.Shared.Resomi.Abilities.Hearing;
 
 public abstract class SharedListenUpSkillSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedActionsSystem _actionsSystem = default!;
-    [Dependency] protected readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] protected readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
     public override void Initialize()
     {
         SubscribeLocalEvent<ListenUpSkillComponent, ListenUpActionEvent>(OnActivateListenUp);
         SubscribeLocalEvent<ListenUpSkillComponent, ListenUpDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<ListenUpSkillComponent, MoveInputEvent>(OnMoveInput);
     }
+
     private void OnActivateListenUp(Entity<ListenUpSkillComponent> ent, ref ListenUpActionEvent args)
     {
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.prepareTime, new ListenUpDoAfterEvent(), ent.Owner, null, null)
+        var doAfterArgs = new DoAfterArgs(EntityManager, ent.Owner, ent.Comp.PrepareTime, new ListenUpDoAfterEvent(), ent.Owner, null, null)
         {
             NeedHand = true,
             BreakOnDamage = true,
@@ -28,25 +29,26 @@ public abstract class SharedListenUpSkillSystem : EntitySystem
         };
         _doAfterSystem.TryStartDoAfter(doAfterArgs);
     }
+
     private void OnDoAfter(Entity<ListenUpSkillComponent> ent, ref ListenUpDoAfterEvent args)
     {
-        if (args.Cancelled || args.Handled || ent.Comp.toggled)
+        if (args.Cancelled || args.Handled || ent.Comp.Toggled)
             return;
 
         AddComp<ListenUpComponent>(ent.Owner);
 
         _actionsSystem.SetToggled(ent.Comp.SwitchListenUpActionEntity, true);
-        ent.Comp.toggled = !ent.Comp.toggled;
+        ent.Comp.Toggled = !ent.Comp.Toggled;
     }
 
     private void OnMoveInput(Entity<ListenUpSkillComponent> ent, ref MoveInputEvent args)
     {
-        if (!ent.Comp.toggled)
+        if (!ent.Comp.Toggled)
             return;
 
         RemComp<ListenUpComponent>(ent.Owner);
 
         _actionsSystem.SetToggled(ent.Comp.SwitchListenUpActionEntity, false);
-        ent.Comp.toggled = !ent.Comp.toggled;
+        ent.Comp.Toggled = !ent.Comp.Toggled;
     }
 }
diff --git a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillComponent.cs b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillComponent.cs
index 2f4c0fa4ad..975d5e255d 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillComponent.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared._Wega.Resomi.Abilities;
+namespace Content.Shared.Resomi.Abilities;
 
 [RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentState]
diff --git a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs
index a6303f17b8..0fe63956be 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs
@@ -1,20 +1,18 @@
 using Robust.Shared.Timing;
 using Content.Shared.Physics;
-using Content.Shared.Popups;
 using Robust.Shared.Physics.Events;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Actions;
 
-namespace Content.Shared._Wega.Resomi.Abilities;
+namespace Content.Shared.Resomi.Abilities;
 
 public abstract class SharedAgillitySkillSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] protected readonly SharedPopupSystem _popup = default!;
-    [Dependency] protected readonly ClimbSystem _climb = default!;
-    [Dependency] protected readonly SharedStaminaSystem _stamina = default!;
-    [Dependency] protected readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly ClimbSystem _climb = default!;
+    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
 
     protected const int BaseCollisionGroup = (int)(CollisionGroup.MobMask);
 
@@ -37,6 +35,6 @@ public abstract class SharedAgillitySkillSystem : EntitySystem
 
     private void OnHandleStateChange(Entity<AgillitySkillComponent> ent, ref SwitchAgillity args)
     {
-        _actions.SetToggled(args.action.Owner, args.toggled);
+        _actions.SetToggled(args.Action.Owner, args.Toggled);
     }
 }
diff --git a/Content.Shared/_Wega/Resomi/Abilities/WeaponsUseInabilityComponent.cs b/Content.Shared/_Wega/Resomi/Abilities/WeaponsUseInabilityComponent.cs
index 7723a5f3c2..2208420b6f 100644
--- a/Content.Shared/_Wega/Resomi/Abilities/WeaponsUseInabilityComponent.cs
+++ b/Content.Shared/_Wega/Resomi/Abilities/WeaponsUseInabilityComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Shared._Wega.Resomi.Abilities;
+namespace Content.Shared.Resomi.Abilities;
 
 
 /// <summary>
diff --git a/Content.Shared/_Wega/Resomi/SharedResomi.cs b/Content.Shared/_Wega/Resomi/SharedResomi.cs
index d84b855971..b68e1843f5 100644
--- a/Content.Shared/_Wega/Resomi/SharedResomi.cs
+++ b/Content.Shared/_Wega/Resomi/SharedResomi.cs
@@ -1,10 +1,9 @@
 using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
-using Content.Shared._Wega.Resomi.Abilities.Hearing;
 using Content.Shared.Actions.Components;
 
-namespace Content.Shared._Wega.Resomi;
+namespace Content.Shared.Resomi;
 
 public sealed partial class SwitchAgillityActionEvent : InstantActionEvent;
 
@@ -16,7 +15,7 @@ public sealed partial class ListenUpDoAfterEvent : SimpleDoAfterEvent;
 /// <summary>
 /// Rises when the action state changes
 /// </summary>
-/// <param name="action"> Entity of Action that we want change the state</param>
-/// <param name="toggled"> </param>
+/// <param name="Action"> Entity of Action that we want change the state</param>
+/// <param name="Toggled"> </param>
 [ByRefEvent]
-public readonly record struct SwitchAgillity(Entity<ActionComponent> action, bool toggled);
+public readonly record struct SwitchAgillity(Entity<ActionComponent> Action, bool Toggled);
diff --git a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs
index d6281a4eab..24ddf0d287 100644
--- a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs
+++ b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using Content.Shared._Wega.Resomi.Abilities.Hearing;
+using Content.Shared.Resomi.Abilities.Hearing;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Physics;
diff --git a/Content.Shared/_Wega/Strangulation/StrangulationComponent.cs b/Content.Shared/_Wega/Strangulation/StrangulationComponent.cs
index 38408aa889..3bb62c6f02 100644
--- a/Content.Shared/_Wega/Strangulation/StrangulationComponent.cs
+++ b/Content.Shared/_Wega/Strangulation/StrangulationComponent.cs
@@ -27,9 +27,6 @@ namespace Content.Shared.Strangulation
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier Damage = new DamageSpecifier { DamageDict = { { "Asphyxiation", 2 } } };
 
-        //[DataField("canStillInteract"), ViewVariables(VVAccess.ReadWrite)]
-        //public bool CanStillInteract = true;
-
         [DataField]
         public ProtoId<AlertPrototype> StrangledAlert = "StrangledAlert";
     }
diff --git a/Content.Shared/_Wega/Surgery/Prototypes/Conditions/InternalStorageCondition.cs b/Content.Shared/_Wega/Surgery/Prototypes/Conditions/InternalStorageCondition.cs
index 03001a8ac0..c410b49c50 100644
--- a/Content.Shared/_Wega/Surgery/Prototypes/Conditions/InternalStorageCondition.cs
+++ b/Content.Shared/_Wega/Surgery/Prototypes/Conditions/InternalStorageCondition.cs
@@ -20,39 +20,22 @@ public sealed partial class InternalStorageCondition : SurgeryStepCondition
         if (!entityManager.TryGetComponent<InternalStorageComponent>(patient, out var storage))
             return false;
 
-        switch (Part)
+        var hasItem = Part switch
         {
-            case "head":
-                if (CheckForSpace)
-                {
-                    return storage.HeadContainer.ContainedEntity == null;
-                }
-                else
-                {
-                    return storage.HeadContainer.ContainedEntity != null;
-                }
+            "head" => storage.HeadContainer.ContainedEntity != null,
+            "torso" => storage.BodyContainer.ContainedEntities.Count > 0,
+            "tooth" => storage.ToothContainer.ContainedEntity != null,
+            _ => false
+        };
 
-            case "torso":
-                if (CheckForSpace)
-                {
-                    return storage.BodyContainer.ContainedEntities.Count < 3;
-                }
-                else
-                {
-                    return storage.BodyContainer.ContainedEntities.Count > 0;
-                }
+        var hasSpace = Part switch
+        {
+            "head" => storage.HeadContainer.ContainedEntity == null,
+            "torso" => storage.BodyContainer.ContainedEntities.Count < 3,
+            "tooth" => storage.ToothContainer.ContainedEntity == null,
+            _ => false
+        };
 
-            case "tooth":
-                if (CheckForSpace)
-                {
-                    return storage.ToothContainer.ContainedEntity == null;
-                }
-                else
-                {
-                    return storage.ToothContainer.ContainedEntity != null;
-                }
-        }
-
-        return false;
+        return CheckForSpace ? hasSpace : hasItem;
     }
 }
diff --git a/Content.Shared/_Wega/Surgery/Prototypes/InternalDamagePrototype.cs b/Content.Shared/_Wega/Surgery/Prototypes/InternalDamagePrototype.cs
index 8060a31c03..c6cec236e6 100644
--- a/Content.Shared/_Wega/Surgery/Prototypes/InternalDamagePrototype.cs
+++ b/Content.Shared/_Wega/Surgery/Prototypes/InternalDamagePrototype.cs
@@ -5,7 +5,6 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Surgery;
 
 [Prototype("internalDamage")]
-[Serializable, NetSerializable]
 public sealed partial class InternalDamagePrototype : IPrototype, ISerializationHooks
 {
     [IdDataField]
diff --git a/Content.Shared/_Wega/Vampire/VampireComponents.cs b/Content.Shared/_Wega/Vampire/VampireComponents.cs
index 216c4951a7..7f32111a64 100644
--- a/Content.Shared/_Wega/Vampire/VampireComponents.cs
+++ b/Content.Shared/_Wega/Vampire/VampireComponents.cs
@@ -14,8 +14,7 @@ namespace Content.Shared.Vampire.Components;
 [AutoGenerateComponentState]
 public sealed partial class VampireComponent : Component
 {
-    [ValidatePrototypeId<MetabolizerTypePrototype>]
-    public static readonly string MetabolizerVampire = "Vampire";
+    public static readonly ProtoId<MetabolizerTypePrototype> MetabolizerVampire = "Vampire";
 
     public static readonly DamageSpecifier HolyDamage = new()
     {
@@ -27,17 +26,10 @@ public sealed partial class VampireComponent : Component
         DamageDict = new Dictionary<string, FixedPoint2>() { { "Heat", 2.5 } }
     };
 
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string DrinkActionPrototype = "ActionDrinkBlood";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string SelectClassActionPrototype = "ActionVampireSelectClass";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string RejuvenateActionPrototype = "ActionVampireRejuvenate";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public static readonly string GlareActionPrototype = "ActionVampireGlare";
+    public static readonly EntProtoId DrinkActionPrototype = "ActionDrinkBlood";
+    public static readonly EntProtoId SelectClassActionPrototype = "ActionVampireSelectClass";
+    public static readonly EntProtoId RejuvenateActionPrototype = "ActionVampireRejuvenate";
+    public static readonly EntProtoId GlareActionPrototype = "ActionVampireGlare";
 
     public readonly SoundSpecifier BloodDrainSound = new SoundPathSpecifier(
         "/Audio/Items/drink.ogg",
diff --git a/Content.Shared/_Wega/Vampire/VampireEvents.cs b/Content.Shared/_Wega/Vampire/VampireEvents.cs
index 40ef8b9764..9b3bc4a7aa 100644
--- a/Content.Shared/_Wega/Vampire/VampireEvents.cs
+++ b/Content.Shared/_Wega/Vampire/VampireEvents.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Actions;
 using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -83,7 +84,7 @@ public sealed partial class VampireSanguinePoolActionEvent : InstantActionEvent
     [DataField]
     public string PolymorphProto = "VampireBlood";
 
-    public string Sound = "/Audio/Effects/Fluids/splat.ogg";
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
 }
 
 public sealed partial class VampirePredatorSensesActionEvent : InstantActionEvent
@@ -91,7 +92,7 @@ public sealed partial class VampirePredatorSensesActionEvent : InstantActionEven
     [DataField]
     public string Proto = "PuddleBlood";
 
-    public string Sound = "/Audio/Effects/Fluids/splat.ogg";
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
 }
 
 public sealed partial class VampireBloodEruptionActionEvent : InstantActionEvent { }
@@ -101,7 +102,7 @@ public sealed partial class VampireBloodBringersRiteActionEvent : InstantActionE
     [DataField]
     public string Proto = "PuddleBlood";
 
-    public string Sound = "/Audio/Effects/Fluids/splat.ogg";
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
 }
 
 // Umbrae Abilities
@@ -147,7 +148,7 @@ public sealed partial class VampireBloodRushActionEvent : InstantActionEvent { }
 
 public sealed partial class VampireSeismicStompActionEvent : InstantActionEvent
 {
-    public string Sound = "/Audio/Effects/Footsteps/largethud.ogg";
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Footsteps/largethud.ogg");
 }
 
 public sealed partial class VampireBloodSwellAdvancedActionEvent : InstantActionEvent { }
@@ -158,7 +159,7 @@ public sealed partial class VampireDemonicGraspActionEvent : EntityTargetActionE
 
 public sealed partial class VampireChargeActionEvent : WorldTargetActionEvent
 {
-    public string Sound = "/Audio/Effects/Footsteps/largethud.ogg";
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Footsteps/largethud.ogg");
 }
 
 // Dantalion Abilities
diff --git a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs
index 43cf6774b4..b13c2d2934 100644
--- a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs
+++ b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Vehicle;
@@ -41,10 +42,8 @@ public abstract partial class SharedVehicleSystem : EntitySystem
     [Dependency] private readonly SharedBuckleSystem _buckle = default!;
     [Dependency] private readonly SharedMoverController _mover = default!;
 
-    [ValidatePrototypeId<TagPrototype>]
-    private const string Dump = "DoorBumpOpener";
-    [ValidatePrototypeId<TagPrototype>]
-    private const string Key = "VehicleKey";
+    private static readonly ProtoId<TagPrototype> Dump = "DoorBumpOpener";
+    private static readonly ProtoId<TagPrototype> Key = "VehicleKey";
 
     private const string KeySlot = "key_slot";
 
diff --git a/Content.Shared/_Wega/Voucher/VoucherSystem.cs b/Content.Shared/_Wega/Voucher/VoucherSystem.cs
index 5a67b653b0..e0416882e2 100644
--- a/Content.Shared/_Wega/Voucher/VoucherSystem.cs
+++ b/Content.Shared/_Wega/Voucher/VoucherSystem.cs
@@ -64,9 +64,8 @@ public sealed partial class VoucherSystem : EntitySystem
     private void OnKitSelected(EntityUid uid, VoucherCardComponent component, VoucherKitSelectedMessage args)
     {
         component.CurrentKit = args.KitId;
-        Dirty(uid, component);
 
-        _popup.PopupClient(Loc.GetString("voucher-kit-selected", ("kitName", _prototype.Index(args.KitId).Name)), uid);
+        _popup.PopupEntity(Loc.GetString("voucher-kit-selected", ("kitName", _prototype.Index(args.KitId).Name)), uid);
     }
 
     private void OpenKitSelectionUI(EntityUid card, VoucherCardComponent component, EntityUid user)
diff --git a/Content.Shared/_Wega/Xenobiology/Components/Mobs/CellModifiedComponent.cs b/Content.Shared/_Wega/Xenobiology/Components/Mobs/CellModifiedComponent.cs
deleted file mode 100644
index 187b81ff44..0000000000
--- a/Content.Shared/_Wega/Xenobiology/Components/Mobs/CellModifiedComponent.cs
+++ /dev/null
@@ -1 +0,0 @@
-///
diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/SlimeExtractorSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/SlimeExtractorSystem.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Resources/Audio/_DeadSpace/Weapons/Guns/Gunshots/deserteagle.ogg b/Resources/Audio/_Wega/Weapons/Guns/Gunshots/deserteagle.ogg
similarity index 100%
rename from Resources/Audio/_DeadSpace/Weapons/Guns/Gunshots/deserteagle.ogg
rename to Resources/Audio/_Wega/Weapons/Guns/Gunshots/deserteagle.ogg
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Neck/cloaks.ftl
deleted file mode 100644
index 5ae36b4b69..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Neck/cloaks.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ent-ADTClothingNeckDarkGreyCloak = темно-серый плащ
-    .desc = Даже грейтайд заслуживает иметь свой плащ.
-ent-ADTClothingNeckGothicCloak = готический плащ
-    .desc = Для классических вампиров, ценящих старый стиль.
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpskirts.ftl
deleted file mode 100644
index 11a52482e2..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpskirts.ftl
+++ /dev/null
@@ -1,47 +0,0 @@
-ent-ADTClothingUniformJumpskirtTurtleneckBlack = чёрная водолазка с юбкой
-    .desc = Любимая одежда книжного червя.
-    
-ent-ADTClothingUniformJumpskirtTurtleneckBlue = синяя водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckBlue.desc }
-    
-ent-ADTClothingUniformJumpskirtTurtleneckAzure = голубая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckAzure.desc }
-    
-ent-ADTClothingUniformJumpskirtTurtleneckGreen = зелёная водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckGreen.desc }
-    
-ent-ADTClothingUniformJumpskirtTurtleneckOrange = оранжевая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckOrange.desc }
-    
-ent-ADTClothingUniformJumpskirtTurtleneckPurple = фиолетовая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckPurple.desc }
-    
-ent-ADTClothingUniformJumpskirtTurtleneckRed = красная водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckRed.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckYellow = жёлтая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckYellow.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckWhite = белая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckWhite.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckBrown = коричневая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckBrown.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckGrey = серая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckGrey.desc } 
-
-ent-ADTClothingUniformJumpskirtTurtleneckAquamarine = аквамариновая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckAquamarine.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckPink = розовая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckPink.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckBlackSleeveless = чёрная безрукавка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckBlackSleeveless.desc }
-
-ent-ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless = белая безрукавка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless.desc } 
-
-ent-ADTClothingUniformJumpskirtTurtleneckSalat = салатовая водолазка с юбкой
-    .desc = { ent-ADTClothingUniformJumpsuitTurtleneckSalat.desc }
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpsuits.ftl
deleted file mode 100644
index 83b6b8770d..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/Uniforms/jumpsuits.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-ent-ADTClothingUniformJumpsuitTurtleneckBlack = чёрная водолазка
-    .desc = Любимая одежда книжного червя.
-
-ent-ADTClothingUniformJumpsuitTurtleneckBlue = синяя водолазка
-    .desc = Тёмный оттенок голубого.
-
-ent-ADTClothingUniformJumpsuitTurtleneckAzure = голубая водолазка
-    .desc = Яркий оттенок синего.
-
-ent-ADTClothingUniformJumpsuitTurtleneckGreen = зелёная водолазка
-    .desc = Дешёвый аналог водолазки Центрального Командования.
-
-ent-ADTClothingUniformJumpsuitTurtleneckOrange = оранжевая водолазка
-    .desc = Я не буду это комментировать.
-
-ent-ADTClothingUniformJumpsuitTurtleneckPurple = фиолетовая водолазка
-    .desc = Почувстсвуй себя учёным РНД.
-
-ent-ADTClothingUniformJumpsuitTurtleneckRed = красная водолазка
-    .desc = Хорошо маскирует следы крови.
-
-ent-ADTClothingUniformJumpsuitTurtleneckYellow = жёлтая водолазка
-    .desc = Наполнена счастьем.
-
-ent-ADTClothingUniformJumpsuitTurtleneckWhite = белая водолазка
-    .desc = Тепло и уютно.
-
-ent-ADTClothingUniformJumpsuitTurtleneckBrown = коричневая водолазка
-    .desc = Знаешь ли ты, почему я ношу красное? Оно хорошо скрывает следы крови! И я вижу, что ты одета в коричневое...
-
-ent-ADTClothingUniformJumpsuitTurtleneckGrey = серая водолазка
-    .desc = Слоновий стиль?
-
-ent-ADTClothingUniformJumpsuitTurtleneckAquamarine = аквамариновая водолазка
-    .desc = Слишком ярко!
-
-ent-ADTClothingUniformJumpsuitTurtleneckPink = розовая водолазка
-    .desc = И кто это будет носить?
-
-ent-ADTClothingUniformJumpsuitTurtleneckBlackSleeveless = чёрная безрукавка
-    .desc = Практичная и удобная водолазка чёрного цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
-
-ent-ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless = белая безрукавка
-    .desc = Практичная и удобная водолазка белого цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
-
-ent-ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless = чёрно-белая безрукавка
-    .desc = Практичная и удобная водолазка чёрно-белого цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
-
-ent-ADTClothingUniformJumpsuitTurtleneckTactick = тактическая водолазка
-    .desc = Практичная и удобная водолазка чёрного цвета для комфортного выполнения боевых задач. На бирке можно заметить "Modeling Agency Dar-Vaxed".
-
-ent-ADTClothingUniformJumpsuitTurtleneckSalat = салатовая водолазка
-    .desc = Практичная и удобная водолазка салатового цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
-
-ent-ADTClothingUniformJumpsuitTurtleneckSalatblack = салатово-чёрная водолазка
-    .desc = Практичная и удобная водолазка салатово-чёрного цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/shoes/magboots.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/shoes/magboots.ftl
deleted file mode 100644
index 53e415b3ce..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Clothing/shoes/magboots.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-ADTClothingShoesBootsMagAdvSynd = улучшенные кроваво-чёрные магнитные ботинки
-    .desc = Новейшая ревизия легендарных кроваво-красных магнитных ботинок. Неотъемлимый предмет гардероба любого уважающего себя мародёра горлекса.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/Human.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/Human.ftl
deleted file mode 100644
index 7e9feee3d1..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/Human.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-marking-Malstrem = Мальстрём
-marking-Malstrem-malstrem = Мальстрём
-marking-Beholder = Наблюдатель
-marking-Beholder-beholder = Наблюдатель
-marking-Terminator = Терминатор
-marking-Terminator-terminator = Терминатор
-marking-Iron_jaw = Стальная челюсть
-marking-Iron_jaw-iron_jaw = Стальная челюсть    
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/demon.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/demon.ftl
deleted file mode 100644
index 48636ed13b..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Mobs/Customization/Markings/demon.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-marking-ADTAllsuccubus = Суккуб
-marking-ADTAllsuccubus-succubus = Суккуб    
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Device/holoprojectors.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Device/holoprojectors.ftl
deleted file mode 100644
index f686ade202..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Device/holoprojectors.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ADTSyndiHoloprojectorField = кроваво-красный сдерживающий голопроектор
-    .desc = Улучшенная версия голопроектора подходящая для проведения наступления.
-    .suffix = { "Синдикат" }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl
deleted file mode 100644
index 6a283b5350..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ent-ADTExtMagazineRifle = расширенный магазин (.20 винтовочные)
-    .desc = { ent-BaseMagazineRifle.desc }
-ent-ADTMagazineHristovAdvanced = магазин (.60 антиматериальные)
-    .desc = { ent-BaseMagazineRifle.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Structures/Holographic/projections.ftl b/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Structures/Holographic/projections.ftl
deleted file mode 100644
index 91a39bacc2..0000000000
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Structures/Holographic/projections.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-ADTSyndiHolosignForcefield = голобарьер
-    .desc = Сдерживающее поле.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl b/Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl
deleted file mode 100644
index 6b4dd29f51..0000000000
--- a/Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-ent-MagazineEagle = пистолетный магазин пустынного орла (.45 магнум)
-    .desc = { ent-BaseMagazineRifle.desc }
-
-ent-MagazineEagleAP = пистолетный магазин пустынного орла (.45 магнум бронебойные)
-    .desc = { ent-BaseMagazineRifle.desc }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_wega/markings/demon.ftl b/Resources/Locale/ru-RU/_wega/markings/demon.ftl
index fe87079b4d..2f092b2185 100644
--- a/Resources/Locale/ru-RU/_wega/markings/demon.ftl
+++ b/Resources/Locale/ru-RU/_wega/markings/demon.ftl
@@ -5,6 +5,7 @@ marking-DemonEars = Аркана, уши (Демонические)
 marking-DemonEars-demon_ears = Уши
 marking-DemonElfEars = Аркана, уши (Эльфийские)
 marking-DemonElfEars-ears_elf = Уши
+# Хвост
 marking-DemomTail = Аркана, хвост
 marking-DemomTail-tail = Хвост
 marking-DemomTail1 = Аркана, хвост (Демонический)
@@ -16,6 +17,7 @@ marking-DemomTailLong-long = Кончик хвоста
 marking-DemomTailUp = Аркана, хвост (Вверх)
 marking-DemomTailUp-tail = Хвост
 marking-DemomTailUp-up = Кончик хвоста
+# Пятна
 marking-DemonChestCowSpots = Аркана, туловище (Коровьи пятна)
 marking-DemonChestCowSpots-cow_spots = Пятна
 marking-DemonChestGuard = Аркана, туловище (Защита)
@@ -28,11 +30,15 @@ marking-DemonChestTreeLines = Аркана, туловище (Древесные
 marking-DemonChestTreeLines-tree_lines = Линии
 marking-DemonChestTrinitySpots = Аркана, туловище (Троичные пятна)
 marking-DemonChestTrinitySpots-trinity_spots = Пятна
+# Чо-то там да
 marking-DemonGoatee = Аркана, Козлиная бородка
 marking-DemonrigthEye = Аркана, Правый глаз
 marking-DemonrigthEye-tattoo_eye_r = Глаз
 marking-DemonleftEye = Аркана, Левый глаз
 marking-DemonleftEye-tattoo_eye_l = Глаз
+marking-Allsuccubus = Суккуб
+marking-Allsuccubus-succubus = Суккуб
+# Рога
 marking-DemonCowHorns = Аркана, рога (Коровьи)
 marking-DemonCowHorns-cow_horns = Рога
 marking-DemonHornsDeer = Аркана, рога (Оленьи)
diff --git a/Resources/Locale/ru-RU/_wega/markings/human.ftl b/Resources/Locale/ru-RU/_wega/markings/human.ftl
index f010650008..25aced9bc9 100644
--- a/Resources/Locale/ru-RU/_wega/markings/human.ftl
+++ b/Resources/Locale/ru-RU/_wega/markings/human.ftl
@@ -3,3 +3,12 @@ marking-HumanBreastDefault = Грудь (Обычная)
 marking-HumanBreastMedium = Грудь (Средняя)
 marking-HumanBreastBig = Грудь (Большая)
 marking-HumanBreastSuperBig = Грудь (Очень большая)
+
+marking-Malstrem = Мальстрём
+marking-Malstrem-malstrem = Мальстрём
+marking-Beholder = Наблюдатель
+marking-Beholder-beholder = Наблюдатель
+marking-Terminator = Терминатор
+marking-Terminator-terminator = Терминатор
+marking-IronJaw = Стальная челюсть
+marking-IronJaw-ironjaw = Стальная челюсть    
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl
index d7bfc01ebf..e8c50eecc1 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl
@@ -6,4 +6,7 @@ ent-ClothingNeckCloakVoidCap = пустотная накидка
     .desc = Плащ-невидимка, который сливается с пустотой космоса.
 ent-ClothingNeckCloakBlueShield = плащ офицера "Синий Щит"
     .desc = Плащ для защитников, рискующих своей грудью ради НаноТрейзен!
-    
\ No newline at end of file
+ent-ClothingNeckDarkGreyCloak = темно-серый плащ
+    .desc = Даже грейтайд заслуживает иметь свой плащ.
+ent-ClothingNeckGothicCloak = готический плащ
+    .desc = Для классических вампиров, ценящих старый стиль.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/shoes/magboots.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/shoes/magboots.ftl
index 1aeaf4dbda..9e95f42bf5 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/shoes/magboots.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/shoes/magboots.ftl
@@ -1,2 +1,4 @@
 ent-ClothingShoesBootsMagCombat = боевые магнитные ботинки
-    .desc = Дешёвая версия продвинутых магнитных ботинков старшего инженера, имеет в себе небольшой разъём для ножа.
\ No newline at end of file
+    .desc = Дешёвая версия продвинутых магнитных ботинков старшего инженера, имеет в себе небольшой разъём для ножа.
+ent-ClothingShoesBootsMagAdvSynd = улучшенные кроваво-чёрные магнитные ботинки
+    .desc = Новейшая ревизия легендарных кроваво-красных магнитных ботинок. Неотъемлимый предмет гардероба любого уважающего себя мародёра горлекса.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniform/jumpsuit.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniform/jumpsuit.ftl
deleted file mode 100644
index 8d4101cbaf..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniform/jumpsuit.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ent-ClothingUniformJumpsuitNoChicks = футболка "БезБаб"
-    .desc = Мы - народ, смело верующий в мир Без Баб!
-ent-ClothingUniformJumpsuitForChicks = футболка "ЗаБаб"
-    .desc = Мы - народ, смело верующий в мир За Баб!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpskirt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpskirt.ftl
index 85f526c2eb..b0e9feaaba 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpskirt.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpskirt.ftl
@@ -4,3 +4,35 @@ ent-ClothingUniformJumpskirtBlueShield = юбка-комбинезон офиц
     .desc = Пурпурная униформа офицера "Синий щит" изготовлена из плотных материалов.
 ent-ClothingUniformJumpskirtPostman = юбка-комбинезон почтальона
     .desc = Практичная юбка-комбинезон, идеальная для быстрого сбора и активной работы.
+ent-ClothingUniformJumpskirtTurtleneckBlack = чёрная водолазка с юбкой
+    .desc = Любимая одежда книжного червя.
+ent-ClothingUniformJumpskirtTurtleneckBlue = синяя водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckBlue.desc }
+ent-ClothingUniformJumpskirtTurtleneckAzure = голубая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckAzure.desc }
+ent-ClothingUniformJumpskirtTurtleneckGreen = зелёная водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckGreen.desc }
+ent-ClothingUniformJumpskirtTurtleneckOrange = оранжевая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckOrange.desc }
+ent-ClothingUniformJumpskirtTurtleneckPurple = фиолетовая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckPurple.desc }
+ent-ClothingUniformJumpskirtTurtleneckRed = красная водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckRed.desc }
+ent-ClothingUniformJumpskirtTurtleneckYellow = жёлтая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckYellow.desc }
+ent-ClothingUniformJumpskirtTurtleneckWhite = белая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckWhite.desc }
+ent-ClothingUniformJumpskirtTurtleneckBrown = коричневая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckBrown.desc }
+ent-ClothingUniformJumpskirtTurtleneckGrey = серая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckGrey.desc } 
+ent-ClothingUniformJumpskirtTurtleneckAquamarine = аквамариновая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckAquamarine.desc }
+ent-ClothingUniformJumpskirtTurtleneckPink = розовая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckPink.desc }
+ent-ClothingUniformJumpskirtTurtleneckBlackSleeveless = чёрная безрукавка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckBlackSleeveless.desc }
+ent-ClothingUniformJumpskirtTurtleneckWhiteSleeveless = белая безрукавка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckWhiteSleeveless.desc } 
+ent-ClothingUniformJumpskirtTurtleneckSalat = салатовая водолазка с юбкой
+    .desc = { ent-ClothingUniformJumpsuitTurtleneckSalat.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl
index d84ef69dac..4161139c0d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl
@@ -8,3 +8,45 @@ ent-ClothingUniformJumpsuitAltBlueShield = водолазка офицера "С
     .desc = Темная водолазка из плотных материалов.
 ent-ClothingUniformJumpsuitPostman = комбинезон почтальона
     .desc = Удобный комбинезон свободного кроя, не сковывающий движений при долгой ходьбе.
+ent-ClothingUniformJumpsuitNoChicks = футболка "БезБаб"
+    .desc = Мы - народ, смело верующий в мир Без Баб!
+ent-ClothingUniformJumpsuitForChicks = футболка "ЗаБаб"
+    .desc = Мы - народ, смело верующий в мир За Баб!
+ent-ClothingUniformJumpsuitTurtleneckBlack = чёрная водолазка
+    .desc = Любимая одежда книжного червя.
+ent-ClothingUniformJumpsuitTurtleneckBlue = синяя водолазка
+    .desc = Тёмный оттенок голубого.
+ent-ClothingUniformJumpsuitTurtleneckAzure = голубая водолазка
+    .desc = Яркий оттенок синего.
+ent-ClothingUniformJumpsuitTurtleneckGreen = зелёная водолазка
+    .desc = Дешёвый аналог водолазки Центрального Командования.
+ent-ClothingUniformJumpsuitTurtleneckOrange = оранжевая водолазка
+    .desc = Я не буду это комментировать.
+ent-ClothingUniformJumpsuitTurtleneckPurple = фиолетовая водолазка
+    .desc = Почувстсвуй себя учёным РНД.
+ent-ClothingUniformJumpsuitTurtleneckRed = красная водолазка
+    .desc = Хорошо маскирует следы крови.
+ent-ClothingUniformJumpsuitTurtleneckYellow = жёлтая водолазка
+    .desc = Наполнена счастьем.
+ent-ClothingUniformJumpsuitTurtleneckWhite = белая водолазка
+    .desc = Тепло и уютно.
+ent-ClothingUniformJumpsuitTurtleneckBrown = коричневая водолазка
+    .desc = Знаешь ли ты, почему я ношу красное? Оно хорошо скрывает следы крови! И я вижу, что ты одета в коричневое...
+ent-ClothingUniformJumpsuitTurtleneckGrey = серая водолазка
+    .desc = Слоновий стиль?
+ent-ClothingUniformJumpsuitTurtleneckAquamarine = аквамариновая водолазка
+    .desc = Слишком ярко!
+ent-ClothingUniformJumpsuitTurtleneckPink = розовая водолазка
+    .desc = И кто это будет носить?
+ent-ClothingUniformJumpsuitTurtleneckBlackSleeveless = чёрная безрукавка
+    .desc = Практичная и удобная водолазка чёрного цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
+ent-ClothingUniformJumpsuitTurtleneckWhiteSleeveless = белая безрукавка
+    .desc = Практичная и удобная водолазка белого цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
+ent-ClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless = чёрно-белая безрукавка
+    .desc = Практичная и удобная водолазка чёрно-белого цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
+ent-ClothingUniformJumpsuitTurtleneckTactick = тактическая водолазка
+    .desc = Практичная и удобная водолазка чёрного цвета для комфортного выполнения боевых задач. На бирке можно заметить "Modeling Agency Dar-Vaxed".
+ent-ClothingUniformJumpsuitTurtleneckSalat = салатовая водолазка
+    .desc = Практичная и удобная водолазка салатового цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
+ent-ClothingUniformJumpsuitTurtleneckSalatblack = салатово-чёрная водолазка
+    .desc = Практичная и удобная водолазка салатово-чёрного цвета. На бирке можно заметить "Modeling Agency Dar-Vaxed".
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/holoprojectors.ftl
index 3fffc39ef6..81010f7918 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/holoprojectors.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/holoprojectors.ftl
@@ -3,3 +3,5 @@ ent-HoloprojectorSex = проектор голобарьера
 ent-HoloprojectorSexEmpty = { ent-HoloprojectorSex }
     .desc = { ent-HoloprojectorSex.desc }
     .suffix = Пустой
+ent-SyndiHoloprojectorField = кроваво-красный сдерживающий голопроектор
+    .desc = Улучшенная версия голопроектора подходящая для проведения наступления.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
index 5515bea240..4d38781923 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
@@ -1,2 +1,6 @@
 ent-MagazinePistolSubMachineGunFoam = магазин ПП (.35 пена)
-    .desc = { ent-BaseItem.desc }
\ No newline at end of file
+    .desc = { ent-BaseItem.desc }
+ent-MagazineEagle = пистолетный магазин пустынного орла (.45 магнум)
+    .desc = { ent-BaseMagazineRifle.desc }
+ent-MagazineEagleAP = пистолетный магазин пустынного орла (.45 магнум бронебойные)
+    .desc = { ent-BaseMagazineRifle.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/rifel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/rifel.ftl
new file mode 100644
index 0000000000..d5f68aa2fd
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/rifel.ftl
@@ -0,0 +1,2 @@
+ent-ExtMagazineRifle = расширенный магазин (.20 винтовочные)
+    .desc = { ent-BaseMagazineRifle.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
new file mode 100644
index 0000000000..8b42a19eec
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
@@ -0,0 +1,2 @@
+ent-MagazineHristovAdvanced = магазин (.60 антиматериальные)
+    .desc = { ent-BaseMagazineRifle.desc }
diff --git a/Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Pistols/pistols.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/pistols/pistols.ftl
similarity index 83%
rename from Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Pistols/pistols.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/pistols/pistols.ftl
index f0aae06057..deef7e5b2c 100644
--- a/Resources/Locale/ru-RU/_DeadSpace/prototypes/Enteties/Objects/Weapons/Guns/Pistols/pistols.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -1,2 +1,2 @@
 ent-WeaponPistolDesertEagle = пустынный орёл
-    .desc = Вот он, воплощение силы и свободы — Пустынный орёл! Одно только упоминание этого оружия вызывает волну мурашек и адреналина.
\ No newline at end of file
+    .desc = Вот он, воплощение силы и свободы — Пустынный орёл! Одно только упоминание этого оружия вызывает волну мурашек и адреналина.
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Rifles/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl
similarity index 78%
rename from Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Rifles/rifle.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl
index 286cff1fd5..9a39cd9d80 100644
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Rifles/rifle.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl
@@ -1,3 +1,2 @@
-ent-ADTWeaponRifleXC67 = штурмовая винтовка xC-67
+ent-WeaponRifleXC67 = штурмовая винтовка xC-67
     .desc = Прототип новой штурмовой винтовки от создателей знаменитой С-20r. Использует патрон 6.5 мм ТСФ. Усовершенствованная эргономика позволяет достичь превосходных показателей точности стрельбы.
-    .suffix = { "Автомат" }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl
similarity index 64%
rename from Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Snipers/snipers.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl
index 6a8dd0c965..9b25441ad4 100644
--- a/Resources/Locale/ru-RU/_ADT/prototypes/Enteties/Objects/Weapons/Guns/Snipers/snipers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl
@@ -1,2 +1,2 @@
-ent-ADTWeaponSniperHristovAdvanced = продвинутая снайперская винтовка
-    .desc = Продвинутая снайперская винтовка, использующая калибр .60 антиматериальный. Идеально подходит для работы в условиях тесных коридоров космической станции.
\ No newline at end of file
+ent-WeaponSniperHristovAdvanced = продвинутая снайперская винтовка
+    .desc = Продвинутая снайперская винтовка, использующая калибр .60 антиматериальный. Идеально подходит для работы в условиях тесных коридоров космической станции.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/structures/holographic/projections.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/structures/holographic/projections.ftl
index 90e3c5446d..bde6514ff8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/structures/holographic/projections.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/structures/holographic/projections.ftl
@@ -1,2 +1,4 @@
 ent-HolosignSex = голографический барьер
     .desc = Барьер из твёрдого света, блокирует движение, но довольно хрупкий.
+ent-SyndiHolosignForcefield = голобарьер
+    .desc = Сдерживающее поле.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
index 4e8c458cd9..61990aad15 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -7,10 +7,10 @@
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
     # Corvax-Wega-Turtleneck-start
-    ADTClothingUniformJumpskirtTurtleneckOrange: 2
-    ADTClothingUniformJumpsuitTurtleneckOrange: 2
-    ADTClothingUniformJumpskirtTurtleneckBrown: 2
-    ADTClothingUniformJumpsuitTurtleneckBrown: 2
+    ClothingUniformJumpskirtTurtleneckOrange: 2
+    ClothingUniformJumpsuitTurtleneckOrange: 2
+    ClothingUniformJumpskirtTurtleneckBrown: 2
+    ClothingUniformJumpsuitTurtleneckBrown: 2
     # Corvax-Wega-Turtleneck-end
     ClothingShoesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 65e5621e8c..2ca017cb51 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -105,8 +105,8 @@
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
     ClothingEyesGlassesCheapSunglasses: 3
-    ADTClothingNeckDarkGreyCloak: 3 # Corvax-Wega-Add
-    ADTClothingNeckGothicCloak: 3 # Corvax-Wega-Add
+    ClothingNeckDarkGreyCloak: 3 # Corvax-Wega-Add
+    ClothingNeckGothicCloak: 3 # Corvax-Wega-Add
     # DO NOT ADD MORE, USE UNIFORM DYING
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
index 2079f9b84a..b356b546cc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -8,11 +8,11 @@
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3
     # Corvax-Wega-Turtleneck-start
-    ADTClothingUniformJumpskirtTurtleneckYellow: 2 
-    ADTClothingUniformJumpsuitTurtleneckYellow: 2
-    ADTClothingUniformJumpskirtTurtleneckSalat: 2
-    ADTClothingUniformJumpsuitTurtleneckSalat: 2 
-    ADTClothingUniformJumpsuitTurtleneckSalatblack: 2
+    ClothingUniformJumpskirtTurtleneckYellow: 2 
+    ClothingUniformJumpsuitTurtleneckYellow: 2
+    ClothingUniformJumpskirtTurtleneckSalat: 2
+    ClothingUniformJumpsuitTurtleneckSalat: 2 
+    ClothingUniformJumpsuitTurtleneckSalatblack: 2
     # Corvax-Wega-Turtleneck-end
     ClothingShoesColorBlack: 3
     ClothingOuterVestHazard: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index 59c73d10d8..7da047277f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -7,14 +7,14 @@
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     # Corvax-Wega-Turtleneck-start
-    ADTClothingUniformJumpskirtTurtleneckAquamarine: 2
-    ADTClothingUniformJumpsuitTurtleneckAquamarine: 2
-    ADTClothingUniformJumpskirtTurtleneckWhite: 2
-    ADTClothingUniformJumpsuitTurtleneckWhite: 2
-    ADTClothingUniformJumpskirtTurtleneckAzure: 2
-    ADTClothingUniformJumpsuitTurtleneckAzure: 2
-    ADTClothingUniformJumpskirtTurtleneckBlue: 2
-    ADTClothingUniformJumpsuitTurtleneckBlue: 2 
+    ClothingUniformJumpskirtTurtleneckAquamarine: 2
+    ClothingUniformJumpsuitTurtleneckAquamarine: 2
+    ClothingUniformJumpskirtTurtleneckWhite: 2
+    ClothingUniformJumpsuitTurtleneckWhite: 2
+    ClothingUniformJumpskirtTurtleneckAzure: 2
+    ClothingUniformJumpsuitTurtleneckAzure: 2
+    ClothingUniformJumpskirtTurtleneckBlue: 2
+    ClothingUniformJumpsuitTurtleneckBlue: 2 
     # Corvax-Wega-Turtleneck-end
     ClothingBeltMedical: 4
     ClothingHeadHatBeretMedic: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
index a7d28efd57..45a282fa32 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -8,14 +8,14 @@
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3
     # Corvax-Wega-Turtleneck-start
-    ADTClothingUniformJumpskirtTurtleneckGrey: 2
-    ADTClothingUniformJumpsuitTurtleneckGrey: 2 
-    ADTClothingUniformJumpskirtTurtleneckPurple: 2
-    ADTClothingUniformJumpsuitTurtleneckPurple: 2 
-    ADTClothingUniformJumpskirtTurtleneckBlack: 2
-    ADTClothingUniformJumpsuitTurtleneckBlack: 2
-    ADTClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
-    ADTClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
+    ClothingUniformJumpskirtTurtleneckGrey: 2
+    ClothingUniformJumpsuitTurtleneckGrey: 2 
+    ClothingUniformJumpskirtTurtleneckPurple: 2
+    ClothingUniformJumpsuitTurtleneckPurple: 2 
+    ClothingUniformJumpskirtTurtleneckBlack: 2
+    ClothingUniformJumpsuitTurtleneckBlack: 2
+    ClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
+    ClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
     # Corvax-Wega-Turtleneck-end
     ClothingOuterCoatRnd: 3
     ClothingShoesColorWhite: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index c4afb4023b..60b0461088 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -10,12 +10,12 @@
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
-    ADTClothingUniformJumpskirtTurtleneckRed: 2
-    ADTClothingUniformJumpsuitTurtleneckRed: 2
-    ADTClothingUniformJumpskirtTurtleneckBlack: 2
-    ADTClothingUniformJumpsuitTurtleneckBlack: 2
-    ADTClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
-    ADTClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
+    ClothingUniformJumpskirtTurtleneckRed: 2
+    ClothingUniformJumpsuitTurtleneckRed: 2
+    ClothingUniformJumpskirtTurtleneckBlack: 2
+    ClothingUniformJumpsuitTurtleneckBlack: 2
+    ClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
+    ClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
     # Corvax-Wega-Turtleneck-end
     ClothingShoesBootsJack: 3
     ClothingHeadHatBeretSecurity: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
index 93e622c642..f47e1d71fd 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -2,40 +2,40 @@
   id: WinterDrobeInventory
   startingInventory:
     # Corvax-Wega-Turtleneck-start
-    ADTClothingUniformJumpskirtTurtleneckAquamarine: 2
-    ADTClothingUniformJumpsuitTurtleneckAquamarine: 2
-    ADTClothingUniformJumpskirtTurtleneckWhite: 2
-    ADTClothingUniformJumpsuitTurtleneckWhite: 2
-    ADTClothingUniformJumpskirtTurtleneckAzure: 2
-    ADTClothingUniformJumpsuitTurtleneckAzure: 2
-    ADTClothingUniformJumpskirtTurtleneckYellow: 2 
-    ADTClothingUniformJumpsuitTurtleneckYellow: 2
-    ADTClothingUniformJumpskirtTurtleneckGreen: 2
-    ADTClothingUniformJumpsuitTurtleneckGreen: 2
-    ADTClothingUniformJumpskirtTurtleneckBrown: 2
-    ADTClothingUniformJumpsuitTurtleneckBrown: 2
-    ADTClothingUniformJumpskirtTurtleneckRed: 2
-    ADTClothingUniformJumpsuitTurtleneckRed: 2
-    ADTClothingUniformJumpskirtTurtleneckOrange: 2
-    ADTClothingUniformJumpsuitTurtleneckOrange: 2
-    ADTClothingUniformJumpskirtTurtleneckPink: 2
-    ADTClothingUniformJumpsuitTurtleneckPink: 2
-    ADTClothingUniformJumpskirtTurtleneckGrey: 2
-    ADTClothingUniformJumpsuitTurtleneckGrey: 2 
-    ADTClothingUniformJumpskirtTurtleneckBlue: 2
-    ADTClothingUniformJumpsuitTurtleneckBlue: 2 
-    ADTClothingUniformJumpskirtTurtleneckPurple: 2
-    ADTClothingUniformJumpsuitTurtleneckPurple: 2 
-    ADTClothingUniformJumpskirtTurtleneckBlack: 2
-    ADTClothingUniformJumpsuitTurtleneckBlack: 2
-    ADTClothingUniformJumpskirtTurtleneckSalat: 2
-    ADTClothingUniformJumpsuitTurtleneckSalat: 2 
-    ADTClothingUniformJumpsuitTurtleneckSalatblack: 2 
-    ADTClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
-    ADTClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
-    ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless: 2 
-    ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless: 2 
-    ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless: 2
+    ClothingUniformJumpskirtTurtleneckAquamarine: 2
+    ClothingUniformJumpsuitTurtleneckAquamarine: 2
+    ClothingUniformJumpskirtTurtleneckWhite: 2
+    ClothingUniformJumpsuitTurtleneckWhite: 2
+    ClothingUniformJumpskirtTurtleneckAzure: 2
+    ClothingUniformJumpsuitTurtleneckAzure: 2
+    ClothingUniformJumpskirtTurtleneckYellow: 2 
+    ClothingUniformJumpsuitTurtleneckYellow: 2
+    ClothingUniformJumpskirtTurtleneckGreen: 2
+    ClothingUniformJumpsuitTurtleneckGreen: 2
+    ClothingUniformJumpskirtTurtleneckBrown: 2
+    ClothingUniformJumpsuitTurtleneckBrown: 2
+    ClothingUniformJumpskirtTurtleneckRed: 2
+    ClothingUniformJumpsuitTurtleneckRed: 2
+    ClothingUniformJumpskirtTurtleneckOrange: 2
+    ClothingUniformJumpsuitTurtleneckOrange: 2
+    ClothingUniformJumpskirtTurtleneckPink: 2
+    ClothingUniformJumpsuitTurtleneckPink: 2
+    ClothingUniformJumpskirtTurtleneckGrey: 2
+    ClothingUniformJumpsuitTurtleneckGrey: 2 
+    ClothingUniformJumpskirtTurtleneckBlue: 2
+    ClothingUniformJumpsuitTurtleneckBlue: 2 
+    ClothingUniformJumpskirtTurtleneckPurple: 2
+    ClothingUniformJumpsuitTurtleneckPurple: 2 
+    ClothingUniformJumpskirtTurtleneckBlack: 2
+    ClothingUniformJumpsuitTurtleneckBlack: 2
+    ClothingUniformJumpskirtTurtleneckSalat: 2
+    ClothingUniformJumpsuitTurtleneckSalat: 2 
+    ClothingUniformJumpsuitTurtleneckSalatblack: 2 
+    ClothingUniformJumpskirtTurtleneckBlackSleeveless: 2
+    ClothingUniformJumpsuitTurtleneckBlackSleeveless: 2 
+    ClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless: 2 
+    ClothingUniformJumpsuitTurtleneckWhiteSleeveless: 2 
+    ClothingUniformJumpskirtTurtleneckWhiteSleeveless: 2
     # Corvax-Wega-Turtleneck-end
     ClothingNeckScarfStripedRed: 3
     ClothingNeckScarfStripedGreen: 3
@@ -57,7 +57,7 @@
     ClothingHeadHatXmasCrown: 2
     # Corvax-Wega-Turtleneck-start
   contrabandInventory:
-    ADTClothingUniformJumpsuitTurtleneckTactick: 2
+    ClothingUniformJumpsuitTurtleneckTactick: 2
     # Corvax-Wega-Turtleneck-end
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
diff --git a/Resources/Prototypes/_ADT/Enteties/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_ADT/Enteties/Clothing/Neck/cloaks.yml
deleted file mode 100644
index 1dd2490ad1..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Clothing/Neck/cloaks.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  parent: ClothingNeckBase
-  id: ADTClothingNeckGothicCloak
-  name: gothic cloak
-  description: For a classy old-style vampires.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi #спрайты от floppo4ka
-  - type: StaticPrice
-    price: 5
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ADTClothingNeckDarkGreyCloak
-  name: dark grey cloak
-  description: Even a greytide deserve his cloak.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi #спрайты от floppo4ka
-  - type: StaticPrice
-    price: 5
diff --git a/Resources/Prototypes/_ADT/Enteties/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_ADT/Enteties/Clothing/Shoes/magboots.yml
deleted file mode 100644
index 9b186b04c1..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Clothing/Shoes/magboots.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: entity
-  parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
-  id: ADTClothingShoesBootsMagAdvSynd
-  name: advanced syndicate magboots
-  description: State-of-the-art magnetic boots that do not slow down their wearer. Made by gorlax for gorlax.
-  suffix: Syndicate
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Shoes/Boots/advanced.rsi
-    state: icon
-  - type: Clothing
-    sprite: _ADT/Clothing/Shoes/Boots/advanced.rsi
-  - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
-  - type: GasTank
-    outputPressure: 42.6
-    air:
-      # 2 minutes of thrust
-      volume: 0.75
-      temperature: 293.15
-      moles:
-      - 0.153853429 # oxygen
-      - 0.153853429 # nitrogen
-  - type: Item
-    sprite: null
-    size: Normal
-  - type: MovementSpeedModifier
-    weightlessAcceleration: 1
-    weightlessFriction: 0.3
-    weightlessModifier: 1.2
-  - type: StaticPrice
-    price: 5000
\ No newline at end of file
diff --git a/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpskirts.yml b/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpskirts.yml
deleted file mode 100644
index d572b209e6..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpskirts.yml
+++ /dev/null
@@ -1,208 +0,0 @@
-#Водолазки от prazat911.
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckAquamarine
-  name: aquamarine turtleneck with skirt
-  description: Too bright!
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckWhite
-  name: white turtleneck with skirt
-  description: Warm and comfy.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckAzure
-  name: azure turtleneck with skirt
-  description: Brighter shade of blue.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckYellow
-  name: yellow turtleneck with skirt
-  description: Filled with happines.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckGreen
-  name: green turtleneck with skirt
-  description: Cheaper analog of CentComm turtleneck.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckBrown
-  name: brown turtleneck with skirt
-  description: -Ya know why i wear red? It hides blood well! -But that's brown color...
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckRed
-  name: red turtleneck with skirt
-  description: Hides blood of clowns well!
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckOrange
-  name: orange turtleneck with skirt
-  description: I don't want to talk about it.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckPink
-  name: pink turtleneck with skirt
-  description: Who would wear this?
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckGrey
-  name: grey turtleneck with skirt
-  description: Grey style?
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckBlue
-  name: blue turtleneck with skirt
-  description: Darker shade of azure.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckPurple
-  name: purple turtleneck with skirt
-  description: Feel yourself like a real scientist.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckBlack
-  name: black turtleneck with skirt
-  description: Favourite clothes of bookworms.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckBlackSleeveless
-  name: black sleeveless turtleneck with skirt
-  description: Black turtleneck sweater with a skirt and no sleeves.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless
-  name: white sleeveless turtleneck with skirt
-  description: White turtleneck sweater with a skirt and no sleeves.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ADTClothingUniformJumpskirtTurtleneckSalat
-  name: salat turtleneck with skirt
-  description: Favourite clothes of bookworms.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi
-  - type: StaticPrice
-    price: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpsuits.yml
deleted file mode 100644
index 55277de8a9..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Clothing/Uniforms/Jumpsuits.yml
+++ /dev/null
@@ -1,247 +0,0 @@
-# Водолазки. От prazat911.
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckAquamarine
-  name: aquamarine turtleneck
-  description: Too bright!
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckWhite
-  name: white turtleneck
-  description: Warm and comfy.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckAzure
-  name: azure turtleneck
-  description: Brighter shade of blue.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckYellow
-  name: yellow turtleneck
-  description: Filled with happines.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckGreen
-  name: green turtleneck
-  description: Cheaper analog of CentComm turtleneck.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckBrown
-  name: brown turtleneck
-  description: -Ya know why i wear red? It hides blood well! -But that's brown color...
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckRed
-  name: red turtleneck
-  description: Hides blood of clowns well!
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckOrange
-  name: orange turtleneck
-  description: I don't want to talk about it.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckPink
-  name: pink turtleneck
-  description: Who would wear this?
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckGrey
-  name: grey turtleneck
-  description: Grey style?
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckBlue
-  name: blue turtleneck
-  description: Darker shade of azure.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckPurple
-  name: purple turtleneck
-  description: Feel yourself like a real scientist.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckBlack
-  name: black turtleneck
-  description: Favourite clothes of bookworms.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless
-  name: ancient jumpsuit
-  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless
-  name: ancient jumpsuit
-  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckBlackSleeveless
-  name: ancient jumpsuit
-  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckTactick
-  name: tactical turtleneck
-  description: Tactical jumpsuit for real CQB lovers.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckSalat
-  name: salat turtleneck
-  description: Favourite clothes of bookworms.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi
-  - type: StaticPrice
-    price: 15
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitTurtleneckSalatblack
-  name: salat black turtleneck
-  description: Favourite clothes of bookworms.
-  components:
-  - type: Sprite
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi
-  - type: Clothing
-    sprite: _ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi
-  - type: StaticPrice
-    price: 15
diff --git a/Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/tale.yml b/Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/tale.yml
deleted file mode 100644
index e8bfa01248..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/tale.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: marking
-  id: ADTAllsuccubus
-  bodyPart: Tail
-  markingCategory: Chest
-  speciesRestriction: [Demon]
-  sprites:
-  - sprite: _ADT/Mobs/Customization/demons/succubus.rsi
-    state: succubus
diff --git a/Resources/Prototypes/_ADT/Enteties/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_ADT/Enteties/Objects/Devices/holoprojectors.yml
deleted file mode 100644
index 15f2672579..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Objects/Devices/holoprojectors.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: entity
-  parent: HoloprojectorField
-  id: ADTSyndiHoloprojectorField
-  name: force field projector
-  description: Creates an impassable forcefield that won't let anything through. Close proximity may or may not cause cancer.
-  components:
-    - type: HolosignProjector
-      signProto: ADTSyndiHolosignForcefield
-      chargeUse: 100
-    - type: Sprite
-      sprite: _ADT/Objects/Devices/Holoprojectors/field.rsi
-      state: icon
-    - type: Tag
-      tags:
-        - HolofanProjector
-    - type: ItemSlots
-      slots:
-        cell_slot:
-          name: power-cell-slot-component-slot-name-default
-          startingItem: PowerCellHigh
\ No newline at end of file
diff --git a/Resources/Prototypes/_ADT/Enteties/Structures/Holographic/projections.yml b/Resources/Prototypes/_ADT/Enteties/Structures/Holographic/projections.yml
deleted file mode 100644
index 13d7ddb032..0000000000
--- a/Resources/Prototypes/_ADT/Enteties/Structures/Holographic/projections.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: entity
-  id: ADTSyndiHolosignForcefield
-  parent: HolosignForcefield
-  name: holographic force field
-  description: A powerful temporal containment field that doesn't let anything through, not even a tesla or singularity.
-  components:
-  - type: Sprite
-    sprite: _ADT/Structures/Holo/field.rsi
-    state: icon
-  - type: PointLight
-    enabled: true
-    radius: 3
-    color: red
-  - type: TimedDespawn
-    lifetime: 90
-  - type: Clickable
-  - type: ContainmentField
-    throwForce: 0
-  - type: Destructible
-    thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 200
-        behaviors:
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_ADT/tags.yml b/Resources/Prototypes/_ADT/tags.yml
deleted file mode 100644
index 010551cadd..0000000000
--- a/Resources/Prototypes/_ADT/tags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: Tag
-  id: ADTMagazineHristov
-
-- type: Tag
-  id: ADTExtMagazineRifle
diff --git a/Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/desert_eagle_mags.yml b/Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/desert_eagle_mags.yml
deleted file mode 100644
index f5a7e80d9d..0000000000
--- a/Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/desert_eagle_mags.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: BaseMagazineEagle
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-      - MagazineEagle
-  - type: BallisticAmmoProvider
-    mayTransfer: true
-    whitelist:
-      tags:
-        - CartridgeMagnum
-    capacity: 8
-  - type: Item
-    size: Small
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: Sprite
-    sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineEagle
-  id: MagazineEagle
-  name: пистолетный магазин пустынного орла (.45 магнум)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnum
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
-- type: entity
-  parent: BaseMagazineEagle
-  id: MagazineEagleAP
-  name: пистолетный магазин пустынного орла (.45 магнум бронебойные)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumAP
-  - type: Sprite
-    layers:
-    - state: red
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_DeadSpace/tags.yml b/Resources/Prototypes/_DeadSpace/tags.yml
deleted file mode 100644
index 5c428336f2..0000000000
--- a/Resources/Prototypes/_DeadSpace/tags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: Tag
-  id: MagazineEagle
-
-- type: Tag
-  id: MagazineEagleAP
diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml
index 79646aab98..02d3b69e19 100644
--- a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml
@@ -25,24 +25,24 @@
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
-  id: ADTClothingBackpackDuffelSyndicateFilledXC67
+  id: ClothingBackpackDuffelSyndicateFilledXC67
   name: xC-67 rifle bundle
   description: bundle with a prototype xC-67 assault rifle and two mags.
   components:
   - type: StorageFill
     contents:
-      - id: ADTWeaponRifleXC67
-      - id: ADTExtMagazineRifle
+      - id: WeaponRifleXC67
+      - id: ExtMagazineRifle
         amount: 2
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
-  id: ADTClothingBackpackDuffelSyndicateFilledHristov
+  id: ClothingBackpackDuffelSyndicateFilledHristov
   name: Hristov bundle
   description: bundle with hristov and four mags.
   components:
   - type: StorageFill
     contents:
-      - id: ADTWeaponSniperHristovAdvanced
-      - id: ADTMagazineHristovAdvanced
+      - id: WeaponSniperHristovAdvanced
+      - id: MagazineHristovAdvanced
         amount: 4
diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml
index 0f8c186a6b..66f78c8c9a 100644
--- a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml
@@ -106,11 +106,11 @@
   - UplinkWeaponry
 
 - type: listing
-  id: ADTUplinkAdvancedHristov
+  id: UplinkAdvancedHristov
   name: uplink-hristov-bundle-name
   description: uplink-hristov-bundle-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
-  productEntity: ADTClothingBackpackDuffelSyndicateFilledHristov
+  productEntity: ClothingBackpackDuffelSyndicateFilledHristov
   cost:
     Telecrystal: 18
   categories:
@@ -122,11 +122,11 @@
       - NukeOpsUplink
 
 - type: listing
-  id: ADTUplinkXC67BundleAgent
+  id: UplinkXC67BundleAgent
   name: uplink-xc67-name
   description: uplink-xc67-desc
-  icon: { sprite: /Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi, state: icon}
-  productEntity: ADTClothingBackpackDuffelSyndicateFilledXC67
+  icon: { sprite: /Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi, state: icon}
+  productEntity: ClothingBackpackDuffelSyndicateFilledXC67
   discountCategory: veryRareDiscounts
   discountDownTo:
     Telecrystal: 13
@@ -142,11 +142,11 @@
 
 
 - type: listing
-  id: ADTUplinkXC67Bundle
+  id: UplinkXC67Bundle
   name: uplink-xc67-name
   description: uplink-xc67-desc
-  icon: { sprite: /Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi, state: icon}
-  productEntity: ADTClothingBackpackDuffelSyndicateFilledXC67
+  icon: { sprite: /Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi, state: icon}
+  productEntity: ClothingBackpackDuffelSyndicateFilledXC67
   cost:
     Telecrystal: 19
   categories:
@@ -161,8 +161,8 @@
   id: UplinkAdvansedMagboots
   name: uplink-advanced-magboots-name
   description: uplink-advanced-magboots-desc
-  icon: { sprite: _ADT/Clothing/Shoes/Boots/advanced.rsi, state: icon }
-  productEntity: ADTClothingShoesBootsMagAdvSynd
+  icon: { sprite: _Wega/Clothing/Shoes/Boots/advanced.rsi, state: icon }
+  productEntity: ClothingShoesBootsMagAdvSynd
   cost:
     Telecrystal: 8
   categories:
@@ -185,10 +185,10 @@
   - UplinkWearables
 
 - type: listing
-  id: ADTUplinkNukeSyndiHoloprojectorField
+  id: UplinkNukeSyndiHoloprojectorField
   name: uplink-syndiholoprojectorfield-name
   description: uplink-syndiholoprojectorfield-desc
-  productEntity: ADTSyndiHoloprojectorField
+  productEntity: SyndiHoloprojectorField
   cost:
     Telecrystal: 5
   categories:
@@ -200,11 +200,11 @@
       - NukeOpsUplink
 
 - type: listing
-  id: ADTUplinkWeaponXC67ammo
+  id: UplinkWeaponXC67ammo
   name: uplink-xc67ammo-name
   description: uplink-xc67ammo-desc
-  icon: { sprite: /Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi, state: base }
-  productEntity: ADTExtMagazineRifle
+  icon: { sprite: /Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi, state: base }
+  productEntity: ExtMagazineRifle
   cost:
     Telecrystal: 1
   categories:
@@ -282,7 +282,7 @@
   id: UplinkDesertEagle
   name: uplink-desert-eagle-name
   description: uplink-desert-eagle-desc
-  icon: { sprite: _DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi, state: icon }
+  icon: { sprite: _Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi, state: icon }
   productEntity: WeaponPistolDesertEagle
   cost:
     Telecrystal: 8
@@ -293,7 +293,7 @@
   id: UplinkMagazineEagle
   name: uplink-magazine-eagle-name
   description: uplink-magazine-eagle-desc
-  icon: { sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi, state: base }
+  icon: { sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi, state: base }
   productEntity: MagazineEagle
   cost:
     Telecrystal: 1
@@ -305,7 +305,7 @@
   id: UplinkMagazineEagleAP
   name: uplink-magazine-eagle-ap-name
   description: uplink-magazine-eagle-ap-desc
-  icon: { sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi, state: red }
+  icon: { sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi, state: red }
   productEntity: MagazineEagleAP
   cost:
     Telecrystal: 3
@@ -329,11 +329,11 @@
       - NukeOpsUplink
 
 - type: listing
-  id: ADTUplinAmmoSniper
+  id: UplinAmmoSniper
   name: uplink-ammo-sniper-name
   description: uplink-ammo-sniper-desc
-  icon: { sprite: _ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi, state: mag-1 }
-  productEntity: ADTMagazineHristovAdvanced
+  icon: { sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi, state: mag-1 }
+  productEntity: MagazineHristovAdvanced
   cost:
     Telecrystal: 2
   categories:
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Belt/syndie_sheath.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Belt/syndie_sheath.yml
index a7babde6a4..a56c0dff3c 100644
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Belt/syndie_sheath.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Belt/syndie_sheath.yml
@@ -10,9 +10,7 @@
   - type: Clothing
     sprite: _Wega/Clothing/Belt/syndie_sheath.rsi
   - type: Item
-    size: Normal
-    shape:
-    - 0,0,0,6 
+    size: Ginormous
   - type: ItemSlots
     slots:
       item:
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml
index afa55ad6fd..8c901d5ad7 100644
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml
@@ -38,3 +38,25 @@
   components:
     - type: Sprite
       sprite: _Wega/Clothing/Neck/Cloaks/blueshield.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckGothicCloak
+  name: gothic cloak
+  description: For a classy old-style vampires.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi
+  - type: StaticPrice
+    price: 5
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckDarkGreyCloak
+  name: dark grey cloak
+  description: Even a greytide deserve his cloak.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi
+  - type: StaticPrice
+    price: 5
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/magboots.yml
index 38b6bb0a5f..c15cfd6ac2 100644
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/magboots.yml
@@ -26,4 +26,38 @@
   - type: ContainerFill
     containers:
       item:
-      - CombatCrowbar
\ No newline at end of file
+      - CombatCrowbar
+
+- type: entity
+  parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
+  id: ClothingShoesBootsMagAdvSynd
+  name: advanced syndicate magboots
+  description: State-of-the-art magnetic boots that do not slow down their wearer. Made by gorlax for gorlax.
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Shoes/Boots/advanced.rsi
+    state: icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Shoes/Boots/advanced.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
+  - type: GasTank
+    outputPressure: 42.6
+    air:
+      # 2 minutes of thrust
+      volume: 0.75
+      temperature: 293.15
+      moles:
+      - 0.153853429 # oxygen
+      - 0.153853429 # nitrogen
+  - type: Item
+    sprite: null
+    size: Normal
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 1
+    weightlessFriction: 0.3
+    weightlessModifier: 1.2
+  - type: StaticPrice
+    price: 5000
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpskirt.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpskirt.yml
index 669811652e..5146fc63aa 100644
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpskirt.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpskirt.yml
@@ -33,3 +33,211 @@
       sprite: _Wega/Clothing/Uniforms/Jumpskirt/postman.rsi
     - type: Clothing
       sprite: _Wega/Clothing/Uniforms/Jumpskirt/postman.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckAquamarine
+  name: aquamarine turtleneck with skirt
+  description: Too bright!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckWhite
+  name: white turtleneck with skirt
+  description: Warm and comfy.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckAzure
+  name: azure turtleneck with skirt
+  description: Brighter shade of blue.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckYellow
+  name: yellow turtleneck with skirt
+  description: Filled with happines.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckGreen
+  name: green turtleneck with skirt
+  description: Cheaper analog of CentComm turtleneck.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckBrown
+  name: brown turtleneck with skirt
+  description: -Ya know why i wear red? It hides blood well! -But that's brown color...
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckRed
+  name: red turtleneck with skirt
+  description: Hides blood of clowns well!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckOrange
+  name: orange turtleneck with skirt
+  description: I don't want to talk about it.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckPink
+  name: pink turtleneck with skirt
+  description: Who would wear this?
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckGrey
+  name: grey turtleneck with skirt
+  description: Grey style?
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckBlue
+  name: blue turtleneck with skirt
+  description: Darker shade of azure.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckPurple
+  name: purple turtleneck with skirt
+  description: Feel yourself like a real scientist.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckBlack
+  name: black turtleneck with skirt
+  description: Favourite clothes of bookworms.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckBlackSleeveless
+  name: black sleeveless turtleneck with skirt
+  description: Black turtleneck sweater with a skirt and no sleeves.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckWhiteSleeveless
+  name: white sleeveless turtleneck with skirt
+  description: White turtleneck sweater with a skirt and no sleeves.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtTurtleneckSalat
+  name: salat turtleneck with skirt
+  description: Favourite clothes of bookworms.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi
+  - type: StaticPrice
+    price: 15
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuit_special.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuit_special.yml
deleted file mode 100644
index 6fe113815f..0000000000
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuit_special.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitNoChicks
-  name: NoChicks T-shirt
-  description: We can live in a world, where's no female do exist!
-  components:
-  - type: Sprite
-    sprite: _Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi
-  - type: Clothing
-    sprite: _Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitForChicks
-  name: ForChicks T-shirt
-  description: We live in a world, which can't exist without a female!
-  components:
-  - type: Sprite
-    sprite: _Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi
-  - type: Clothing
-    sprite: _Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi
diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml
index c620a8da0c..a0134307a2 100644
--- a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -55,3 +55,272 @@
       sprite: _Wega/Clothing/Uniforms/Jumpsuit/postman.rsi
     - type: Clothing
       sprite: _Wega/Clothing/Uniforms/Jumpsuit/postman.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitNoChicks
+  name: NoChicks T-shirt
+  description: We can live in a world, where's no female do exist!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitForChicks
+  name: ForChicks T-shirt
+  description: We live in a world, which can't exist without a female!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckAquamarine
+  name: aquamarine turtleneck
+  description: Too bright!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckWhite
+  name: white turtleneck
+  description: Warm and comfy.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckAzure
+  name: azure turtleneck
+  description: Brighter shade of blue.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckYellow
+  name: yellow turtleneck
+  description: Filled with happines.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckGreen
+  name: green turtleneck
+  description: Cheaper analog of CentComm turtleneck.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckBrown
+  name: brown turtleneck
+  description: -Ya know why i wear red? It hides blood well! -But that's brown color...
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckRed
+  name: red turtleneck
+  description: Hides blood of clowns well!
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckOrange
+  name: orange turtleneck
+  description: I don't want to talk about it.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckPink
+  name: pink turtleneck
+  description: Who would wear this?
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckGrey
+  name: grey turtleneck
+  description: Grey style?
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckBlue
+  name: blue turtleneck
+  description: Darker shade of azure.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckPurple
+  name: purple turtleneck
+  description: Feel yourself like a real scientist.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckBlack
+  name: black turtleneck
+  description: Favourite clothes of bookworms.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless
+  name: ancient jumpsuit
+  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckWhiteSleeveless
+  name: ancient jumpsuit
+  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckBlackSleeveless
+  name: ancient jumpsuit
+  description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckTactick
+  name: tactical turtleneck
+  description: Tactical jumpsuit for real CQB lovers.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckSalat
+  name: salat turtleneck
+  description: Favourite clothes of bookworms.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi
+  - type: StaticPrice
+    price: 15
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitTurtleneckSalatblack
+  name: salat black turtleneck
+  description: Favourite clothes of bookworms.
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi
+  - type: Clothing
+    sprite: _Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi
+  - type: StaticPrice
+    price: 15
diff --git a/Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/cyberlimbs.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/cyberlimbs.yml
similarity index 76%
rename from Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/cyberlimbs.yml
rename to Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/cyberlimbs.yml
index b427b16bcc..763e1cc00c 100644
--- a/Resources/Prototypes/_ADT/Enteties/Mobs/Customization/Markings/cyberlimbs.yml
+++ b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/cyberlimbs.yml
@@ -9,7 +9,7 @@
         !type:EyeColoring
           negative: true
   sprites:
-  - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
+  - sprite: _Wega/Mobs/Customization/headaugs.rsi
     state: malstrem
 
 - type: marking
@@ -23,7 +23,7 @@
         !type:EyeColoring
           negative: true
   sprites:
-  - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
+  - sprite: _Wega/Mobs/Customization/headaugs.rsi
     state: beholder
 
 - type: marking
@@ -37,11 +37,11 @@
         !type:EyeColoring
           negative: true
   sprites:
-  - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
+  - sprite: _Wega/Mobs/Customization/headaugs.rsi
     state: terminator
 
 - type: marking
-  id: Iron_jaw
+  id: IronJaw
   bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Human]
@@ -51,5 +51,5 @@
         !type:EyeColoring
           negative: true
   sprites:
-  - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
-    state: iron_jaw
\ No newline at end of file
+  - sprite: _Wega/Mobs/Customization/headaugs.rsi
+    state: iron_jaw
diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml
index 348b4ac52d..2d5bb445e3 100644
--- a/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml
+++ b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml
@@ -88,3 +88,12 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_l
+
+- type: marking
+  id: Allsuccubus
+  bodyPart: Tail
+  markingCategory: Chest
+  speciesRestriction: [Demon]
+  sprites:
+  - sprite: _Wega/Mobs/Customization/demon.rsi
+    state: succubus
diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_Wega/Entities/Objects/Devices/holoprojectors.yml
index ed1a89218a..92b30a21e8 100644
--- a/Resources/Prototypes/_Wega/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Devices/holoprojectors.yml
@@ -25,3 +25,24 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
+
+- type: entity
+  parent: HoloprojectorField
+  id: SyndiHoloprojectorField
+  name: force field projector
+  description: Creates an impassable forcefield that won't let anything through. Close proximity may or may not cause cancer.
+  components:
+    - type: HolosignProjector
+      signProto: SyndiHolosignForcefield
+      chargeUse: 100
+    - type: Sprite
+      sprite: _Wega/Objects/Devices/Holoprojectors/field.rsi
+      state: icon
+    - type: Tag
+      tags:
+        - HolofanProjector
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellHigh
diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 732a752c0c..9b0e98a546 100644
--- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -32,3 +32,63 @@
   - type: Tag
     tags:
       - MagazinePistolSubMachineGunFoam
+
+- type: entity
+  parent: BaseItem
+  id: BaseMagazineEagle
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeMagnum
+    capacity: 8
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+  - type: Tag
+    tags:
+      - MagazineEagle
+
+- type: entity
+  parent: BaseMagazineEagle
+  id: MagazineEagle
+  name: desert eagle pistol magazine (.45 magnum)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnum
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  parent: BaseMagazineEagle
+  id: MagazineEagleAP
+  name: desert eagle pistol magazine (.45 magnum armor-piercing)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumAP
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
similarity index 84%
rename from Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml
rename to Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 5ba7ba32f2..5d4acb117f 100644
--- a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -1,6 +1,6 @@
 # Empty mags
 - type: entity
-  id: ADTBaseExtMagazineRifle
+  id: BaseExtMagazineRifle
   name: extented riffle magazine (.20)
   description: Extented riffle magazine for .20 with a capacity of 45.
   parent: BaseItem
@@ -8,7 +8,7 @@
   components:
   - type: Tag
     tags:
-      - ADTExtMagazineRifle
+      - ExtMagazineRifle
   - type: Item
     size: Small
   - type: BallisticAmmoProvider
@@ -21,7 +21,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -35,10 +35,10 @@
 
 # Magazines
 - type: entity
-  id: ADTExtMagazineRifle
+  id: ExtMagazineRifle
   name: extented riffle magazine (.20)
   description: Extented riffle magazine for .20 with a capacity of 45.
-  parent: ADTBaseExtMagazineRifle
+  parent: BaseExtMagazineRifle
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRifle
diff --git a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
similarity index 84%
rename from Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
rename to Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
index 64a3f20340..50aef07ab5 100644
--- a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
@@ -1,11 +1,8 @@
 - type: entity
-  id: ADTMagazineHristovAdvanced
+  id: MagazineHristovAdvanced
   name: Hristov Magazine (.60 antimaterial)
   parent: BaseItem
   components:
-  - type: Tag
-    tags:
-    - ADTMagazineHristov
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel
     mayTransfer: true
@@ -21,7 +18,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: _ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -32,3 +29,6 @@
     steps: 2
     zeroVisible: false
   - type: Appearance
+  - type: Tag
+    tags:
+    - MagazineHristov
diff --git a/Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Pistols/desert_eagle.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
similarity index 69%
rename from Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Pistols/desert_eagle.yml
rename to Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index fc8bad42fc..fcf2eff2b8 100644
--- a/Resources/Prototypes/_DeadSpace/Enteties/Objects/Weapons/Guns/Pistols/desert_eagle.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -1,9 +1,11 @@
 - type: entity
   parent: BaseItem
-  id: DesertEagleBase
-  abstract: true
+  id: WeaponPistolDesertEagle
+  name: desert eagle
+  description: "Here it is, the embodiment of strength and freedom — the Desert Eagle! The mere mention of this weapon causes a wave of goosebumps and adrenaline."
   components:
   - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -12,7 +14,7 @@
   - type: Item
     size: Small
   - type: Clothing
-    sprite: _DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi
     quickEquip: false
     slots:
     - suitStorage
@@ -23,7 +25,9 @@
     availableModes:
       - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
+      path: /Audio/_Wega/Weapons/Guns/Gunshots/deserteagle.ogg
+      params:
+        volume: 2
   - type: ChamberMagazineAmmoProvider
   - type: AmmoCounter
     soundRack:
@@ -39,7 +43,6 @@
         whitelist:
           tags:
             - MagazineEagle
-            - MagazineEagleAP
       gun_chamber:
         name: Chamber
         startingItem: CartridgeMagnum
@@ -58,22 +61,3 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
-
-- type: entity
-  parent: DesertEagleBase
-  id: WeaponPistolDesertEagle
-  name: Desert Eagle
-  description: desc 
-  components:
-  - type: Sprite
-    sprite: _DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi
-  - type: Clothing
-    sprite: _DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi
-  - type: Gun
-    fireRate: 2
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/_DeadSpace/Weapons/Guns/Gunshots/deserteagle.ogg
-      params:
-        volume: 2
diff --git a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Rifles/xc67.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
similarity index 81%
rename from Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Rifles/xc67.yml
rename to Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index f7fab1f9db..ff48c89c8f 100644
--- a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Rifles/xc67.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,24 +1,20 @@
 - type: entity
   parent: BaseWeaponRifle
-  id: ADTWeaponRifleXC67
+  id: WeaponRifleXC67
   name: assault riffle xC-67
   description: A prototype of a new assault rifle from the creators of the famous C-20r. Uses the .20 cartridge. Advanced ergonomics allow for excellent shooting accuracy.
   components:
   - type: Sprite
-    sprite: _ADT/Objects/Weapons/Guns/Rifles/xc67.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Rifles/xc67.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
-    sprite: _ADT/Objects/Weapons/Guns/Rifles/xc67.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Rifles/xc67.rsi
   - type: Gun
-    #minAngle: 2
-    #maxAngle: 8
     fireRate: 6.5
-    #angleIncrease: 1
-    #angleDecay: 12
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -29,14 +25,14 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: ADTExtMagazineRifle
+        startingItem: ExtMagazineRifle
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
         priority: 2
         whitelist:
           tags:
             - MagazineRifle
-            - ADTExtMagazineRifle
+            - ExtMagazineRifle
       gun_chamber:
         name: Chamber
         startingItem: CartridgeRifle
diff --git a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
similarity index 71%
rename from Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Snipers/snipers.yml
rename to Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 5c002aec97..ed660eef75 100644
--- a/Resources/Prototypes/_ADT/Enteties/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -1,30 +1,28 @@
 - type: entity
-  name: semi-aito Hristov
   parent: BaseItem
-  id: ADTWeaponSniperHristovAdvanced
+  id: WeaponSniperHristovAdvanced
+  name: semi-aito Hristov
   description: A portable anti-material rifle. Uses .60 anti-material ammo upgraded by gorlax marodeurs.
   components:
   - type: Item
     size: Huge
   - type: Sprite
-    sprite: _ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
-    sprite: _ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi
+    sprite: _Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi
     slots:
     - Back
     - suitStorage
     quickEquip: false
   - type: Wieldable
-  - type: GunWieldBonus
-    minAngle: -23
-    maxAngle: -44
+  - type: GunRequiresWield
   - type: Gun
-    minAngle: 24
-    maxAngle: 45
-    fireRate: 1
+    minAngle: 1
+    maxAngle: 1
+    fireRate: 0.7
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
@@ -36,11 +34,11 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: ADTMagazineHristovAdvanced
+        startingItem: MagazineHristovAdvanced
         priority: 2
         whitelist:
           tags:
-          - ADTMagazineHristov
+          - MagazineHristov
         insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
   - type: ContainerContainer
@@ -48,10 +46,6 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: MagazineAmmoProvider
-  # - type: MagazineVisuals
-  #   magState: mag
-  #   steps: 4
-  #   zeroVisible: true
   - type: Appearance
   - type: StaticPrice
     price: 5000
diff --git a/Resources/Prototypes/_Wega/Entities/StatusEffects/body.yml b/Resources/Prototypes/_Wega/Entities/StatusEffects/body.yml
new file mode 100644
index 0000000000..450359b7ec
--- /dev/null
+++ b/Resources/Prototypes/_Wega/Entities/StatusEffects/body.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: MobStatusEffectBase
+  id: StatusEffectDizzy
+  name: dizzy
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+        - DizzyGen
+  - type: DizzyEffect
diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/_Wega/Entities/Structures/Holographic/projections.yml
index 25a106c30b..8823d10621 100644
--- a/Resources/Prototypes/_Wega/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/_Wega/Entities/Structures/Holographic/projections.yml
@@ -28,3 +28,30 @@
       color: "#df37cf"
     - type: Climbable
     - type: Clickable
+
+- type: entity
+  id: SyndiHolosignForcefield
+  parent: HolosignForcefield
+  name: holographic force field
+  description: A powerful temporal containment field that doesn't let anything through, not even a tesla or singularity.
+  components:
+  - type: Sprite
+    sprite: _Wega/Structures/Holo/field.rsi
+    state: icon
+  - type: PointLight
+    enabled: true
+    radius: 3
+    color: red
+  - type: TimedDespawn
+    lifetime: 90
+  - type: Clickable
+  - type: ContainmentField
+    throwForce: 0
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml
index 231f150d8d..e97b0ff969 100644
--- a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml
+++ b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml
@@ -249,6 +249,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: BloodStructure
+    fixture: fix1
     structureGear:
     - ClothingEyesZealotBlindfold
     - BloodCultVeilShifter
@@ -267,6 +268,17 @@
   - type: Sprite
     sprite: _Wega/Structures/Specific/bloodcult_structures.rsi
     state: altar
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 190
+        mask:
+        - MachineMask
+        layer:
+          - MachineLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -287,6 +299,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: BloodStructure
+    fixture: fix1
     structureGear:
     - BloodCultEldritchSharpener
     - DrinkUnholyFlaskFull
@@ -341,6 +354,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: BloodStructure
+    fixture: fix1
     sound: "/Audio/_Wega/Effects/anvil.ogg"
     structureGear:
     - ClothingOuterArmorCult
@@ -364,6 +378,7 @@
     bodyType: Dynamic
   - type: BloodPylon
   - type: BloodStructure
+    fixture: fix1
     canInteract: false
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/_Wega/Loadouts/Jobs/Personal/Jumpsuit.yml b/Resources/Prototypes/_Wega/Loadouts/Jobs/Personal/Jumpsuit.yml
index 562484df99..4c6bea3212 100644
--- a/Resources/Prototypes/_Wega/Loadouts/Jobs/Personal/Jumpsuit.yml
+++ b/Resources/Prototypes/_Wega/Loadouts/Jobs/Personal/Jumpsuit.yml
@@ -201,221 +201,204 @@
 - type: loadout
   id: JumpskirtTurtleneckAquamarine
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckAquamarine
+    jumpsuit: ClothingUniformJumpskirtTurtleneckAquamarine
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckAquamarine
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckAquamarine  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckAquamarine  
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpskirtTurtleneckWhite
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckWhite
+    jumpsuit: ClothingUniformJumpskirtTurtleneckWhite
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckWhite
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckWhite  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckWhite  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckAzure
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckAzure
+    jumpsuit: ClothingUniformJumpskirtTurtleneckAzure
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckAzure
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckAzure  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckAzure  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckYellow
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckYellow
+    jumpsuit: ClothingUniformJumpskirtTurtleneckYellow
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckYellow
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckYellow  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckYellow  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckGreen
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckGreen
+    jumpsuit: ClothingUniformJumpskirtTurtleneckGreen
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckGreen
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckGreen  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckGreen  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckBrown
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckBrown
+    jumpsuit: ClothingUniformJumpskirtTurtleneckBrown
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckBrown
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckBrown  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckBrown  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckRed
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckRed
+    jumpsuit: ClothingUniformJumpskirtTurtleneckRed
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckRed
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckRed  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckRed  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckOrange
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckOrange
+    jumpsuit: ClothingUniformJumpskirtTurtleneckOrange
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckOrange
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckOrange  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckOrange  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckPink
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckPink
+    jumpsuit: ClothingUniformJumpskirtTurtleneckPink
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckPink
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckPink  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckPink  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckGrey
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckGrey
+    jumpsuit: ClothingUniformJumpskirtTurtleneckGrey
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckGrey
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckGrey  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckGrey  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckBlue
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckBlue
+    jumpsuit: ClothingUniformJumpskirtTurtleneckBlue
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckBlue
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckBlue  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckBlue  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckPurple
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckPurple
+    jumpsuit: ClothingUniformJumpskirtTurtleneckPurple
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckPurple
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckPurple  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckPurple  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckBlack
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckBlack
+    jumpsuit: ClothingUniformJumpskirtTurtleneckBlack
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckBlack
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckBlack  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckBlack  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpskirtTurtleneckSalat
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckSalat
+    jumpsuit: ClothingUniformJumpskirtTurtleneckSalat
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckSalat
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckSalat  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckSalat  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpsuitTurtleneckSalatblack
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckSalatblack
+    jumpsuit: ClothingUniformJumpsuitTurtleneckSalatblack
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpskirtTurtleneckBlackSleeveless
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckBlackSleeveless  
+    jumpsuit: ClothingUniformJumpskirtTurtleneckBlackSleeveless  
   groupBy: "wegaTJ" 
 
 - type: loadout
   id: JumpsuitTurtleneckBlackSleeveless
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckBlackSleeveless
+    jumpsuit: ClothingUniformJumpsuitTurtleneckBlackSleeveless
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpsuitTurtleneckWhiteBlackSleeveless
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless  
+    jumpsuit: ClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless  
   groupBy: "wegaTJ" 
   
 - type: loadout
   id: JumpsuitTurtleneckWhiteSleeveless
   equipment:
-    jumpsuit: ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless
+    jumpsuit: ClothingUniformJumpsuitTurtleneckWhiteSleeveless
   groupBy: "wegaTJ"    
     
 - type: loadout
   id: JumpskirtTurtleneckWhiteSleeveless
   equipment:
-    jumpsuit: ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless
+    jumpsuit: ClothingUniformJumpskirtTurtleneckWhiteSleeveless
   groupBy: "wegaTJ" 
-
-
-
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
\ No newline at end of file
diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml
index dc0c6591c2..94459385ab 100644
--- a/Resources/Prototypes/_Wega/tags.yml
+++ b/Resources/Prototypes/_Wega/tags.yml
@@ -235,3 +235,12 @@
   
 - type: Tag
   id: Cook
+
+- type: Tag
+  id: MagazineEagle
+
+- type: Tag
+  id: MagazineHristov
+
+- type: Tag
+  id: ExtMagazineRifle
diff --git a/Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/meta.json b/Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/meta.json
deleted file mode 100644
index 3a49244833..0000000000
--- a/Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by discord:lunalita",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-  "states": [
-    {
-      "name": "succubus",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/equipped-NECK.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/equipped-NECK.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/darkgrey_cloak.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/equipped-NECK.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/equipped-NECK.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Neck/Cloaks/gothic_cloak.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/equipped-FEET.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/equipped-FEET.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/equipped-FEET.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/icon-on.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/icon-on.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/icon-on.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-equipped-FEET.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-equipped-FEET.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-equipped-FEET.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-equipped-FEET.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-inhand-left.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-inhand-right.png b/Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Shoes/Boots/advanced.rsi/on-inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Shoes/Boots/advanced.rsi/on-inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi/meta.json
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/icon.png
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_forchicks.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_forchicks.rsi/meta.json
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/icon.png
diff --git a/Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Wega/Clothing/Uniform/Jumpsuit/tshirt_nochicks.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/tshirt_nochicks.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_tactick.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/icon.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/meta.json
rename to Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi/meta.json
diff --git a/Resources/Textures/_Wega/Mobs/Customization/demon.rsi/meta.json b/Resources/Textures/_Wega/Mobs/Customization/demon.rsi/meta.json
index 5f80c0df33..9e3de7349d 100644
--- a/Resources/Textures/_Wega/Mobs/Customization/demon.rsi/meta.json
+++ b/Resources/Textures/_Wega/Mobs/Customization/demon.rsi/meta.json
@@ -55,6 +55,10 @@
             "name": "trinity_spots",
             "directions": 4
         },
+        {
+            "name": "succubus",
+            "directions": 4
+        },
         {
             "name": "tail",
             "directions": 4
diff --git a/Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/succubus.png b/Resources/Textures/_Wega/Mobs/Customization/demon.rsi/succubus.png
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/demons/succubus.rsi/succubus.png
rename to Resources/Textures/_Wega/Mobs/Customization/demon.rsi/succubus.png
diff --git a/Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/beholder.png b/Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/beholder.png
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/beholder.png
rename to Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/beholder.png
diff --git a/Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/iron_jaw.png b/Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/iron_jaw.png
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/iron_jaw.png
rename to Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/iron_jaw.png
diff --git a/Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/malstrem.png b/Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/malstrem.png
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/malstrem.png
rename to Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/malstrem.png
diff --git a/Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/meta.json b/Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/meta.json
rename to Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/terminator.png b/Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/terminator.png
similarity index 100%
rename from Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi/terminator.png
rename to Resources/Textures/_Wega/Mobs/Customization/headaugs.rsi/terminator.png
diff --git a/Resources/Textures/_ADT/Objects/Devices/Holoprojectors/field.rsi/icon.png b/Resources/Textures/_Wega/Objects/Devices/Holoprojectors/field.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Devices/Holoprojectors/field.rsi/icon.png
rename to Resources/Textures/_Wega/Objects/Devices/Holoprojectors/field.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Objects/Devices/Holoprojectors/field.rsi/meta.json b/Resources/Textures/_Wega/Objects/Devices/Holoprojectors/field.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Devices/Holoprojectors/field.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Devices/Holoprojectors/field.rsi/meta.json
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/base.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/base.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/mag-1.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/mag-1.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/mag-1.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ext_rifle_mag.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/base.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/base.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/mag-1.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/mag-1.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/mag-1.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/mag-1.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/snipers.rsi/meta.json
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/base.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/base.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/bolt-open.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/bolt-open.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/bolt-open.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/bolt-open.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/equipped-BELT.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/icon.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/icon.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-left.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/inhand-right.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/mag-0.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/mag-0.png
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/mag-0.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/mag-0.png
diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Pistols/deserteagle.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/base.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/base.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/bolt-open.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/bolt-open.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/bolt-open.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/bolt-open.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-BACKPACK.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-SUITSTORAGE.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-SUITSTORAGE.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/icon.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/mag-0.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/mag-0.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/mag-0.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/mag-0.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-left.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-right.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/xc67.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/base.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/base.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/base.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/bolt-open.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/bolt-open.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/bolt-open.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/bolt-open.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-BACKPACK.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-SUITSTORAGE.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-SUITSTORAGE.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-left.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-left.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-right.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/inhand-right.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/meta.json
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/meta.json
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-left.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_ADT/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-right.png
rename to Resources/Textures/_Wega/Objects/Weapons/Guns/Snipers/new_hristov.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_ADT/Structures/Holo/field.rsi/icon.png b/Resources/Textures/_Wega/Structures/Holo/field.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_ADT/Structures/Holo/field.rsi/icon.png
rename to Resources/Textures/_Wega/Structures/Holo/field.rsi/icon.png
diff --git a/Resources/Textures/_ADT/Structures/Holo/field.rsi/meta.json b/Resources/Textures/_Wega/Structures/Holo/field.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_ADT/Structures/Holo/field.rsi/meta.json
rename to Resources/Textures/_Wega/Structures/Holo/field.rsi/meta.json