diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs
index 3ad087d1ae..87bbebba1b 100644
--- a/Content.Client/Chat/ChatBox.cs
+++ b/Content.Client/Chat/ChatBox.cs
@@ -43,6 +43,7 @@ namespace Content.Client.Chat
 
             AnchorLeft = 1.0f;
             AnchorRight = 1.0f;*/
+            MouseFilter = MouseFilterMode.Stop;
 
             var outerVBox = new VBoxContainer();
 
diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs
index e0ee549fbd..a2a3e04ae7 100644
--- a/Content.Client/Chat/ChatManager.cs
+++ b/Content.Client/Chat/ChatManager.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Client.Interfaces.Chat;
 using Content.Shared.Chat;
 using Robust.Client.Console;
@@ -81,10 +81,7 @@ namespace Content.Client.Chat
         {
             _netManager.RegisterNetMessage<MsgChatMessage>(MsgChatMessage.NAME, _onChatMessage);
 
-            _speechBubbleRoot = new LayoutContainer
-            {
-                MouseFilter = Control.MouseFilterMode.Ignore
-            };
+            _speechBubbleRoot = new LayoutContainer();
             LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide);
             _userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot);
             _speechBubbleRoot.SetPositionFirst();
diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs
index 01453c12f0..2766ab1b0b 100644
--- a/Content.Client/Chat/SpeechBubble.cs
+++ b/Content.Client/Chat/SpeechBubble.cs
@@ -1,4 +1,4 @@
-using Content.Client.Interfaces.Chat;
+using Content.Client.Interfaces.Chat;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -44,14 +44,12 @@ namespace Content.Client.Chat
             _senderEntity = senderEntity;
             _eyeManager = eyeManager;
 
-            MouseFilter = MouseFilterMode.Ignore;
             // Use text clipping so new messages don't overlap old ones being pushed up.
             RectClipContent = true;
 
             var label = new RichTextLabel
             {
                 MaxWidth = 256,
-                MouseFilter = MouseFilterMode.Ignore
             };
             label.SetMessage(text);
 
@@ -59,7 +57,6 @@ namespace Content.Client.Chat
             {
                 StyleClasses = { "tooltipBox" },
                 Children = { label },
-                MouseFilter = MouseFilterMode.Ignore,
                 ModulateSelfOverride = Color.White.WithAlpha(0.75f)
             };
 
diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs
index 03f0af16c5..04597fc3f9 100644
--- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs
+++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs
@@ -120,7 +120,6 @@ namespace Content.Client.GameObjects.Components.Doors
                     {
                         animPlayer.Play(OpenAnimation, AnimationKey);
                     }
-
                     break;
                 case DoorVisualState.Open:
                     sprite.LayerSetState(DoorVisualLayers.Base, "open");
diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
new file mode 100644
index 0000000000..6ad061678b
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
@@ -0,0 +1,107 @@
+using System;
+using Content.Shared.GameObjects.Components.Power;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.Components.Animations;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
+using YamlDotNet.RepresentationModel;
+
+namespace Content.Client.GameObjects.Components.Power
+{
+    public class AutolatheVisualizer2D : AppearanceVisualizer
+    {
+        private const string AnimationKey = "autolathe_animation";
+
+        private Animation _buildingAnimation;
+        private Animation _insertingMetalAnimation;
+        private Animation _insertingGlassAnimation;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            _buildingAnimation = PopulateAnimation("autolathe_building", "autolathe_building_unlit", 0.5f);
+            _insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f);
+            _insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f);
+        }
+
+        private Animation PopulateAnimation(string sprite, string spriteUnlit, float length)
+        {
+            var animation = new Animation {Length = TimeSpan.FromSeconds(length)};
+
+            var flick = new AnimationTrackSpriteFlick();
+            animation.AnimationTracks.Add(flick);
+            flick.LayerKey = AutolatheVisualLayers.Base;
+            flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(sprite, 0f));
+
+            var flickUnlit = new AnimationTrackSpriteFlick();
+            animation.AnimationTracks.Add(flickUnlit);
+            flickUnlit.LayerKey = AutolatheVisualLayers.BaseUnlit;
+            flickUnlit.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(spriteUnlit, 0f));
+
+            return animation;
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            if (!entity.HasComponent<AnimationPlayerComponent>())
+            {
+                entity.AddComponent<AnimationPlayerComponent>();
+            }
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            if (!component.TryGetData(PowerDeviceVisuals.VisualState, out LatheVisualState state))
+            {
+                state = LatheVisualState.Idle;
+            }
+
+            switch (state)
+            {
+                case LatheVisualState.Idle:
+                    if (animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Stop(AnimationKey);
+                    }
+
+                    sprite.LayerSetState(AutolatheVisualLayers.Base, "autolathe");
+                    sprite.LayerSetState(AutolatheVisualLayers.BaseUnlit, "autolathe_unlit");
+                    break;
+                case LatheVisualState.Producing:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_buildingAnimation, AnimationKey);
+                    }
+                    break;
+                case LatheVisualState.InsertingMetal:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_insertingMetalAnimation, AnimationKey);
+                    }
+                    break;
+                case LatheVisualState.InsertingGlass:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_insertingGlassAnimation, AnimationKey);
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            var glowingPartsVisible = !(component.TryGetData(PowerDeviceVisuals.Powered, out bool powered) && !powered);
+            sprite.LayerSetVisible(AutolatheVisualLayers.BaseUnlit, glowingPartsVisible);
+        }
+        public enum AutolatheVisualLayers
+        {
+            Base,
+            BaseUnlit
+        }
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
new file mode 100644
index 0000000000..4547c1668c
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
@@ -0,0 +1,104 @@
+using System;
+using Content.Shared.GameObjects.Components.Power;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.Components.Animations;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
+using YamlDotNet.RepresentationModel;
+
+namespace Content.Client.GameObjects.Components.Power
+{
+    public class ProtolatheVisualizer2D : AppearanceVisualizer
+    {
+        private const string AnimationKey = "protolathe_animation";
+
+        private Animation _buildingAnimation;
+        private Animation _insertingMetalAnimation;
+        private Animation _insertingGlassAnimation;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            _buildingAnimation = PopulateAnimation("protolathe_building", 0.9f);
+            _insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f);
+            _insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f);
+        }
+
+        private Animation PopulateAnimation(string sprite, float length)
+        {
+            var animation = new Animation {Length = TimeSpan.FromSeconds(length)};
+
+            var flick = new AnimationTrackSpriteFlick();
+            animation.AnimationTracks.Add(flick);
+            flick.LayerKey = ProtolatheVisualLayers.AnimationLayer;
+            flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(sprite, 0f));
+
+            return animation;
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            if (!entity.HasComponent<AnimationPlayerComponent>())
+            {
+                entity.AddComponent<AnimationPlayerComponent>();
+            }
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            if (!component.TryGetData(PowerDeviceVisuals.VisualState, out LatheVisualState state))
+            {
+                state = LatheVisualState.Idle;
+            }
+            sprite.LayerSetVisible(ProtolatheVisualLayers.AnimationLayer, true);
+            switch (state)
+            {
+                case LatheVisualState.Idle:
+                    if (animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Stop(AnimationKey);
+                    }
+
+                    sprite.LayerSetState(ProtolatheVisualLayers.Base, "protolathe");
+                    sprite.LayerSetState(ProtolatheVisualLayers.BaseUnlit, "protolathe_unlit");
+                    sprite.LayerSetVisible(ProtolatheVisualLayers.AnimationLayer, false);
+                    break;
+                case LatheVisualState.Producing:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_buildingAnimation, AnimationKey);
+                    }
+                    break;
+                case LatheVisualState.InsertingMetal:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_insertingMetalAnimation, AnimationKey);
+                    }
+                    break;
+                case LatheVisualState.InsertingGlass:
+                    if (!animPlayer.HasRunningAnimation(AnimationKey))
+                    {
+                        animPlayer.Play(_insertingGlassAnimation, AnimationKey);
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            var glowingPartsVisible = !(component.TryGetData(PowerDeviceVisuals.Powered, out bool powered) && !powered);
+            sprite.LayerSetVisible(ProtolatheVisualLayers.BaseUnlit, glowingPartsVisible);
+        }
+        public enum ProtolatheVisualLayers
+        {
+            Base,
+            BaseUnlit,
+            AnimationLayer
+        }
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
index a1491a0a7a..f66c6c7751 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
@@ -242,23 +242,22 @@ namespace Content.Client.GameObjects.Components.Storage
                 };
                 AddChild(ActualButton);
 
