diff --git a/Content.Client/Construction/ConstructionMenu.xaml.cs b/Content.Client/Construction/ConstructionMenu.xaml.cs
index ccb631586f..e2da520180 100644
--- a/Content.Client/Construction/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/ConstructionMenu.xaml.cs
@@ -182,8 +182,8 @@ namespace Content.Client.Construction
                             case StackType.Plasteel:
                                 return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasteel.png");
 
-                            case StackType.Phoron:
-                                return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/phoron.png");
+                            case StackType.Plasma:
+                                return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasma.png");
 
                             case StackType.Cable:
                                 return _resourceCache.GetTexture("/Textures/Objects/Tools/cables.rsi/coil-30.png");
diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
index 757dddbc28..edb4f3c1c1 100644
--- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power
         private Animation _insertingMetalAnimation;
         private Animation _insertingGlassAnimation;
         private Animation _insertingGoldAnimation;
-        private Animation _insertingPhoronAnimation;
+        private Animation _insertingPlasmaAnimation;
 
         public override void LoadData(YamlMappingNode node)
         {
@@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
             _insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f);
             _insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f);
             _insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f);
-            _insertingPhoronAnimation = PopulateAnimation("autolathe_inserting_phoron_sheet", "autolathe_inserting_unlit", 0.9f);
+            _insertingPlasmaAnimation = PopulateAnimation("autolathe_inserting_plasma_sheet", "autolathe_inserting_unlit", 0.9f);
         }
 
         private Animation PopulateAnimation(string sprite, string spriteUnlit, float length)
@@ -103,10 +103,10 @@ namespace Content.Client.GameObjects.Components.Power
                         animPlayer.Play(_insertingGoldAnimation, AnimationKey);
                     }
                     break;
-                case LatheVisualState.InsertingPhoron:
+                case LatheVisualState.InsertingPlasma:
                     if (!animPlayer.HasRunningAnimation(AnimationKey))
                     {
-                        animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
+                        animPlayer.Play(_insertingPlasmaAnimation, AnimationKey);
                     }
                     break;
                 default:
diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
index 9bce43d0ee..46b55dfade 100644
--- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power
         private Animation _insertingMetalAnimation;
         private Animation _insertingGlassAnimation;
         private Animation _insertingGoldAnimation;
-        private Animation _insertingPhoronAnimation;
+        private Animation _insertingPlasmaAnimation;
 
         public override void LoadData(YamlMappingNode node)
         {
@@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
             _insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f);
             _insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f);
             _insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f);
-            _insertingPhoronAnimation = PopulateAnimation("protolathe_phoron", 0.9f);
+            _insertingPlasmaAnimation = PopulateAnimation("protolathe_plasma", 0.9f);
         }
 
         private Animation PopulateAnimation(string sprite, float length)
@@ -99,10 +99,10 @@ namespace Content.Client.GameObjects.Components.Power
                         animPlayer.Play(_insertingGoldAnimation, AnimationKey);
                     }
                     break;
-                case LatheVisualState.InsertingPhoron:
+                case LatheVisualState.InsertingPlasma:
                     if (!animPlayer.HasRunningAnimation(AnimationKey))
                     {
-                        animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
+                        animPlayer.Play(_insertingPlasmaAnimation, AnimationKey);
                     }
                     break;
                 default:
diff --git a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
similarity index 69%
rename from Content.Server/Atmos/Reactions/PhoronFireReaction.cs
rename to Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
index d08f840293..77bcf4647d 100644
--- a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Serialization;
 namespace Content.Server.Atmos.Reactions
 {
     [UsedImplicitly]
-    public class PhoronFireReaction : IGasReactionEffect
+    public class PlasmaFireReaction : IGasReactionEffect
     {
         public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup)
         {
@@ -21,43 +21,43 @@ namespace Content.Server.Atmos.Reactions
             var temperature = mixture.Temperature;
             var location = holder as TileAtmosphere;
 
-            // More phoron released at higher temperatures
+            // More plasma released at higher temperatures
             var temperatureScale = 0f;
             var superSaturation = false;
 
-            if (temperature > Atmospherics.PhoronUpperTemperature)
+            if (temperature > Atmospherics.PlasmaUpperTemperature)
                 temperatureScale = 1f;
             else
-                temperatureScale = (temperature - Atmospherics.PhoronMinimumBurnTemperature) /
-                                   (Atmospherics.PhoronUpperTemperature - Atmospherics.PhoronMinimumBurnTemperature);
+                temperatureScale = (temperature - Atmospherics.PlasmaMinimumBurnTemperature) /
+                                   (Atmospherics.PlasmaUpperTemperature - Atmospherics.PlasmaMinimumBurnTemperature);
 
             if (temperatureScale > 0f)
             {
-                var phoronBurnRate = 0f;
+                var plasmaBurnRate = 0f;
                 var oxygenBurnRate = Atmospherics.OxygenBurnRateBase - temperatureScale;
 
-                if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Phoron) >
+                if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Plasma) >
                     Atmospherics.SuperSaturationThreshold)
                     superSaturation = true;
 
                 if (mixture.GetMoles(Gas.Oxygen) >
-                    mixture.GetMoles(Gas.Phoron) * Atmospherics.PhoronOxygenFullburn)
-                    phoronBurnRate = (mixture.GetMoles(Gas.Phoron) * temperatureScale) /
-                                     Atmospherics.PhoronBurnRateDelta;
+                    mixture.GetMoles(Gas.Plasma) * Atmospherics.PlasmaOxygenFullburn)
+                    plasmaBurnRate = (mixture.GetMoles(Gas.Plasma) * temperatureScale) /
+                                     Atmospherics.PlasmaBurnRateDelta;
                 else
-                    phoronBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PhoronOxygenFullburn)) / Atmospherics.PhoronBurnRateDelta;
+                    plasmaBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PlasmaOxygenFullburn)) / Atmospherics.PlasmaBurnRateDelta;
 
-                if (phoronBurnRate > Atmospherics.MinimumHeatCapacity)
+                if (plasmaBurnRate > Atmospherics.MinimumHeatCapacity)
                 {
-                    phoronBurnRate = MathF.Min(MathF.Min(phoronBurnRate, mixture.GetMoles(Gas.Phoron)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate);
-                    mixture.SetMoles(Gas.Phoron, mixture.GetMoles(Gas.Phoron) - phoronBurnRate);
-                    mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (phoronBurnRate * oxygenBurnRate));
+                    plasmaBurnRate = MathF.Min(MathF.Min(plasmaBurnRate, mixture.GetMoles(Gas.Plasma)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate);
+                    mixture.SetMoles(Gas.Plasma, mixture.GetMoles(Gas.Plasma) - plasmaBurnRate);
+                    mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (plasmaBurnRate * oxygenBurnRate));
 
-                    mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, phoronBurnRate);
+                    mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, plasmaBurnRate);
 
-                    energyReleased += Atmospherics.FirePhoronEnergyReleased * (phoronBurnRate);
+                    energyReleased += Atmospherics.FirePlasmaEnergyReleased * (plasmaBurnRate);
 
-                    mixture.ReactionResults[GasReaction.Fire] += (phoronBurnRate) * (1 + oxygenBurnRate);
+                    mixture.ReactionResults[GasReaction.Fire] += (plasmaBurnRate) * (1 + oxygenBurnRate);
                 }
             }
 
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index 7035c5194f..4b3d894894 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -150,14 +150,14 @@ namespace Content.Server.Atmos
             if (oxygen < 0.5f)
                 return;
 
