diff --git a/addons/mortar/CfgMagazineGroups.hpp b/addons/mortar/CfgMagazineGroups.hpp
index 5b15e57..cdc4e81 100644
--- a/addons/mortar/CfgMagazineGroups.hpp
+++ b/addons/mortar/CfgMagazineGroups.hpp
@@ -1,10 +1,17 @@
 class ace_csw_groups { // Ammo that can be loaded into CSW's
 	///// 82 mm ammo (for BM 37)
 	class LIB_1Rnd_82mm_Mo_HE { // The magazine which the player can place into their inventory
-		LIB_1Rnd_82mm_Mo_HE = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
+		LIB_1rnd_82mmHE_BM37 = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
+	};
+	class LIB_1rnd_82mmHE_BM37 { // The magazine which the player can place into their inventory
+		LIB_1rnd_82mmHE_BM37 = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
+		LIB_8Rnd_82mmHE_BM37 = 1;
 	};
 	class LIB_1Rnd_82mm_Mo_Smoke { // The magazine which the player can place into their inventory
-		LIB_1Rnd_82mm_Mo_Smoke = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
+		LIB_82mm_BM37_SmokeShell = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
+	};
+	class LIB_82mm_BM37_SmokeShell { // The magazine which the player can place into their inventory
+		LIB_82mm_BM37_SmokeShell = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
 	};
 	class LIB_1Rnd_82mm_Mo_Illum { // The magazine which the player can place into their inventory
 		LIB_1Rnd_82mm_Mo_Illum = 1; // Magazine that is loaded into the weapon as per CfgWeapons >> weapon >> magazines
@@ -13,10 +20,17 @@ class ace_csw_groups { // Ammo that can be loaded into CSW's
 
 	///// 81 mm ammo (for GrWr 34)
 	class LIB_1Rnd_81mm_Mo_HE {
-		LIB_1Rnd_81mm_Mo_HE = 1;
+		LIB_1rnd_81mmHE_GRWR34 = 1;
+	};
+	class LIB_1rnd_81mmHE_GRWR34 {
+		LIB_1rnd_81mmHE_GRWR34 = 1;
+		LIB_8rnd_81mmHE_GRWR34 = 1;
 	};
 	class LIB_1Rnd_81mm_Mo_Smoke {
-		LIB_1Rnd_81mm_Mo_Smoke = 1;
+		LIB_81mm_GRWR34_SmokeShell = 1;
+	};
+	class LIB_81mm_GRWR34_SmokeShell {
+		LIB_81mm_GRWR34_SmokeShell = 1;
 	};
 	class LIB_1Rnd_81mm_Mo_Illum {
 		LIB_1Rnd_81mm_Mo_Illum = 1;
@@ -25,10 +39,17 @@ class ace_csw_groups { // Ammo that can be loaded into CSW's
 
 	///// 60 mm ammo (for M2)
 	class LIB_1Rnd_60mm_Mo_HE {
-		LIB_1Rnd_60mm_Mo_HE = 1;
+		LIB_1rnd_60mmHE_M2 = 1;
+	};
+	class LIB_1rnd_60mmHE_M2 {
+		LIB_1rnd_60mmHE_M2 = 1;
+		LIB_8rnd_60mmHE_M2 = 1;
 	};
 	class LIB_1Rnd_60mm_Mo_Smoke {
-		LIB_1Rnd_60mm_Mo_Smoke = 1;
+		LIB_60mm_M2_SmokeShell = 1;
+	};
+	class LIB_60mm_M2_SmokeShell {
+		LIB_60mm_M2_SmokeShell = 1;
 	};
 	class LIB_1Rnd_60mm_Mo_Illum {
 		LIB_1Rnd_60mm_Mo_Illum = 1;
diff --git a/addons/mortar/cfgMagazines.hpp b/addons/mortar/cfgMagazines.hpp
index fd37bfb..1bd8240 100644
--- a/addons/mortar/cfgMagazines.hpp
+++ b/addons/mortar/cfgMagazines.hpp
@@ -1,22 +1,45 @@
 class CfgMagazines
 {
+	class 8Rnd_82mm_Mo_Smoke_white;
 	class ACE_1Rnd_82mm_Mo_HE;
 	class ACE_1Rnd_82mm_Mo_Smoke;
 	class ACE_1Rnd_82mm_Mo_Illum;
-	class LIB_1Rnd_82mm_Mo_HE: ACE_1Rnd_82mm_Mo_HE
+	class LIB_8Rnd_82mmHE_BM37;
+	class LIB_8Rnd_81mmHE_GRWR34;
+	class LIB_8Rnd_60mmHE_M2;
+	class LIB_1rnd_82mmHE_BM37: LIB_8Rnd_82mmHE_BM37
 	{
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell80.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_he_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_HE_ca.paa";
-		ammo = "LIB_Sh_82_HE";
+		ace_arsenal_hide = -1;
 	};
-	class LIB_1Rnd_82mm_Mo_Smoke: ACE_1Rnd_82mm_Mo_Smoke
+	class LIB_82mm_BM37_SmokeShell: 8Rnd_82mm_Mo_Smoke_white
 	{
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell80.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_smoke_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_Smoke_ca.paa";
+		ace_arsenal_hide = -1;
+	};
+	class LIB_1rnd_81mmHE_GRWR34: LIB_8Rnd_81mmHE_GRWR34
+	{
+		ace_arsenal_hide = -1;
+	};
+	class LIB_81mm_GRWR34_SmokeShell: 8Rnd_82mm_Mo_Smoke_white
+	{
+		ace_arsenal_hide = -1;
+	};
+	class LIB_1rnd_60mmHE_M2: LIB_8Rnd_60mmHE_M2
+	{
+		ace_arsenal_hide = -1;
+	};
+	class LIB_60mm_M2_SmokeShell: 8Rnd_82mm_Mo_Smoke_white
+	{
+		ace_arsenal_hide = -1;
+	};
+	class LIB_1Rnd_82mm_Mo_HE: LIB_1rnd_82mmHE_BM37
+	{
+		ace_arsenal_hide = 1;
+		scope = 1;
+	};
+	class LIB_1Rnd_82mm_Mo_Smoke: LIB_82mm_BM37_SmokeShell
+	{
+		ace_arsenal_hide = 1;
+		scope = 1;
 	};
 	class LIB_1Rnd_82mm_Mo_Illum: ACE_1Rnd_82mm_Mo_Illum
 	{
@@ -25,22 +48,15 @@ class CfgMagazines
 		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_illum_co.paa"};
 		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_Illum_ca.paa";
 	};
-	class LIB_1Rnd_81mm_Mo_HE: ACE_1Rnd_82mm_Mo_HE
+	class LIB_1Rnd_81mm_Mo_HE: LIB_1rnd_81mmHE_GRWR34
 	{
-		displayName = "$STR_ACE_81mm_magazine_HE_displayName";
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell80.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_he_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_HE_ca.paa";
-		ammo = "LIB_Sh_81_HE";
+		ace_arsenal_hide = 1;
+		scope = 1;
 	};
-	class LIB_1Rnd_81mm_Mo_Smoke: ACE_1Rnd_82mm_Mo_Smoke
+	class LIB_1Rnd_81mm_Mo_Smoke: LIB_81mm_GRWR34_SmokeShell
 	{
-		displayName = "$STR_ACE_81mm_magazine_Smoke_displayName";
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell80.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_smoke_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_Smoke_ca.paa";
+		ace_arsenal_hide = 1;
+		scope = 1;
 	};
 	class LIB_1Rnd_81mm_Mo_Illum: ACE_1Rnd_82mm_Mo_Illum
 	{
@@ -50,24 +66,15 @@ class CfgMagazines
 		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell80_illum_co.paa"};
 		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_80_Illum_ca.paa";
 	};
-	class LIB_1Rnd_60mm_Mo_HE: ACE_1Rnd_82mm_Mo_HE
+	class LIB_1Rnd_60mm_Mo_HE: LIB_1rnd_60mmHE_M2
 	{
-		displayName = "$STR_ACE_60mm_magazine_HE_displayName";
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell60.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell60_he_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_60_HE_ca.paa";
-		ammo = "LIB_Sh_60_HE";
-		mass = 30;
+		ace_arsenal_hide = 1;
+		scope = 1;
 	};
-	class LIB_1Rnd_60mm_Mo_Smoke: ACE_1Rnd_82mm_Mo_Smoke
+	class LIB_1Rnd_60mm_Mo_Smoke: LIB_60mm_M2_SmokeShell
 	{
-		displayName = "$STR_ACE_60mm_magazine_Smoke_displayName";
-		model = "\WW2\Assets_m\Weapons\Ammoboxes_m\mortars\WW2_shell60.p3d";
-		hiddenSelections[] = {"camo1"};
-		hiddenSelectionsTextures[] = {"WW2\Assets_t\Weapons\Ammoboxes_t\WW2_Mortars\shell60_smoke_co.paa"};
-		picture = "\WW2\Assets_t\Weapons\Equipment_t\Magazines\Mortars\M_60_Smoke_ca.paa";
-		mass = 30;
+		ace_arsenal_hide = 1;
+		scope = 1;
 	};
 	class LIB_1Rnd_60mm_Mo_Illum: ACE_1Rnd_82mm_Mo_Illum
 	{