diff --git a/DATA/EQUIPMENT/engine_equip.ini b/DATA/EQUIPMENT/engine_equip.ini
index 3504a3c3..d84c6bf2 100644
--- a/DATA/EQUIPMENT/engine_equip.ini
+++ b/DATA/EQUIPMENT/engine_equip.ini
@@ -28,6 +28,7 @@ ids_name = 263671
 ids_info = 264671
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -61,6 +62,7 @@ ids_name = 263672
 ids_info = 264672
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -94,6 +96,7 @@ ids_name = 263673
 ids_info = 264673
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -129,6 +132,7 @@ ids_name = 263674
 ids_info = 264674
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -164,6 +168,7 @@ ids_name = 263675
 ids_info = 264675
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -199,6 +204,7 @@ ids_name = 263676
 ids_info = 264676
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -234,6 +240,7 @@ ids_name = 263677
 ids_info = 264677
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -269,6 +276,7 @@ ids_name = 263678
 ids_info = 264678
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -304,6 +312,7 @@ ids_name = 263679
 ids_info = 264679
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -339,6 +348,7 @@ ids_name = 263680
 ids_info = 264680
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -374,6 +384,7 @@ ids_name = 263681
 ids_info = 264681
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -409,6 +420,7 @@ ids_name = 263682
 ids_info = 264682
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -444,6 +456,7 @@ ids_name = 263683
 ids_info = 264683
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -479,6 +492,7 @@ ids_name = 263684
 ids_info = 264684
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -514,6 +528,7 @@ ids_name = 263685
 ids_info = 264685
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -549,6 +564,7 @@ ids_name = 263686
 ids_info = 264686
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -584,6 +600,7 @@ ids_name = 263687
 ids_info = 264687
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -620,6 +637,7 @@ ids_name = 263688
 ids_info = 264688
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -656,6 +674,7 @@ ids_name = 263689
 ids_info = 264689
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -692,6 +711,7 @@ ids_name = 263690
 ids_info = 264690
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -727,6 +747,7 @@ ids_name = 263691
 ids_info = 264691
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -762,6 +783,7 @@ ids_name = 263692
 ids_info = 264692
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -797,6 +819,7 @@ ids_name = 263693
 ids_info = 264693
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -832,6 +855,7 @@ ids_name = 263694
 ids_info = 264694
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -867,6 +891,7 @@ ids_name = 263695
 ids_info = 264695
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -902,6 +927,7 @@ ids_name = 263696
 ids_info = 264696
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -937,6 +963,7 @@ ids_name = 263697
 ids_info = 264697
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -972,6 +999,7 @@ ids_name = 263698
 ids_info = 264698
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1007,6 +1035,7 @@ ids_name = 263699
 ids_info = 264699
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1042,6 +1071,7 @@ ids_name = 263700
 ids_info = 264700
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1077,6 +1107,7 @@ ids_name = 263701
 ids_info = 264701
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1112,6 +1143,7 @@ ids_name = 263702
 ids_info = 264702
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1147,6 +1179,7 @@ ids_name = 263881
 ids_info = 264881
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 reverse_fraction = 0.1
@@ -1176,6 +1209,7 @@ ids_name = 263882
 ids_info = 264882
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 240000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1203,6 +1237,7 @@ ids_name = 263883
 ids_info = 264883
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 240000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1230,6 +1265,7 @@ ids_name = 263884
 ids_info = 264884
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 240000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1257,6 +1293,7 @@ ids_name = 263885
 ids_info = 264885
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 240000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1284,6 +1321,7 @@ ids_name = 263886
 ids_info = 264886
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 240000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1303,6 +1341,7 @@ ids_name = 263887
 ids_info = 264887
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 1200000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1328,6 +1367,7 @@ ids_name = 263888
 ids_info = 264888
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1347,6 +1387,7 @@ ids_name = 263889
 ids_info = 264889
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1366,6 +1407,7 @@ ids_name = 263890
 ids_info = 264890
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1390,6 +1432,7 @@ ids_name = 263891
 ids_info = 264891
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1409,6 +1452,7 @@ ids_name = 263892
 ids_info = 264892
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 360000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1435,6 +1479,7 @@ ids_name = 263893
 ids_info = 264893
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 360000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1461,6 +1506,7 @@ ids_name = 263894
 ids_info = 264894
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1485,6 +1531,7 @@ ids_name = 263895
 ids_info = 264895
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1504,6 +1551,7 @@ ids_name = 263896
 ids_info = 264896
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 360000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1530,6 +1578,7 @@ ids_name = 263897
 ids_info = 264897
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1554,6 +1603,7 @@ ids_name = 263898
 ids_info = 264898
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1573,6 +1623,7 @@ ids_name = 263899
 ids_info = 264899
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 reverse_fraction = 0.1
@@ -1598,6 +1649,7 @@ ids_name = 263900
 ids_info = 264900
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1626,6 +1678,7 @@ ids_name = 263901
 ids_info = 264901
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1645,6 +1698,7 @@ ids_name = 263902
 ids_info = 264902
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
@@ -1664,6 +1718,7 @@ ids_name = 263903
 ids_info = 264903
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1692,6 +1747,7 @@ ids_name = 263904
 ids_info = 264904
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 48000
 linear_drag = 599
 power_usage = 0
