diff --git a/Resources/Prototypes/_LuaM/shipyard/TSFMC/Arrow.yml b/Resources/Prototypes/_LuaM/shipyard/TSFMC/Arrow.yml
index 80edab46cd..ff26d9a034 100644
--- a/Resources/Prototypes/_LuaM/shipyard/TSFMC/Arrow.yml
+++ b/Resources/Prototypes/_LuaM/shipyard/TSFMC/Arrow.yml
@@ -17,7 +17,9 @@
   - Frigate
   engine:
   - Plasma
-
+  addComponents:
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: TSFMCArrow
   mapName: 'Arrow'
diff --git a/Resources/Prototypes/_LuaM/shipyard/TSFMC/Rising.yml b/Resources/Prototypes/_LuaM/shipyard/TSFMC/Rising.yml
index 7abbe94c90..ea52eb5eb5 100644
--- a/Resources/Prototypes/_LuaM/shipyard/TSFMC/Rising.yml
+++ b/Resources/Prototypes/_LuaM/shipyard/TSFMC/Rising.yml
@@ -17,7 +17,9 @@
   - Frigate
   engine:
   - Plasma
-
+  addComponents:
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: TSFMCRising
   mapName: 'Rising'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Base/base.yml b/Resources/Prototypes/_Mono/Shipyard/Base/base.yml
index 30b1e9293d..2b2f2cf534 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Base/base.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Base/base.yml
@@ -18,4 +18,4 @@
   parent: BaseVessel
   addComponents:
   - type: IFF
-    flags: [IsPlayerShuttle, HideLabel]
+    flags: [IsPlayerShuttle, HideLabel, AlwaysShowColor] # LuaM add: AlwaysShowColor
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml
index df2bcbbc8c..6765309db2 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml
@@ -16,6 +16,9 @@
   - Pirate
   engine:
   - AME # LuaM: Uranium > AME
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 
 - type: gameMap
   id: Bastion
@@ -27,7 +30,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Bastion PDV{1}'
+          mapNameTemplate: 'Bastion AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml
index 8c446e0239..9611156276 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml
@@ -16,6 +16,9 @@
   - Fighter
   engine:
   - Plasma
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 
 - type: gameMap
   id: Carrion
@@ -27,7 +30,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Carrion PDV{1}'
+          mapNameTemplate: 'Carrion AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml
index 516789d642..ff7b923204 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml
@@ -19,7 +19,9 @@
   engine:
   - AME
   - Uranium # LuaM add
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Europa
   mapName: 'AN Europa' # LuaM: 'IDY Europa' > AN 'Europa'
@@ -33,7 +35,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Europa PDV{1}'
+          mapNameTemplate: 'Europa AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml
index 9a106bd883..02dd20e5bb 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml
@@ -17,7 +17,9 @@
   - Corvette
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Fenrir
   mapName: 'AN Fenrir' # LuaM: 'BT-Y Fenrir' > 'AN Fenrir'
@@ -28,7 +30,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Fenrir PDV{1}'
+          mapNameTemplate: 'Fenrir AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml
index 97248b676b..fb5282bb45 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml
@@ -16,7 +16,9 @@
   - Pirate
   engine:
   - Uranium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Garm
   mapName: 'AN Garm' # LuaM: 'WEN Garm' > 'AN Garm'
@@ -30,7 +32,7 @@
         description: "Old cargo hull, now carries heavy bombardment arnament, capable of sending stations back to the Stone Age."
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Garm PDV{1}'
+          mapNameTemplate: 'Garm AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml
index 2c1c699e18..9d1e075c49 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml
@@ -16,7 +16,9 @@
   - Pursuit
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Hazel
   mapName: 'AN Hazel' # LuaM: 'BT-Y Hazel' > 'AN Hazel'
