diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini
index d890a4f0..5622d291 100644
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -2056,24 +2056,24 @@ item_icon = Equipment\models\commodities\nn_icons\ge_csv.3db
 nickname = rem_csv_package
 category = ship
 hull = rem_csv_hull
-addon = ge_t_engine_01
-addon = shield02_mark06_fr, HpShield01
-addon = ge_fighter5_power01
-addon = ge_s_scanner_01
-addon = ge_s_tractor_01
-addon = LargeWhiteSpecial, HpHeadlight
-addon = FastSmallRed, HpRunningLight01
-addon = SlowSmallYellow, HpRunningLight02
-addon = SlowSmallYellow, HpRunningLight03
-addon = SlowSmallYellow, HpRunningLight04
-addon = SlowSmallYellow, HpRunningLight05
-addon = SlowSmallYellow, HpRunningLight06
-addon = SlowSmallYellow, HpRunningLight07
-addon = SlowSmallYellow, HpRunningLight08
-addon = contrail01, HpContrail01
-addon = contrail01, HpContrail02
-addon = DockingLightRedSmall, HpDockLight01
-addon = DockingLightRedSmall, HpDockLight02
+addon = ge_t_engine_01, 1
+addon = shield02_mark06_fr, HpShield01, 1
+addon = ge_fighter5_power01, 1
+addon = ge_s_scanner_01, 1
+addon = ge_s_tractor_01, 1
+addon = LargeWhiteSpecial, HpHeadlight, 1
+addon = FastSmallRed, HpRunningLight01, 1
+addon = SlowSmallYellow, HpRunningLight02, 1
+addon = SlowSmallYellow, HpRunningLight03, 1
+addon = SlowSmallYellow, HpRunningLight04, 1
+addon = SlowSmallYellow, HpRunningLight05, 1
+addon = SlowSmallYellow, HpRunningLight06, 1
+addon = SlowSmallYellow, HpRunningLight07, 1
+addon = SlowSmallYellow, HpRunningLight08, 1
+addon = contrail01, HpContrail01, 1
+addon = contrail01, HpContrail02, 1
+addon = DockingLightRedSmall, HpDockLight01, 1
+addon = DockingLightRedSmall, HpDockLight02, 1
 
 [Good]
 nickname = remtrain_hull
@@ -2092,30 +2092,30 @@ addon = ge_t_engine_01, internal, 1
 addon = co_elite2_power01, internal, 1
 addon = ge_s_scanner_01, internal, 1
 addon = ge_s_tractor_01, internal, 1
-addon = SlowMediumWhite, HpRunningLight01
-addon = SlowMediumWhite, HpRunningLight02
-addon = SlowMediumWhite, HpRunningLight03
-addon = SlowMediumWhite, HpRunningLight04
-addon = SlowMediumWhite, HpRunningLight05
-addon = SlowMediumWhite, HpRunningLight06
-addon = SlowMediumWhite, HpRunningLight07
-addon = SlowMediumWhite, HpRunningLight08
-addon = SlowMediumWhite, HpRunningLight09
-addon = SlowMediumWhite, HpRunningLight10
-addon = SlowMediumWhite, HpRunningLight11
-addon = SlowMediumWhite, HpRunningLight12
-addon = SlowMediumWhite, HpRunningLight13
-addon = SlowMediumWhite, HpRunningLight14
-addon = SlowMediumWhite, HpRunningLight15
-addon = DockingLightRed, HpDockLight01
-addon = DockingLightRed, HpDockLight02
-addon = DockingLightRed, HpDockLight03
-addon = LargeWhiteSpecial, HpHeadLight01
-addon = LargeWhiteSpecial, HpHeadLight02
-addon = cargopod_drab, HpCargo01
-addon = cargopod_drab, HpCargo02
-addon = cargopod_drab, HpCargo03
-addon = cargopod_drab, HpCargo04
+addon = SlowMediumWhite, HpRunningLight01, 1
+addon = SlowMediumWhite, HpRunningLight02, 1
+addon = SlowMediumWhite, HpRunningLight03, 1
+addon = SlowMediumWhite, HpRunningLight04, 1
+addon = SlowMediumWhite, HpRunningLight05, 1
+addon = SlowMediumWhite, HpRunningLight06, 1
+addon = SlowMediumWhite, HpRunningLight07, 1
+addon = SlowMediumWhite, HpRunningLight08, 1
+addon = SlowMediumWhite, HpRunningLight09, 1
+addon = SlowMediumWhite, HpRunningLight10, 1
+addon = SlowMediumWhite, HpRunningLight11, 1
+addon = SlowMediumWhite, HpRunningLight12, 1
+addon = SlowMediumWhite, HpRunningLight13, 1
+addon = SlowMediumWhite, HpRunningLight14, 1
+addon = SlowMediumWhite, HpRunningLight15, 1
+addon = DockingLightRed, HpDockLight01, 1
+addon = DockingLightRed, HpDockLight02, 1
+addon = DockingLightRed, HpDockLight03, 1
+addon = LargeWhiteSpecial, HpHeadLight01, 1
+addon = LargeWhiteSpecial, HpHeadLight02, 1
+addon = cargopod_drab, HpCargo01, 1
+addon = cargopod_drab, HpCargo02, 1
+addon = cargopod_drab, HpCargo03, 1
+addon = cargopod_drab, HpCargo04, 1
 
 
 ; Blood Dragon