-                var hBoxContainer = new HBoxContainer {MouseFilter = MouseFilterMode.Ignore};
+                var hBoxContainer = new HBoxContainer();
                 EntitySpriteView = new SpriteView
                 {
-                    CustomMinimumSize = new Vector2(32.0f, 32.0f), MouseFilter = MouseFilterMode.Ignore
+                    CustomMinimumSize = new Vector2(32.0f, 32.0f)
                 };
                 EntityName = new Label
                 {
                     SizeFlagsVertical = SizeFlags.ShrinkCenter,
                     Text = "Backpack",
-                    MouseFilter = MouseFilterMode.Ignore
                 };
                 hBoxContainer.AddChild(EntitySpriteView);
                 hBoxContainer.AddChild(EntityName);
 
                 EntityControl = new Control
                 {
-                    SizeFlagsHorizontal = SizeFlags.FillExpand, MouseFilter = MouseFilterMode.Ignore
+                    SizeFlagsHorizontal = SizeFlags.FillExpand
                 };
                 EntitySize = new Label
                 {
diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
index 832ea53501..c88bf50150 100644
--- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
@@ -121,7 +121,7 @@ namespace Content.Client.GameObjects.EntitySystems
 
             DebugTools.AssertNotNull(_currentPopup);
 
-            var buttons = new List<Button>();
+            var buttons = new Dictionary<string, List<Button>>();
 
             var vBox = _currentPopup.List;
             vBox.DisposeAllChildren();
@@ -137,7 +137,10 @@ namespace Content.Client.GameObjects.EntitySystems
                     };
                 }
 
-                buttons.Add(button);
+                if(!buttons.ContainsKey(data.Category))
+                    buttons[data.Category] = new List<Button>();
+
+                buttons[data.Category].Add(button);
             }
 
             var user = GetUserEntity();
@@ -148,7 +151,13 @@ namespace Content.Client.GameObjects.EntitySystems
                     continue;
 
                 var disabled = verb.GetVisibility(user, component) != VerbVisibility.Visible;