@@ -27,7 +29,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Hazel PDV{1}'
+          mapNameTemplate: 'Hazel AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml
index 3cc97c7647..b57c57465f 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml
@@ -18,7 +18,9 @@
   - Patrol
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: MotleyAnne
   mapName: 'AN Motley Anne' # LuaM: 'PDV-IED Motley Anne' > 'AN-IED Motley Anne'
@@ -29,7 +31,7 @@
       stationProto: StandardFrontierVessel
       components:
       - type: StationNameSetup
-        mapNameTemplate: 'Motley Anne PDV{1}'
+        mapNameTemplate: 'Motley Anne AN{1}' # LuaM: PDV > AN
         nameGenerator:
           !type:NanotrasenNameGenerator
           prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml
index f4a75fb84b..2fa677c299 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml
@@ -18,7 +18,9 @@
   - Corvette
   engine:
   - Uranium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Neptune
   mapName: 'AN Neptune' # LuaM: 'PDW Neptune' > 'AN Neptune'
@@ -29,7 +31,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Neptune PDV{1}'
+          mapNameTemplate: 'Neptune AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml
index 987b942e8f..2a90f3739d 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml
@@ -17,7 +17,9 @@
   - Frigate
   engine:
   - Plasma # LuaM: AME > Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Saintie
   mapName: 'AN Saintie' # LuaM: 'PDW Saintie' > 'AN Saintie'
@@ -28,7 +30,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Saintie PDV{1}'
+          mapNameTemplate: 'Saintie AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
index 2d6a20a478..77edc37d5e 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
@@ -19,7 +19,9 @@
   - Corvette
   engine:
   - Bananium # LuaM Uranium > Bananium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Scorpion
   mapName: 'AN Scorpion' # LuaM: 'PDV Scorpion' > 'AN Scorpion'
@@ -30,7 +32,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Scorpion PDV{1}'
+          mapNameTemplate: 'Scorpion AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/spyglassmk2.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/spyglassmk2.yml
index 9b6c330f5a..36b4a4c3c6 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/spyglassmk2.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/spyglassmk2.yml
@@ -16,7 +16,9 @@
   - Science
   engine:
   - Uranium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: SpyglassMKII
   mapName: 'AN Spyglass MKII' # LuaM: 'PDV Spyglass MKII' > 'AN Spyglass MKII'
@@ -27,7 +29,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Spyglass MKII PDV{1}'
+          mapNameTemplate: 'Spyglass MKII AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml
index 9391a680df..f0d46e87c4 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml
@@ -15,7 +15,9 @@
   - Pirate
   engine:
   - Uranium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Tethys
   mapName: 'AN Tethys' # LuaM: 'PDV Tethys' > 'AN Tethys'
@@ -26,7 +28,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Tethys PDV{1}'
+          mapNameTemplate: 'Tethys AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml
index e84ac62c86..fa964832f2 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml
@@ -18,7 +18,9 @@
   - Frigate
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Vulture
   mapName: 'AN Vulture' # LuaM: 'UI Vulture' > 'AN Vulture'
@@ -32,7 +34,7 @@
         description: "Its rumored that a Vulture razed a small planet on its own. Now its your turn to find out for yourself."
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Vulture PDV{1}'
+          mapNameTemplate: 'Vulture AN{1}' # LuaM: PDV > AN
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml
index 088d535a0a..e5fe268b31 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml
@@ -20,7 +20,9 @@
   - Patrol
   engine:
   - Plasma # LuaM: AME > Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Flyssa
   mapName: 'TSF-SKR Flyssa-K'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml
index 14214231ab..3af56d5012 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml
@@ -29,7 +29,9 @@
   - Patrol
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#E03131FF"
 - type: gameMap
   id: Saturn
   mapName: 'AN-HSS Saturn' # LuaM: 'PDW-HSS Saturn' > 'AN-HSS Saturn'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml
index d1ec32baf1..bfa6fd1eb9 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml
@@ -17,7 +17,9 @@
   - Corvette
   engine:
   - Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Aldebaran
   mapName: 'Aldebaran'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml
index 5950627e97..f3ee5eacee 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml
@@ -18,11 +18,13 @@
   - Patrol
   engine:
   - Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Altair
   mapName: 'Altair'
-  mapPath: /Maps/_LuaM/Shuttles/TSFMC/altair.yml # LuaM: /Maps/_Mono/Shuttles/Nfsd/altair.yml > /Maps/_LuaM/Shuttles/TSFMC/altair.yml 
+  mapPath: /Maps/_LuaM/Shuttles/TSFMC/altair.yml # LuaM: /Maps/_Mono/Shuttles/Nfsd/altair.yml > /Maps/_LuaM/Shuttles/TSFMC/altair.yml
   minPlayers: 0
   stations:
     Altair:
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml
index bc7f2bbd2e..5711a02854 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml
@@ -17,7 +17,9 @@
   - Frigate
   engine:
   - Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Andromeda
   mapName: 'Andromeda'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml
index c62bd4e125..b179b70081 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml
@@ -17,7 +17,9 @@
   - Pursuit
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Dagger
   mapName: 'Dagger'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml
index bff18ed4e5..ede14e731a 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml
@@ -15,7 +15,9 @@
   - Pursuit
   engine:
   - Bananium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Hoplite
   mapName: 'Hoplite'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml
index 23c7f0b802..d09ee385ed 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml
@@ -17,7 +17,9 @@
   - Uranium
   company:
   - TSF
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Jaguar
   mapName: 'Jaguar'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml
index 66e726fa09..0189782bc8 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml
@@ -17,7 +17,9 @@
   - Corvette
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Mercury
   mapName: 'Mercury'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml
index 2947589e49..2124740be0 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml
@@ -18,7 +18,9 @@
   cloakHunter: true
   company:
   - TSF
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Ocelot
   mapName: 'Ocelot'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml
index a1fed05518..91eab0235c 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml
@@ -10,14 +10,16 @@
   category: Medium
   group: Security
   access: Security
-  shuttlePath: /Maps/_LuaM/Shuttles/TSFMC/sentinel.yml # LuaM: /Maps/_Mono/Shuttles/Nfsd/sentinel.yml > /Maps/_LuaM/Shuttles/TSFMC/sentinel.yml 
+  shuttlePath: /Maps/_LuaM/Shuttles/TSFMC/sentinel.yml # LuaM: /Maps/_Mono/Shuttles/Nfsd/sentinel.yml > /Maps/_LuaM/Shuttles/TSFMC/sentinel.yml
   guidebookPage: Null
   class:
   - Patrol
   - Corvette
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Sentinel
   mapName: 'Sentinel'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml
index e1131448fe..40e90d57d9 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml
@@ -16,7 +16,9 @@
   - Science
   engine:
   - Plasma
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Shiv
   mapName: 'Shiv'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml
index 7472015974..2685c0d10b 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml
@@ -17,7 +17,9 @@
   - Pursuit
   engine:
   - Bananium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Spica
   mapName: 'Spica'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml
index a75778aa07..212de8e1ae 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml
@@ -18,7 +18,9 @@
   cloakHunter: true
   company:
   - TSF
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Syringe
   mapName: 'Syringe'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml
index 5e96e45842..377075bb55 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml
@@ -19,7 +19,9 @@
   - Pursuit
   engine:
   - AME
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Tarantula
   mapName: 'Tarantula'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml
index 87aac177b2..b50c6330cb 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml
@@ -16,7 +16,9 @@
   - Patrol
   engine:
   - Uranium
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Tumour
   mapName: 'Tumour'
diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml
index 88a2082994..4d8005ca86 100644
--- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml
@@ -18,7 +18,9 @@
   - Uranium
   company:
   - TSF
-
+  addComponents: # LuaM add
+    - type: IFF
+      color: "#047ABDFF"
 - type: gameMap
   id: Welder
   mapName: 'Welder'