diff --git a/A3A/addons/config_fixes/Aegis/CfgVehicles.hpp b/A3A/addons/config_fixes/Aegis/CfgVehicles.hpp
new file mode 100644
index 0000000000..4e7bef596e
--- /dev/null
+++ b/A3A/addons/config_fixes/Aegis/CfgVehicles.hpp
@@ -0,0 +1,10 @@
+//Aegis - CfgVehicles.hpp
+
+class CfgVehicles 
+{
+//#include "air.hpp"
+//#include "armor.hpp"
+#include "ifv.hpp"
+//#include "sea.hpp"
+//#include "soft.hpp"
+};
\ No newline at end of file
diff --git a/A3A/addons/config_fixes/Aegis/CfgWeapons.hpp b/A3A/addons/config_fixes/Aegis/CfgWeapons.hpp
index 605c931771..5054571040 100644
--- a/A3A/addons/config_fixes/Aegis/CfgWeapons.hpp
+++ b/A3A/addons/config_fixes/Aegis/CfgWeapons.hpp
@@ -8,4 +8,3 @@ class CfgWeapons
         baseWeapon = "Aegis_arifle_AKM74_sand_F";
     };
 };
-
diff --git a/A3A/addons/config_fixes/Aegis/config.cpp b/A3A/addons/config_fixes/Aegis/config.cpp
index fc9871d208..31f337fd57 100644
--- a/A3A/addons/config_fixes/Aegis/config.cpp
+++ b/A3A/addons/config_fixes/Aegis/config.cpp
@@ -21,5 +21,5 @@ class CfgPatches
 };
 
 // Uncomment when needed
