diff --git a/addons/attach/XEH_preInit.sqf b/addons/attach/XEH_preInit.sqf
index bcbd7e543c..279ea4d4c7 100644
--- a/addons/attach/XEH_preInit.sqf
+++ b/addons/attach/XEH_preInit.sqf
@@ -1,7 +1,11 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(attach);
 PREP(canAttach);
 PREP(canDetach);
 PREP(detach);
-PREP(openAttachUI);
\ No newline at end of file
+PREP(openAttachUI);
+
+ADDON = true;
diff --git a/addons/backblast/XEH_preInit.sqf b/addons/backblast/XEH_preInit.sqf
index 1becf28c05..ec4edb75bc 100644
--- a/addons/backblast/XEH_preInit.sqf
+++ b/addons/backblast/XEH_preInit.sqf
@@ -1,5 +1,9 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(getDistance);
 PREP(launcherBackblast);
 PREP(tankDangerZone);
+
+ADDON = true;
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 3cfb392784..1bd305fa02 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -1,6 +1,8 @@
 // by commy2
 #include "script_component.hpp"
 
+ADDON = false;
+
 // ACE Common Function
 PREP(addActionEventHandler);
 PREP(addActionMenuEventHandler);
@@ -252,5 +254,4 @@ PREP(loadPersonLocal_F);
 PREP(unloadPerson_F);
 
 
-
 ADDON = true;
diff --git a/addons/disposable/XEH_preInit.sqf b/addons/disposable/XEH_preInit.sqf
index 3f2c3a4f9a..26543c369a 100644
--- a/addons/disposable/XEH_preInit.sqf
+++ b/addons/disposable/XEH_preInit.sqf
@@ -1,6 +1,10 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(aiDropWeaponCallback);
 PREP(replaceATWeapon);
 PREP(takeLoadedATWeapon);
 PREP(updateInventoryDisplay);
+
+ADDON = true;
diff --git a/addons/explosives/XEH_preInit.sqf b/addons/explosives/XEH_preInit.sqf
index 8ccfdb5aae..c55fb79a72 100644
--- a/addons/explosives/XEH_preInit.sqf
+++ b/addons/explosives/XEH_preInit.sqf
@@ -18,6 +18,8 @@ None
 */
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(addClacker);
 PREP(canDefuse);
 PREP(canDetonate);
@@ -49,3 +51,5 @@ PREP(setPosition);
 PREP(startDefuse);
 PREP(startTimer);
 PREP(triggerType);
+
+ADDON = true;
diff --git a/addons/gforces/XEH_preInit.sqf b/addons/gforces/XEH_preInit.sqf
index ce10f592bb..1d249ff6a0 100644
--- a/addons/gforces/XEH_preInit.sqf
+++ b/addons/gforces/XEH_preInit.sqf
@@ -1,6 +1,10 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(pfhUpdateGForces);
 
 GVAR(GForces) = [];
 GVAR(GForces_Index) = 0;
+
+ADDON = true;
diff --git a/addons/goggles/XEH_preInit.sqf b/addons/goggles/XEH_preInit.sqf
index c2878f3721..5b0d4da30f 100644
--- a/addons/goggles/XEH_preInit.sqf
+++ b/addons/goggles/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(applyDirtEffect);
 PREP(applyDust);
 PREP(applyGlassesEffect);
@@ -21,3 +23,5 @@ PREP(removeDirtEffect);
 PREP(removeDustEffect);
 PREP(removeGlassesEffect);
 PREP(removeRainEffect);
+
+ADDON = true;
diff --git a/addons/grenades/XEH_preInit.sqf b/addons/grenades/XEH_preInit.sqf
index e83aeaae6b..569cbfa8f6 100644
--- a/addons/grenades/XEH_preInit.sqf
+++ b/addons/grenades/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(flashbangEffectStages);
 PREP(flashbangExplosionEH);
 PREP(flashbangThrownFuze);
@@ -7,3 +9,5 @@ PREP(nextMode);
 PREP(throwGrenade);
 
 ["flashbangExplosion", { _this call DFUNC(flashbangExplosionEH) }] call EFUNC(common,addEventHandler);