@@ -1720,6 +1776,7 @@ ids_name = 263905
 ids_info = 264905
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 360000
 linear_drag = 3000
 reverse_fraction = 0.1
@@ -1744,6 +1801,7 @@ ids_name = 263906
 ids_info = 264906
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
@@ -1763,6 +1821,7 @@ ids_name = 263907
 ids_info = 264907
 volume = 0
 mass = 10
+DA_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 max_force = 3000000
 linear_drag = 100000
 reverse_fraction = 0.1
diff --git a/DATA/EQUIPMENT/engine_good.ini b/DATA/EQUIPMENT/engine_good.ini
index 2f44ad9e..6dd92943 100644
--- a/DATA/EQUIPMENT/engine_good.ini
+++ b/DATA/EQUIPMENT/engine_good.ini
@@ -10,7 +10,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263671
 ids_info = 264671
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Startracker
 [Good]
@@ -22,7 +23,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263672
 ids_info = 264672
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Starblazer
 
@@ -35,7 +37,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263673
 ids_info = 264673
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Hawk
 
@@ -48,7 +51,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263674
 ids_info = 264674
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Falcon
 
@@ -61,7 +65,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263675
 ids_info = 264675
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Eagle
 
@@ -77,6 +82,7 @@ ids_info = 264676
 shop_archetype = equipment\models\hardware\li_free_flow_ion_drive.3db
 attachment_archetype = equipment\models\hardware\li_free_flow_ion_drive.3db
 material_library = equipment\models\hardware.mat
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Dagger
 
@@ -89,7 +95,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263677
 ids_info = 264677
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Stiletto
 
@@ -102,7 +109,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263678
 ids_info = 264678
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Sabre
 
@@ -115,7 +123,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263679
 ids_info = 264679
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Dromedary
 
@@ -128,7 +137,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263680
 ids_info = 264680
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Legionare
 
@@ -141,7 +151,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263681
 ids_info = 264681
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Centurio
 
@@ -154,7 +165,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263682
 ids_info = 264682
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Titan
 
@@ -167,7 +179,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263683
 ids_info = 264683
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Piranha
 
@@ -180,7 +193,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263684
 ids_info = 264684
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Barracuda
 
@@ -193,7 +207,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263685
 ids_info = 264685
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Hammerhead
 
@@ -206,7 +221,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263686
 ids_info = 264686
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Patriot
 
@@ -219,7 +235,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263687
 ids_info = 264687
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Defender
 
@@ -232,7 +249,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263688
 ids_info = 264688
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Rhino
 
@@ -245,7 +263,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263689
 ids_info = 264689
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Cavalier
 
@@ -258,7 +277,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263690
 ids_info = 264690
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Crusader
 
@@ -271,7 +291,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263691
 ids_info = 264691
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Clydesdale
 
@@ -284,11 +305,11 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263692
 ids_info = 264692
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Drake
 
-
 [Good]
 nickname = ge_kf_engine_01
 equipment = ge_kf_engine_01
@@ -298,7 +319,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263693
 ids_info = 264693
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ;Dragon
 
@@ -311,7 +333,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263694
 ids_info = 264694
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Drone
 
@@ -324,7 +347,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263695
 ids_info = 264695
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Banshee
 
@@ -337,7 +361,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263696
 ids_info = 264696
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Valykrie
 
@@ -350,7 +375,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263697
 ids_info = 264697
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Humpback
 
@@ -363,7 +389,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263698
 ids_info = 264698
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Blood Hound
 
@@ -376,7 +403,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263699
 ids_info = 264699
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Wolfshound
 