-            var phoron = Air.GetMoles(Gas.Phoron);
+            var plasma = Air.GetMoles(Gas.Plasma);
             var tritium = Air.GetMoles(Gas.Tritium);
 
             if (Hotspot.Valid)
             {
                 if (soh)
                 {
-                    if (phoron > 0.5f || tritium > 0.5f)
+                    if (plasma > 0.5f || tritium > 0.5f)
                     {
                         if (Hotspot.Temperature < exposedTemperature)
                             Hotspot.Temperature = exposedTemperature;
@@ -169,7 +169,7 @@ namespace Content.Server.Atmos
                 return;
             }
 
-            if ((exposedTemperature > Atmospherics.PhoronMinimumBurnTemperature) && (phoron > 0.5f || tritium > 0.5f))
+            if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f))
             {
                 Hotspot = new Hotspot
                 {
@@ -753,7 +753,7 @@ namespace Content.Server.Atmos
             ExcitedGroup?.ResetCooldowns();
 
             if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f)
-                || Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Phoron] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
+                || Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Plasma] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
             {
                 Hotspot = new Hotspot();
                 UpdateVisuals();
diff --git a/Content.Server/Construction/StackHelpers.cs b/Content.Server/Construction/StackHelpers.cs
index 9521042b72..fcb72892cc 100644
--- a/Content.Server/Construction/StackHelpers.cs
+++ b/Content.Server/Construction/StackHelpers.cs
@@ -33,8 +33,8 @@ namespace Content.Server.Construction
                     prototype = "MetalRodStack1";
                     break;
 
-                case StackType.Phoron:
-                    prototype = "PhoronStack1";
+                case StackType.Plasma:
+                    prototype = "PlasmaStack1";
                     break;
 
                 case StackType.Plasteel:
diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
index 6ed0bcdeb1..9a8bcdb594 100644
--- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
@@ -225,7 +225,7 @@ namespace Content.Server.GameObjects.Components.Atmos
 
                 case "chem.WeldingFuel":
                 case "chem.Thermite":
-                case "chem.Phoron":
+                case "chem.Plasma":
                 case "chem.Ethanol":
                     AdjustFireStacks(volume.Float() / 10f);
                     return volume;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
index 461647fd43..451a5c39d5 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
@@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping.Filters
             base.ExposeData(serializer);
             serializer.DataField(ref _volumeFilterRate, "startingVolumePumpRate", 0);
             serializer.DataField(ref _maxVolumeFilterRate, "maxVolumePumpRate", 100);
-            serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Phoron);
+            serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Plasma);
             serializer.DataField(ref _initialInletDirection, "inletDirection", PipeDirection.None);
             serializer.DataField(ref _initialFilterOutletDirection, "filterOutletDirection", PipeDirection.None);
             serializer.DataField(ref _initialOutletDirection, "outletDirection", PipeDirection.None);
diff --git a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
index 8806e69272..0652e6bba7 100644
--- a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
@@ -104,8 +104,8 @@ namespace Content.Server.GameObjects.Components.Power
         void ISolutionChange.SolutionChanged(SolutionChangeEventArgs eventArgs)
         {
             IsRigged = Owner.TryGetComponent(out SolutionContainerComponent? solution)
-                       && solution.Solution.ContainsReagent("chem.Phoron", out var phoron)
-                       && phoron >= 5;
+                       && solution.Solution.ContainsReagent("chem.Plasma", out var plasma)
+                       && plasma >= 5;
         }
     }
 
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index d87ac132cd..15661334ad 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -168,16 +168,16 @@ namespace Content.Shared.Atmos
         public const float FireMinimumTemperatureToExist = T0C + 100f;
         public const float FireMinimumTemperatureToSpread = T0C + 150f;
         public const float FireSpreadRadiosityScale = 0.85f;
-        public const float FirePhoronEnergyReleased = 3000000f;
+        public const float FirePlasmaEnergyReleased = 3000000f;
         public const float FireGrowthRate = 40000f;
 
         public const float SuperSaturationThreshold = 96f;
 
         public const float OxygenBurnRateBase = 1.4f;
-        public const float PhoronMinimumBurnTemperature = (100f+T0C);
-        public const float PhoronUpperTemperature = (1370f+T0C);
-        public const float PhoronOxygenFullburn = 10f;
-        public const float PhoronBurnRateDelta = 9f;
+        public const float PlasmaMinimumBurnTemperature = (100f+T0C);
+        public const float PlasmaUpperTemperature = (1370f+T0C);
+        public const float PlasmaOxygenFullburn = 10f;
+        public const float PlasmaBurnRateDelta = 9f;
 
         /// <summary>
         ///     This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs)
