diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index eb4a274fd4..7437df942c 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -38,8 +38,8 @@ class CfgWeapons {
 
     // VS-121
     class DMR_01_base_F: Rifle_Long_Base_F {
-        ACE_barrelTwist = 241.3;
         ACE_barrelLength = 609.6;
+        ACE_barrelTwist = 241.3;
         initSpeed = -1.00019;
     };
 
@@ -69,16 +69,16 @@ class CfgWeapons {
 
     // ASP-1 Kir
     class DMR_04_base_F: Rifle_Long_Base_F {
-        initSpeed = -1.0;
-        ACE_barrelTwist = 203.2;
         ACE_barrelLength = 450.088;
+        ACE_barrelTwist = 203.2;
+        initSpeed = -1.0;
     };
 
     // Cyrus
     class DMR_05_base_F: Rifle_Long_Base_F {
-        initSpeed = -1.0; // 780 m/s according with the ACE_ammoTempMuzzleVelocityShifts at the normal conditions (15°C)
-        ACE_barrelTwist = 360.0;
         ACE_barrelLength = 620.0;
+        ACE_barrelTwist = 360.0;
+        initSpeed = -1.0; // 780 m/s according with the ACE_ammoTempMuzzleVelocityShifts at the normal conditions (15°C)
     };
 
     // M14
@@ -129,7 +129,7 @@ class CfgWeapons {
             "ACE_30Rnd_65_Creedmor_mag"
         };
     };
-    
+
     class arifle_MXM_khk_F: arifle_MXM_Black_F {
         magazines[] += {
             "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
@@ -157,69 +157,178 @@ class CfgWeapons {
         initSpeed = -0.946382;
     };
 
-    // KH2002 Sama
-    class arifle_katiba_Base_F: Rifle_Base_F {};
+    // KH2002 Sama variants
+    class arifle_katiba_Base_F: Rifle_Base_F {
+        ACE_barrelTwist = 203.2;
+    };
 
-    // CTAR-21
-    class Tavor_base_F: Rifle_Base_F {};
+    // KH2002 Sama
+    class arifle_Katiba_F: arifle_katiba_Base_F {
+        ACE_barrelLength = 508.0;
+        initSpeed = -1.0;
+    };
+
+    // KH2002C Sama
+    class arifle_Katiba_C_F: arifle_katiba_Base_F {
+        ACE_barrelLength = 393.7;
+        initSpeed = -0.961294;
+    };
+
+    // KH2002 Sama KGL
+    class arifle_Katiba_GL_F: arifle_katiba_Base_F {
+        ACE_barrelLength = 508.0;
+        initSpeed = -1.0;
+    };
+
+    // CTAR-21 variants
+    class Tavor_base_F: Rifle_Base_F {
+        ACE_barrelTwist = 177.8;
+    };
+
+     // CTAR-21
+    class arifle_TRG20_F: Tavor_base_F {
+        ACE_barrelLength = 381.0;
+        initSpeed = -0.961496;
+    };
+
+    // TAR-21
+    class arifle_TRG21_F: Tavor_base_F {
+        ACE_barrelLength = 459.74;
+        initSpeed = -1.0;
+    };
+
+    // TAR-21 EGLM
+    class arifle_TRG21_GL_F: arifle_TRG21_F {
+        initSpeed = -1.0;
+    };
+
+    // F2000 variants
+    class mk20_base_F: Rifle_Base_F {
+        ACE_barrelTwist = 177.8;
+    };
 
     // F2000
-    class mk20_base_F: Rifle_Base_F {};
+    class arifle_Mk20_F: mk20_base_F {
+        ACE_barrelLength = 441.96;
+        initSpeed = -0.992849;
+    };
 
-    // P90 (1.86)
+    // F2000 Tactical
+    class arifle_Mk20C_F: mk20_base_F {
+        ACE_barrelLength = 406.4;
+        initSpeed = -0.974297;
+    };
+
+    // F2000 EGLM
+    class arifle_Mk20_GL_F: mk20_base_F {
+        ACE_barrelLength = 406.4;
+        initSpeed = -0.974297;
+    };
+
+    // P90 (1.86) variants
     class SMG_03_TR_BASE: Rifle_Base_F {
-        ACE_barrelTwist = 228.6; // 1:9 inch twist
         ACE_barrelLength = 407;
-        ACE_twistDirection = 1;
+        ACE_barrelTwist = 228.6; // 1:9 inch twist
         initSpeed = -1.083916; // 775 m/s according with the ACE_muzzleVelocities at 15°C, default BI value -1.1 (786 m/s)
         modes[] = {"Single"};
     };
+
     class SMG_03C_BASE: SMG_03_TR_BASE {
         ACE_barrelLength = 264;
         modes[] = {"Single", "FullAuto"};
     };
 
+    // HK416 variants
     // HK416A5 11"
     class arifle_SPAR_01_base_F: Rifle_Base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_green",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.869636;
-        ACE_barrelTwist = 177.8;
         ACE_barrelLength = 264.0;
+        ACE_barrelTwist = 177.8;
+        initSpeed = -0.869636;
     };
 
     // HK416A5 14.5"
     class arifle_SPAR_02_base_F: Rifle_Base_F {
-        initSpeed = -0.999864;
-        ACE_barrelTwist = 177.8;
         ACE_barrelLength = 368.0;
+        ACE_barrelTwist = 177.8;
+        initSpeed = -0.999864;
     };
 
     // HK417A2 20"
     class arifle_SPAR_03_base_F: Rifle_Base_F {
-        magazines[] = {
-            "20Rnd_762x51_Mag",
-            "ACE_20Rnd_762x51_Mag_Tracer",
-            "ACE_20Rnd_762x51_Mag_Tracer_Dim",
-            "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
-            "ACE_20Rnd_762x51_M118LR_Mag",
-            "ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
-            "ACE_20Rnd_762x51_M993_AP_Mag",
-            "ACE_20Rnd_762x51_Mag_SD"
-        };
-        initSpeed = -0.991536;
-        ACE_barrelTwist = 279.4;
         ACE_barrelLength = 508.0;
+        ACE_barrelTwist = 279.4;
+        initSpeed = -0.991536;
+    };
+
+    // RFB SDAR
+    class SDAR_base_F: Rifle_Base_F {
+        ACE_barrelLength = 457.2;
+        ACE_barrelTwist = 285.75;
+        initSpeed = -0.998321;
+    };
+
+    // AKS
+    class arifle_AKS_base_F: Rifle_Base_F {
+        ACE_barrelLength = 210;
+        ACE_barrelTwist = 160;
+        initSpeed = -1; // 735 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    // AKM
+    class arifle_AKM_base_F: Rifle_Base_F {
+        ACE_barrelLength = 415;
+        ACE_barrelTwist = 240;
+        initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    // AK15,AK15K,RPK (AK12)
+    class arifle_AK12_base_F: Rifle_Base_F {
+        ACE_barrelLength = 415;
+        ACE_barrelTwist = 240;
+        initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    class arifle_AK12U_base_F: arifle_AK12_base_F {
+        ACE_barrelLength = 314;
+        initSpeed = -0.937063; // 715*0.937063= 670 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    class arifle_RPK12_base_F: arifle_AK12_base_F {
+        ACE_barrelLength = 590;
+        initSpeed = -1.041958; // 715*1.041958= 745 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    // MSBS GROT (Promet)
+    class arifle_MSBS65_base_F: Rifle_Base_F {
+        ACE_barrelLength = 406.4; // 16"
+        ACE_barrelTwist = 228.6;
+        initSpeed = -0.971576; // 774*0.971576= 752 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    class arifle_MSBS65_Mark_base_F: arifle_MSBS65_base_F {
+        ACE_barrelLength = 508; // 20"
+        initSpeed = -1.007752; // 774*1.007752= 780 m/s according with the ACE_muzzleVelocities at 15°C
+    };
+
+    // QBZ-95-1
+    class arifle_CTAR_base_F: Rifle_Base_F {
+        ACE_barrelLength = 463.0;
+        ACE_barrelTwist = 244.0;
+        initSpeed = -0.978947;
+    };
+
+    // QBZ-95-1 LSW
+    class arifle_CTARS_base_F: Rifle_Base_F {
+        ACE_barrelLength = 600.0;
+        ACE_barrelTwist = 244.0;
+        initSpeed = -1.0;
+    };
+
+    // Type 115
+    class arifle_ARX_base_F: Rifle_Base_F {
+        ACE_barrelLength = 463.0;
+        ACE_barrelTwist = 228.6;
+        initSpeed = -0.984262;
     };
 
     // Stoner 99 LMG
@@ -243,9 +352,6 @@ class CfgWeapons {
         ACE_barrelLength = 414.02;
     };
 
-    // RFB SDAR
-    class SDAR_base_F: Rifle_Base_F {};
-
     class Pistol;
     class Pistol_Base_F: Pistol {};
 
@@ -300,128 +406,6 @@ class CfgWeapons {
         ACE_barrelLength = 177.8;
     };
 
-    // AKS
-    class arifle_AKS_base_F: Rifle_Base_F {
-        initSpeed = -1; // 735 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 160;
-        ACE_barrelLength = 210;
-    };
-
-    // AKM
-    class arifle_AKM_base_F: Rifle_Base_F {
-        initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 240;
-        ACE_barrelLength = 415;
-    };
-
-    // AK15,AK15K,RPK (AK12)
-    class arifle_AK12_base_F: Rifle_Base_F {
-        initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 240;
-        ACE_barrelLength = 415;
-    };
-
-    class arifle_AK12U_base_F: arifle_AK12_base_F {
-        initSpeed = -0.937063; // 715*0.937063= 670 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 240;
-        ACE_barrelLength = 314;
-    };
-
-    class arifle_RPK12_base_F: arifle_AK12_base_F {
-        initSpeed = -1.041958; // 715*1.041958= 745 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 240;
-        ACE_barrelLength = 590;
-    };
-
-    // MSBS GROT (Promet)
-    class arifle_MSBS65_base_F: Rifle_Base_F {
-        initSpeed = -0.971576; // 774*0.971576= 752 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelTwist = 228.6;
-        ACE_barrelLength = 406.4; // 16"
-    };
-
-    class arifle_MSBS65_Mark_base_F: arifle_MSBS65_base_F {
-        initSpeed = -1.007752; // 774*1.007752= 780 m/s according with the ACE_muzzleVelocities at 15°C
-        ACE_barrelLength = 508; // 20"
-    };
-
-    // QBZ-95-1
-    class arifle_CTAR_base_F: Rifle_Base_F {
-        initSpeed = -0.978947;
-        ACE_barrelTwist = 244.0;
-        ACE_barrelLength = 463.0;
-    };
-
-    // QBZ-95-1 LSW
-    class arifle_CTARS_base_F: Rifle_Base_F {
-        initSpeed = -1.0;
-        ACE_barrelTwist = 244.0;
-        ACE_barrelLength = 600.0;
-    };
-
-    // Type 115
-    class arifle_ARX_base_F: Rifle_Base_F {
-        initSpeed = -0.984262;
-        ACE_barrelTwist = 228.6;
-        ACE_barrelLength = 463.0;
-    };
-
-    // KH2002 Sama
-    class arifle_Katiba_F: arifle_katiba_Base_F {
-        magazines[] = {
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_green_mag_Tracer",
-            "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
-        };
-        initSpeed = -1.0;
-        ACE_barrelTwist = 203.2;
-        ACE_barrelLength = 508.0;
-    };
-
-    // KH2002C Sama
-    class arifle_Katiba_C_F: arifle_katiba_Base_F {
-        magazines[] = {
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_green_mag_Tracer",
-            "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
-        };
-        initSpeed = -0.961294;
-        ACE_barrelTwist = 203.2;
-        ACE_barrelLength = 393.7;
-    };
-
-    // KH2002 Sama KGL
-    class arifle_Katiba_GL_F: arifle_katiba_Base_F {
-        magazines[] = {
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_green_mag_Tracer",
-            "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
-        };
-        initSpeed = -1.0;
-        ACE_barrelTwist = 203.2;
-        ACE_barrelLength = 508.0;
-    };
-
-    // RFB SDAR
-    class arifle_SDAR_F: SDAR_base_F {
-        magazines[] = {
-            "20Rnd_556x45_UW_mag",
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.998321;
-        ACE_barrelTwist = 285.75;
-        ACE_barrelLength = 457.2;
-    };
-
     class SMG_02_base_F: Rifle_Short_Base_F  {};
 
     // Scorpion Evo 3 A1
@@ -438,120 +422,6 @@ class CfgWeapons {
         ACE_barrelLength = 115.0;
     };
 
-    // CTAR-21
-    class arifle_TRG20_F: Tavor_base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.961496;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 381.0;
-    };
-
-    // TAR-21
-    class arifle_TRG21_F: Tavor_base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -1.0;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 459.74;
-    };
-
-    // TAR-21 EGLM
-    class arifle_TRG21_GL_F: arifle_TRG21_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -1.0;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 459.74;
-    };
-
-    // F2000
-    class arifle_Mk20_F: mk20_base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.992849;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 441.96;
-    };
-
-    // F2000 Tactical
-    class arifle_Mk20C_F: mk20_base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.974297;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 406.4;
-    };
-
-    // F2000 EGLM
-    class arifle_Mk20_GL_F: mk20_base_F {
-        magazines[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_green",
-            "ACE_30Rnd_556x45_Stanag_M995_AP_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk262_mag",
-            "ACE_30Rnd_556x45_Stanag_Mk318_mag",
-            "ACE_30Rnd_556x45_Stanag_Tracer_Dim"
-        };
-        initSpeed = -0.974297;
-        ACE_barrelTwist = 177.8;
-        ACE_barrelLength = 406.4;
-    };
-
     class SMG_01_Base: Rifle_Short_Base_F {};
 
     // Vector SMG