diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs
index bffe42c721..b4357a5736 100644
--- a/Content.Client/Chat/SpeechBubble.cs
+++ b/Content.Client/Chat/SpeechBubble.cs
@@ -12,7 +12,7 @@ namespace Content.Client.Chat
 {
     public abstract class SpeechBubble : Control
     {
-        public enum SpeechType
+        public enum SpeechType : byte
         {
             Emote,
             Say
diff --git a/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs
index fc5bfaf5af..16348a3422 100644
--- a/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs
@@ -81,7 +81,7 @@ namespace Content.Client.GameObjects.Components.Atmos
         }
     }
 
-    public enum FireVisualLayers
+    public enum FireVisualLayers : byte
     {
         Fire
     }
diff --git a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs
index 2262ea1c7e..2ec10888e2 100644
--- a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs
@@ -66,7 +66,7 @@ namespace Content.Client.GameObjects.Components.Atmos
             return stateId;
         }
 
-        private enum Layer
+        private enum Layer : byte
         {
             PipeBase,
         }
diff --git a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs
index 04247bdae6..2f4f38ccd6 100644
--- a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs
@@ -41,7 +41,7 @@ namespace Content.Client.GameObjects.Components.Atmos
             sprite.LayerSetVisible(pumpEnabledLayer, pumpVisualState.PumpEnabled);
         }
 
-        public enum Layer
+        public enum Layer : byte
         {
             PumpEnabled,
         }
diff --git a/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
index fa660f0ea0..8dcee9a7b3 100644
--- a/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
@@ -64,7 +64,7 @@ namespace Content.Client.GameObjects.Components.Atmos
             sprite.LayerSetVisible(baseSiphonLayer, true);
         }
 
-        private enum Layer
+        private enum Layer : byte
         {
             SiphonBase,
         }
diff --git a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
index 0a6872b9ea..1ada0e195d 100644
--- a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
@@ -94,7 +94,7 @@ namespace Content.Client.GameObjects.Components.Atmos
         }
     }
 
-    public enum VaporVisualLayers
+    public enum VaporVisualLayers : byte
     {
         Base
     }
diff --git a/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
index 6693907aab..aee70602d8 100644
--- a/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
@@ -64,7 +64,7 @@ namespace Content.Client.GameObjects.Components.Atmos
             sprite.LayerSetVisible(baseVentLayer, true);
         }
 
-        private enum Layer
+        private enum Layer : byte
         {
             VentBase,
         }
diff --git a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs
index 568978ab8b..a5a99f6b09 100644
--- a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs
@@ -93,7 +93,7 @@ namespace Content.Client.GameObjects.Components.Botany
         }
     }
 
-    public enum PlantHolderLayers
+    public enum PlantHolderLayers : byte
     {
         Plant,
         HealthLight,
diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
index 30d8418950..e549594173 100644
--- a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
+++ b/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
@@ -32,7 +32,7 @@ namespace Content.Client.GameObjects.Components.CloningPod
             }
         }
 
-        public enum CloningPodVisualLayers
+        public enum CloningPodVisualLayers : byte
         {
             Machine,
         }
diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
index 2441c9c589..62e0b5abca 100644
--- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
+++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
@@ -91,7 +91,7 @@ namespace Content.Client.GameObjects.Components.Clothing
         }
     }
 
-    public enum FemaleClothingMask
+    public enum FemaleClothingMask : byte
     {
         NoMask = 0,
         UniformFull,
diff --git a/Content.Client/GameObjects/Components/ComputerVisualizer.cs b/Content.Client/GameObjects/Components/ComputerVisualizer.cs
index 0e1ad20dd7..b16effe704 100644
--- a/Content.Client/GameObjects/Components/ComputerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/ComputerVisualizer.cs
@@ -85,7 +85,7 @@ namespace Content.Client.GameObjects.Components
             }
         }
 
-        public enum Layers
+        public enum Layers : byte
         {
             Body,
             Screen,
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs
index a7985d6ef6..f4132a174a 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs
@@ -154,7 +154,7 @@ namespace Content.Client.GameObjects.Components.Disposal
         }
     }
 
-    public enum DisposalUnitVisualLayers
+    public enum DisposalUnitVisualLayers : byte
     {
         Base,
         Handle,
diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs
index e5c0023409..4cdc6cff2c 100644
--- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs
@@ -167,7 +167,7 @@ namespace Content.Client.GameObjects.Components.Doors
         }
     }
 