@@ -254,7 +254,7 @@ namespace Content.Shared.Atmos
         Oxygen = 0,
         Nitrogen = 1,
         CarbonDioxide = 2,
-        Phoron = 3,
+        Plasma = 3,
         Tritium = 4,
         WaterVapor = 5,
     }
diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
index b1965ce364..4a9feb6fc6 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
+++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
@@ -11,6 +11,6 @@ namespace Content.Shared.GameObjects.Components.Power
         InsertingMetal,
         InsertingGlass,
         InsertingGold,
-        InsertingPhoron
+        InsertingPlasma
     }
 }
diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
index bcd14e0053..8f99d94742 100644
--- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
@@ -128,7 +128,7 @@ namespace Content.Shared.GameObjects.Components
         MVCable,
         HVCable,
         Gold,
-        Phoron,
+        Plasma,
         Ointment,
         Gauze,
         Brutepack,
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index a337e11985..7355812aba 100644
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -24,12 +24,12 @@
 
 - type: gas
   id: 3
-  name: Phoron
+  name: Plasma
   specificHeat: 200
   heatCapacityRatio: 1.7
-  molarMass: 120 #creadth: making it very heavy (x4 of oxygen), idk what the proper value should be
+  molarMass: 120
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: phoron
+  gasOverlayState: plasma
   color: FF3300
 
 - type: gas
diff --git a/Resources/Prototypes/Atmospherics/reactions.yml b/Resources/Prototypes/Atmospherics/reactions.yml
index 625b1fa2d3..765a75fff6 100644
--- a/Resources/Prototypes/Atmospherics/reactions.yml
+++ b/Resources/Prototypes/Atmospherics/reactions.yml
@@ -1,14 +1,14 @@
 - type: gasReaction
-  id: PhoronFire
+  id: PlasmaFire
   priority: -2
   minimumTemperature: 373.149 # Same as Atmospherics.FireMinimumTemperatureToExist
   minimumRequirements: # In this case, same as minimum mole count.
     - 0.01  # oxygen
     - 0     # nitrogen
     - 0     # carbon dioxide
-    - 0.01  # phoron
+    - 0.01  # plasma
   effects:
-    - !type:PhoronFireReaction {}
+    - !type:PlasmaFireReaction {}
 
 - type: gasReaction
   id: TritiumFire
@@ -18,7 +18,7 @@
     - 0.01  # oxygen
     - 0     # nitrogen
     - 0     # carbon dioxide
-    - 0     # phoron
+    - 0     # plasma
     - 0.01  # tritium
   effects:
     - !type:TritiumFireReaction {}
diff --git a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml
index 2d88feee39..7d7c3bcdf8 100644
--- a/Resources/Prototypes/Catalog/Fills/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/gas_tanks.yml
@@ -103,11 +103,11 @@
       sprite: Objects/Tanks/generic.rsi
 
 - type: entity
-  id: PhoronTankFilled
-  parent: PhoronTank
-  name: phoron tank
+  id: PlasmaTankFilled
+  parent: PlasmaTank
+  name: plasma tank
   suffix: Filled
-  description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
+  description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
   components:
     - type: GasTank
       outputPressure: 101.325
@@ -117,5 +117,5 @@
           - 0
           - 0
           - 0
-          - 11.3146928 # phoron
+          - 11.3146928 # plasma
         temperature: 293.15
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
index d4e8add604..fbb0c2e5c3 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
@@ -79,7 +79,7 @@
           - 0 # oxygen
           - 0 # nitrogen
           - 0 # CO2
-          - 0 # Phoron
+          - 0 # Plasma
           - 0 # Tritium
           - 0 # Water vapor
         temperature: 293.15
@@ -152,8 +152,8 @@
 
 - type: entity
   parent: GasCanister
-  id: PhoronCanister
-  name: Phoron Canister
+  id: PlasmaCanister
+  name: Plasma Canister
   components:
     - type: Sprite
       sprite: Constructible/Atmos/canister.rsi
@@ -165,7 +165,7 @@
           - 0 # oxygen
           - 0 # nitrogen
           - 0 # carbon dioxide
