diff --git a/addons/ai/CfgWeapons.hpp b/addons/ai/CfgWeapons.hpp
index be3245cce3..03dfe2d6a0 100644
--- a/addons/ai/CfgWeapons.hpp
+++ b/addons/ai/CfgWeapons.hpp
@@ -22,6 +22,7 @@ class CfgWeapons {
     };
 
     class Rifle_Base_F: Rifle {};
+    class Rifle_Short_Base_F: Rifle_Base_F {};
     class Rifle_Long_Base_F: Rifle_Base_F {};
 
     // MX
@@ -470,7 +471,7 @@ class CfgWeapons {
     };
 
     // PD2000
-    class pdw2000_base_F: Rifle_Base_F {
+    class pdw2000_base_F: Rifle_Short_Base_F {
         aiDispersionCoefY = 18.0;
         aiDispersionCoefX = 12.0;
 
@@ -484,7 +485,7 @@ class CfgWeapons {
     };
 
     // Vector
-    class SMG_01_Base: Rifle_Base_F {
+    class SMG_01_Base: Rifle_Short_Base_F {
         aiDispersionCoefY = 18.0;
         aiDispersionCoefX = 12.0;
 
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 0344e618bb..2446aeb3b3 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -9,7 +9,8 @@ class CfgWeapons {
     class MMG_01_base_F;
     class MMG_02_base_F;
     class Rifle_Base_F;
-    class Rifle_Long_Base_F;
+    class Rifle_Short_Base_F: Rifle_Base_F {};
+    class Rifle_Long_Base_F: Rifle_Base_F {};
     class MuzzleSlot;
 
     /* Long Rifles */
@@ -189,8 +190,8 @@ class CfgWeapons {
             dispersion = 0.0008727; // radians. Equal to 3 MOA.
         };
     };
-    class pdw2000_base_F: Rifle_Base_F {};
-    class SMG_01_Base: Rifle_Base_F {};
+    class pdw2000_base_F: Rifle_Short_Base_F {};
+    class SMG_01_Base: Rifle_Short_Base_F {};
     class SMG_02_base_F: Rifle_Base_F {};
 
     /* Pistols */
diff --git a/addons/flashsuppressors/CfgWeapons.hpp b/addons/flashsuppressors/CfgWeapons.hpp
index e807dc2ae9..bf5aee16f1 100644
--- a/addons/flashsuppressors/CfgWeapons.hpp
+++ b/addons/flashsuppressors/CfgWeapons.hpp
@@ -9,6 +9,12 @@ class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount supp
         ACE_muzzle_mzls_B = 1;
     };
 };
+class asdg_MuzzleSlot_65: asdg_MuzzleSlot_762 { // for 6.5 weapons, mostly to deal with BIS vanilla compatibility
+    class compatibleItems: compatibleItems {
+        ACE_muzzle_mzls_H = 1;
+        ACE_muzzle_mzls_B = 0;
+    };
+};
 class asdg_MuzzleSlot_93x64: asdg_MuzzleSlot { // for 9.3x64 universal mount suppressors
     class compatibleItems {
         ACE_muzzle_mzls_93mmg = 1;
@@ -19,6 +25,11 @@ class asdg_MuzzleSlot_9MM_SMG: asdg_MuzzleSlot { // for 9x19mm universal mount S
         ACE_muzzle_mzls_smg_02 = 1;
     };
 };
+class asdg_MuzzleSlot_9MM: asdg_MuzzleSlot { // for 9x19mm universal mount pistol suppressors
+    class compatibleItems {
+        ACE_muzzle_mzls_smg_02 = 1;
+    };
+};
 class asdg_MuzzleSlot_556: asdg_MuzzleSlot { // for 5.56x45 universal mount suppressors
     class compatibleItems {
         ACE_muzzle_mzls_L = 1;
@@ -29,12 +40,16 @@ class asdg_MuzzleSlot_45ACP_SMG: asdg_MuzzleSlot { // for .45ACP universal mount
         ACE_muzzle_mzls_smg_01 = 1;
     };
 };
+class asdg_MuzzleSlot_45ACP: asdg_MuzzleSlot { // for .45ACP universal mount pistol suppressors
+    class compatibleItems {
+        ACE_muzzle_mzls_smg_01 = 1;
+    };
+};
 class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 universal mount MG suppressors
     class compatibleItems {
         ACE_muzzle_mzls_B = 1;
     };
 };
-
 class MuzzleSlot;
 
 class CfgWeapons {
@@ -44,100 +59,6 @@ class CfgWeapons {
         class WeaponSlotsInfo;
     };
 
-    /* MX */
-   class arifle_MX_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_MXC_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_GL_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_SW_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762MG {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MXM_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-
-
-    /* Katiba */
-
-    class arifle_Katiba_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-    class arifle_Katiba_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_Katiba_C_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-
-
     /* Other */
     class LMG_Mk200_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
@@ -150,56 +71,6 @@ class CfgWeapons {
         };
     };
 
-    /* Pistols */
-
-    class Pistol;
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo;
-    };
-
-    class hgun_P07_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_Rook40_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_ACPC2_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    /*class hgun_Pistol_heavy_02_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };*/
-
 
     /* Flashsuppressors */
 
diff --git a/addons/realisticweights/CfgWeapons.hpp b/addons/realisticweights/CfgWeapons.hpp
index 5c60f8d464..d84b13ab72 100644
--- a/addons/realisticweights/CfgWeapons.hpp
+++ b/addons/realisticweights/CfgWeapons.hpp
@@ -3,6 +3,9 @@ class CfgWeapons {
     class Rifle_Long_Base_F: Rifle_Base_F {
         class WeaponSlotsInfo;
     };
+    class Rifle_Short_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
     class Launcher;
     class Launcher_Base_F: Launcher {
         class WeaponSlotsInfo;
@@ -176,7 +179,7 @@ class CfgWeapons {
 // - SMGs ---------------------------------------------------------------------
 
     // - CPW ------------------------------------------------------------------
-    class pdw2000_base_F: Rifle_Base_F {
+    class pdw2000_base_F: Rifle_Short_Base_F {
         class WeaponSlotsInfo;
     };
     class hgun_PDW2000_F: pdw2000_base_F {
@@ -186,7 +189,7 @@ class CfgWeapons {
     };
 
     // - KRISS Vector ---------------------------------------------------------
-    class SMG_01_Base: Rifle_Base_F {
+    class SMG_01_Base: Rifle_Short_Base_F {
         class WeaponSlotsInfo;
     };
     class SMG_01_F: SMG_01_Base {
diff --git a/addons/smallarms/CfgWeapons.hpp b/addons/smallarms/CfgWeapons.hpp
index 1cb7979d5b..d998ceb1da 100644
--- a/addons/smallarms/CfgWeapons.hpp
+++ b/addons/smallarms/CfgWeapons.hpp
@@ -4,7 +4,8 @@ class Mode_FullAuto;
 
 class CfgWeapons {
     class Rifle_Base_F;
-    class Rifle_Long_Base_F;
+    class Rifle_Short_Base_F: Rifle_Base_F {};
+    class Rifle_Long_Base_F: Rifle_Base_F {};
 
     ///////////////////////////////////////////////////////////////////////////////
     //////////// SMALL ARMS WEAPONS ///////////////////////////////////////////////
@@ -91,7 +92,7 @@ class CfgWeapons {
 
     // SMG Vermin ////////////////////////////////////////////////////
 
-    class SMG_01_Base: Rifle_Base_F {
+    class SMG_01_Base: Rifle_Short_Base_F {
         // http://kriss-usa.com/pdf/operatormanual/
         // 1200 rpm
         class Single: Mode_SemiAuto {
@@ -131,7 +132,7 @@ class CfgWeapons {
 
     // SMG PDW2000 ///////////////////////////////////////////////////
 
-    class pdw2000_base_F: Rifle_Base_F {
+    class pdw2000_base_F: Rifle_Short_Base_F {
         modes[] = {"Single", "FullAuto"}; // No burst on this thing
 
         class Single: Mode_SemiAuto {