diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
index 62354f0..c6db940 100644
--- a/addons/main/script_version.hpp
+++ b/addons/main/script_version.hpp
@@ -1,3 +1,3 @@
 #define MAJOR 1
-#define MINOR 2
+#define MINOR 3
 #define PATCH 0
diff --git a/addons/medical_arsenal/$PBOPREFIX$ b/addons/medical_arsenal/$PBOPREFIX$
deleted file mode 100644
index 2a3a2e4..0000000
--- a/addons/medical_arsenal/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\afmed\addons\medical_arsenal
\ No newline at end of file
diff --git a/addons/medical_arsenal/CfgEventHandlers.hpp b/addons/medical_arsenal/CfgEventHandlers.hpp
deleted file mode 100644
index 917a0ac..0000000
--- a/addons/medical_arsenal/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class Extended_PreInit_EventHandlers {
-    class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
-    };
-};
-class Extended_PostInit_EventHandlers {
-    class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_postInit));
-    };
-};
diff --git a/addons/medical_arsenal/README.md b/addons/medical_arsenal/README.md
deleted file mode 100644
index c2717a5..0000000
--- a/addons/medical_arsenal/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Medical Arsenal
-
-ACE Arsenal integration for ArmaForces Medical.
-
-### Authors
-
-- [veteran29](http://github.com/veteran29)
diff --git a/addons/medical_arsenal/XEH_postInit.sqf b/addons/medical_arsenal/XEH_postInit.sqf
deleted file mode 100644
index 421c54b..0000000
--- a/addons/medical_arsenal/XEH_postInit.sqf
+++ /dev/null
@@ -1 +0,0 @@
-#include "script_component.hpp"
diff --git a/addons/medical_arsenal/XEH_preInit.sqf b/addons/medical_arsenal/XEH_preInit.sqf
deleted file mode 100644
index 16f9edc..0000000
--- a/addons/medical_arsenal/XEH_preInit.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-ADDON = false;
-
-#include "initSettings.sqf"
-
-if (GVAR(addCategory)) then {
-    GVAR(medicalArsenalButton) = [
-        ALL_MEDICAL_ITEMS,
-        LLSTRING(Medications),
-        "\z\ace\addons\medical_gui\data\categories\medication.paa"
-    ] call ace_arsenal_fnc_addRightPanelButton;
-};
-
-ADDON = true;
diff --git a/addons/medical_arsenal/config.cpp b/addons/medical_arsenal/config.cpp
deleted file mode 100644
index 5a023b8..0000000
--- a/addons/medical_arsenal/config.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        name = COMPONENT_NAME;
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {
-            "afmed_main",
-            "ace_arsenal"
-        };
-        author = "ArmaForces";
-        VERSION_CONFIG;
-    };
-};
-
-#include "CfgEventHandlers.hpp"
diff --git a/addons/medical_arsenal/initSettings.sqf b/addons/medical_arsenal/initSettings.sqf
deleted file mode 100644
index 469bbc3..0000000
--- a/addons/medical_arsenal/initSettings.sqf
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-    QGVAR(addCategory),
-    "CHECKBOX",
-    LLSTRING(AddCategory),
-    [LELSTRING(Main,SettingsCategory), LLSTRING(SettingsSubcategory)],
-    true,
-    false,
-    {},
-    true
-] call CBA_fnc_addSetting;
diff --git a/addons/medical_arsenal/script_component.hpp b/addons/medical_arsenal/script_component.hpp
deleted file mode 100644
index 1958d79..0000000
--- a/addons/medical_arsenal/script_component.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#define COMPONENT medical_arsenal
-#include "\z\afmed\addons\main\script_mod.hpp"
-
-// #define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
-
-#ifdef DEBUG_ENABLED_MEDICAL_ARSENAL
-    #define DEBUG_MODE_FULL
-#endif
-    #ifdef DEBUG_SETTINGS_MEDICAL_ARSENAL
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_MEDICAL_ARSENAL
-#endif
-
-#include "\z\afmed\addons\main\script_macros.hpp"
-
-#define ALL_MEDICAL_ITEMS [\
-    "ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_quikclot",\
-    "ACE_tourniquet", "ACE_splint",\
-    "ACE_morphine", "ACE_adenosine", "ACE_atropine", "ACE_epinephrine",\
-    "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250",\
-    "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250",\
-    "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250",\
-    "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag",\
-    "AFMED_apap"\
-]
diff --git a/addons/medical_arsenal/stringtable.xml b/addons/medical_arsenal/stringtable.xml
deleted file mode 100644
index 8daa907..0000000
--- a/addons/medical_arsenal/stringtable.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project name="AFMED">
-    <Package name="Medical_Arsenal">
-        <Key ID="STR_AFMED_Medical_Arsenal_Medications">
-            <English>Medications</English>
-            <Polish>Medykamenty</Polish>
-        </Key>
-        <Key ID="STR_AFMED_Medical_Arsenal_AddCategory">
-            <English>Add arsenal category</English>
-            <Polish>Dodaj kategorię do arsenału</Polish>
-        </Key>
-        <Key ID="STR_AFMED_Medical_Arsenal_SettingsSubcategory">
-            <English>Arsenal</English>
-            <Polish>Arsenał</Polish>
-        </Key>
-    </Package>
-</Project>
diff --git a/addons/medical_treatment/CfgWeapons.hpp b/addons/medical_treatment/CfgWeapons.hpp
index d918162..2095e82 100644
--- a/addons/medical_treatment/CfgWeapons.hpp
+++ b/addons/medical_treatment/CfgWeapons.hpp
@@ -4,12 +4,17 @@ class CfgWeapons {
     class AFMED_apap: ACE_ItemCore {
         scope = 2;
         scopeCurator = 2;
+
         author = "ArmaForces";
         displayName = CSTRING(Apap_DisplayName);
-        picture = QPATHTOF(ui\icons\apap.paa);
-        model = "\A3\Structures_F_EPA\Items\Medical\PainKillers_F.p3d";
         descriptionShort = CSTRING(Apap_Desc_Short);
         descriptionUse = CSTRING(Apap_Desc_Use);
+        picture = QPATHTOF(ui\icons\apap.paa);
+
+        model = "\A3\Structures_F_EPA\Items\Medical\PainKillers_F.p3d";
+
+        ACE_isMedicalItem = 1;
+
         class ItemInfo: CBA_MiscItem_ItemInfo {
             mass = 0.5;
         };