+
+ADDON = true;
diff --git a/addons/gui/XEH_preInit.sqf b/addons/gui/XEH_preInit.sqf
index 9c2bcf0909..b5cc064d18 100644
--- a/addons/gui/XEH_preInit.sqf
+++ b/addons/gui/XEH_preInit.sqf
@@ -22,4 +22,4 @@ PREP(sendMessageTo);
 PREP(sendDisplayInformationTo);
 PREP(sendDisplayMessageTo);
 
-ADDON = true;
\ No newline at end of file
+ADDON = true;
diff --git a/addons/hearing/XEH_preInit.sqf b/addons/hearing/XEH_preInit.sqf
index d160232c05..95d317b4b1 100644
--- a/addons/hearing/XEH_preInit.sqf
+++ b/addons/hearing/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(addEarPlugs);
 PREP(earRinging);
 PREP(explosionNear);
@@ -8,3 +10,5 @@ PREP(hasEarPlugsIn);
 PREP(putInEarPlugs);
 PREP(removeEarPlugs);
 PREP(updateVolume);
+
+ADDON = true;
diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf
index 2c6d32d4de..42795d6c75 100644
--- a/addons/interact_menu/XEH_preInit.sqf
+++ b/addons/interact_menu/XEH_preInit.sqf
@@ -50,4 +50,4 @@ GVAR(objectActionsHash) = HASH_CREATE;
 
 GVAR(uidCounter) = 0;
 
-ADDON = true;
\ No newline at end of file
+ADDON = true;
diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf
index b09bcee71c..bcb8103ea2 100644
--- a/addons/interaction/XEH_preInit.sqf
+++ b/addons/interaction/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(addInteraction);
 PREP(addInteractionSelf);
 PREP(addSelectableItem);
@@ -45,6 +47,4 @@ PREP(sortOptionsByPriority);
 PREP(tapShoulder);
 PREP(updateTooltipPosition);
 
-
-
-
+ADDON = true;
diff --git a/addons/laserpointer/XEH_preInit.sqf b/addons/laserpointer/XEH_preInit.sqf
index 3a89535f2e..e7c74d3445 100644
--- a/addons/laserpointer/XEH_preInit.sqf
+++ b/addons/laserpointer/XEH_preInit.sqf
@@ -1,4 +1,8 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(drawLaserpoint);
 PREP(onDraw);
+
+ADDON = true;
diff --git a/addons/lockbackpacks/XEH_preInit.sqf b/addons/lockbackpacks/XEH_preInit.sqf
index 77b8885da4..c474ff625a 100644
--- a/addons/lockbackpacks/XEH_preInit.sqf
+++ b/addons/lockbackpacks/XEH_preInit.sqf
@@ -1,5 +1,9 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(getBackpackAssignedUnit);
 PREP(isBackpack);
 PREP(onOpenInventory);
+
+ADDON = true;
diff --git a/addons/magazinerepack/XEH_preInit.sqf b/addons/magazinerepack/XEH_preInit.sqf
index e811ff60c6..5caba1ffac 100644
--- a/addons/magazinerepack/XEH_preInit.sqf
+++ b/addons/magazinerepack/XEH_preInit.sqf
@@ -1,5 +1,9 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(magazineRepack);
 PREP(magazineRepackCallback);
 PREP(openSelectMagazineUI);
+
+ADDON = true;
diff --git a/addons/map/XEH_preInit.sqf b/addons/map/XEH_preInit.sqf
index b13b0ca384..1ab43c7ca8 100644
--- a/addons/map/XEH_preInit.sqf
+++ b/addons/map/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(addLineMarker);
 PREP(blueForceTrackingModule);
 PREP(blueForceTrackingUpdate);
@@ -29,3 +31,5 @@ PREP(updateLineMarker);
 
 ["drawing_requestMarkers", FUNC(copyMapRemoteSend) ] call EFUNC(common,addEventHandler);
 ["drawing_sendbackMarkers", FUNC(copyMapReceiveMarkers) ] call EFUNC(common,addEventHandler);
+
+ADDON = true;
diff --git a/addons/markers/XEH_preInit.sqf b/addons/markers/XEH_preInit.sqf
index 6ac258ed2a..8e07056da4 100644
--- a/addons/markers/XEH_preInit.sqf
+++ b/addons/markers/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(initInsertMarker);
 PREP(onLBSelChangedColor);
 PREP(onLBSelChangedShape);