-    public enum DoorVisualLayers
+    public enum DoorVisualLayers : byte
     {
         Base,
         BaseUnlit,
diff --git a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs b/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs
index d8d23acd50..65899c014a 100644
--- a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs
@@ -44,7 +44,7 @@ namespace Content.Client.GameObjects.Components.Fluids
         }
     }
 
-    public enum SprayVisualLayers
+    public enum SprayVisualLayers : byte
     {
         Base
     }
diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs
index 7373b2969b..df5afbe8df 100644
--- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs
@@ -60,7 +60,7 @@ namespace Content.Client.GameObjects.Components.Gravity
             }
         }
 
-        public enum GravityGeneratorVisualLayers
+        public enum GravityGeneratorVisualLayers : byte
         {
             Base,
             Core
diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
index f1e432e50c..e6d4101c0a 100644
--- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
+++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
@@ -277,7 +277,7 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
             Clockwise = 4,
         }
 
-        public enum CornerLayers
+        public enum CornerLayers : byte
         {
             SE,
             NE,
@@ -290,7 +290,7 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
     ///     Controls the mode with which icon smoothing is calculated.
     /// </summary>
     [PublicAPI]
-    public enum IconSmoothingMode
+    public enum IconSmoothingMode : byte
     {
         /// <summary>
         ///     Each icon is made up of 4 corners, each of which can get a different state depending on
diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
index 0c12b02f62..2a345e7429 100644
--- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
@@ -53,7 +53,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
             sprite.LayerSetVisible(MicrowaveVisualizerLayers.BaseUnlit, glowingPartsVisible);
         }
 
-        private enum MicrowaveVisualizerLayers
+        private enum MicrowaveVisualizerLayers : byte
         {
             Base,
             BaseUnlit
diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/GameObjects/Components/LowWallComponent.cs
index 4ee6e93a1e..d5b12e1275 100644
--- a/Content.Client/GameObjects/Components/LowWallComponent.cs
+++ b/Content.Client/GameObjects/Components/LowWallComponent.cs
@@ -217,7 +217,7 @@ namespace Content.Client.GameObjects.Components
         }
 
         [SuppressMessage("ReSharper", "InconsistentNaming")]
-        private enum OverCornerLayers
+        private enum OverCornerLayers : byte
         {
             SE,
             NE,
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs
index e795f3f395..ec09f819e3 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs
@@ -48,7 +48,7 @@ namespace Content.Client.GameObjects.Components.MedicalScanner
             }
         }
 
-        public enum MedicalScannerVisualLayers
+        public enum MedicalScannerVisualLayers : byte
         {
             Machine,
             Terminal,
diff --git a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs b/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
index 2a80904c5d..586f28ac85 100644
--- a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
@@ -71,7 +71,7 @@ namespace Content.Client.GameObjects.Components.Mobs
         }
     }
 
-    public enum DamageStateVisualLayers
+    public enum DamageStateVisualLayers : byte
     {
         Base
     }
diff --git a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs
index a8aa86b777..416b20b766 100644
--- a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs
@@ -23,7 +23,7 @@ namespace Content.Client.GameObjects.Components.Morgue
         }
     }
 
-    public enum BodyBagVisualLayers
+    public enum BodyBagVisualLayers : byte
     {
         Label,
     }
diff --git a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
index 861cb577a0..d0381dfce0 100644
--- a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
@@ -69,7 +69,7 @@ namespace Content.Client.GameObjects.Components.Storage
         }
     }
 
-    public enum CrematoriumVisualLayers
+    public enum CrematoriumVisualLayers : byte
     {
         Base,
         Light,
diff --git a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
index 25747c1a36..5d29d243ee 100644
--- a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
@@ -75,7 +75,7 @@ namespace Content.Client.GameObjects.Components.Storage
         }
     }
 
-    public enum MorgueVisualLayers
+    public enum MorgueVisualLayers : byte
     {
         Base,
         Light,
diff --git a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs
index f7d8e4886e..37894446aa 100644
--- a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs
@@ -48,7 +48,7 @@ namespace Content.Client.GameObjects.Components.Movement
             }
         }
 
-        enum Layers
+        enum Layers : byte
         {
             Portal
         }
diff --git a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs
index d83e99165f..7b91020906 100644
--- a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs
@@ -53,7 +53,7 @@ namespace Content.Client.GameObjects.Components.Nutrition
         }
     }
 
-    public enum CreamPiedVisualLayers
+    public enum CreamPiedVisualLayers : byte
     {
         Pie,
     }
