diff --git a/addons/brightFlares/$PBOPREFIX$ b/addons/brightFlares/$PBOPREFIX$
deleted file mode 100644
index c0e8baf6..00000000
--- a/addons/brightFlares/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-x\grad\addons\brightFlares
diff --git a/addons/brightFlares/README.md b/addons/brightFlares/README.md
deleted file mode 100644
index cbb248f4..00000000
--- a/addons/brightFlares/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### brightFlares
-
-Increases brightness of 40mm flares to a level where they are usable for illumination.
-
-#### Maintainer(s)
-
-* Fusselwurm
diff --git a/addons/brightFlares/config.cpp b/addons/brightFlares/config.cpp
deleted file mode 100644
index ca3edd34..00000000
--- a/addons/brightFlares/config.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-	class ADDON {
-		author = "$STR_grad_Author";
-		name = QUOTE(ADDON);
-		url = "$STR_grad_URL";
-		requiredVersion = 1.0;
-		requiredAddons[] = {"grad_main", "A3_Data_F", "A3_Weapons_F"};
-		units[] = {};
-		weapons[] = {};
-		VERSION_CONFIG;
-        authors[] = {
-			"Fusselwurm <fusselwurm@gmail.com>"
-		};
-	};
-};
-
-#include "cfgAmmo.hpp"
diff --git a/addons/grenadeLauncherAmmo/$PBOPREFIX$ b/addons/grenadeLauncherAmmo/$PBOPREFIX$
new file mode 100644
index 00000000..0ac11e4c
--- /dev/null
+++ b/addons/grenadeLauncherAmmo/$PBOPREFIX$
@@ -0,0 +1 @@
+x\grad\addons\grenadeLauncherAmmo
\ No newline at end of file
diff --git a/addons/grenadeLauncherAmmo/README.md b/addons/grenadeLauncherAmmo/README.md
new file mode 100644
index 00000000..0ade461b
--- /dev/null
+++ b/addons/grenadeLauncherAmmo/README.md
@@ -0,0 +1,8 @@
+### grenadeLauncherAmmo
+
+* Increases brightness of 40mm flares to a level where they are usable for illumination.
+* Decreases bounciness of 40mm smoke grenades
+
+#### Maintainer(s)
+
+* Fusselwurm
diff --git a/addons/brightFlares/cfgAmmo.hpp b/addons/grenadeLauncherAmmo/cfgAmmo.hpp
similarity index 70%
rename from addons/brightFlares/cfgAmmo.hpp
rename to addons/grenadeLauncherAmmo/cfgAmmo.hpp
index ac39f25e..d576f1c5 100644
--- a/addons/brightFlares/cfgAmmo.hpp
+++ b/addons/grenadeLauncherAmmo/cfgAmmo.hpp
@@ -11,4 +11,11 @@ class CfgAmmo {
     class Flare_82mm_AMOS_White: FlareCore {
         intensity = 4000000;
     };
+
+    class SmokeShell;
+    class G_40mm_Smoke: SmokeShell
+    {
+        simulation = "shotSmoke";
+        deflectionSlowDown = 0.4;
+    };
 };
diff --git a/addons/grenadeLauncherAmmo/config.cpp b/addons/grenadeLauncherAmmo/config.cpp
new file mode 100644
index 00000000..5e4da308
--- /dev/null
+++ b/addons/grenadeLauncherAmmo/config.cpp
@@ -0,0 +1,20 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = "$STR_grad_Author";
+        name = QUOTE(ADDON);
+        url = "$STR_grad_URL";
+        requiredVersion = 1.0;
+        requiredAddons[] = {"grad_main", "A3_Data_F", "A3_Weapons_F"};
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+        authors[] = {
+            "Fusselwurm <fusselwurm@gmail.com>",
+            "Willard"
+        };
+    };
+};
+
+#include "cfgAmmo.hpp"
diff --git a/addons/brightFlares/script_component.hpp b/addons/grenadeLauncherAmmo/script_component.hpp
similarity index 71%
rename from addons/brightFlares/script_component.hpp
rename to addons/grenadeLauncherAmmo/script_component.hpp
index 32e9e2e9..0580a815 100644
--- a/addons/brightFlares/script_component.hpp
+++ b/addons/grenadeLauncherAmmo/script_component.hpp
@@ -1,4 +1,4 @@
-#define COMPONENT brightFlares
+#define COMPONENT grenadeLauncherAmmo
 
 #include "\x\grad\addons\main\script_mod.hpp"
 #include "\x\grad\addons\main\script_macros.hpp"