-          - 1871.71051 # phoron
+          - 1871.71051 # plasma
         temperature: 293.15
 
 - type: entity
@@ -183,7 +183,7 @@
           - 0 # oxygen
           - 0 # nitrogen
           - 0 # CO2
-          - 0 # Phoron
+          - 0 # Plasma
           - 1871.71051 # Tritium
         temperature: 293.15
 
@@ -202,7 +202,7 @@
           - 0 # oxygen
           - 0 # nitrogen
           - 0 # CO2
-          - 0 # Phoron
+          - 0 # Plasma
           - 0 # Tritium
           - 1871.71051 # Water vapor
         temperature: 293.15
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
index 3c00a38b73..774756c8d9 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
@@ -395,17 +395,17 @@
       state_closed: scicratesecure_door
 
 - type: entity
-  id: CratePhoron
-  name: phoron crate
+  id: CratePlasma
+  name: plasma crate
   parent: CrateGeneric
   components:
   - type: AccessReader
   - type: SecureEntityStorage
   - type: Sprite
-    sprite: Constructible/Storage/Crates/phoron.rsi
+    sprite: Constructible/Storage/Crates/plasma.rsi
     layers:
-    - state: phoroncrate
-    - state: phoroncrate_door
+    - state: plasmacrate
+    - state: plasmacrate_door
       map: ["enum.StorageVisualLayers.Door"]
     - state: welded
       visible: false
@@ -414,13 +414,13 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Storage/Crates/phoron.rsi
-    state: phoroncrate_icon
+    sprite: Constructible/Storage/Crates/plasma.rsi
+    state: plasmacrate_icon
   - type: Appearance
     visuals:
     - type: StorageVisualizer
-      state_open: phoroncrate_open
-      state_closed: phoroncrate_door
+      state_open: plasmacrate_open
+      state_closed: plasmacrate_door
 
 - type: entity
   id: CrateSecure
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
index 311f160d43..87ef28bd9b 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -891,8 +891,8 @@
 
 - type: entity
   parent: BaseSign
-  id: WarningPhoron
-  name: phoron waste sign
+  id: WarningPlasma
+  name: plasma waste sign
   description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
@@ -907,7 +907,7 @@
       - SmallImpassable
       - Clickable
   - type: Sprite
-    state: atmos_phoron
+    state: atmos_plasma
 
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
index 571e5e7ea2..f762ebd521 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -89,15 +89,15 @@
     node: reinforcedWindow
 
 - type: entity
-  id: PhoronWindow
-  name: phoronwindow
+  id: PlasmaWindow
+  name: plasma window
   parent: Window
   components:
   - type: Sprite
     drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/phoron_window.rsi
+    sprite: Constructible/Structures/Windows/plasma_window.rsi
   - type: Icon
-    sprite: Constructible/Structures/Windows/phoron_window.rsi
+    sprite: Constructible/Structures/Windows/plasma_window.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -110,7 +110,7 @@
         soundCollection: GlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
-          ShardGlassPhoron:
+          ShardGlassPlasma:
             min: 1
             max: 2
       - !type:DoActsBehavior
@@ -120,4 +120,4 @@
     base: pwindow
   - type: Construction
     graph: window
-    node: phoronWindow
+    node: plasmaWindow
diff --git a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml
index a1d7a55269..c4aa4a1465 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml
@@ -157,37 +157,37 @@
     count: 1
 
 - type: entity
-  name: phoron ore
-  id: OrePhoron
+  name: plasma ore
+  id: OrePlasma
   parent: BaseItem
   components:
   - type: Sprite
     sprite: Objects/Materials/materials.rsi
-    state: phoron_ore
+    state: plasma_ore
 
 - type: entity
-  name: phoron sheet
-  id: PhoronStack
+  name: plasma sheet
+  id: PlasmaStack
   parent: MaterialStack
   suffix: Full
   components:
   - type: Material
     materials:
     - key: enum.MaterialKeys.Stack
-      mat: phoron
+      mat: plasma
   - type: Stack