-                buttons.Add(CreateVerbButton(verb.GetText(user, component), disabled, verb.ToString(),
+                var category = verb.GetCategory(user, component);
+
+
+                if(!buttons.ContainsKey(category))
+                    buttons[category] = new List<Button>();
+
+                buttons[category].Add(CreateVerbButton(verb.GetText(user, component), disabled, verb.ToString(),
                     entity.ToString(), () => verb.Activate(user, component)));
             }
             //Get global verbs. Visible for all entities regardless of their components.
@@ -158,17 +167,33 @@ namespace Content.Client.GameObjects.EntitySystems
                     continue;
 
                 var disabled = globalVerb.GetVisibility(user, entity) != VerbVisibility.Visible;
-                buttons.Add(CreateVerbButton(globalVerb.GetText(user, entity), disabled, globalVerb.ToString(),
+                var category = globalVerb.GetCategory(user, entity);
+
+                if(!buttons.ContainsKey(category))
+                    buttons[category] = new List<Button>();
+
+                buttons[category].Add(CreateVerbButton(globalVerb.GetText(user, entity), disabled, globalVerb.ToString(),
                     entity.ToString(), () => globalVerb.Activate(user, entity)));
             }
 
             if (buttons.Count > 0)
             {
-                buttons.Sort((a, b) => string.Compare(a.Text, b.Text, StringComparison.Ordinal));
-
-                foreach (var button in buttons)
+                foreach (var (category, verbs) in buttons)
                 {
-                    vBox.AddChild(button);
+                    if (string.IsNullOrEmpty(category))
+                        continue;
+
+                    vBox.AddChild(CreateCategoryButton(category, verbs));
+                }
+
+                if (buttons.ContainsKey(""))
+                {
+                    buttons[""].Sort((a, b) => string.Compare(a.Text, b.Text, StringComparison.Ordinal));
+
+                    foreach (var verb in buttons[""])
+                    {
+                        vBox.AddChild(verb);
+                    }
                 }
             }
             else
@@ -204,6 +229,25 @@ namespace Content.Client.GameObjects.EntitySystems
             return button;
         }
 
+        private Button CreateCategoryButton(string text, List<Button> verbButtons)
+        {
+            verbButtons.Sort((a, b) => string.Compare(a.Text, b.Text, StringComparison.Ordinal));
+
+            var button = new Button
+            {
+                Text = $"{text}...",
+            };
+            button.OnPressed += _ =>
+                {
+                    _currentPopup.List.DisposeAllChildren();
+                    foreach (var verb in verbButtons)
+                    {
+                        _currentPopup.List.AddChild(verb);
+                    }
+                };
+            return button;
+        }
+
         private void CloseContextMenu()
         {
             _currentPopup?.Dispose();
diff --git a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs
index 482f615dc9..b1d25b96ab 100644
--- a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs
+++ b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs
@@ -13,6 +13,8 @@ namespace Content.Client.GlobalVerbs
     class ViewVariablesVerb : GlobalVerb
     {
         public override string GetText(IEntity user, IEntity target) => "View variables";
+        public override string GetCategory(IEntity user, IEntity target) => "Debug";
+
         public override bool RequireInteractionRange => false;
 
         public override VerbVisibility GetVisibility(IEntity user, IEntity target)
diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
index 53b350bdd0..30b8238d20 100644
--- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
+++ b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
@@ -345,14 +345,12 @@ namespace Content.Client.UserInterface.Cargo
 
             var hBox = new HBoxContainer
             {
-                SizeFlagsHorizontal = SizeFlags.FillExpand,
-                MouseFilter = MouseFilterMode.Ignore
+                SizeFlagsHorizontal = SizeFlags.FillExpand
             };
 
             Icon = new TextureRect
             {
                 CustomMinimumSize = new Vector2(32.0f, 32.0f),
-                MouseFilter = MouseFilterMode.Ignore,
                 RectClipContent = true
             };
             hBox.AddChild(Icon);
@@ -366,7 +364,6 @@ namespace Content.Client.UserInterface.Cargo
             var panel = new PanelContainer
             {
                 PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 42) },
-                MouseFilter = MouseFilterMode.Ignore
             };
             PointCost = new Label
             {
@@ -396,13 +393,11 @@ namespace Content.Client.UserInterface.Cargo
             var hBox = new HBoxContainer
             {
                 SizeFlagsHorizontal = SizeFlags.FillExpand,
-                MouseFilter = MouseFilterMode.Ignore
             };
 
             Icon = new TextureRect
             {
                 CustomMinimumSize = new Vector2(32.0f, 32.0f),
-                MouseFilter = MouseFilterMode.Ignore,
                 RectClipContent = true
             };
             hBox.AddChild(Icon);
diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs
index ca738faeb3..3f4291deeb 100644
--- a/Content.Client/UserInterface/CharacterSetupGui.cs
+++ b/Content.Client/UserInterface/CharacterSetupGui.cs
@@ -141,6 +141,7 @@ namespace Content.Client.UserInterface
             {
                 preferencesManager.CreateCharacter(HumanoidCharacterProfile.Default());
                 UpdateUI();
+                args.Event.Handle();
             };
 
             hBox.AddChild(new PanelContainer
@@ -179,13 +180,14 @@ namespace Content.Client.UserInterface
                 _charactersVBox.AddChild(characterPickerButton);
 
                 var characterIndexCopy = characterIndex;
-                characterPickerButton.ActualButton.OnPressed += args =>
+                characterPickerButton.OnPressed += args =>
                 {
                     _humanoidProfileEditor.Profile = (HumanoidCharacterProfile) character;
                     _humanoidProfileEditor.CharacterSlot = characterIndexCopy;
                     _humanoidProfileEditor.UpdateControls();
                     _preferencesManager.SelectCharacter(character);
                     UpdateUI();
+                    args.Event.Handle();
                 };
                 characterIndex++;
             }
@@ -195,9 +197,8 @@ namespace Content.Client.UserInterface
             _charactersVBox.AddChild(_createNewCharacterButton);
         }
 
-        private class CharacterPickerButton : Control
+        private class CharacterPickerButton : ContainerButton
         {
-            public readonly Button ActualButton;
             private IEntity _previewDummy;
 
             public CharacterPickerButton(
@@ -206,6 +207,10 @@ namespace Content.Client.UserInterface
                 ButtonGroup group,
                 ICharacterProfile profile)
             {
+                AddStyleClass(StyleClassButton);
+                ToggleMode = true;
+                Group = group;
+
                 _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace);
                 _previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
                 var humanoid = profile as HumanoidCharacterProfile;
@@ -216,22 +221,13 @@ namespace Content.Client.UserInterface
 
                 var isSelectedCharacter = profile == preferencesManager.Preferences.SelectedCharacter;
 
-                ActualButton = new Button
-                {
-                    SizeFlagsHorizontal = SizeFlags.FillExpand,
-                    SizeFlagsVertical = SizeFlags.FillExpand,
-                    ToggleMode = true,
-                    Group = group
-                };
                 if (isSelectedCharacter)
-                    ActualButton.Pressed = true;
-                AddChild(ActualButton);
+                    Pressed = true;
 
                 var view = new SpriteView
                 {
                     Sprite = _previewDummy.GetComponent<SpriteComponent>(),
                     Scale = (2, 2),
-                    MouseFilter = MouseFilterMode.Ignore,
                     OverrideDirection = Direction.South
                 };
 
@@ -264,7 +260,6 @@ namespace Content.Client.UserInterface
                 var internalHBox = new HBoxContainer
                 {
                     SizeFlagsHorizontal = SizeFlags.FillExpand,
-                    MouseFilter = MouseFilterMode.Ignore,
                     SeparationOverride = 0,
                     Children =
                     {
diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/UserInterface/GameHud.cs
index 7367a82caa..fdfd3e624c 100644
--- a/Content.Client/UserInterface/GameHud.cs
+++ b/Content.Client/UserInterface/GameHud.cs
@@ -107,7 +107,7 @@ namespace Content.Client.UserInterface
 
         public void Initialize()
         {
-            RootControl = new LayoutContainer {MouseFilter = Control.MouseFilterMode.Ignore};
+            RootControl = new LayoutContainer();
             LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide);
 
             var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png");
@@ -237,7 +237,6 @@ namespace Content.Client.UserInterface
 
             HandsContainer = new MarginContainer
             {
-                MouseFilter = MouseFilterMode.Ignore,
                 SizeFlagsVertical = Control.SizeFlags.ShrinkEnd
             };
 
@@ -353,13 +352,11 @@ namespace Content.Client.UserInterface
 
                 AddChild(new MarginContainer
                 {
-                    MouseFilter = MouseFilterMode.Ignore,
                     MarginTopOverride = 4,
                     Children =
                     {
                         new VBoxContainer
                         {
-                            MouseFilter = MouseFilterMode.Ignore,
                             Children =
                             {
                                 (_textureRect = new TextureRect
@@ -367,7 +364,6 @@ namespace Content.Client.UserInterface
                                     Texture = texture,
                                     SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
                                     SizeFlagsVertical = SizeFlags.Expand | SizeFlags.ShrinkCenter,
-                                    MouseFilter = MouseFilterMode.Ignore,
                                     ModulateSelfOverride = ColorNormal,
                                     CustomMinimumSize = (0, 32),
                                     Stretch = TextureRect.StretchMode.KeepCentered
@@ -376,7 +372,6 @@ namespace Content.Client.UserInterface
                                 {
                                     Text = keyName,
                                     SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
-                                    MouseFilter = MouseFilterMode.Ignore,
                                     ModulateSelfOverride = ColorNormal,
                                     StyleClasses = {StyleClassLabelTopButton}
                                 })
diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs
index 0f66d323a3..2356d7e24e 100644
--- a/Content.Client/UserInterface/HandsGui.cs
+++ b/Content.Client/UserInterface/HandsGui.cs
@@ -39,8 +39,6 @@ namespace Content.Client.UserInterface
         {
             IoCManager.InjectDependencies(this);
 
-            MouseFilter = MouseFilterMode.Ignore;
-
             var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png");
             var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png");
             var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png");
@@ -54,8 +52,7 @@ namespace Content.Client.UserInterface
             var hBox = new HBoxContainer
             {
                 SeparationOverride = 0,
-                Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel},
-                MouseFilter = MouseFilterMode.Ignore
+                Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel}
             };
 
             AddChild(hBox);
@@ -68,7 +65,6 @@ namespace Content.Client.UserInterface
             // Active hand
             _leftButton.AddChild(ActiveHandRect = new TextureRect
             {
-                MouseFilter = MouseFilterMode.Ignore,
                 Texture = textureHandActive,
                 TextureScale = (2, 2)
             });
diff --git a/Content.Client/UserInterface/ItemSlotButton.cs b/Content.Client/UserInterface/ItemSlotButton.cs
index a6b0e0fa49..f27583f737 100644
--- a/Content.Client/UserInterface/ItemSlotButton.cs
+++ b/Content.Client/UserInterface/ItemSlotButton.cs
@@ -31,7 +31,6 @@ namespace Content.Client.GameObjects
 
             AddChild(SpriteView = new SpriteView
             {
-                MouseFilter = MouseFilterMode.Ignore,
                 Scale = (2, 2),
                 OverrideDirection = Direction.South
             });
@@ -52,7 +51,6 @@ namespace Content.Client.GameObjects
             {
                 SizeFlagsHorizontal = SizeFlags.ShrinkCenter,
                 SizeFlagsVertical = SizeFlags.ShrinkCenter,
-                MouseFilter = MouseFilterMode.Ignore,
                 Stretch = TextureRect.StretchMode.KeepCentered,
                 TextureScale = (2, 2),
                 Visible = false,
diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs
index bd5bd73a60..97cdd91310 100644
--- a/Content.Client/UserInterface/NanoStyle.cs
+++ b/Content.Client/UserInterface/NanoStyle.cs
@@ -307,19 +307,19 @@ namespace Content.Client.UserInterface
                     }),
 
                 // Regular buttons!
-                new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[]
+                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassNormal}), new[]
                 {
                     new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal),
                 }),
-                new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[]
+                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassHover}), new[]
                 {
                     new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover),
                 }),