diff --git a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs
index 242e3ca8c6..48c80de34b 100644
--- a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs
+++ b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs
@@ -17,7 +17,7 @@ namespace Content.Client.GameObjects.Components.PDA
         /// </summary>
         private string _state;
 
-        private enum PDAVisualLayers
+        private enum PDAVisualLayers : byte
         {
             Base,
             Flashlight,
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
index a568f031d6..1b3be7ca82 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
@@ -46,7 +46,7 @@ namespace Content.Client.GameObjects.Components.Power.AME
             }
         }
 
-        enum Layers
+        enum Layers : byte
         {
             Display,
         }
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
index 94dc4adbc0..229a698ddd 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
@@ -52,7 +52,7 @@ namespace Content.Client.GameObjects.Components.Power.AME
         }
     }
 
-    enum Layers
+    enum Layers : byte
     {
         Core,
         CoreState,
diff --git a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs
index 2c078f03dc..b12d83ba3e 100644
--- a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs
@@ -55,7 +55,7 @@ namespace Content.Client.GameObjects.Components.Power
             }
         }
 
-        enum Layers
+        enum Layers : byte
         {
             ChargeState,
             Lock,
diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
index e952fead3f..49d411036f 100644
--- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
@@ -114,7 +114,7 @@ namespace Content.Client.GameObjects.Components.Power
             var glowingPartsVisible = !(component.TryGetData(PowerDeviceVisuals.Powered, out bool powered) && !powered);
             sprite.LayerSetVisible(AutolatheVisualLayers.BaseUnlit, glowingPartsVisible);
         }
-        public enum AutolatheVisualLayers
+        public enum AutolatheVisualLayers : byte
         {
             Base,
             BaseUnlit
diff --git a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs
index 0bd1ab8f2e..10b79e7d93 100644
--- a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs
@@ -41,7 +41,7 @@ namespace Content.Client.GameObjects.Components.Power
             }
         }
 
-        private enum Layers
+        private enum Layers : byte
         {
             Charge
         }
diff --git a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs
index 32bb1126c8..8f7813be7a 100644
--- a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs
@@ -68,7 +68,7 @@ namespace Content.Client.GameObjects.Components.Power
             }
         }
 
-        enum Layers
+        enum Layers : byte
         {
             Base,
             Light,
diff --git a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs
index 4b6e64ef70..5235d2a8d4 100644
--- a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs
@@ -18,7 +18,7 @@ namespace Content.Client.GameObjects.Components.Power
         }
     }
 
-    public enum PowerDeviceVisualLayers
+    public enum PowerDeviceVisualLayers : byte
     {
         Powered
     }
diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
index 76292302b6..8176d89c93 100644
--- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
@@ -110,7 +110,7 @@ namespace Content.Client.GameObjects.Components.Power
             var glowingPartsVisible = !(component.TryGetData(PowerDeviceVisuals.Powered, out bool powered) && !powered);
             sprite.LayerSetVisible(ProtolatheVisualLayers.BaseUnlit, glowingPartsVisible);
         }
-        public enum ProtolatheVisualLayers
+        public enum ProtolatheVisualLayers : byte
         {
             Base,
             BaseUnlit,
diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs
index f03b3793b5..1e6e9bb5af 100644
--- a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs
@@ -62,7 +62,7 @@ namespace Content.Client.GameObjects.Components.Power
             }
         }
 
-        enum Layers
+        enum Layers : byte
         {
             Input,
             Charge,
diff --git a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs
index bdaeb507c5..65b6524a73 100644
--- a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs
+++ b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs
@@ -96,7 +96,7 @@ namespace Content.Client.GameObjects.Components
         }
 
     }
-    public enum RadiationCollectorVisualLayers
+    public enum RadiationCollectorVisualLayers : byte
     {
         Main
     }
diff --git a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs b/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs
index 37ba018968..3745982465 100644
--- a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs
@@ -61,7 +61,7 @@ namespace Content.Client.GameObjects.Components.Recycling
         }
     }
 
-    public enum RecyclerVisualLayers
+    public enum RecyclerVisualLayers : byte
     {
         Bloody
     }
diff --git a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs
index cd7db57d3a..f60702ca9f 100644
--- a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs
+++ b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs
@@ -51,7 +51,7 @@ namespace Content.Client.GameObjects.Components
             Sprite.LayerSetState(ReinforcedCornerLayers.NW, $"{_reinforcedStateBase}{(int) cornerNW}");
         }
 