-    stacktype: enum.StackType.Phoron
+    stacktype: enum.StackType.Plasma
   - type: Sprite
     sprite: Objects/Materials/sheets.rsi
-    state: phoron
+    state: plasma
   - type: Item
     sprite: Objects/Materials/sheets.rsi
-    HeldPrefix: phoron
+    HeldPrefix: plasma
 
 - type: entity
-  id: PhoronStack1
-  name: phoron sheet
-  parent: PhoronStack
+  id: PlasmaStack1
+  name: plasma sheet
+  parent: PlasmaStack
   suffix: 1
   components:
   - type: Stack
diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
index 2aea0da9b9..631b631bce 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -109,7 +109,7 @@
   name: soap
   id: SoapNT
   parent: Soap
-  description: A Nanotrasen brand bar of soap. Smells of phoron.
+  description: A Nanotrasen brand bar of soap. Smells of plasma.
   components:
     - type: Sprite
       state: soapnt
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 6b219b7c63..d9969b5088 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -147,20 +147,20 @@
         - Back
 
 - type: entity
-  id: PhoronTank
+  id: PlasmaTank
   parent: GasTankBase
-  name: phoron tank
+  name: plasma tank
   suffix: Empty
-  description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
+  description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
   components:
     - type: Sprite
-      sprite: Objects/Tanks/phoron.rsi
+      sprite: Objects/Tanks/plasma.rsi
     - type: GasTank
       outputPressure: 101.325
       air:
         volume: 70
         temperature: 293.15
     - type: Clothing
-      sprite: Objects/Tanks/phoron.rsi
+      sprite: Objects/Tanks/plasma.rsi
       Slots:
         - Belt
diff --git a/Resources/Prototypes/Entities/Objects/shards.yml b/Resources/Prototypes/Entities/Objects/shards.yml
index c5d1d6a1f8..948774211a 100644
--- a/Resources/Prototypes/Entities/Objects/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/shards.yml
@@ -54,9 +54,9 @@
       amount: 10
 
 - type: entity
-  id: ShardGlassPhoron
-  name: phoron glass shard
-  description: A small piece of phoron glass. It looks sharp, you wouldn't want to step on it barefoot.
+  id: ShardGlassPlasma
+  name: plasma glass shard
+  description: A small piece of plasma glass. It looks sharp, you wouldn't want to step on it barefoot.
   parent: ShardBase
   components:
     - type: Sprite
@@ -66,6 +66,6 @@
     - type: WelderRefinable
       refineResult:
       - GlassStack
-      - PhoronStack
+      - PlasmaStack
     - type: DamageOtherOnHit
       amount: 15
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 2a67394e45..b742d8ecfb 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -99,8 +99,8 @@
       amount: 0.5
 
 - type: reagent
-  id: chem.Phoron
-  name: phoron
+  id: chem.Plasma
+  name: plasma
   desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
   physicalDesc: gaseous
   color: "#7e009e"
diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml
index b39ba30366..b78a44f430 100644
--- a/Resources/Prototypes/Reagents/materials.yml
+++ b/Resources/Prototypes/Reagents/materials.yml
@@ -38,9 +38,9 @@
   specificHeat: 1000
 
 - type: material
-  id: phoron
-  name: phoron
-  icon: Objects/Materials/phoron_sheet.png
+  id: plasma
+  name: plasma
+  icon: Objects/Materials/sheets.rsi/plasma.png
   density: 200
   electricResistivity: 2.1e-1
   thermalConductivity: 80
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
index 069646137a..130fa28427 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
@@ -4,14 +4,14 @@
   graph:
     - node: start
       edges:
-        - to: phoronWindow
+        - to: plasmaWindow
           steps:
             - material: Metal
               amount: 2
               doAfter: 2
             - material: Glass
               amount: 2
-            - material: Phoron
+            - material: Plasma
               amount: 2
               doAfter: 3
 
@@ -61,8 +61,8 @@
             - tool: Anchoring
               doAfter: 2
 
-    - node: phoronWindow
-      entity: PhoronWindow
+    - node: plasmaWindow
+      entity: PlasmaWindow
       edges:
         - to: start
           completed:
@@ -73,7 +73,7 @@
               prototype: MetalSheet1
               amount: 2
             - !type:SpawnPrototype
-              prototype: PhoronSheet1
+              prototype: PlasmaSheet1
               amount: 2
             - !type:DeleteEntity {}
           steps:
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 720c48b34e..5a56555e30 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -107,18 +107,18 @@
   canRotate: false
 
 - type: construction
-  name: phoron window
-  id: PhoronWindow
+  name: plasma window
+  id: PlasmaWindow
   graph: window
   startNode: start
-  targetNode: phoronWindow
+  targetNode: plasmaWindow
   category: Structures
   description: Clear and even tougher, with an orange tint. Must be built on top of a low wall.
   conditions:
     - !type:LowWallInTile {}
     - !type:NoWindowsInTile {}
   icon:
-    sprite: Constructible/Structures/Windows/phoron_window.rsi
+    sprite: Constructible/Structures/Windows/plasma_window.rsi
     state: full
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 6d50158ee7..286c7c5a8e 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -73,7 +73,7 @@
       amount: 1
     chem.Sodium:
       amount: 1
-    chem.Phoron:
+    chem.Plasma:
       amount: 5
       catalyst: true
   products:
@@ -106,7 +106,7 @@
   reactants:
     chem.Oxygen:
       amount: 2
-    chem.Phoron:
+    chem.Plasma:
       amount: 5
       catalyst: true
   products:
@@ -211,7 +211,7 @@
       amount: 1
     chem.Copper:
       amount: 1
-    chem.Phoron:
+    chem.Plasma:
       amount: 5
       catalyst: true
   products:
@@ -239,7 +239,7 @@
       amount: 1
     chem.Tramadol:
       amount: 1
-    chem.Phoron:
+    chem.Plasma:
       amount: 1
   products:
     chem.Oxycodone: 3
@@ -407,7 +407,7 @@
   reactants:
     chem.Ammonia:
       amount: 1
-    chem.Phoron:
+    chem.Plasma:
       amount: 1
   products:
     chem.Lexorin: 2
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_phoron.png b/Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png
similarity index 100%
rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_phoron.png
rename to Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png
diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json b/Resources/Textures/Constructible/Misc/decals.rsi/meta.json
index 353e0d413d..c05bf9d8a2 100644
--- a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json
+++ b/Resources/Textures/Constructible/Misc/decals.rsi/meta.json
@@ -88,7 +88,7 @@
       ]
     },
     {
-      "name": "atmos_phoron",
+      "name": "atmos_plasma",
       "delays": [
         [
           1
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png
new file mode 100644
index 0000000000..87f6def58f
Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png differ
diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json
index 6df05acbda..e67c993fe4 100644
--- a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json
+++ b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json
@@ -93,6 +93,22 @@
                 ]
             ]
         },
