diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
index e44d0b82..e242e008 100644
--- a/addons/main/script_version.hpp
+++ b/addons/main/script_version.hpp
@@ -1,3 +1,3 @@
 #define MAJOR 1
 #define MINOR 4
-#define PATCH 0
+#define PATCH 1
diff --git a/addons/msf/CfgGroups_Indep_Foxhound.hpp b/addons/msf/CfgGroups_Indep_Foxhound.hpp
index d8b08804..d0b1639d 100644
--- a/addons/msf/CfgGroups_Indep_Foxhound.hpp
+++ b/addons/msf/CfgGroups_Indep_Foxhound.hpp
@@ -89,7 +89,7 @@ class TACU_MSF_G_I_Infantry_Foxhound {
             position[] = {5, -5, 0};
         };
         class unit2 {
-            vehicle = "TACU_MSF_U_I_Foxhound_Autorifleman";
+            vehicle = "TACU_MSF_U_I_Foxhound_SMG_01";
             side = 2;
             rank = "PRIVATE";
             position[] = {-5, -5, 0};
diff --git a/addons/msf/CfgGroups_Opfor_Foxhound.hpp b/addons/msf/CfgGroups_Opfor_Foxhound.hpp
index 25db6828..af880f0c 100644
--- a/addons/msf/CfgGroups_Opfor_Foxhound.hpp
+++ b/addons/msf/CfgGroups_Opfor_Foxhound.hpp
@@ -89,7 +89,7 @@ class TACU_MSF_G_O_Infantry_Foxhound {
             position[] = {5, -5, 0};
         };
         class unit2 {
-            vehicle = "TACU_MSF_U_O_Foxhound_Autorifleman";
+            vehicle = "TACU_MSF_U_O_Foxhound_SMG_01";
             side = 0;
             rank = "PRIVATE";
             position[] = {-5, -5, 0};
diff --git a/addons/msf/CfgVehicles_DDogs_Black.hpp b/addons/msf/CfgVehicles_DDogs_Black.hpp
index c0f80d90..64d48bf1 100644
--- a/addons/msf/CfgVehicles_DDogs_Black.hpp
+++ b/addons/msf/CfgVehicles_DDogs_Black.hpp
@@ -20,10 +20,10 @@ class TACU_MSF_U_I_DDogs_Black_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     respawnLinkedItems[] = {DEFAULT_ITEMS_RADIO, "tacs_Helmet_Enc_Ballistic_DarkBlack", "G_Balaclava_TI_blk_F", "TACU_MSF_Vest_HeavyPlateCarrier_Black", "CUP_NVG_PVS14"};
     Items[] = {mag_8("ACE_fieldDressing")};
     respawnItems[] = {mag_8("ACE_fieldDressing")};
-    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
-    respawnMagazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
+    respawnMagazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
     headgearList[] = {
         "tacs_Helmet_Enc_Ballistic_DarkBlack", 1
     };
@@ -42,10 +42,10 @@ class TACU_MSF_U_I_DDogs_Black_Rifleman_AT: TACU_MSF_U_I_DDogs_Black_Rifleman_01
     icon = "iconManAT";
     role = "MissileSpecialist";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Rifleman_AT.jpg);
-    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "CUP_launch_M136", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "CUP_launch_M136", "Throw", "Put"};
-    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
-    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "CUP_launch_M136", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "CUP_launch_M136", "Throw", "Put"};
+    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
+    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
 };
 class TACU_MSF_U_O_DDogs_Black_Rifleman_AT: TACU_MSF_U_I_DDogs_Black_Rifleman_AT {
     side = 0;
@@ -57,10 +57,10 @@ class TACU_MSF_U_I_DDogs_Black_Autorifleman: TACU_MSF_U_I_DDogs_Black_Rifleman_0
     icon = "iconManMG";
     role = "MachineGunner";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Autorifleman.jpg);