-                new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[]
+                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassPressed}), new[]
                 {
                     new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed),
                 }),
-                new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[]
+                new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[]
                 {
                     new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled),
                 }),
diff --git a/Content.Client/UserInterface/StatusEffectsUI.cs b/Content.Client/UserInterface/StatusEffectsUI.cs
index 2e09c01a2f..e6f0fc044f 100644
--- a/Content.Client/UserInterface/StatusEffectsUI.cs
+++ b/Content.Client/UserInterface/StatusEffectsUI.cs
@@ -1,4 +1,4 @@
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.UserInterface
@@ -14,7 +14,6 @@ namespace Content.Client.UserInterface
         public StatusEffectsUI()
         {
             _vBox = new VBoxContainer();
-            MouseFilter = Control.MouseFilterMode.Ignore;
             AddChild(_vBox);
 
             LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin);
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
index 3e123fca11..98b064bfc2 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -208,7 +208,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
                     if (SolutionValidReaction(reaction, out int unitReactions))
                     {
                         PerformReaction(reaction, unitReactions);
-                        checkForNewReaction = true; 
+                        checkForNewReaction = true;
                         break;
                     }
                 }
diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
index 4124a7a219..f7f3b81bbd 100644
--- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
+++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Interactable.Tools;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces;
 using Content.Shared.Construction;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
@@ -12,6 +13,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.Construction.ConstructionStepMaterial;
@@ -34,6 +36,8 @@ namespace Content.Server.GameObjects.Components.Construction
 #pragma warning disable 649
         [Dependency] private IRobustRandom _random;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager;
+        [Dependency] private readonly IServerNotifyManager _notifyManager;
+        [Dependency] private readonly ILocalizationManager _localizationManager;
 #pragma warning restore 649
 
         public override void Initialize()