diff --git a/addons/grenadeLauncherAmmoRhs/$PBOPREFIX$ b/addons/grenadeLauncherAmmoRhs/$PBOPREFIX$
new file mode 100644
index 00000000..9541e288
--- /dev/null
+++ b/addons/grenadeLauncherAmmoRhs/$PBOPREFIX$
@@ -0,0 +1 @@
+x\grad\addons\grenadeLauncherAmmoRhs
\ No newline at end of file
diff --git a/addons/grenadeLauncherAmmoRhs/README.md b/addons/grenadeLauncherAmmoRhs/README.md
new file mode 100644
index 00000000..fd945594
--- /dev/null
+++ b/addons/grenadeLauncherAmmoRhs/README.md
@@ -0,0 +1,7 @@
+### grenadeLauncherAmmoRhs
+
+* Decreases bounciness of the RHS 40mm smoke grenades
+
+#### Maintainer(s)
+
+* Fusselwurm
diff --git a/addons/grenadeLauncherAmmoRhs/cfgAmmo.hpp b/addons/grenadeLauncherAmmoRhs/cfgAmmo.hpp
new file mode 100644
index 00000000..27d87958
--- /dev/null
+++ b/addons/grenadeLauncherAmmoRhs/cfgAmmo.hpp
@@ -0,0 +1,37 @@
+class CfgAmmo {
+    class SmokeShell;
+    class rhs_40mm_smoke_white: SmokeShell
+    {
+        simulation = "shotSmoke";
+        deflectionSlowDown = 0.4;
+    };
+
+    class SmokeShellRed;
+    class rhs_40mm_smoke_red: SmokeShellRed
+    {
+        simulation = "shotSmoke";
+        deflectionSlowDown = 0.4;
+    };
+
+    class SmokeShellGreen;
+    class rhs_40mm_smoke_green: SmokeShellGreen
+    {
+        simulation = "shotSmoke";
+        deflectionSlowDown = 0.4;
+    };
+
+    class SmokeShellYellow;
+    class rhs_40mm_smoke_yellow: SmokeShellYellow
+    {
+        simulation = "shotSmoke";
+        deflectionSlowDown = 0.4;
+    };
+
+    class rhs_g_vog25;
+    class rhs_g_vg40md_white: rhs_g_vog25
+    {
+        simulation = "shotSmoke";
+        deflecting = 30;
+        deflectionSlowDown = 0.4;
+    }
+};
diff --git a/addons/grenadeLauncherAmmoRhs/config.cpp b/addons/grenadeLauncherAmmoRhs/config.cpp
new file mode 100644
index 00000000..41db73f3
--- /dev/null
+++ b/addons/grenadeLauncherAmmoRhs/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = "$STR_grad_Author";
+        name = QUOTE(ADDON);
+        url = "$STR_grad_URL";
+        requiredVersion = 1.0;
+        requiredAddons[] = {"grad_main", "A3_Weapons_F", "rhs_c_weapons", "rhsusf_c_weapons"};
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+        authors[] = {
+            "Willard"
+        };
+    };
+};
+
+#include "cfgAmmo.hpp"
diff --git a/addons/grenadeLauncherAmmoRhs/script_component.hpp b/addons/grenadeLauncherAmmoRhs/script_component.hpp
new file mode 100644
index 00000000..8b9aa339
--- /dev/null
+++ b/addons/grenadeLauncherAmmoRhs/script_component.hpp
@@ -0,0 +1,4 @@
+#define COMPONENT grenadeLauncherAmmoRhs
+
+#include "\x\grad\addons\main\script_mod.hpp"
+#include "\x\grad\addons\main\script_macros.hpp"