+        {
+            "name": "autolathe_inserting_plasma_sheet",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
         {
             "name": "autolathe_inserting_gold_plate",
             "delays": [
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/locked.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/locked.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json
similarity index 87%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json
index bb879f3e69..04b2a52d89 100644
--- a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/meta.json
+++ b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json
@@ -8,17 +8,17 @@
     },
     "states": [
         {
-            "name": "phoroncrate",
+            "name": "plasmacrate",
             "select": [],
             "flags": {}
         },
         {
-            "name": "phoroncrate_door",
+            "name": "plasmacrate_door",
             "select": [],
             "flags": {}
         },
         {
-            "name": "phoroncrate_icon",
+            "name": "plasmacrate_icon",
             "select": [],
             "flags": {}
         },
@@ -46,7 +46,7 @@
             "name": "sparking",            "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
         },
         {
-            "name": "phoroncrate_open",
+            "name": "plasmacrate_open",
             "select": [],
             "flags": {}
 	}
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/off.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/off.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_door.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_door.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_icon.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_icon.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_open.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/phoroncrate_open.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/sparking.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/sparking.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/unlocked.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/unlocked.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png
diff --git a/Resources/Textures/Constructible/Storage/Crates/phoron.rsi/welded.png b/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Constructible/Storage/Crates/phoron.rsi/welded.png
rename to Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png
deleted file mode 100644
index ead82446a8..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png
deleted file mode 100644
index a587292bd1..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png
deleted file mode 100644
index f8b0fa0ff5..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png
deleted file mode 100644
index a587292bd1..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png
deleted file mode 100644
index f8b0fa0ff5..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png
deleted file mode 100644
index a6938da9d2..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png
deleted file mode 100644
index ef4325d6bf..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png
deleted file mode 100644
index a6938da9d2..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png
deleted file mode 100644
index 4e754d7d97..0000000000
Binary files a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png and /dev/null differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png
new file mode 100644
index 0000000000..850c4af37a
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json
rename to Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png
new file mode 100644
index 0000000000..8b4eb741d6
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png
new file mode 100644
index 0000000000..270bb8a168
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png
new file mode 100644
index 0000000000..8b4eb741d6
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png
new file mode 100644
index 0000000000..270bb8a168
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png
new file mode 100644
index 0000000000..92a2e25099
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png
new file mode 100644
index 0000000000..c4dd3aeeb5
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png
new file mode 100644
index 0000000000..92a2e25099
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png differ
diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png
new file mode 100644
index 0000000000..a0cee7e71e
Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png differ
diff --git a/Resources/Textures/Effects/atmospherics.rsi/meta.json b/Resources/Textures/Effects/atmospherics.rsi/meta.json
index 9a88a3dfef..097df896da 100644
--- a/Resources/Textures/Effects/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Effects/atmospherics.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "phoron", "delays": [[0.1, 0.1, 0.1]]}, {"name": "phoron_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "plasma", "delays": [[0.1, 0.1, 0.1]]}, {"name": "plasma_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]}
diff --git a/Resources/Textures/Effects/atmospherics.rsi/phoron.png b/Resources/Textures/Effects/atmospherics.rsi/phoron.png
deleted file mode 100644
index bf43a48196..0000000000
Binary files a/Resources/Textures/Effects/atmospherics.rsi/phoron.png and /dev/null differ
diff --git a/Resources/Textures/Effects/atmospherics.rsi/plasma.png b/Resources/Textures/Effects/atmospherics.rsi/plasma.png
new file mode 100644
index 0000000000..f4c568e322
Binary files /dev/null and b/Resources/Textures/Effects/atmospherics.rsi/plasma.png differ
diff --git a/Resources/Textures/Effects/atmospherics.rsi/phoron_old.png b/Resources/Textures/Effects/atmospherics.rsi/plasma_old.png
similarity index 100%
rename from Resources/Textures/Effects/atmospherics.rsi/phoron_old.png
rename to Resources/Textures/Effects/atmospherics.rsi/plasma_old.png
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index a6277d2a5c..b4f8812367 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -58,6 +58,9 @@
         {
             "name": "tinbar_single"
         },
+        {
+            "name": "plasma_ore"
+        },
         {
             "name": "phoron_ore"
         },
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png b/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png
new file mode 100644
index 0000000000..71d824eedb
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
index 7dd54c1780..56884b6d2c 100644
--- a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
@@ -35,6 +35,12 @@
         {
             "name": "phoron"
         },
+        {
+            "name": "plasmaglass"
+        },
+        {
+            "name": "plasma"
+        },
         {
             "name": "metal"
         },
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png b/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png
new file mode 100644
index 0000000000..fc2764fe53
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png b/Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png
new file mode 100644
index 0000000000..a836a32cd0
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png differ
diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png
rename to Resources/Textures/Objects/Tanks/plasma.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/icon.png b/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Tanks/phoron.rsi/icon.png
rename to Resources/Textures/Objects/Tanks/plasma.rsi/icon.png
diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/plasma.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Tanks/phoron.rsi/inhand-left.png
rename to Resources/Textures/Objects/Tanks/plasma.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/plasma.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Tanks/phoron.rsi/inhand-right.png
rename to Resources/Textures/Objects/Tanks/plasma.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Tanks/phoron.rsi/meta.json
rename to Resources/Textures/Objects/Tanks/plasma.rsi/meta.json