@@ -49,8 +53,10 @@ namespace Content.Server.GameObjects.Components.Construction
         {
             var playerEntity = eventArgs.User;
             var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
-            if (!interactionSystem.InRangeUnobstructed(playerEntity.Transform.MapPosition, Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: true))
+            if (!interactionSystem.InRangeUnobstructed(playerEntity.Transform.MapPosition, Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: Prototype.CanBuildInImpassable))
             {
+                _notifyManager.PopupMessage(Owner.Transform.GridPosition, playerEntity,
+                    _localizationManager.GetString("You can't reach there!"));
                 return false;
             }
 
diff --git a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
index 3ef1905fc6..4a036e0cb8 100644
--- a/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
+++ b/Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
@@ -3,6 +3,7 @@ using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Construction;
 using Content.Shared.GameObjects.Components.Construction;
+using Content.Shared.Interfaces;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
@@ -10,6 +11,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
@@ -24,6 +26,8 @@ namespace Content.Server.GameObjects.Components.Construction
         [Dependency] private readonly IMapManager _mapManager;
         [Dependency] private readonly IServerEntityManager _serverEntityManager;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager;
+        [Dependency] private readonly ISharedNotifyManager _notifyManager;
+        [Dependency] private readonly ILocalizationManager _localizationManager;
 #pragma warning restore 649
 
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
@@ -44,8 +48,10 @@ namespace Content.Server.GameObjects.Components.Construction
             var transform = Owner.Transform;
 
             var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
-            if (!interactionSystem.InRangeUnobstructed(loc.ToMap(_mapManager), Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: true))
+            if (!interactionSystem.InRangeUnobstructed(loc.ToMap(_mapManager), Owner.Transform.WorldPosition, ignoredEnt: Owner, insideBlockerValid: prototype.CanBuildInImpassable))
             {
+                _notifyManager.PopupMessage(transform.GridPosition, Owner,
+                        _localizationManager.GetString("You can't reach there!"));
                 return;
             }
 
diff --git a/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs b/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs
index 26d056ac17..969b071bd8 100644
--- a/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs
@@ -104,12 +104,6 @@ namespace Content.Server.GameObjects.Components.Movement
         /// </summary>
         [ViewVariables] public bool DiagonalMovementEnabled => _configurationManager.GetCVar<bool>("game.diagonalmovement");
 
-        public override void Initialize()
-        {
-            base.Initialize();
-            _configurationManager.RegisterCVar("game.diagonalmovement", true, CVar.ARCHIVE);
-        }
-
         /// <inheritdoc />
         public override void OnAdd()
         {
diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs
index d08a471024..f1020eb091 100644
--- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs
+++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs
@@ -1,18 +1,22 @@
 // Only unused on .NET Core due to KeyValuePair.Deconstruct
 // ReSharper disable once RedundantUsingDirective
+
+using System;
 using Robust.Shared.Utility;
 using System.Collections.Generic;
+using System.Linq;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Materials;
+using Content.Shared.GameObjects.Components.Power;
 using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
+using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
 
@@ -32,16 +36,28 @@ namespace Content.Server.GameObjects.Components.Research
         [ViewVariables]
         public bool Producing { get; private set; } = false;
 
+        private AppearanceComponent _appearance;
+        private LatheState _state = LatheState.Base;
+
+        protected virtual LatheState State
+        {
+            get => _state;
+            set => _state = value;
+        }
+
         private LatheRecipePrototype _producingRecipe = null;
         private PowerDeviceComponent _powerDevice;
         private bool Powered => _powerDevice.Powered;
 
+        private static readonly TimeSpan InsertionTime = TimeSpan.FromSeconds(0.9f);
+
         public override void Initialize()
         {
             base.Initialize();
             _userInterface = Owner.GetComponent<ServerUserInterfaceComponent>().GetBoundUserInterface(LatheUiKey.Key);
             _userInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
             _powerDevice = Owner.GetComponent<PowerDeviceComponent>();
+            _appearance = Owner.GetComponent<AppearanceComponent>();
         }
 
         private void UserInterfaceOnOnReceiveMessage(ServerBoundUserInterfaceMessage message)
@@ -100,12 +116,17 @@ namespace Content.Server.GameObjects.Components.Research
 
             _userInterface.SendMessage(new LatheProducingRecipeMessage(recipe.ID));
 
+            State = LatheState.Producing;
+            SetAppearance(LatheVisualState.Producing);
+
             Timer.Spawn(recipe.CompleteTime, () =>
             {
                 Producing = false;
                 _producingRecipe = null;
                 Owner.EntityManager.SpawnEntity(recipe.Result, Owner.Transform.GridPosition);
                 _userInterface.SendMessage(new LatheStoppedProducingRecipeMessage());
+                State = LatheState.Base;
+                SetAppearance(LatheVisualState.Idle);
             });
 
             return true;
@@ -125,7 +146,6 @@ namespace Content.Server.GameObjects.Components.Research
                 return;
             }
             OpenUserInterface(actor.playerSession);
-            return;
         }
         bool IAttackBy.AttackBy(AttackByEventArgs eventArgs)
         {
@@ -151,15 +171,37 @@ namespace Content.Server.GameObjects.Components.Research
 
             foreach (var mat in material.MaterialTypes.Values)
             {
-
                 storage.InsertMaterial(mat.ID, VolumePerSheet * multiplier);
             }
 
+            State = LatheState.Inserting;
+            switch (material.MaterialTypes.Values.First().Name)
+            {
+                case "Steel":
+                    SetAppearance(LatheVisualState.InsertingMetal);
+                    break;
+                case "Glass":
+                    SetAppearance(LatheVisualState.InsertingGlass);
+                    break;
+            }
+
+            Timer.Spawn(InsertionTime, async () =>
+            {
+                State = LatheState.Base;
+                SetAppearance(LatheVisualState.Idle);
+            });
+
             eventArgs.AttackWith.Delete();
 
             return false;
         }
 
+        private void SetAppearance(LatheVisualState state)
+        {
+            if (_appearance != null || Owner.TryGetComponent(out _appearance))
+                _appearance.SetData(PowerDeviceVisuals.VisualState, state);
+        }
+
         private Queue<string> GetIDQueue()
         {
             var queue = new Queue<string>();
@@ -170,5 +212,12 @@ namespace Content.Server.GameObjects.Components.Research
 
             return queue;
         }
+
+        protected enum LatheState
+        {
+            Base,
+            Inserting,
+            Producing
+        }
     }
 }
diff --git a/Content.Server/GameObjects/Components/RotatableComponent.cs b/Content.Server/GameObjects/Components/RotatableComponent.cs
index 5150f9ad8a..5707056e0e 100644
--- a/Content.Server/GameObjects/Components/RotatableComponent.cs
+++ b/Content.Server/GameObjects/Components/RotatableComponent.cs
@@ -40,6 +40,8 @@ namespace Content.Server.GameObjects.Components
                 return "Rotate clockwise";
             }
 
+            protected override string GetCategory(IEntity user, RotatableComponent component) => "Rotate";
+
             protected override VerbVisibility GetVisibility(IEntity user, RotatableComponent component)
             {
                 return VerbVisibility.Visible;
@@ -59,6 +61,8 @@ namespace Content.Server.GameObjects.Components
                 return "Rotate counter-clockwise";
             }
 
+            protected override string GetCategory(IEntity user, RotatableComponent component) => "Rotate";
+
             protected override VerbVisibility GetVisibility(IEntity user, RotatableComponent component)
             {
                 return VerbVisibility.Visible;
diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
index a2524b6204..5860ac4e35 100644
--- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
@@ -11,10 +11,12 @@ using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.Player;
 using Robust.Server.Interfaces.Timing;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input;
+using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Map;
@@ -38,6 +40,7 @@ namespace Content.Server.GameObjects.EntitySystems
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
         [Dependency] private readonly IMapManager _mapManager;
         [Dependency] private readonly IRobustRandom _robustRandom;
+        [Dependency] private readonly IConfigurationManager _configurationManager;
 #pragma warning restore 649
 
         private AudioSystem _audioSystem;
@@ -78,6 +81,8 @@ namespace Content.Server.GameObjects.EntitySystems
             SubscribeLocalEvent<PlayerDetachedSystemMessage>(PlayerDetached);
 
             _audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
+
+            _configurationManager.RegisterCVar("game.diagonalmovement", true, CVar.ARCHIVE);
         }
 
         private static void PlayerAttached(PlayerAttachSystemMessage ev)
diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs
index d9c44a1cd6..95be3be1aa 100644
--- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs
@@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
                 // TODO: These keys being giant strings is inefficient as hell.
                 data.Add(new VerbsResponseMessage.VerbData(verb.GetText(userEntity, component),
-                    $"{component.GetType()}:{verb.GetType()}",
+                    $"{component.GetType()}:{verb.GetType()}", verb.GetCategory(userEntity, component),
                     vis == VerbVisibility.Visible));
             }
 
@@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.EntitySystems
                     continue;
 
                 data.Add(new VerbsResponseMessage.VerbData(globalVerb.GetText(userEntity, entity),
-                    globalVerb.GetType().ToString(), vis == VerbVisibility.Visible));
+                    globalVerb.GetType().ToString(), globalVerb.GetCategory(userEntity, entity), vis == VerbVisibility.Visible));
             }
 
             var response = new VerbsResponseMessage(data, req.EntityUid);
diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs
index d67391c202..52150d57be 100644
--- a/Content.Server/GlobalVerbs/ControlMobVerb.cs
+++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs
@@ -16,6 +16,8 @@ namespace Content.Server.GlobalVerbs
     public class ControlMobVerb : GlobalVerb
     {
         public override string GetText(IEntity user, IEntity target) => "Control Mob";
+        public override string GetCategory(IEntity user, IEntity target) => "Debug";
+
         public override bool RequireInteractionRange => false;
 
         public override VerbVisibility GetVisibility(IEntity user, IEntity target)
diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/GlobalVerbs/RejuvenateVerb.cs
index d5511bf0a7..e2082077c0 100644
--- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs
+++ b/Content.Server/GlobalVerbs/RejuvenateVerb.cs
@@ -15,6 +15,8 @@ namespace Content.Server.GlobalVerbs
     class RejuvenateVerb : GlobalVerb
     {
         public override string GetText(IEntity user, IEntity target) => "Rejuvenate";
+        public override string GetCategory(IEntity user, IEntity target) => "Debug";
+
         public override bool RequireInteractionRange => false;
 
         public override VerbVisibility GetVisibility(IEntity user, IEntity target)
diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs
index 3d22568ee8..d9e04eacbf 100644
--- a/Content.Shared/Construction/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/ConstructionPrototype.cs
@@ -21,6 +21,7 @@ namespace Content.Shared.Construction
         private string _id;
         private string _result;
         private string _placementMode;
+        private bool _canBuildInImpassable;
 
         /// <summary>
         ///     Friendly name displayed in the construction GUI.
@@ -37,6 +38,11 @@ namespace Content.Shared.Construction
         /// </summary>
         public SpriteSpecifier Icon => _icon;
 
+        /// <summary>
+        ///     If you can start building or complete steps on impassable terrain.
+        /// </summary>
+        public bool CanBuildInImpassable => _canBuildInImpassable;
+
         /// <summary>
         ///     A list of keywords that are used for searching.
         /// </summary>
@@ -81,6 +87,7 @@ namespace Content.Shared.Construction
             ser.DataField(ref _type, "objecttype", ConstructionType.Structure);
             ser.DataField(ref _result, "result", null);
             ser.DataField(ref _placementMode, "placementmode", "PlaceFree");
+            ser.DataField(ref _canBuildInImpassable, "canbuildinimpassable", false);
 
             _keywords = ser.ReadDataField<List<string>>("keywords", new List<string>());
             {
diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
new file mode 100644
index 0000000000..21ab0d43a0
--- /dev/null
+++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
@@ -0,0 +1,14 @@
+using System;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components.Power
+{
+    [Serializable, NetSerializable]
+    public enum LatheVisualState
+    {
+        Idle,
+        Producing,
+        InsertingMetal,
+        InsertingGlass
+    }
+}
diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs
index 2f050760f4..67ee873851 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs
+++ b/Content.Shared/GameObjects/Components/Power/SharedPowerDeviceComponent.cs
@@ -6,6 +6,7 @@ namespace Content.Shared.GameObjects.Components.Power
     [Serializable, NetSerializable]
     public enum PowerDeviceVisuals
     {
+        VisualState,
         Powered
     }
 }
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
index 3ba08ebe2b..6a976aa977 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
+++ b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
@@ -35,12 +35,14 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
             {
                 public readonly string Text;
                 public readonly string Key;
+                public readonly string Category;
                 public readonly bool Available;
 
-                public VerbData(string text, string key, bool available)
+                public VerbData(string text, string key, string category, bool available)
                 {
                     Text = text;
                     Key = key;
+                    Category = category;
                     Available = available;
                 }
             }
diff --git a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs
index dcf8d182b8..c4c5e3a3ab 100644
--- a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs
+++ b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs
@@ -27,6 +27,13 @@ namespace Content.Shared.GameObjects
         /// <returns>The text string that is shown in the right click menu for this verb.</returns>
         public abstract string GetText(IEntity user, IEntity target);
 
+        /// <summary>
+        ///     Gets the category of this verb.
+        /// </summary>
+        /// <param name="user">The entity of the user opening this menu.</param>
+        /// <returns>The category of this verb.</returns>
+        public virtual string GetCategory(IEntity user, IEntity target) => "";
+
         /// <summary>
         ///     Gets the visibility level of this verb in the right click menu.
         /// </summary>
diff --git a/Content.Shared/GameObjects/Verbs/Verb.cs b/Content.Shared/GameObjects/Verbs/Verb.cs
index b5e213541c..819bc0fb41 100644
--- a/Content.Shared/GameObjects/Verbs/Verb.cs
+++ b/Content.Shared/GameObjects/Verbs/Verb.cs
@@ -31,6 +31,14 @@ namespace Content.Shared.GameObjects
         /// <returns>The text string that is shown in the right click menu for this verb.</returns>
         public abstract string GetText(IEntity user, IComponent component);
 
+        /// <summary>
+        ///     Gets the category of this verb.
+        /// </summary>
+        /// <param name="user">The entity of the user opening this menu.</param>
+        /// <param name="component">The component instance for which this verb is being loaded.</param>
+        /// <returns>The category of this verb.</returns>
+        public virtual string GetCategory(IEntity user, IComponent component)  => "";
+
         /// <summary>
         ///     Gets the visibility level of this verb in the right click menu.
         /// </summary>
@@ -63,6 +71,14 @@ namespace Content.Shared.GameObjects
         /// <returns>The text string that is shown in the right click menu for this verb.</returns>
         protected abstract string GetText(IEntity user, T component);
 
+        /// <summary>
+        ///     Gets the category of this verb.
+        /// </summary>
+        /// <param name="user">The entity of the user opening this menu.</param>
+        /// <param name="component">The component instance for which this verb is being loaded.</param>
+        /// <returns>The category of this verb.</returns>
+        protected virtual string GetCategory(IEntity user, T component) => "";
+
         /// <summary>
         ///     Gets the visibility level of this verb in the right click menu.
         /// </summary>
@@ -84,6 +100,12 @@ namespace Content.Shared.GameObjects
             return GetText(user, (T) component);
         }
 
+        /// <inheritdoc />
+        public sealed override string GetCategory(IEntity user, IComponent component)
+        {
+            return GetCategory(user, (T) component);
+        }
+
         /// <inheritdoc />
         public sealed override VerbVisibility GetVisibility(IEntity user, IComponent component)
         {
diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Construction/machines.yml
index 6425a5f04f..03a3a34b8d 100644
--- a/Resources/Prototypes/Construction/machines.yml
+++ b/Resources/Prototypes/Construction/machines.yml
@@ -5,6 +5,7 @@
   category: Machines
   description: A simple wall-mounted light fixture.
   placementmode: SnapgridBorder
+  canbuildinimpassable: true
   icon:
     sprite: Objects/Lighting/lighting.rsi
     state: on
@@ -17,6 +18,7 @@
       sprite: Objects/Lighting/lighting.rsi
       state: construct
 
+
   - material: Cable
     amount: 1
     icon:
diff --git a/Resources/Prototypes/Construction/power.yml b/Resources/Prototypes/Construction/power.yml
index 3b87b8b84a..2fcda4d312 100644
--- a/Resources/Prototypes/Construction/power.yml
+++ b/Resources/Prototypes/Construction/power.yml
@@ -41,6 +41,7 @@
   category: Machines/Power
   placementmode: SnapgridCenter
   description: Provides power from the grid wirelessly to other machines in the area.
+  canbuildinimpassable: true
   icon:
     sprite: Buildings/apc.rsi
     state: apc0
diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml
index 15dbd08963..459fb5f2f7 100644
--- a/Resources/Prototypes/Construction/structures.yml
+++ b/Resources/Prototypes/Construction/structures.yml
@@ -19,7 +19,7 @@
   - material: Metal
     amount: 2
     reverse:
-      tool: Welder
+      tool: Wrench
 
 - type: construction
   name: Table
@@ -33,3 +33,65 @@
   steps:
   - material: Metal
     amount: 2
+
+- type: construction
+  name: Window
+  id: window
+  category: Structures
+  description: Clear.
+  icon:
+    sprite: Buildings/window.rsi
+    state: full
+  objecttype: Structure
+  result: window
+  placementmode: SnapgridCenter
+  steps:
+  - material: Glass
+    amount: 2
+
+- type: construction
+  name: Low Wall
+  id: low_wall
+  category: Structures
+  description: A low wall used for mounting windows.
+  icon:
+    sprite: Buildings/low_wall.rsi
+    state: metal
+  objecttype: Structure
+  result: low_wall
+  placementmode: SnapgridCenter
+  steps:
+  - material: Metal
+    amount: 2
+    icon: Buildings/wall_girder.png
+    reverse:
+      tool: Wrench
+
+  - material: Metal
+    amount: 2
+    reverse:
+      tool: Wrench
+
+- type: construction
+  name: Rein Window
+  id: rwindow
+  category: Structures
+  description: Clear but tough.
+  icon:
+    sprite: Buildings/rwindow.rsi
+    state: full
+  objecttype: Structure
+  result: rwindow
+  placementmode: SnapgridCenter
+  steps:
+  - material: Glass
+    amount: 2
+    reverse:
+      tool: Wrench
+
+# Should be replaced with Metal Rods when someone puts them in.
+  - material: Metal
+    amount: 2
+    reverse:
+      # Should be replaced with Wirecutter when someone makes it work.
+      tool: Wrench
diff --git a/Resources/Prototypes/Entities/buildings/lathe.yml b/Resources/Prototypes/Entities/buildings/lathe.yml
index f49b58f89e..67a52069f2 100644
--- a/Resources/Prototypes/Entities/buildings/lathe.yml
+++ b/Resources/Prototypes/Entities/buildings/lathe.yml
@@ -25,9 +25,10 @@
     sprite: Buildings/autolathe.rsi
     layers:
     - state: autolathe
+      map: ["enum.AutolatheVisualLayers.Base"]
     - state: autolathe_unlit
       shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
   - type: Icon
     sprite: Buildings/autolathe.rsi
     state: autolathe
@@ -56,7 +57,7 @@
       - Multitool
   - type: Appearance
     visuals:
-    - type: PowerDeviceVisualizer2D
+    - type: AutolatheVisualizer2D
 
 - type: entity
   parent: BaseLathe
@@ -67,9 +68,12 @@
     sprite: Buildings/research.rsi
     layers:
     - state: protolathe
+      map: ["enum.ProtolatheVisualLayers.Base"]
     - state: protolathe_unlit
       shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
+    - state: protolathe
+      map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
   - type: Icon
     sprite: Buildings/research.rsi
     state: protolathe
@@ -104,4 +108,4 @@
       type: ResearchClientBoundUserInterface
   - type: Appearance
     visuals:
-    - type: PowerDeviceVisualizer2D
+    - type: ProtolatheVisualizer2D
diff --git a/Resources/Prototypes/Entities/buildings/walls.yml b/Resources/Prototypes/Entities/buildings/walls.yml
index 5bd0e7f08c..92af17e090 100644
--- a/Resources/Prototypes/Entities/buildings/walls.yml
+++ b/Resources/Prototypes/Entities/buildings/walls.yml
@@ -13,8 +13,10 @@
   - type: Sprite
     netsync: false
     drawdepth: Walls
+
   - type: Icon
     state: full
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -26,6 +28,7 @@
   - type: Occluder
     sizeX: 32
     sizeY: 32
+
   - type: SnapGrid
     offset: Center
 
diff --git a/Resources/Prototypes/Entities/buildings/windows.yml b/Resources/Prototypes/Entities/buildings/windows.yml
index 279dbd654c..fefb671a8b 100644
--- a/Resources/Prototypes/Entities/buildings/windows.yml
+++ b/Resources/Prototypes/Entities/buildings/windows.yml
@@ -2,6 +2,10 @@
   id: window
   name: Window
   description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -13,7 +17,7 @@
 
   - type: Icon
     sprite: Buildings/window.rsi
-    state: window0
+    state: full
 
   - type: Collidable
     shapes:
@@ -30,10 +34,6 @@
   - type: Window
     base: window
 
-  placement:
-    snap:
-    - Wall
-
 - type: entity
   id: rwindow
   name: Reinforced Window
@@ -48,4 +48,4 @@
 
   - type: Icon
     sprite: Buildings/rwindow.rsi
-    state: rwindow0
+    state: full
diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml
index a6b84530c3..2a6001bca3 100644
--- a/Resources/Prototypes/Entities/items/clothing/gloves.yml
+++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml
@@ -456,8 +456,8 @@
 - type: entity
   parent: GlovesBase
   id: GlovesLeather
-  name: Leather gloves
-  description: ''
+  name: 'Botanist''s leather gloves'
+  description: 'These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They''re also quite warm.'
   components:
   - type: Sprite
     sprite: Clothing/Gloves/leather.rsi
@@ -465,6 +465,7 @@
     sprite: Clothing/Gloves/leather.rsi
   - type: Clothing
     sprite: Clothing/Gloves/leather.rsi
+    HeatResistance: 1400
 
 - type: entity
   parent: GlovesBase
@@ -776,5 +777,4 @@
   - type: Icon
     sprite: Clothing/Gloves/yellow.rsi
   - type: Clothing
-    HeatResistance: 1500
     sprite: Clothing/Gloves/yellow.rsi
diff --git a/Resources/Prototypes/Entities/items/item_base.yml b/Resources/Prototypes/Entities/items/item_base.yml
index ce56ba084c..efc42621d6 100644
--- a/Resources/Prototypes/Entities/items/item_base.yml
+++ b/Resources/Prototypes/Entities/items/item_base.yml
@@ -11,7 +11,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 26
+      mask: 0
       layer: 32
     IsScrapingFloor: true
   - type: Physics
diff --git a/Resources/Prototypes/Entities/mobs/human.yml b/Resources/Prototypes/Entities/mobs/human.yml
index d455a96e7a..50f789e8e0 100644
--- a/Resources/Prototypes/Entities/mobs/human.yml
+++ b/Resources/Prototypes/Entities/mobs/human.yml
@@ -26,7 +26,7 @@
   - type: InteractionOutline
   - type: Sprite
     netsync: false
-
+    drawdepth: Mobs
     layers:
     - map: ["enum.HumanoidVisualLayers.Chest"]
       color: "#e8b59b"
diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_r.png b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_glass_plate.png
similarity index 100%
rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_r.png
rename to Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_glass_plate.png
diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting.png b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_metal_plate.png
similarity index 100%
rename from Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting.png
rename to Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_metal_plate.png
diff --git a/Resources/Textures/Buildings/autolathe.rsi/meta.json b/Resources/Textures/Buildings/autolathe.rsi/meta.json
index 3bb1cccea4..9f868d6a0c 100644
--- a/Resources/Textures/Buildings/autolathe.rsi/meta.json
+++ b/Resources/Textures/Buildings/autolathe.rsi/meta.json
@@ -28,15 +28,15 @@
             "directions": 1,
             "delays": [
                 [
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055
                 ]
             ]
         },
@@ -45,20 +45,37 @@
             "directions": 1,
             "delays": [
                 [
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15,
-                    0.15
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055,
+                    0.055
                 ]
             ]
         },
         {
-            "name": "autolathe_inserting",
+            "name": "autolathe_inserting_metal_plate",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "autolathe_inserting_glass_plate",
             "directions": 1,
             "delays": [
                 [
@@ -99,23 +116,6 @@
                     1.0
                 ]
             ]
-        },
-        {
-            "name": "autolathe_r",
-            "directions": 1,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Buildings/research.rsi/meta.json b/Resources/Textures/Buildings/research.rsi/meta.json
index 6eacf5723e..c41bbc75d9 100644
--- a/Resources/Textures/Buildings/research.rsi/meta.json
+++ b/Resources/Textures/Buildings/research.rsi/meta.json
@@ -259,7 +259,7 @@
             ]
         },
         {
-            "name": "protolathe_n",
+            "name": "protolathe_building",
             "directions": 1,
             "delays": [
                 [
@@ -314,7 +314,7 @@
             ]
         },
         {
-            "name": "protolathe_t",
+            "name": "protolathe_open",
             "directions": 1,
             "delays": [
                 [
diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_n.png b/Resources/Textures/Buildings/research.rsi/protolathe_building.png
similarity index 100%
rename from Resources/Textures/Buildings/research.rsi/protolathe_n.png
rename to Resources/Textures/Buildings/research.rsi/protolathe_building.png
diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_t.png b/Resources/Textures/Buildings/research.rsi/protolathe_open.png
similarity index 100%
rename from Resources/Textures/Buildings/research.rsi/protolathe_t.png
rename to Resources/Textures/Buildings/research.rsi/protolathe_open.png
diff --git a/Resources/Textures/Buildings/rwindow.rsi/full.png b/Resources/Textures/Buildings/rwindow.rsi/full.png
new file mode 100644
index 0000000000..b54c1e59b7
Binary files /dev/null and b/Resources/Textures/Buildings/rwindow.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/rwindow.rsi/meta.json b/Resources/Textures/Buildings/rwindow.rsi/meta.json
index e45955bc22..d0b59b807f 100644
--- a/Resources/Textures/Buildings/rwindow.rsi/meta.json
+++ b/Resources/Textures/Buildings/rwindow.rsi/meta.json
@@ -1 +1,164 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "rwindow0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi",
+  "states": [
+    {
+      "name": "full",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow0",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow1",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow2",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow3",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow4",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow5",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow6",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow7",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Buildings/window.rsi/full.png b/Resources/Textures/Buildings/window.rsi/full.png
new file mode 100644
index 0000000000..7a620720ce
Binary files /dev/null and b/Resources/Textures/Buildings/window.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/window.rsi/meta.json b/Resources/Textures/Buildings/window.rsi/meta.json
index 906d239759..b3ba878755 100644
--- a/Resources/Textures/Buildings/window.rsi/meta.json
+++ b/Resources/Textures/Buildings/window.rsi/meta.json
@@ -1 +1,164 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "window0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi",
+  "states": [
+    {
+      "name": "full",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window0",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window1",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window2",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window3",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window4",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window5",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window6",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window7",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/RobustToolbox b/RobustToolbox
index 0a306514a2..a21bad1f1b 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 0a306514a2c927d3e19f2f6fcec9eee64b488ce4
+Subproject commit a21bad1f1b423cd1d000eb6b69293c70614f9f15