-//#include "CfgVehicles.hpp" - Later for Russian BTR
+#include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
diff --git a/A3A/addons/config_fixes/Aegis/ifv.hpp b/A3A/addons/config_fixes/Aegis/ifv.hpp
new file mode 100644
index 0000000000..4e4339e876
--- /dev/null
+++ b/A3A/addons/config_fixes/Aegis/ifv.hpp
@@ -0,0 +1,169 @@
+//Aegis - ifv.hpp
+
+// Mora/Lancer/Odyniec //
+class APC_Tracked_03_base_v2_F;
+class I_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
+class a3a_I_APC_tracked_03_cannon_v2_F : I_APC_tracked_03_cannon_v2_F
+{
+    animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class I_E_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
+class a3a_I_E_APC_tracked_03_cannon_v2_F : I_E_APC_tracked_03_cannon_v2_F
+{
+    animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class B_A_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
+class a3a_B_A_APC_tracked_03_cannon_v2_F : B_A_APC_tracked_03_cannon_v2_F
+{
+    animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class B_A_APC_tracked_03_cannon_v2_wdl_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
+class a3a_B_A_APC_tracked_03_cannon_v2_wdl_F : B_A_APC_tracked_03_cannon_v2_wdl_F
+{
+    animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class B_A_APC_tracked_03_cannon_v2_tna_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
+class a3a_B_A_APC_tracked_03_cannon_v2_tna_F : B_A_APC_tracked_03_cannon_v2_tna_F
+{
+    animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+
+// Marshall/Borsuk //
+class APC_Wheeled_01_base_v2_F;
+class B_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
+class a3a_B_APC_Wheeled_01_cannon_v2_F : B_APC_Wheeled_01_cannon_v2_F
+{
+    animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class B_W_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
+class a3a_B_W_APC_Wheeled_01_cannon_v2_F : B_W_APC_Wheeled_01_cannon_v2_F
+{
+    animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class B_T_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
+class a3a_B_T_APC_Wheeled_01_cannon_v2_F : B_T_APC_Wheeled_01_cannon_v2_F
+{
+    animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class Aegis_I_E_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
+class a3a_Aegis_I_E_APC_Wheeled_01_cannon_v2_F : Aegis_I_E_APC_Wheeled_01_cannon_v2_F
+{
+    animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+
+// Marid/Kazak //
+class APC_Wheeled_02_base_v2_F;
+class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
+class a3a_O_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F
+{
+    animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
+class a3a_O_T_APC_Wheeled_02_rcws_v2_ghex_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
+{
+    animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class O_R_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
+class a3a_O_R_APC_Wheeled_02_rcws_v2_F : O_R_APC_Wheeled_02_rcws_v2_F
+{
+    animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+
+// Kamysh/Okhotnik //
+class O_APC_Tracked_02_base_F;
+class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
+class a3a_O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_base_F { class EventHandlers; };
+class a3a_O_T_APC_Tracked_02_cannon_ghex_F : O_T_APC_Tracked_02_cannon_ghex_F
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+class O_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_cannon_F {};
+class Aegis_O_R_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS {};
+class a3a_Aegis_O_R_APC_Tracked_02_30mm_lxWS : Aegis_O_R_APC_Tracked_02_30mm_lxWS
+{
+    animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+};
+
+// Bogatyr //
+class Wheeled_APC_F;
+class APC_Wheeled_04_base_F : Wheeled_APC_F { class Turrets; };
+class O_R_APC_Wheeled_04_cannon_F : APC_Wheeled_04_base_F { class EventHandlers; class Turrets : Turrets { class MainTurret; }; };
+class a3a_O_R_APC_Wheeled_04_cannon_F : O_R_APC_Wheeled_04_cannon_F
+{
+    class EventHandlers : EventHandlers
+    {
+        init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
+    };
+    class Turrets : Turrets 
+    {
+        class MainTurret : MainTurret
+        {
+            magazines[] = {"140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","2000Rnd_762x51_Belt_Green","4rnd_Vorona_HEAT","4rnd_Vorona_HE"};
+            weapons[] = {"autocannon_30mm_CTWS","LMG_coax_ext","missiles_Vorona_vehicle"};
+        };
+    };
+};
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf
index c70784bb0c..9e0a72e60e 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf
@@ -28,7 +28,7 @@ private _cargoTrucks = ["I_Truck_02_transport_F", "I_Truck_02_covered_F"];
 ["vehiclesMedical", ["I_Truck_02_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["I_APC_tracked_03_cannon_v2_F", "I_APC_Wheeled_03_cannon_F", "I_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate;;
-["vehiclesIFVs", ["I_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_I_APC_tracked_03_cannon_v2_F", "a3a_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["I_MBT_03_cannon_F"]] call _fnc_saveToTemplate;
 private _AA = ["I_LT_01_AA_F"];
 
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf
index c374d8d964..e6d36dfabf 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf
@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf
index b1e8bae371..dd8c12f630 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Temperate.sqf
@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_wdl_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_wdl_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_wdl_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_W_MBT_01_TUSK_F", "B_W_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_W_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf
index b07d0c36c5..123da5049e 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Tropical.sqf
@@ -28,7 +28,7 @@
 ["vehiclesMedical", ["B_A_Truck_01_medical_tna_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["B_A_APC_tracked_03_cannon_v2_tna_F"]] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+["vehiclesIFVs", ["a3a_B_A_APC_tracked_03_cannon_v2_tna_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf
index 9ab9a7bec0..2323bb31a5 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf
@@ -27,8 +27,8 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_0
 ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate;
-private _vehiclesIFVs = ["a3a_T_APC_Tracked_02_cannon_F"];
+["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F", "a3a_O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate;
+private _vehiclesIFVs = ["a3a_O_T_APC_Tracked_02_cannon_ghex_F", "O_T_APC_Tracked_02_cannon_ghex_F"];
 ["vehiclesTanks", ["O_T_MBT_02_cannon_ghex_F"]] call _fnc_saveToTemplate; 
 ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate;
 
@@ -216,10 +216,10 @@ _loadoutData set ["items_unarmed_extras", []];
 ///////////////////////////////////////
 
 private _sfLoadoutData = _loadoutData call _fnc_copyLoadoutData;
-_sfLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_ghex_F", "Aegis_U_O_CombatFatigues_ghex_02_F"]];
-_sfLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_grn_F"]];
-_sfLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_grn_F"]];
-_sfLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_grn_F"]];
+_sfLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
+_sfLoadoutData set ["vests", ["V_HarnessO_ghex_F", "Aegis_V_ChestrigEast_ghex_F"]];
+_sfLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
+_sfLoadoutData set ["Hvests", ["V_TacVest_oli"]];
 _sfLoadoutData set ["backpacks", ["B_ViperLightHarness_ghex_F", "B_ViperHarness_ghex_F"]];
 _sfLoadoutData set ["helmets", ["H_HelmetSpecO_ghex_F", "H_HelmetSpecO_blk"]];
 _sfLoadoutData set ["NVGs", ["O_NVGoggles_ghex_F"]];
@@ -278,11 +278,11 @@ _sfLoadoutData set ["sidearms", [
 /////////////////////////////////
 
 private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData;
-_militaryLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
+_militaryLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_ghex_F", "Aegis_U_O_CombatFatigues_02_ghex_F"]];
 _militaryLoadoutData set ["slUniforms", ["U_O_T_Officer_F"]];
-_militaryLoadoutData set ["vests", ["V_HarnessO_ghex_F"]];
-_militaryLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
-_militaryLoadoutData set ["Hvests", ["V_TacVest_oli"]];
+_militaryLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_grn_F"]];
+_militaryLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_grn_F"]];
+_militaryLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_grn_F"]];
 _militaryLoadoutData set ["backpacks", ["B_Carryall_ghex_F", "B_FieldPack_ghex_F", "B_AssaultPack_ghex_F"]];
 _militaryLoadoutData set ["helmets", ["H_HelmetO_ghex_F", "H_HelmetLeaderO_ghex_F"]];
 _militaryLoadoutData set ["binoculars", ["Laserdesignator_02_ghex_F"]];
@@ -360,9 +360,9 @@ _policeLoadoutData set ["sidearms", ["hgun_Pistol_01_F"]];
 ////////////////////////////////
 
 private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_militiaLoadoutData set ["uniforms", ["U_O_T_officer_noInsignia_ghex_F", "Aegis_U_O_CombatUniform_tshirt_ghex_F"]];
+_militiaLoadoutData set ["uniforms", ["U_O_T_officer_noInsignia_ghex_F"]];
 _militiaLoadoutData set ["slUniforms", ["U_O_T_Officer_F"]];
-_militiaLoadoutData set ["vests", ["V_HarnessO_ghex_F", "V_BandollierB_ghex_F"]];
+_militiaLoadoutData set ["vests", ["Aegis_V_ChestrigEast_ghex_F", "V_HarnessO_ghex_F", "V_BandollierB_ghex_F"]];
 _militiaLoadoutData set ["glVests", ["V_HarnessOGL_ghex_F"]];
 _militiaLoadoutData set ["Hvests", ["V_TacVest_oli"]];
 _militiaLoadoutData set ["backpacks", ["B_Carryall_ghex_F", "B_FieldPack_ghex_F", "B_AssaultPack_ghex_F"]];
@@ -381,7 +381,7 @@ _militiaLoadoutData set ["SMGs", [
 ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["machineGuns", [
-["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""]
+["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Tracer_F"], [], ""]
 ]];
 _militiaLoadoutData set ["marksmanRifles", [
 ["srifle_DMR_07_blk_F", "", "", "optic_Arco_blk_F", [], [], ""]
@@ -396,8 +396,8 @@ _militiaLoadoutData set ["sidearms", ["hgun_Rook40_F"]];
 //////////////////////////
 
 private _crewLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
-_crewLoadoutData set ["uniforms", ["U_O_T_Soldier_F"]];
-_crewLoadoutData set ["vests", ["V_HarnessO_ghex_F"]];
+_crewLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_02_ghex_F"]];
+_crewLoadoutData set ["vests", ["Aegis_V_ChestrigEast_ghex_F"]];
 _crewLoadoutData set ["helmets", ["H_HelmetCrew_O", "H_Tank_black_F"]];
 
 private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf
index 9c9c809c1f..9ec1f6b4f6 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Iran.sqf
@@ -27,8 +27,8 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Tru
 ["vehiclesFuelTrucks", ["O_Truck_03_fuel_F", "O_Truck_02_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["O_Truck_02_medical_F", "O_Truck_03_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-["vehiclesAPCs", ["a3a_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate;
-private _vehiclesIFVs = ["a3a_APC_Tracked_02_cannon_F"];
+["vehiclesAPCs", ["O_APC_Wheeled_02_rcws_v2_F", "a3a_O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate;
+private _vehiclesIFVs = ["a3a_O_APC_Tracked_02_cannon_F", "O_APC_Tracked_02_cannon_F"];
 ["vehiclesTanks", ["O_MBT_02_cannon_F"]] call _fnc_saveToTemplate; 
 ["vehiclesAA", ["O_APC_Tracked_02_AA_F"]] call _fnc_saveToTemplate;
 
@@ -225,10 +225,10 @@ _loadoutData set ["items_unarmed_extras", []];
 ///////////////////////////////////////
 
 private _sfLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_sfLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_F", "Aegis_U_O_CombatFatigues_02_F"]];
-_sfLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_khk_F"]];
-_sfLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_khk_F"]];
-_sfLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_khk_F"]];
+_sfLoadoutData set ["uniforms", ["U_O_CombatUniform_ocamo"]];
+_sfLoadoutData set ["vests", ["V_HarnessO_brn", "Aegis_V_ChestrigEast_hex_F"]];
+_sfLoadoutData set ["glVests", ["V_HarnessOGL_brn"]];
+_sfLoadoutData set ["Hvests", ["V_TacVest_brn"]];
 _sfLoadoutData set ["backpacks", ["B_TacticalPack_ocamo", "B_Carryall_ocamo", "B_FieldPack_ocamo", "B_Carryall_ocamo", "B_AssaultPack_ocamo"]];
 _sfLoadoutData set ["helmets", ["H_HelmetSpecO_ocamo"]];
 _sfLoadoutData set ["binoculars", ["Laserdesignator_02"]];
@@ -285,11 +285,11 @@ _sfLoadoutData set ["sidearms", [
 /////////////////////////////////
 
 private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_militaryLoadoutData set ["uniforms", ["U_O_CombatUniform_ocamo"]];
+_militaryLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_F", "Aegis_U_O_CombatFatigues_02_F", "Aegis_U_O_CombatUniform_tshirt_hex_F"]];
 _militaryLoadoutData set ["slUniforms", ["U_O_OfficerUniform_ocamo"]];
-_militaryLoadoutData set ["vests", ["V_HarnessO_brn"]];
-_militaryLoadoutData set ["glVests", ["V_HarnessOGL_brn"]];
-_militaryLoadoutData set ["Hvests", ["V_TacVest_brn"]];
+_militaryLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_khk_F"]];
+_militaryLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_khk_F"]];
+_militaryLoadoutData set ["Hvests", ["Aegis_V_OCarrierLuchnik_CQB_khk_F"]];
 _militaryLoadoutData set ["backpacks", ["B_TacticalPack_ocamo", "B_Carryall_ocamo", "B_FieldPack_ocamo", "B_Carryall_ocamo", "B_AssaultPack_ocamo"]];
 _militaryLoadoutData set ["helmets", ["H_HelmetO_ocamo", "H_HelmetLeaderO_ocamo"]];
 _militaryLoadoutData set ["binoculars", ["Laserdesignator_02"]];
@@ -367,10 +367,10 @@ _policeLoadoutData set ["sidearms", ["hgun_Pistol_01_F"]];
 ////////////////////////////////
 
 private _militiaLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_militiaLoadoutData set ["uniforms", ["U_O_officer_noInsignia_hex_F", "Aegis_U_O_CombatUniform_tshirt_hex_F"]];
+_militiaLoadoutData set ["uniforms", ["U_O_officer_noInsignia_hex_F"]];
 _militiaLoadoutData set ["slUniforms", ["U_O_OfficerUniform_ocamo"]];
-_militiaLoadoutData set ["vests", ["Aegis_V_ChestrigEast_hex_F", "V_BandollierB_khk"]];
-_militiaLoadoutData set ["glVests", ["Aegis_V_ChestrigEast_hex_F", "V_HarnessOGL_brn"]];
+_militiaLoadoutData set ["vests", ["V_HarnessO_brn", "Aegis_V_ChestrigEast_hex_F", "V_BandollierB_khk"]];
+_militiaLoadoutData set ["glVests", ["V_HarnessOGL_brn"]];
 _militiaLoadoutData set ["Hvests", ["V_TacVest_brn"]];
 _militiaLoadoutData set ["backpacks", ["B_TacticalPack_ocamo", "B_Carryall_ocamo", "B_FieldPack_ocamo", "B_Carryall_cbr", "B_Kitbag_cbr"]];
 _militiaLoadoutData set ["helmets", ["H_HelmetLuchnik_cover_hex_F"]];
@@ -391,7 +391,7 @@ _militiaLoadoutData set ["SMGs", [
 ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["machineGuns", [
-["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""]
+["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Tracer_F"], [], ""]
 ]];
 _militiaLoadoutData set ["marksmanRifles", [
 ["srifle_DMR_01_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_hex"]
@@ -406,8 +406,8 @@ _militiaLoadoutData set ["sidearms", ["hgun_Rook40_F"]];
 //////////////////////////
 
 private _crewLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
-_crewLoadoutData set ["uniforms", ["U_O_CombatUniform_ocamo"]];
-_crewLoadoutData set ["vests", ["V_HarnessO_brn"]];
+_crewLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_02_F"]];
+_crewLoadoutData set ["vests", ["Aegis_V_ChestrigEast_hex_F"]];
 _crewLoadoutData set ["helmets", ["H_HelmetCrew_O"]];
 
 private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf
index e926943de6..e2c5968ba3 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf
@@ -27,8 +27,8 @@ private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"];
 ["vehiclesFuelTrucks", ["I_E_Truck_02_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["I_E_Truck_02_Medical_F", "Aegis_I_E_APC_Wheeled_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-private _APCs = ["Aegis_I_E_APC_Wheeled_01_cannon_v2_F"];
-["vehiclesIFVs", ["I_E_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
+private _APCs = ["Aegis_I_E_APC_Wheeled_01_cannon_v2_F", "a3a_Aegis_I_E_APC_Wheeled_01_cannon_v2_F", "I_E_APC_tracked_03_cannon_v2_F"];
+["vehiclesIFVs", ["a3a_I_E_APC_tracked_03_cannon_v2_F"]] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["Aegis_I_E_MBT_03_cannon_F"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["B_W_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
@@ -378,7 +378,7 @@ _militiaLoadoutData set ["SMGs", [
 ["SMG_03C_black", "", "", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["machineGuns", [
-["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""]
+["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Tracer_F"], [], ""]
 ]];
 _militiaLoadoutData set ["marksmanRifles", [
 ["srifle_DMR_01_black_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_blk"]
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf
index a8106c1b12..02a1a91dcb 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_Russia.sqf
@@ -27,8 +27,8 @@ private _cargoTrucks = ["O_R_Truck_03_transport_F","O_R_Truck_03_covered_F","O_R
 ["vehiclesFuelTrucks", ["O_R_Truck_02_fuel_F","O_R_Truck_03_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["O_R_Truck_02_medical_F","O_R_Truck_03_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-private _APCs = [];
-["vehiclesIFVs", ["Aegis_O_R_APC_Tracked_02_30mm_lxWS"]] call _fnc_saveToTemplate;
+private _APCs = ["O_R_APC_Wheeled_02_rcws_v2_F", "a3a_O_R_APC_Wheeled_04_cannon_F", "a3a_O_R_APC_Wheeled_02_rcws_v2_F"];
+["vehiclesIFVs", ["a3a_Aegis_O_R_APC_Tracked_02_30mm_lxWS"]] call _fnc_saveToTemplate;
 private _Tanks = ["O_R_MBT_02_cannon_F"];
 private _AA = ["O_R_APC_Tracked_02_AA_F"];
 
@@ -76,6 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"];
 //If Western Sahara DLC
 if ("ws" in A3A_enabledDLC) then {
 	_cargoTrucks append ["O_R_Truck_02_cargo_F","O_R_Truck_02_flatbed_F"];
+	_APCs = _APCs - ["a3a_O_R_APC_Wheeled_04_cannon_F"];
 	_APCs append ["O_R_APC_Wheeled_04_cannon_F"];
 	_AA append ["Aegis_O_R_Truck_02_aa_F"];
 };
@@ -277,7 +278,7 @@ _sfLoadoutData set ["sidearms", [
 /////////////////////////////////
 
 private _militaryLoadoutData = _loadoutData call _fnc_copyLoadoutData; // touch and shit breaks
-_militaryLoadoutData set ["uniforms", ["U_O_R_CombatUniform_taiga_F", "U_O_R_CombatUniform_taiga_F", "U_O_R_CombatUniform_tshirt_taiga_F"]];
+_militaryLoadoutData set ["uniforms", ["Aegis_U_O_CombatFatigues_rutaiga_F", "Aegis_U_O_CombatFatigues_02_rutaiga_F", "U_O_R_CombatUniform_tshirt_taiga_F"]];
 _militaryLoadoutData set ["slUniforms", ["U_O_R_OfficerUniform_taiga_F"]];
 _militaryLoadoutData set ["vests", ["Aegis_V_OCarrierLuchnik_Lite_F"]];
 _militaryLoadoutData set ["glVests", ["Aegis_V_OCarrierLuchnik_GL_F"]];
@@ -388,7 +389,7 @@ _militiaLoadoutData set ["SMGs", [
 ["SMG_02_F", "", "acc_flashlight", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["machineGuns", [
-["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["30Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_F", "75Rnd_762x39_Mag_Tracer_F"], [], ""]
+["arifle_RPK_F", "", "acc_flashlight_pistol", "", ["75Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Tracer_F"], [], ""]
 ]];
 _militiaLoadoutData set ["marksmanRifles", [
 ["srifle_DMR_01_black_F", "", "acc_flashlight", "optic_Arco_blk_F", [], [], "bipod_02_F_blk"]
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf
index b19ee9e2ac..dc197b8def 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf
@@ -27,8 +27,8 @@ private _LightArmed = ["B_MRAP_01_hmg_F", "B_MRAP_01_hmg_F", "B_MRAP_01_gmg_F"];
 ["vehiclesFuelTrucks", ["B_Truck_01_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["B_Truck_01_medical_F", "B_APC_Wheeled_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-private _APCs = ["B_APC_Wheeled_01_cannon_v2_F", "B_APC_Tracked_01_rcws_F", "B_APC_Tracked_01_CRV_F"];           // CRV has no cargo: "B_APC_Tracked_01_CRV_F"
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+private _APCs = ["B_APC_Wheeled_01_cannon_v2_F", "B_APC_Tracked_01_rcws_F"];
+["vehiclesIFVs", ["a3a_B_APC_Wheeled_01_cannon_v2_F"]] call _fnc_saveToTemplate;
 private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"];
 ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
@@ -84,7 +84,7 @@ if ("enoch" in A3A_enabledDLC) then {
     _vehiclesMilitiaCars append ["a3a_Offroad_01_comms_tan_F", "a3a_Offroad_01_covered_tan_F"];
 };
 if ("tanks" in A3A_enabledDLC) then {
-    ["vehiclesLightTanks", ["B_AFV_Wheeled_01_cannon_F","B_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
+    ["vehiclesLightTanks", ["a3a_AFV_Wheeled_01_cannon_F", "B_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
 };
 if ("expansion" in A3A_enabledDLC) then {
     _LightUnarmed append ["B_MRAP_01_F","B_LSV_01_unarmed_F"];
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf
index 5181ff814e..d8abc03bc3 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Temperate.sqf
@@ -27,8 +27,8 @@ private _LightArmed = ["B_T_MRAP_01_hmg_F", "B_T_MRAP_01_hmg_F", "B_T_MRAP_01_gm
 ["vehiclesFuelTrucks", ["B_T_Truck_01_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["B_T_Truck_01_medical_F", "B_W_APC_Wheeled_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-private _APCs = ["B_W_APC_Wheeled_01_cannon_v2_F", "B_W_APC_Tracked_01_rcws_F", "B_W_APC_Tracked_01_CRV_F"];
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+private _APCs = ["B_W_APC_Wheeled_01_cannon_v2_F", "B_W_APC_Tracked_01_rcws_F"];
+["vehiclesIFVs", ["a3a_B_W_APC_Wheeled_01_cannon_v2_F"]] call _fnc_saveToTemplate;
 private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"];
 ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
@@ -85,7 +85,7 @@ if ("enoch" in A3A_enabledDLC) then {
     _vehiclesMilitiaCars append ["C_Offroad_01_comms_F", "C_Offroad_01_covered_F"];
 };
 if ("tanks" in A3A_enabledDLC) then {
-    ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
+    ["vehiclesLightTanks", ["a3a_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
 };
 if ("expansion" in A3A_enabledDLC) then {
     _LightUnarmed append ["B_T_MRAP_01_F", "B_T_LSV_01_unarmed_F"];
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf
index 50f35684bd..de31de733f 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Tropical.sqf
@@ -27,8 +27,8 @@ private _LightArmed = ["B_T_MRAP_01_hmg_F", "B_T_MRAP_01_hmg_F", "B_T_MRAP_01_gm
 ["vehiclesFuelTrucks", ["B_T_Truck_01_fuel_F"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["B_T_Truck_01_medical_F", "B_T_APC_Wheeled_01_medical_F"]] call _fnc_saveToTemplate;
 ["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-private _APCs = ["B_T_APC_Wheeled_01_cannon_v2_F", "B_T_APC_Tracked_01_rcws_F", "B_T_APC_Tracked_01_CRV_F"];
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
+private _APCs = ["B_T_APC_Wheeled_01_cannon_v2_F", "B_T_APC_Tracked_01_rcws_F"];
+["vehiclesIFVs", ["a3a_B_T_APC_Wheeled_01_cannon_v2_F"]] call _fnc_saveToTemplate;
 private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"];
 ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate;
 
@@ -84,7 +84,7 @@ if ("enoch" in A3A_enabledDLC) then {
     _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"];
 };
 if ("tanks" in A3A_enabledDLC) then {
-    ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
+    ["vehiclesLightTanks", ["a3a_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate;
 };
 if ("expansion" in A3A_enabledDLC) then {
     _LightUnarmed append ["B_T_MRAP_01_F", "B_T_LSV_01_unarmed_F"];
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf
index fd4f6fd1ee..1a22392b59 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf
@@ -76,16 +76,17 @@ if ("rf" in A3A_enabledDLC) then {
 ///////////////////////////
 
 private _initialRebelEquipment = [
-"hgun_Pistol_heavy_02_F","hgun_ACPC2_black_F",
-"sgun_Mp153_classic_F",
-"6Rnd_45ACP_Cylinder","9Rnd_45ACP_Mag","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell",
-["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3],
-"B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oicamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk",
-"V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_ChestrigF_blk","V_ChestrigF_rgr","V_ChestrigF_khk","V_ChestrigF_oli",
-"V_BandollierB_blk","V_BandollierB_cbr","V_BandollierB_rgr","V_BandollierB_khk","V_BandollierB_oli","V_BandollierB_taiga_F","V_BandollierB_tna_F",
-"V_Rangemaster_belt","V_Rangemaster_belt_blk","V_Rangemaster_belt_cbr","V_Rangemaster_belt_ghex_F","V_Rangemaster_belt_khk","V_Rangemaster_belt_oli","V_Rangemaster_belt_taiga_F","V_Rangemaster_belt_tna_F",
-"Binocular","hgun_Pistol_Signal_F","6Rnd_GreenSignal_F","6Rnd_RedSignal_F",
-"acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"];
+    "hgun_Pistol_heavy_02_F","hgun_ACPC2_black_F",
+    "sgun_Mp153_classic_F",
+    "6Rnd_45ACP_Cylinder","9Rnd_45ACP_Mag","4Rnd_12Gauge_Pellets","4Rnd_12Gauge_Slug","MiniGrenade","SmokeShell",
+    ["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3],
+    "B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oicamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk",
+    "V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_ChestrigF_blk","V_ChestrigF_rgr","V_ChestrigF_khk","V_ChestrigF_oli",
+    "Aegis_V_Ammo_Bandolier_F","V_BandollierB_blk","V_BandollierB_cbr","V_BandollierB_rgr","V_BandollierB_khk","V_BandollierB_oli","V_BandollierB_taiga_F","V_BandollierB_tna_F",
+    "V_Rangemaster_belt","V_Rangemaster_belt_blk","V_Rangemaster_belt_cbr","V_Rangemaster_belt_ghex_F","V_Rangemaster_belt_khk","V_Rangemaster_belt_oli","V_Rangemaster_belt_taiga_F","V_Rangemaster_belt_tna_F",
+    "Binocular","hgun_Pistol_Signal_F","6Rnd_GreenSignal_F","6Rnd_RedSignal_F",
+    "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"
+];
 
 if ("expansion" in A3A_enabledDLC) then {
     _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], "hgun_Pistol_01_F", "10Rnd_9x21_Mag"];
diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf
index 45343456c1..59ad4fcd66 100644
--- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf
+++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf
@@ -76,10 +76,11 @@ private _initialRebelEquipment = [
     ["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3],
     "B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oicamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk",
     "V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_ChestrigF_blk","V_ChestrigF_rgr","V_ChestrigF_khk","V_ChestrigF_oli",
-    "V_BandollierB_blk","V_BandollierB_cbr","V_BandollierB_rgr","V_BandollierB_khk","V_BandollierB_oli","V_BandollierB_taiga_F","V_BandollierB_tna_F",
+    "Aegis_V_Ammo_Bandolier_F","V_BandollierB_blk","V_BandollierB_cbr","V_BandollierB_rgr","V_BandollierB_khk","V_BandollierB_oli","V_BandollierB_taiga_F","V_BandollierB_tna_F",
     "V_Rangemaster_belt","V_Rangemaster_belt_blk","V_Rangemaster_belt_cbr","V_Rangemaster_belt_ghex_F","V_Rangemaster_belt_khk","V_Rangemaster_belt_oli","V_Rangemaster_belt_taiga_F","V_Rangemaster_belt_tna_F",
     "Binocular","hgun_Pistol_Signal_F","6Rnd_GreenSignal_F","6Rnd_RedSignal_F",
-    "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"];
+    "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"
+];
 _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45]];
 
 if ("enoch" in A3A_enabledDLC) then {