-    weapons[] = {"TACU_MSF_W_Stoner99LMG", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Stoner99LMG", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_4("200Rnd_65x39_cased_Box_Tracer"), mag_2("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_4("200Rnd_65x39_cased_Box_Tracer"), mag_2("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Stoner99LMG", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Stoner99LMG", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_4("200Rnd_65x39_cased_Box_Tracer"), mag_2("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_4("200Rnd_65x39_cased_Box_Tracer"), mag_2("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_DDogs_Black_Autorifleman: TACU_MSF_U_I_DDogs_Black_Autorifleman {
     side = 0;
@@ -72,10 +72,10 @@ class TACU_MSF_U_I_DDogs_Black_Grenadier: TACU_MSF_U_I_DDogs_Black_Rifleman_01 {
     icon = "iconMan";
     role = "Rifleman";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Grenadier.jpg);
-    weapons[] = {"TACU_MSF_W_Promet_GL_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_GL_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_7("30Rnd_65x39_caseless_msbs_mag"), mag_5("1Rnd_HE_Grenade_shell"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
-    respawnMagazines[] = {mag_7("30Rnd_65x39_caseless_msbs_mag"), mag_5("1Rnd_HE_Grenade_shell"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Promet_GL_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_GL_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_7("30Rnd_65x39_caseless_msbs_mag"), mag_5("1Rnd_HE_Grenade_shell"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
+    respawnMagazines[] = {mag_7("30Rnd_65x39_caseless_msbs_mag"), mag_5("1Rnd_HE_Grenade_shell"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
 };
 class TACU_MSF_U_O_DDogs_Black_Grenadier: TACU_MSF_U_I_DDogs_Black_Grenadier {
     side = 0;
@@ -88,8 +88,8 @@ class TACU_MSF_U_I_DDogs_Black_Teamleader: TACU_MSF_U_I_DDogs_Black_Rifleman_01
     sensitivityEar = 0.15;
     icon = "iconManLeader";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Teamleader.jpg);
-    magazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell")};
-    respawnMagazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell")};
+    magazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell")};
+    respawnMagazines[] = {mag_8("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell")};
 };
 class TACU_MSF_U_O_DDogs_Black_Teamleader: TACU_MSF_U_I_DDogs_Black_Teamleader {
     side = 0;
@@ -102,10 +102,10 @@ class TACU_MSF_U_I_DDogs_Black_Marksman: TACU_MSF_U_I_DDogs_Black_Rifleman_01 {
     sensitivityEar = 0.15;
     role = "Marksman";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Marksman.jpg);
-    weapons[] = {"TACU_MSF_W_Promet_DMR_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_DMR_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Promet_DMR_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_DMR_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_DDogs_Black_Marksman: TACU_MSF_U_I_DDogs_Black_Marksman {
     side = 0;
@@ -119,10 +119,10 @@ class TACU_MSF_U_I_DDogs_Black_Medic: TACU_MSF_U_I_DDogs_Black_Rifleman_01 {
     role = "CombatLifeSaver";
     backpack = "TACU_MSF_B_Medic_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Medic.jpg);
-    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", mag_2("SmokeShell")};
-    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", mag_2("SmokeShell")};
+    weapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", mag_2("SmokeShell")};
+    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", mag_2("SmokeShell")};
 };
 class TACU_MSF_U_O_DDogs_Black_Medic: TACU_MSF_U_I_DDogs_Black_Medic {
     side = 0;
@@ -136,10 +136,10 @@ class TACU_MSF_U_I_DDogs_Black_Engineer: TACU_MSF_U_I_DDogs_Black_Rifleman_01 {
     engineer = 1;
     backpack = "TACU_MSF_B_Engineer_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_DDogs_Black_Engineer.jpg);
-    weapons[] = {"TACU_MSF_W_Promet_SG_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Promet_SG_Black", "TACU_MSF_W_FNX45_Green", "Throw", "Put"};
-    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_4("6Rnd_12Gauge_Slug"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_4("6Rnd_12Gauge_Slug"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_Promet_SG_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_Promet_SG_Black", "TACU_MSF_W_Mk23_SOCOM", "Throw", "Put"};
+    magazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_4("6Rnd_12Gauge_Slug"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_6("30Rnd_65x39_caseless_msbs_mag"), mag_4("6Rnd_12Gauge_Slug"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_DDogs_Black_Engineer: TACU_MSF_U_I_DDogs_Black_Engineer {
     side = 0;
diff --git a/addons/msf/CfgVehicles_Foxhound.hpp b/addons/msf/CfgVehicles_Foxhound.hpp
index 497825e4..28c8b154 100644
--- a/addons/msf/CfgVehicles_Foxhound.hpp
+++ b/addons/msf/CfgVehicles_Foxhound.hpp
@@ -16,14 +16,14 @@ class TACU_MSF_U_I_Foxhound_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     uniformClass = "U_O_R_Gorka_01_black_F";
     backpack = "";
     editorPreview = QPATHTOF(ui\MSF_U_I_Foxhound_Rifleman_01.jpg);
-    linkedItems[] = {DEFAULT_ITEMS_RADIO, "TACU_MSF_Helmet_LightCombat_DarkBlack", "G_Balaclava_TI_blk_F", "V_PlateCarrier2_blk", "CUP_NVG_PVS14"};
-    respawnLinkedItems[] = {DEFAULT_ITEMS_RADIO, "TACU_MSF_Helmet_LightCombat_DarkBlack", "G_Balaclava_TI_blk_F", "V_PlateCarrier2_blk", "CUP_NVG_PVS14"};
+    linkedItems[] = {DEFAULT_ITEMS_RADIO, "TACU_MSF_Helmet_LightCombat_DarkBlack", "G_Balaclava_TI_blk_F", "V_PlateCarrier2_blk", "CUP_NVG_GPNVG_black"};
+    respawnLinkedItems[] = {DEFAULT_ITEMS_RADIO, "TACU_MSF_Helmet_LightCombat_DarkBlack", "G_Balaclava_TI_blk_F", "V_PlateCarrier2_blk", "CUP_NVG_GPNVG_black"};
     Items[] = {mag_8("ACE_fieldDressing")};
     respawnItems[] = {mag_8("ACE_fieldDressing")};
-    weapons[] = {"TACU_MSF_W_HoneyBadger", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HoneyBadger", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    magazines[] = {mag_8("29rnd_300BLK_STANAG_T"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_2("ACE_M84")};
-    respawnMagazines[] = {mag_8("29rnd_300BLK_STANAG_T"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_2("ACE_M84")};
+    weapons[] = {"TACU_MSF_W_CZ_BREN2_8in_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_CZ_BREN2_8in_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_4("ACE_M84")};
+    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_4("ACE_M84")};
     headgearList[] = {
         "TACU_MSF_Helmet_LightCombat_Foxhound", 1
     };
@@ -37,30 +37,15 @@ class TACU_MSF_U_O_Foxhound_Rifleman_01: TACU_MSF_U_I_Foxhound_Rifleman_01 {
     faction = "TACU_MSF_O";
 };
 
-class TACU_MSF_U_I_Foxhound_Autorifleman: TACU_MSF_U_I_Foxhound_Rifleman_01 {
-    displayName = "Autorifleman";
-    icon = "iconMan";
-    role = "Rifleman";
-    editorPreview = QPATHTOF(ui\MSF_U_I_Foxhound_Autorifleman.jpg);
-    weapons[] = {"TACU_MSF_W_HoneyBadger", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HoneyBadger", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    magazines[] = {mag_6("hlc_50rnd_300BLK_STANAG_EPR"), mag_2("11Rnd_45ACP_Mag"), "SmokeShell", mag_2("ACE_M84")};
-    respawnMagazines[] = {mag_6("hlc_50rnd_300BLK_STANAG_EPR"), mag_2("11Rnd_45ACP_Mag"), "SmokeShell", mag_2("ACE_M84")};
-};
-class TACU_MSF_U_O_Foxhound_Autorifleman: TACU_MSF_U_I_Foxhound_Autorifleman {
-    side = 0;
-    faction = "TACU_MSF_O";
-};
-
 class TACU_MSF_U_I_Foxhound_Marksman: TACU_MSF_U_I_Foxhound_Rifleman_01 {
     displayName = "Marksman";
     icon = "iconMan";
     role = "Rifleman";
     editorPreview = QPATHTOF(ui\MSF_U_I_Foxhound_Marksman.jpg);
-    weapons[] = {"TACU_MSF_W_LAR15", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_LAR15", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    magazines[] = {mag_6("hlc_30rnd_556x45_S_PMAG"), mag_3("11Rnd_45ACP_Mag")};
-    respawnMagazines[] = {mag_6("hlc_30rnd_556x45_S_PMAG"), mag_3("11Rnd_45ACP_Mag")};
+    weapons[] = {"TACU_MSF_W_M110_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_M110_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    magazines[] = {mag_6("CUP_20Rnd_762x51_B_M110"), mag_4("CUP_12Rnd_45ACP_mk23")};
+    respawnMagazines[] = {mag_6("CUP_20Rnd_762x51_B_M110"), mag_4("CUP_12Rnd_45ACP_mk23")};
 };
 class TACU_MSF_U_O_Foxhound_Marksman: TACU_MSF_U_I_Foxhound_Marksman {
     side = 0;
@@ -68,14 +53,14 @@ class TACU_MSF_U_O_Foxhound_Marksman: TACU_MSF_U_I_Foxhound_Marksman {
 };
 
 class TACU_MSF_U_I_Foxhound_SMG_01: TACU_MSF_U_I_Foxhound_Rifleman_01 {
-    displayName = "Rifleman (SMG)";
+    displayName = "Sub Machine-Gunner";
     icon = "iconMan";
     role = "Rifleman";
     editorPreview = QPATHTOF(ui\MSF_U_I_Foxhound_SMG_01.jpg);
-    weapons[] = {"TACU_MSF_W_Scorpion", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_Scorpion", "TACU_MSF_W_FNX45_Stealth_Green", "Throw", "Put"};
-    magazines[] = {mag_8("30Rnd_9x21_Mag_SMG_02"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_2("ACE_M84")};
-    respawnMagazines[] = {mag_8("30Rnd_9x21_Mag_SMG_02"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_2("ACE_M84")};
+    weapons[] = {"TACU_MSF_W_MP7A1_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_MP7A1_Stealth", "TACU_MSF_W_Mk23_SOCOM_Stealth", "Throw", "Put"};
+    magazines[] = {mag_10("CUP_40Rnd_46x30_MP7"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_4("ACE_M84")};
+    respawnMagazines[] = {mag_10("CUP_40Rnd_46x30_MP7"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell"), mag_4("ACE_M84")};
 };
 class TACU_MSF_U_O_Foxhound_SMG_01: TACU_MSF_U_I_Foxhound_SMG_01 {
     side = 0;
diff --git a/addons/msf/CfgVehicles_Regular_Black.hpp b/addons/msf/CfgVehicles_Regular_Black.hpp
index 6e568cda..a53fc2df 100644
--- a/addons/msf/CfgVehicles_Regular_Black.hpp
+++ b/addons/msf/CfgVehicles_Regular_Black.hpp
@@ -20,10 +20,10 @@ class TACU_MSF_U_I_Regular_Black_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     respawnLinkedItems[] = {DEFAULT_ITEMS_RADIO, "G_Balaclava_TI_blk_F", "TACU_MSF_Vest_PlateCarrier_Black"};
     Items[] = {mag_8("ACE_fieldDressing")};
     respawnItems[] = {mag_8("ACE_fieldDressing")};
-    weapons[] = {"TACU_MSF_W_HK416_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_10("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
-    respawnMagazines[] = {mag_10("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK416_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_10("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
+    respawnMagazines[] = {mag_10("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
     headgearList[] = {
         "", 1
     };
@@ -43,10 +43,10 @@ class TACU_MSF_U_I_Regular_Black_Rifleman_AT: TACU_MSF_U_I_Regular_Black_Riflema
     role = "MissileSpecialist";
     backpack = "TACU_MSF_B_AT_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Rifleman_AT.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_RPG7V", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_RPG7V", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_RPG7V", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_RPG7V", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Rifleman_AT: TACU_MSF_U_I_Regular_Black_Rifleman_AT {
     side = 0;
@@ -58,10 +58,10 @@ class TACU_MSF_U_I_Regular_Black_Autorifleman: TACU_MSF_U_I_Regular_Black_Riflem
     icon = "iconManMG";
     role = "MachineGunner";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Autorifleman.jpg);
-    weapons[] = {"TACU_MSF_W_M27_Grip", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_M27_Grip", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_5("150Rnd_556x45_Drum_Mag_Tracer_F"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_5("150Rnd_556x45_Drum_Mag_Tracer_F"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_M27_Grip", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_M27_Grip", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_5("150Rnd_556x45_Drum_Mag_Tracer_F"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_5("150Rnd_556x45_Drum_Mag_Tracer_F"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Autorifleman: TACU_MSF_U_I_Regular_Black_Autorifleman {
     side = 0;
@@ -72,10 +72,10 @@ class TACU_MSF_U_I_Regular_Black_TeamLeader: TACU_MSF_U_I_Regular_Black_Rifleman
     displayName = "Team Leader";
     icon = "iconManLeader";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_TeamLeader.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_GL_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_GL_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_2("1Rnd_HE_Grenade_shell"), mag_2("1Rnd_Smoke_Grenade_shell"), mag_2("UGL_FlareWhite_F"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell")};
-    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_2("1Rnd_HE_Grenade_shell"), mag_2("1Rnd_Smoke_Grenade_shell"), mag_2("UGL_FlareWhite_F"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), mag_2("SmokeShell")};
+    weapons[] = {"TACU_MSF_W_HK416_GL_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_GL_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_2("1Rnd_HE_Grenade_shell"), mag_2("1Rnd_Smoke_Grenade_shell"), mag_2("UGL_FlareWhite_F"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell")};
+    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_2("1Rnd_HE_Grenade_shell"), mag_2("1Rnd_Smoke_Grenade_shell"), mag_2("UGL_FlareWhite_F"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), mag_2("SmokeShell")};
 };
 class TACU_MSF_U_O_Regular_Black_TeamLeader: TACU_MSF_U_I_Regular_Black_TeamLeader {
     side = 0;
@@ -89,10 +89,10 @@ class TACU_MSF_U_I_Regular_Black_Engineer: TACU_MSF_U_I_Regular_Black_Rifleman_0
     engineer = 1;
     backpack = "TACU_MSF_B_Engineer_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Engineer.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_8("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Engineer: TACU_MSF_U_I_Regular_Black_Engineer {
     side = 0;
@@ -102,10 +102,10 @@ class TACU_MSF_U_O_Regular_Black_Engineer: TACU_MSF_U_I_Regular_Black_Engineer {
 class TACU_MSF_U_I_Regular_Black_SMG: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     displayName = "SMG";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_SMG.jpg);
-    weapons[] = {"SMG_03C_black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"SMG_03C_black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_6("50Rnd_570x28_SMG_03"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_6("50Rnd_570x28_SMG_03"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"SMG_03C_black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"SMG_03C_black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_6("50Rnd_570x28_SMG_03"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_6("50Rnd_570x28_SMG_03"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_SMG: TACU_MSF_U_I_Regular_Black_SMG {
     side = 0;
@@ -119,10 +119,10 @@ class TACU_MSF_U_I_Regular_Black_Medic: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     role = "CombatLifeSaver";
     backpack = "TACU_MSF_B_Medic_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Medic.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), mag_2("SmokeShell")};
-    respawnMagazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), mag_2("SmokeShell")};
+    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("SmokeShell")};
+    respawnMagazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("SmokeShell")};
 };
 class TACU_MSF_U_O_Regular_Black_Medic: TACU_MSF_U_I_Regular_Black_Medic {
     side = 0;
@@ -132,10 +132,10 @@ class TACU_MSF_U_O_Regular_Black_Medic: TACU_MSF_U_I_Regular_Black_Medic {
 class TACU_MSF_U_I_Regular_Black_Grenadier: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     displayName = "Grenadier";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Grenadier.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_GL_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_GL_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_6("1Rnd_HE_Grenade_shell"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
-    respawnMagazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_6("1Rnd_HE_Grenade_shell"), mag_3("11Rnd_45ACP_Mag"), mag_2("HandGrenade"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK416_GL_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_GL_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_6("1Rnd_HE_Grenade_shell"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
+    respawnMagazines[] = {mag_7("CUP_30Rnd_556x45_PMAG_QP"), mag_6("1Rnd_HE_Grenade_shell"), mag_3("CUP_12Rnd_45ACP_mk23"), mag_2("HandGrenade"), "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Grenadier: TACU_MSF_U_I_Regular_Black_Grenadier {
     side = 0;
@@ -146,10 +146,10 @@ class TACU_MSF_U_I_Regular_Black_Marksman: TACU_MSF_U_I_Regular_Black_Rifleman_0
     displayName = "Marksman";
     role = "Marksman";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Marksman.jpg);
-    weapons[] = {"TACU_MSF_W_HK417_DMR_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK417_DMR_Black", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_6("CUP_20Rnd_762x51_HK417"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_6("CUP_20Rnd_762x51_HK417"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK417_DMR_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK417_DMR_Black", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_6("CUP_20Rnd_762x51_HK417"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_6("CUP_20Rnd_762x51_HK417"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Marksman: TACU_MSF_U_I_Regular_Black_Marksman {
     side = 0;
@@ -161,10 +161,10 @@ class TACU_MSF_U_I_Regular_Black_Sniper: TACU_MSF_U_I_Regular_Black_Rifleman_01
     role = "Marksman";
     uniformClass = "TACU_MSF_Uniform_Combat_TigerBlack";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_Sniper.jpg);
-    weapons[] = {"TACU_MSF_W_M200_Intervention", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_M200_Intervention", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_5("7Rnd_408_Mag"), mag_3("11Rnd_45ACP_Mag"), "SmokeShell"};
-    respawnMagazines[] = {mag_5("7Rnd_408_Mag"), mag_3("11Rnd_45ACP_Mag"), "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_M200_Intervention", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_M200_Intervention", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_5("7Rnd_408_Mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "SmokeShell"};
+    respawnMagazines[] = {mag_5("7Rnd_408_Mag"), mag_3("CUP_12Rnd_45ACP_mk23"), "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_Sniper: TACU_MSF_U_I_Regular_Black_Sniper {
     side = 0;
@@ -177,10 +177,10 @@ class TACU_MSF_U_I_Regular_Black_HAT: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     role = "MissileSpecialist";
     backpack = "TACU_MSF_B_HAT_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_HAT.jpg);
-    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_Javelin", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_Javelin", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {mag_6("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
-    respawnMagazines[] = {mag_6("CUP_30Rnd_556x45_PMAG_QP"), mag_3("11Rnd_45ACP_Mag"), "HandGrenade", "SmokeShell"};
+    weapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_Javelin", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"TACU_MSF_W_HK416_CQC_Black", "CUP_launch_Javelin", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {mag_6("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
+    respawnMagazines[] = {mag_6("CUP_30Rnd_556x45_PMAG_QP"), mag_3("CUP_12Rnd_45ACP_mk23"), "HandGrenade", "SmokeShell"};
 };
 class TACU_MSF_U_O_Regular_Black_HAT: TACU_MSF_U_I_Regular_Black_HAT {
     side = 0;
@@ -193,10 +193,10 @@ class TACU_MSF_U_I_Regular_Black_MMG: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     role = "MachineGunner";
     backpack = "TACU_MSF_B_MMG_Black";
     editorPreview = QPATHTOF(ui\MSF_U_I_Regular_Black_MMG.jpg);
-    weapons[] = {"MMG_02_black_F", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"MMG_02_black_F", "hgun_Pistol_heavy_01_green_F", "Throw", "Put"};
-    magazines[] = {"130Rnd_338_Mag", mag_2("11Rnd_45ACP_Mag")};
-    respawnMagazines[] = {"130Rnd_338_Mag", mag_2("11Rnd_45ACP_Mag")};
+    weapons[] = {"MMG_02_black_F", "CUP_hgun_Mk23", "Throw", "Put"};
+    respawnWeapons[] = {"MMG_02_black_F", "CUP_hgun_Mk23", "Throw", "Put"};
+    magazines[] = {"130Rnd_338_Mag", mag_2("CUP_12Rnd_45ACP_mk23")};
+    respawnMagazines[] = {"130Rnd_338_Mag", mag_2("CUP_12Rnd_45ACP_mk23")};
 };
 class TACU_MSF_U_O_Regular_Black_MMG: TACU_MSF_U_I_Regular_Black_MMG {
     side = 0;
@@ -214,8 +214,8 @@ class TACU_MSF_U_I_Regular_Black_Pilot: TACU_MSF_U_I_Regular_Black_Rifleman_01 {
     respawnLinkedItems[] = {DEFAULT_ITEMS_RADIO, "H_PilotHelmetHeli_B", "G_Balaclava_TI_blk_F", "CUP_V_PMC_CIRAS_Combat_Black_Veh"};
     weapons[] = {"hgun_Pistol_heavy_01_F", "Throw", "Put"};
     respawnWeapons[] = {"hgun_Pistol_heavy_01_F", "Throw", "Put"};
-    magazines[] = {mag_4("11Rnd_45ACP_Mag"), mag_2("SmokeShell")};
-    respawnMagazines[] = {mag_4("11Rnd_45ACP_Mag"), mag_2("SmokeShell")};
+    magazines[] = {mag_4("CUP_12Rnd_45ACP_mk23"), mag_2("SmokeShell")};
+    respawnMagazines[] = {mag_4("CUP_12Rnd_45ACP_mk23"), mag_2("SmokeShell")};
     headgearList[] = {
         "H_PilotHelmetHeli_B", 1
     };
diff --git a/addons/msf/CfgWeapons.hpp b/addons/msf/CfgWeapons.hpp
index 851ad951..bdca6152 100644
--- a/addons/msf/CfgWeapons.hpp
+++ b/addons/msf/CfgWeapons.hpp
@@ -127,7 +127,6 @@ class CfgWeapons {
         scope = 1;
 		scopeCurator = 1;
 		class LinkedItems {
-            EQUIP_OPTIC(cup_optic_eotech553_black);
             EQUIP_POINTER(cup_acc_flashlight);
 		};
     };
@@ -138,7 +137,6 @@ class CfgWeapons {
         scope = 1;
 		scopeCurator = 1;
 		class LinkedItems {
-            EQUIP_OPTIC(cup_optic_eotech553_black);
             EQUIP_POINTER(cup_acc_flashlight);
 		};
     };
@@ -149,7 +147,6 @@ class CfgWeapons {
         scope = 1;
 		scopeCurator = 1;
 		class LinkedItems {
-            EQUIP_OPTIC(cup_optic_eotech553_black);
             EQUIP_POINTER(cup_acc_flashlight);
 		};
     };
@@ -160,7 +157,6 @@ class CfgWeapons {
         scope = 1;
 		scopeCurator = 1;
 		class LinkedItems {
-            EQUIP_OPTIC(cup_optic_eotech553_black);
             EQUIP_POINTER(cup_acc_flashlight);
 		};
     };
@@ -182,7 +178,6 @@ class CfgWeapons {
         scope = 1;
 		scopeCurator = 1;
 		class LinkedItems {
-            EQUIP_OPTIC(cup_optic_eotech553_black);
             EQUIP_POINTER(cup_acc_flashlight);
             EQUIP_BIPOD(bipod_01_f_blk);
 		};
@@ -254,62 +249,62 @@ class CfgWeapons {
         };
     };
 
-    class hgun_Pistol_heavy_01_green_F;
-    class TACU_MSF_W_FNX45_Green: hgun_Pistol_heavy_01_green_F {
+    class CUP_hgun_Mk23;
+    class TACU_MSF_W_Mk23_SOCOM: CUP_hgun_Mk23 {
         dlc = QUOTE(PREFIX);
         scope = 1;
         scopeCurator = 1;
         class LinkedItems {
-            EQUIP_OPTIC(optic_mrd_black);
-            EQUIP_POINTER(cup_acc_mlpls_laser);
+            EQUIP_POINTER(cup_acc_mk23_lam_f);
         };
     };
-    class TACU_MSF_W_FNX45_Stealth_Green: hgun_Pistol_heavy_01_green_F {
+
+    // Weapons - Spec Ops
+    class CUP_hgun_Mk23;
+    class TACU_MSF_W_Mk23_SOCOM_Stealth: CUP_hgun_Mk23 {
         dlc = QUOTE(PREFIX);
         scope = 1;
         scopeCurator = 1;
         class LinkedItems {
-            EQUIP_OPTIC(optic_mrd_black);
-            EQUIP_POINTER(cup_acc_mlpls_laser);
-            EQUIP_MUZZLE(muzzle_snds_acp);
+            EQUIP_POINTER(cup_acc_mk23_lam_f);
+            EQUIP_MUZZLE(cup_muzzle_snds_mk23);
         };
     };
 
-    // Weapons - Spec Ops
-    class hlc_rifle_honeybadger;
-    class TACU_MSF_W_HoneyBadger: hlc_rifle_honeybadger {
+    class CUP_smg_MP7;
+    class TACU_MSF_W_MP7A1_Stealth: CUP_smg_MP7 {
         dlc = QUOTE(PREFIX);
         scope = 1;
         scopeCurator = 1;
         class LinkedItems {
-            EQUIP_OPTIC(optic_aco);
-            EQUIP_POINTER(acc_pointer_ir);
-            EQUIP_MUZZLE(muzzle_hbadger);
+            EQUIP_OPTIC(cup_optic_mrad);
+            EQUIP_POINTER(cup_acc_anpeq_15_black);
+            EQUIP_MUZZLE(cup_muzzle_snds_mp7);
         };
     };
 
-    class hlc_rifle_samr2;
-    class TACU_MSF_W_LAR15: hlc_rifle_samr2 {
+    class CUP_CZ_BREN2_556_8;
+    class TACU_MSF_W_CZ_BREN2_8in_Stealth: CUP_CZ_BREN2_556_8 {
         dlc = QUOTE(PREFIX);
         scope = 1;
         scopeCurator = 1;
         class LinkedItems {
-            EQUIP_OPTIC(optic_nightstalker);
-            EQUIP_POINTER(acc_pointer_ir);
-            EQUIP_MUZZLE(hlc_muzzle_556nato_kac);
-            EQUIP_BIPOD(bipod_01_f_blk);
+            EQUIP_OPTIC(cup_optic_mrad);
+            EQUIP_POINTER(cup_acc_anpeq_15_black);
+            EQUIP_MUZZLE(cup_muzzle_snds_m16);
         };
     };
 
-    class SMG_02_F;
-    class TACU_MSF_W_Scorpion: SMG_02_F {
+    class CUP_srifle_M110_black;
+    class TACU_MSF_W_M110_Stealth: CUP_srifle_M110_black {
         dlc = QUOTE(PREFIX);
         scope = 1;
         scopeCurator = 1;
         class LinkedItems {
-            EQUIP_OPTIC(optic_aco);
-            EQUIP_POINTER(acc_pointer_ir);
-            EQUIP_MUZZLE(muzzle_snds_l);
+            EQUIP_OPTIC(optic_nightstalker);
+            EQUIP_POINTER(cup_acc_anpeq_15_black);
+            EQUIP_MUZZLE(cup_muzzle_snds_m110_black);
+            EQUIP_BIPOD(cup_bipod_vltor_modpod_black);
         };
     };
 };
diff --git a/addons/msf/config.cpp b/addons/msf/config.cpp
index 4fc095e4..61093be7 100644
--- a/addons/msf/config.cpp
+++ b/addons/msf/config.cpp
@@ -101,7 +101,6 @@ class CfgPatches {
             "TACU_MSF_U_I_DDogs_Wood_Teamleader",
             // Units (Indep - Foxhound Special Forces)
             "TACU_MSF_U_I_Foxhound_Rifleman_01",
-            "TACU_MSF_U_I_Foxhound_Autorifleman",
             "TACU_MSF_U_I_Foxhound_Marksman",
             "TACU_MSF_U_I_Foxhound_SMG_01",
             // Units (Opfor - Combat Black)
@@ -174,7 +173,6 @@ class CfgPatches {
             "TACU_MSF_U_O_DDogs_Wood_Teamleader",
             // Units (Opfor - Foxhound Special Forces)
             "TACU_MSF_U_O_Foxhound_Rifleman_01",
-            "TACU_MSF_U_O_Foxhound_Autorifleman",
             "TACU_MSF_U_O_Foxhound_Marksman",
             "TACU_MSF_U_O_Foxhound_SMG_01",
             // Vehicles (Indep - Ground - Black))
@@ -267,22 +265,22 @@ class CfgPatches {
             "TACU_MSF_Vest_PlateCarrier_Coyote",
             "TACU_MSF_Vest_PlateCarrier_Green",
             // Weapons
-            "TACU_MSF_W_FNX45_Green",
-            "TACU_MSF_W_FNX45_Stealth_Green",
+            "TACU_MSF_W_CZ_BREN2_8in_Stealth",
             "TACU_MSF_W_HK416_Black",
             "TACU_MSF_W_HK416GL_Black",
             "TACU_MSF_W_HK416_CQC_Black",
             "TACU_MSF_W_HK416GL_CQC_Black",
             "TACU_MSF_W_HK417DMR_Black",
-            "TACU_MSF_W_HoneyBadger",
-            "TACU_MSF_W_LAR15",
+            "TACU_MSF_W_M110_Stealth",
             "TACU_MSF_W_M200_Intervention",
             "TACU_MSF_W_M27_Grip",
+            "TACU_MSF_W_Mk23_SOCOM",
+            "TACU_MSF_W_Mk23_SOCOM_Stealth",
+            "TACU_MSF_W_MP7A1_Stealth",
             "TACU_MSF_W_Promet_Black",
             "TACU_MSF_W_PrometGL_Black",
             "TACU_MSF_W_PrometDMR_Black",
             "TACU_MSF_W_PrometSG_Black",
-            "TACU_MSF_W_Scorpion",
             "TACU_MSF_W_Stoner99LMG"
         };
         requiredVersion = REQUIRED_VERSION;
diff --git a/addons/msf/ui/MSF_U_I_Foxhound_Autorifleman.jpg b/addons/msf/ui/MSF_U_I_Foxhound_Autorifleman.jpg
deleted file mode 100644
index 72e58098..00000000
Binary files a/addons/msf/ui/MSF_U_I_Foxhound_Autorifleman.jpg and /dev/null differ
diff --git a/mod.cpp b/mod.cpp
index ee46173b..6e2f6567 100644
--- a/mod.cpp
+++ b/mod.cpp
@@ -1,4 +1,4 @@
-name = "TAC Units 1.4.0";
+name = "TAC Units 1.4.1";
 picture = "logo_tacu_ca.paa";
 actionName = "Website";
 action = "http://www.theseus-aegis.com/";