@@ -2173,21 +2173,21 @@ addon = ge_tl_engine_01, internal, 1
 addon = co_elite_power01, internal, 1
 addon = ge_s_scanner_01, internal, 1
 addon = ge_s_tractor_01, internal, 1
-addon = contrail01, HpContrail01
-addon = contrail01, HpContrail02
-addon = DockingLightRedSmall, HpDockLight01
-addon = DockingLightRedSmall, HpDockLight02
-addon = LargeWhiteSpecial, HpHeadLight01
-addon = SlowSmallWhite, HpRunningLight01
-addon = SlowSmallWhite, HpRunningLight02
-addon = SlowSmallWhite, HpRunningLight03
-addon = SlowSmallWhite, HpRunningLight04
-addon = SlowSmallWhite, HpRunningLight05
-addon = SlowSmallWhite, HpRunningLight06
-addon = SlowSmallWhite, HpRunningLight07
-addon = SlowSmallWhite, HpRunningLight08
-addon = SlowSmallWhite, HpRunningLight09
-addon = SlowSmallWhite, HpRunningLight10
+addon = contrail01, HpContrail01, 1
+addon = contrail01, HpContrail02, 1
+addon = DockingLightRedSmall, HpDockLight01, 1
+addon = DockingLightRedSmall, HpDockLight02, 1
+addon = LargeWhiteSpecial, HpHeadLight01, 1
+addon = SlowSmallWhite, HpRunningLight01, 1
+addon = SlowSmallWhite, HpRunningLight02, 1
+addon = SlowSmallWhite, HpRunningLight03, 1
+addon = SlowSmallWhite, HpRunningLight04, 1
+addon = SlowSmallWhite, HpRunningLight05, 1
+addon = SlowSmallWhite, HpRunningLight06, 1
+addon = SlowSmallWhite, HpRunningLight07, 1
+addon = SlowSmallWhite, HpRunningLight08, 1
+addon = SlowSmallWhite, HpRunningLight09, 1
+addon = SlowSmallWhite, HpRunningLight10, 1
 
 
 ; Transport Player
@@ -2209,18 +2209,18 @@ addon = ge_t_engine_01, internal, 1
 addon = co_elite2_power01, internal, 1
 addon = ge_s_scanner_01, internal, 1
 addon = ge_s_tractor_01, internal, 1
-addon = SlowMediumWhite, HpRunningLight06
-addon = SlowMediumWhite, HpRunningLight07
-addon = SlowMediumWhite, HpRunningLight08
-addon = SlowMediumWhite, HpRunningLight09
-addon = SlowMediumWhite, HpRunningLight10
-addon = SlowMediumWhite, HpRunningLight11
-addon = SlowMediumWhite, HpRunningLight12
-addon = SlowMediumWhite, HpRunningLight13
-addon = DockingLightRed, HpDockLight01
-addon = DockingLightRed, HpDockLight02
-addon = DockingLightRed, HpDockLight03
-addon = LargeWhiteSpecial, HpHeadLight01
-addon = LargeWhiteSpecial, HpHeadLight02
-addon = cargopod_drab, HpCargo01
-addon = cargopod_drab, HpCargo02
+addon = SlowMediumWhite, HpRunningLight06, 1
+addon = SlowMediumWhite, HpRunningLight07, 1
+addon = SlowMediumWhite, HpRunningLight08, 1
+addon = SlowMediumWhite, HpRunningLight09, 1
+addon = SlowMediumWhite, HpRunningLight10, 1
+addon = SlowMediumWhite, HpRunningLight11, 1
+addon = SlowMediumWhite, HpRunningLight12, 1
+addon = SlowMediumWhite, HpRunningLight13, 1
+addon = DockingLightRed, HpDockLight01, 1
+addon = DockingLightRed, HpDockLight02, 1
+addon = DockingLightRed, HpDockLight03, 1
+addon = LargeWhiteSpecial, HpHeadLight01, 1
+addon = LargeWhiteSpecial, HpHeadLight02, 1
+addon = cargopod_drab, HpCargo01, 1
+addon = cargopod_drab, HpCargo02, 1