@@ -72,3 +74,5 @@ if (isNil QGVAR(MarkerColorsCache)) then {
 };
 
 [QGVAR(sendMarkersJIP), FUNC(sendMarkersJIP)] call EFUNC(common,addEventHandler);
+
+ADDON = true;
diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf
index 331edd5b21..57800cd5b7 100644
--- a/addons/medical/XEH_preInit.sqf
+++ b/addons/medical/XEH_preInit.sqf
@@ -10,6 +10,8 @@
 
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(actionCarryUnit);
 PREP(ActioncheckBloodPressure);
 PREP(ActionCheckBloodPressureLocal);
diff --git a/addons/movement/XEH_preInit.sqf b/addons/movement/XEH_preInit.sqf
index e4c6a2f056..3047be3518 100644
--- a/addons/movement/XEH_preInit.sqf
+++ b/addons/movement/XEH_preInit.sqf
@@ -1,6 +1,10 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(getWeight);
 PREP(canClimb);
 PREP(climb);
 PREP(handleClimb);
+
+ADDON = true;
diff --git a/addons/nametags/XEH_preInit.sqf b/addons/nametags/XEH_preInit.sqf
index 14ecdc8a41..79258c5cec 100644
--- a/addons/nametags/XEH_preInit.sqf
+++ b/addons/nametags/XEH_preInit.sqf
@@ -1,5 +1,6 @@
 #include "script_component.hpp"
 
+ADDON = false;
 
 PREP(canShow);
 PREP(doShow);
@@ -10,3 +11,5 @@ PREP(onMouseZChanged);
 PREP(setText);
 
 GVAR(ShowNamesTime) = -10;
+
+ADDON = true;
diff --git a/addons/nightvision/XEH_preInit.sqf b/addons/nightvision/XEH_preInit.sqf
index 98e19f31ad..9f59a01418 100644
--- a/addons/nightvision/XEH_preInit.sqf
+++ b/addons/nightvision/XEH_preInit.sqf
@@ -1,6 +1,10 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(blending);
 PREP(decreaseNVGBrightness);
 PREP(increaseNVGBrightness);
 PREP(updatePPEffects);
+
+ADDON = true;
diff --git a/addons/overheating/XEH_preInit.sqf b/addons/overheating/XEH_preInit.sqf
index fb3c53040d..2bd256087b 100644
--- a/addons/overheating/XEH_preInit.sqf
+++ b/addons/overheating/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(checkTemperature);
 PREP(clearJam);
 PREP(cooldown);
@@ -8,3 +10,5 @@ PREP(jamWeapon);
 PREP(overheat);
 PREP(swapBarrel);
 PREP(swapBarrelCallback);
+
+ADDON = true;
diff --git a/addons/recoil/XEH_preInit.sqf b/addons/recoil/XEH_preInit.sqf
index 4d2bf8c538..2df8a83ebd 100644
--- a/addons/recoil/XEH_preInit.sqf
+++ b/addons/recoil/XEH_preInit.sqf
@@ -1,4 +1,8 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(burstDispersion);
 PREP(camShake);
+
+ADDON = true;
diff --git a/addons/reload/XEH_preInit.sqf b/addons/reload/XEH_preInit.sqf
index 9a7373b2dc..b5c8e45d35 100644
--- a/addons/reload/XEH_preInit.sqf
+++ b/addons/reload/XEH_preInit.sqf
@@ -1,3 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(checkAmmo);
+
+ADDON = true;
diff --git a/addons/respawn/XEH_preInit.sqf b/addons/respawn/XEH_preInit.sqf
index 831aeaa423..f57e1f3714 100644
--- a/addons/respawn/XEH_preInit.sqf
+++ b/addons/respawn/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(canMoveRallypoint);
 PREP(handleKilled);
 PREP(handleRespawn);
@@ -13,3 +15,5 @@ PREP(removeDisconnectedPlayer);
 PREP(restoreGear);
 PREP(showFriendlyFireMessage);
 PREP(teleportToRallypoint);