@@ -389,7 +417,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263700
 ids_info = 264700
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Mule
 
@@ -402,7 +431,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263701
 ids_info = 264701
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Anubis
 
@@ -415,7 +445,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263702
 ids_info = 264702
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Train
 
@@ -428,7 +459,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263881
 ids_info = 264881
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 ; Armored Transport
 
@@ -441,7 +473,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263882
 ids_info = 264882
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_tt_engine_01
@@ -452,7 +485,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263883
 ids_info = 264883
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_ttl_engine_01
@@ -463,7 +497,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263884
 ids_info = 264884
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_ta_engine_01
@@ -474,7 +509,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263885
 ids_info = 264885
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_mnr_engine_01
@@ -485,7 +521,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263886
 ids_info = 264886
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_lc_engine_01
@@ -496,7 +533,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263887
 ids_info = 264887
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_lb_engine_01
@@ -507,7 +545,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263888
 ids_info = 264888
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_lbd_engine_01
@@ -518,7 +557,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263889
 ids_info = 264889
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_bd_engine_01
@@ -529,7 +569,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263890
 ids_info = 264890
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_bb_engine_01
@@ -540,7 +581,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263891
 ids_info = 264891
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_bg_engine_01
@@ -551,7 +593,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263892
 ids_info = 264892
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_kg_engine_01
@@ -562,7 +605,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263893
 ids_info = 264893
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_kd_engine_01
@@ -573,7 +617,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263894
 ids_info = 264894
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_kb_engine_01
@@ -584,7 +629,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263895
 ids_info = 264895
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_rg_engine_01
@@ -595,7 +641,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263896
 ids_info = 264896
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_rc_engine_01
@@ -606,7 +653,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263897
 ids_info = 264897
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_rb_engine_01
@@ -617,7 +665,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263898
 ids_info = 264898
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_csv_engine_01
@@ -628,7 +677,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263899
 ids_info = 264899
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_lft_engine_01
@@ -639,7 +689,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263900
 ids_info = 264900
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_lnr_engine_01
@@ -650,7 +701,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263901
 ids_info = 264901
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_psn_engine_01
@@ -661,7 +713,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263902
 ids_info = 264902
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_rpr_engine_01
@@ -672,7 +725,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263903
 ids_info = 264903
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_nf_engine_01
@@ -683,7 +737,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263904
 ids_info = 264904
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_ng_engine_01
@@ -694,7 +749,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263905
 ids_info = 264905
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_nb_engine_01
@@ -705,7 +761,8 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263906
 ids_info = 264906
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
 
 [Good]
 nickname = ge_ob_engine_01
@@ -716,4 +773,5 @@ item_icon = equipment\models\commodities\nn_icons\equip_engine1.3db
 combinable = False
 ids_name = 263907
 ids_info = 264907
-shop_archetype = equipment\models\commodities\crates\crate_grey.3db
\ No newline at end of file
+shop_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
+attachment_archetype = equipment\models\hardware\br_xenon_ion_drive.3db
\ No newline at end of file
diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini
index 21d47dff..1fefe53d 100644
--- a/DATA/SHIPS/shiparch.ini
+++ b/DATA/SHIPS/shiparch.ini
@@ -5240,7 +5240,6 @@ hp_type = hp_thruster, HpThruster01
 hp_type = hp_mine_dropper, HpMine01
 hp_type = hp_countermeasure_dropper, HpCM01
 hp_type = hp_fighter_engine_special_1, HpDrive01
-;hp_type = hp_fighter_engine_special_4, HpDrive02
 hp_type = hp_fighter_power_special_1, HpPower01
 hp_type = hp_fighter_power_special_5, HpPower02
 
@@ -5272,6 +5271,8 @@ type = Starboard_Wing
 hit_pts = 138
 root_health_proxy = true
 
+; Startracker
+
 [Ship]
 ids_name = 237016
 ids_info = 66530
@@ -5335,6 +5336,9 @@ hp_type = hp_thruster, HpThruster01
 hp_type = hp_mine_dropper, HpMine01
 hp_type = hp_countermeasure_dropper, HpCM01
 hp_type = hp_torpedo_special_2, HpTorpedo01
+hp_type = hp_fighter_engine_special_1, HpDrive01
+hp_type = hp_fighter_power_special_1, HpPower01
+hp_type = hp_fighter_power_special_5, HpPower02
 
 [CollisionGroup]
 obj = port_wing_lod1