-        public enum ReinforcedCornerLayers
+        public enum ReinforcedCornerLayers : byte
         {
             SE,
             NE,
diff --git a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs b/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs
index 69ed7754f5..0f87118d8b 100644
--- a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs
+++ b/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs
@@ -35,7 +35,7 @@ namespace Content.Client.GameObjects.Components
         }
     }
 
-    public enum ReinforcedWallVisualLayers
+    public enum ReinforcedWallVisualLayers : byte
     {
         Deconstruction,
     }
diff --git a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs
index 29b558e798..afdf7b2ca1 100644
--- a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs
@@ -85,7 +85,7 @@ namespace Content.Client.GameObjects.Components.Storage
         }
     }
 
-    public enum StorageVisualLayers
+    public enum StorageVisualLayers : byte
     {
         Door,
         Welded,
diff --git a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
index b31af5f4b7..2d4fde6db6 100644
--- a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
@@ -69,7 +69,7 @@ namespace Content.Client.GameObjects.Components.Trigger
             }
         }
     }
-    public enum TriggerVisualLayers
+    public enum TriggerVisualLayers : byte
     {
         Base
     }
diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs
index 50de4b17e4..95f8ecd0af 100644
--- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs
+++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs
@@ -202,7 +202,7 @@ namespace Content.Client.GameObjects.Components.VendingMachines
             }
         }
 
-        public enum VendingMachineVisualLayers
+        public enum VendingMachineVisualLayers : byte
         {
             // Off / Broken. The other layers will overlay this if the machine is on.
             Unlit,
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
index cc8dd51679..d52e6fa630 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
@@ -22,7 +22,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
         }
     }
 
-    public enum AmmoVisualLayers
+    public enum AmmoVisualLayers : byte
     {
         Base,
     }
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
index d52c35c00b..a20573a78e 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
+++ b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Maths;
 namespace Content.Client.GameObjects.Components.Weapons.Ranged
 {
     // Yeah I put it all in the same enum, don't judge me
-    public enum RangedBarrelVisualLayers
+    public enum RangedBarrelVisualLayers : byte
     {
         Base,
         BaseUnshaded,
diff --git a/Content.Client/GameObjects/Components/WindowComponent.cs b/Content.Client/GameObjects/Components/WindowComponent.cs
index 3a06cba79e..14be884b07 100644
--- a/Content.Client/GameObjects/Components/WindowComponent.cs
+++ b/Content.Client/GameObjects/Components/WindowComponent.cs
@@ -113,7 +113,7 @@ namespace Content.Client.GameObjects.Components
     }
 
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum WindowDamageLayers
+    public enum WindowDamageLayers : byte
     {
         DamageSE,
         DamageNE,
diff --git a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs
index e523dae030..9b73d10d2f 100644
--- a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs
@@ -21,7 +21,7 @@ namespace Content.Client.GameObjects.Components.Wires
             }
         }
 
-        public enum WiresVisualLayers
+        public enum WiresVisualLayers : byte
         {
             MaintenancePanel,
         }
diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
index a5dc75b1d6..b2cae9a813 100644
--- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
@@ -497,7 +497,8 @@ namespace Content.Client.GameObjects.EntitySystems.AI
     }
 
     [Flags]
-    public enum PathfindingDebugMode {
+    public enum PathfindingDebugMode : byte
+    {
         None = 0,
         Route = 1 << 0,
         Graph = 1 << 1,
diff --git a/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs
index 4a3fa1ed35..7a7e982b8b 100644
--- a/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -98,7 +98,7 @@ namespace Content.Client.GameObjects.EntitySystems
         }
     }
 
-    internal enum AtmosDebugOverlayMode
+    internal enum AtmosDebugOverlayMode : byte
     {
         TotalMoles,
         GasMoles,
diff --git a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
index 2103cb84d7..8cb69b8e2d 100644
--- a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
@@ -73,7 +73,7 @@ namespace Content.Client.GameObjects.EntitySystems
 
         private readonly List<SpriteComponent> _highlightedSprites = new();
 
-        private enum DragState
+        private enum DragState : byte
         {
             NotDragging,
             // not dragging yet, waiting to see
diff --git a/Content.Client/State/LauncherConnecting.cs b/Content.Client/State/LauncherConnecting.cs
index ff1a39ab7a..250935f353 100644
--- a/Content.Client/State/LauncherConnecting.cs
+++ b/Content.Client/State/LauncherConnecting.cs
@@ -295,7 +295,7 @@ namespace Content.Client.State
             _disconnected.Visible = page == Page.Disconnected;
         }
 
-        private enum Page
+        private enum Page : byte
         {
             Connecting,
             ConnectFailed,