+
+ADDON = true;
diff --git a/addons/resting/XEH_preInit.sqf b/addons/resting/XEH_preInit.sqf
index 5a91cc7868..6a2a2040b7 100644
--- a/addons/resting/XEH_preInit.sqf
+++ b/addons/resting/XEH_preInit.sqf
@@ -1,7 +1,11 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(getIntersection);
 PREP(hasBipod);
 PREP(pfhCheckRest);
 PREP(restWeapon);
 PREP(unRestWeapon);
+
+ADDON = true;
diff --git a/addons/safemode/XEH_preInit.sqf b/addons/safemode/XEH_preInit.sqf
index bc80c4269d..6bedb35134 100644
--- a/addons/safemode/XEH_preInit.sqf
+++ b/addons/safemode/XEH_preInit.sqf
@@ -1,7 +1,11 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(firstMode);
 PREP(lockSafety);
 PREP(playChangeFiremodeSound);
 PREP(setSafeModeVisual);
 PREP(unlockSafety);
+
+ADDON = true;
diff --git a/addons/scopes/XEH_preInit.sqf b/addons/scopes/XEH_preInit.sqf
index cc83dd6332..9dc7450c94 100644
--- a/addons/scopes/XEH_preInit.sqf
+++ b/addons/scopes/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(adjustScope);
 PREP(canAdjustScope);
 PREP(firedEH);
@@ -8,3 +10,5 @@ PREP(hideZeroing);
 PREP(inventoryCheck);
 
 GVAR(fadeScript) = scriptNull;
+
+ADDON = true;
diff --git a/addons/vector/XEH_preInit.sqf b/addons/vector/XEH_preInit.sqf
index 4ce39de4e9..a0a20d3315 100644
--- a/addons/vector/XEH_preInit.sqf
+++ b/addons/vector/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(clearDisplay);
 PREP(convertToTexturesDegree);
 PREP(convertToTexturesDistance);
@@ -37,3 +39,5 @@ GVAR(keyDownTimeDistance) = -1;
 GVAR(useMil) = false;
 GVAR(useFeet) = false;
 GVAR(modeReticle) = 0;
+
+ADDON = true;
diff --git a/addons/vehiclelock/XEH_preInit.sqf b/addons/vehiclelock/XEH_preInit.sqf
index 7040450597..80d1d6335f 100644
--- a/addons/vehiclelock/XEH_preInit.sqf
+++ b/addons/vehiclelock/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(addKeyForVehicle);
 PREP(getVehicleSideKey);
 PREP(hasKeyForVehicle);
@@ -12,3 +14,5 @@ PREP(setVehicleLockEH);
 //Add Event Handlers
 ["SetupCustomKey", {_this call FUNC(serverSetupCustomKeyEH)}] call EFUNC(common,addEventHandler);
 ["SetVehicleLock", {_this call FUNC(setVehicleLockEH)}] call EFUNC(common,addEventHandler);
+
+ADDON = true;
diff --git a/addons/vehicles/XEH_preInit.sqf b/addons/vehicles/XEH_preInit.sqf
index 85fc9fe8d2..7070aab075 100644
--- a/addons/vehicles/XEH_preInit.sqf
+++ b/addons/vehicles/XEH_preInit.sqf
@@ -1,4 +1,8 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(speedLimiter);
 PREP(startEngine);
+
+ADDON = true;
diff --git a/addons/weaponselect/XEH_preInit.sqf b/addons/weaponselect/XEH_preInit.sqf
index ec81c4834e..0dfb72f353 100644
--- a/addons/weaponselect/XEH_preInit.sqf
+++ b/addons/weaponselect/XEH_preInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+ADDON = false;
+
 PREP(countMagazinesForGrenadeMuzzle);
 PREP(displayGrenadeTypeAndNumber);
 PREP(findNextGrenadeMagazine);
@@ -63,3 +65,5 @@ GVAR(AllMuzzles)       = uiNamespace getVariable QGVAR(AllMuzzles);
 GVAR(FragMagazines)    = uiNamespace getVariable QGVAR(FragMagazines);
 GVAR(NonFragMagazines) = uiNamespace getVariable QGVAR(NonFragMagazines);
 GVAR(AllMagazines)     = uiNamespace getVariable QGVAR(AllMagazines);
+
+ADDON = true;