diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 559f186..552d8b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,19 +1,21 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
+    push:
+        branches:
+            - master
+    pull_request:
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Setup HEMTT
-        uses: arma-actions/hemtt@v1
-      - name: Run HEMTT build
-        run: |
-            hemtt check --pedantic
-            hemtt release
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@master
+            - name: Setup HEMTT
+              uses: arma-actions/hemtt@v1
+            - name: Run HEMTT check
+              run: |
+                  hemtt release
+            - name: Run HEMTT build
+              run: |
+                  hemtt release
diff --git a/.gitignore b/.gitignore
index 0015813..ef23081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ texHeaders.bin
 *.swp
 *.swo
 *.biprivatekey
+.hemttprivatekey
 Thumbs.db
 
 node_modules
diff --git a/addons/ai/functions/fnc_despawn.sqf b/addons/ai/functions/fnc_despawn.sqf
index a647c2a..a44ec8b 100644
--- a/addons/ai/functions/fnc_despawn.sqf
+++ b/addons/ai/functions/fnc_despawn.sqf
@@ -22,7 +22,7 @@
 #include "script_component.hpp"
 if !(isServer) exitWith {};
 params [
-    ["_group", [], ["", objNull, grpNull]],
+    ["_group", [], ["", objNull, grpNull, []]],
     ["_id", "", [""]],
     ["_init", {}, [{}]],
     ["_params",[], [[]]]
diff --git a/addons/assets/config.cpp b/addons/assets/config.cpp
index 91552b9..34badc6 100644
--- a/addons/assets/config.cpp
+++ b/addons/assets/config.cpp
@@ -4,8 +4,7 @@ class CfgPatches {
     class ADDON {
         units[] = {
             QGVAR(PortableBoat),
-            QGVAR(PortableBoatBackpack),
-            "FPA_scissors"
+            QGVAR(PortableBoatBackpack)
         };
         weapons[] = {"FPA_scissors"};
         requiredVersion = REQUIRED_VERSION;
diff --git a/addons/common/functions/fnc_onZeusInterface.sqf b/addons/common/functions/fnc_onZeusInterface.sqf
index da937ad..52b4d4c 100644
--- a/addons/common/functions/fnc_onZeusInterface.sqf
+++ b/addons/common/functions/fnc_onZeusInterface.sqf
@@ -4,7 +4,7 @@
 */
 
 #include "script_component.hpp"
-#include "\a3\ui_f\hpp\defineDIKCodes.inc"
+#include "\A3\Ui_f\hpp\defineDIKCodes.inc"
 #include "\A3\ui_f_curator\ui\defineResinclDesign.inc"
 
 #define IDD_CTRL_ACRE 777550
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index 1abfb89..64569f0 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -8,6 +8,7 @@ class CfgPatches {
         requiredAddons[] = {"fpa_main", "ace_medical_treatment", "ace_zeus"};
         author = "diwako";
         authorUrl = "";
+        VERSION_CONFIG;
     };
 };
 
diff --git a/addons/saveMarkers/$PBOPREFIX$ b/addons/savemarkers/$PBOPREFIX$
similarity index 100%
rename from addons/saveMarkers/$PBOPREFIX$
rename to addons/savemarkers/$PBOPREFIX$
diff --git a/addons/saveMarkers/README.md b/addons/savemarkers/README.md
similarity index 100%
rename from addons/saveMarkers/README.md
rename to addons/savemarkers/README.md
diff --git a/addons/saveMarkers/XEH_PREP.hpp b/addons/savemarkers/XEH_PREP.hpp
similarity index 100%
rename from addons/saveMarkers/XEH_PREP.hpp
rename to addons/savemarkers/XEH_PREP.hpp
diff --git a/addons/saveMarkers/XEH_postInitClient.sqf b/addons/savemarkers/XEH_postInitClient.sqf
similarity index 100%
rename from addons/saveMarkers/XEH_postInitClient.sqf
rename to addons/savemarkers/XEH_postInitClient.sqf
diff --git a/addons/saveMarkers/XEH_preClientInit.sqf b/addons/savemarkers/XEH_preClientInit.sqf
similarity index 100%
rename from addons/saveMarkers/XEH_preClientInit.sqf
rename to addons/savemarkers/XEH_preClientInit.sqf
diff --git a/addons/saveMarkers/XEH_preInit.sqf b/addons/savemarkers/XEH_preInit.sqf
similarity index 100%
rename from addons/saveMarkers/XEH_preInit.sqf
rename to addons/savemarkers/XEH_preInit.sqf
diff --git a/addons/saveMarkers/cfgEventhandlers.hpp b/addons/savemarkers/cfgEventhandlers.hpp
similarity index 100%
rename from addons/saveMarkers/cfgEventhandlers.hpp
rename to addons/savemarkers/cfgEventhandlers.hpp
diff --git a/addons/saveMarkers/cfgNotifications.hpp b/addons/savemarkers/cfgNotifications.hpp
similarity index 100%
rename from addons/saveMarkers/cfgNotifications.hpp
rename to addons/savemarkers/cfgNotifications.hpp
diff --git a/addons/saveMarkers/config.cpp b/addons/savemarkers/config.cpp
similarity index 100%
rename from addons/saveMarkers/config.cpp
rename to addons/savemarkers/config.cpp
diff --git a/addons/saveMarkers/functions/fnc_allMarkers.sqf b/addons/savemarkers/functions/fnc_allMarkers.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_allMarkers.sqf
rename to addons/savemarkers/functions/fnc_allMarkers.sqf
diff --git a/addons/saveMarkers/functions/fnc_createMarkerPreview.sqf b/addons/savemarkers/functions/fnc_createMarkerPreview.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_createMarkerPreview.sqf
rename to addons/savemarkers/functions/fnc_createMarkerPreview.sqf
diff --git a/addons/saveMarkers/functions/fnc_findSaveInList.sqf b/addons/savemarkers/functions/fnc_findSaveInList.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_findSaveInList.sqf
rename to addons/savemarkers/functions/fnc_findSaveInList.sqf
diff --git a/addons/saveMarkers/functions/fnc_getMarkersInArea.sqf b/addons/savemarkers/functions/fnc_getMarkersInArea.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_getMarkersInArea.sqf
rename to addons/savemarkers/functions/fnc_getMarkersInArea.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadDisplay.sqf b/addons/savemarkers/functions/fnc_loadDisplay.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadDisplay.sqf
rename to addons/savemarkers/functions/fnc_loadDisplay.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadHelp.sqf b/addons/savemarkers/functions/fnc_loadHelp.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadHelp.sqf
rename to addons/savemarkers/functions/fnc_loadHelp.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadMarker.sqf b/addons/savemarkers/functions/fnc_loadMarker.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadMarker.sqf
rename to addons/savemarkers/functions/fnc_loadMarker.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadMarkersLoop.sqf b/addons/savemarkers/functions/fnc_loadMarkersLoop.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadMarkersLoop.sqf
rename to addons/savemarkers/functions/fnc_loadMarkersLoop.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadMarkersStart.sqf b/addons/savemarkers/functions/fnc_loadMarkersStart.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadMarkersStart.sqf
rename to addons/savemarkers/functions/fnc_loadMarkersStart.sqf
diff --git a/addons/saveMarkers/functions/fnc_loadNotification.sqf b/addons/savemarkers/functions/fnc_loadNotification.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_loadNotification.sqf
rename to addons/savemarkers/functions/fnc_loadNotification.sqf
diff --git a/addons/saveMarkers/functions/fnc_onButtonDelete.sqf b/addons/savemarkers/functions/fnc_onButtonDelete.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onButtonDelete.sqf
rename to addons/savemarkers/functions/fnc_onButtonDelete.sqf
diff --git a/addons/saveMarkers/functions/fnc_onButtonLoad.sqf b/addons/savemarkers/functions/fnc_onButtonLoad.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onButtonLoad.sqf
rename to addons/savemarkers/functions/fnc_onButtonLoad.sqf
diff --git a/addons/saveMarkers/functions/fnc_onButtonSave.sqf b/addons/savemarkers/functions/fnc_onButtonSave.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onButtonSave.sqf
rename to addons/savemarkers/functions/fnc_onButtonSave.sqf
diff --git a/addons/saveMarkers/functions/fnc_onDraw.sqf b/addons/savemarkers/functions/fnc_onDraw.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onDraw.sqf
rename to addons/savemarkers/functions/fnc_onDraw.sqf
diff --git a/addons/saveMarkers/functions/fnc_onEditNameChanged.sqf b/addons/savemarkers/functions/fnc_onEditNameChanged.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onEditNameChanged.sqf
rename to addons/savemarkers/functions/fnc_onEditNameChanged.sqf
diff --git a/addons/saveMarkers/functions/fnc_onKeydownMap.sqf b/addons/savemarkers/functions/fnc_onKeydownMap.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onKeydownMap.sqf
rename to addons/savemarkers/functions/fnc_onKeydownMap.sqf
diff --git a/addons/saveMarkers/functions/fnc_onMouseButtonDownMap.sqf b/addons/savemarkers/functions/fnc_onMouseButtonDownMap.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onMouseButtonDownMap.sqf
rename to addons/savemarkers/functions/fnc_onMouseButtonDownMap.sqf
diff --git a/addons/saveMarkers/functions/fnc_onMouseButtonUpMap.sqf b/addons/savemarkers/functions/fnc_onMouseButtonUpMap.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onMouseButtonUpMap.sqf
rename to addons/savemarkers/functions/fnc_onMouseButtonUpMap.sqf
diff --git a/addons/saveMarkers/functions/fnc_onSavesListSelChanged.sqf b/addons/savemarkers/functions/fnc_onSavesListSelChanged.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onSavesListSelChanged.sqf
rename to addons/savemarkers/functions/fnc_onSavesListSelChanged.sqf
diff --git a/addons/saveMarkers/functions/fnc_onUnload.sqf b/addons/savemarkers/functions/fnc_onUnload.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_onUnload.sqf
rename to addons/savemarkers/functions/fnc_onUnload.sqf
diff --git a/addons/saveMarkers/functions/fnc_openDialog.sqf b/addons/savemarkers/functions/fnc_openDialog.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_openDialog.sqf
rename to addons/savemarkers/functions/fnc_openDialog.sqf
diff --git a/addons/saveMarkers/functions/fnc_saveMarkers.sqf b/addons/savemarkers/functions/fnc_saveMarkers.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_saveMarkers.sqf
rename to addons/savemarkers/functions/fnc_saveMarkers.sqf
diff --git a/addons/saveMarkers/functions/fnc_setButtonEnabled.sqf b/addons/savemarkers/functions/fnc_setButtonEnabled.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_setButtonEnabled.sqf
rename to addons/savemarkers/functions/fnc_setButtonEnabled.sqf
diff --git a/addons/saveMarkers/functions/fnc_setListSelected.sqf b/addons/savemarkers/functions/fnc_setListSelected.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_setListSelected.sqf
rename to addons/savemarkers/functions/fnc_setListSelected.sqf
diff --git a/addons/saveMarkers/functions/fnc_toggleHelp.sqf b/addons/savemarkers/functions/fnc_toggleHelp.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_toggleHelp.sqf
rename to addons/savemarkers/functions/fnc_toggleHelp.sqf
diff --git a/addons/saveMarkers/functions/fnc_updateButtonSave.sqf b/addons/savemarkers/functions/fnc_updateButtonSave.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_updateButtonSave.sqf
rename to addons/savemarkers/functions/fnc_updateButtonSave.sqf
diff --git a/addons/saveMarkers/functions/fnc_updateSavesList.sqf b/addons/savemarkers/functions/fnc_updateSavesList.sqf
similarity index 100%
rename from addons/saveMarkers/functions/fnc_updateSavesList.sqf
rename to addons/savemarkers/functions/fnc_updateSavesList.sqf
diff --git a/addons/saveMarkers/functions/script_component.hpp b/addons/savemarkers/functions/script_component.hpp
similarity index 100%
rename from addons/saveMarkers/functions/script_component.hpp
rename to addons/savemarkers/functions/script_component.hpp
diff --git a/addons/saveMarkers/script_component.hpp b/addons/savemarkers/script_component.hpp
similarity index 100%
rename from addons/saveMarkers/script_component.hpp
rename to addons/savemarkers/script_component.hpp
diff --git a/addons/saveMarkers/ui/defines.hpp b/addons/savemarkers/ui/defines.hpp
similarity index 100%
rename from addons/saveMarkers/ui/defines.hpp
rename to addons/savemarkers/ui/defines.hpp
diff --git a/addons/saveMarkers/ui/dialog.hpp b/addons/savemarkers/ui/dialog.hpp
similarity index 100%
rename from addons/saveMarkers/ui/dialog.hpp
rename to addons/savemarkers/ui/dialog.hpp
diff --git a/addons/saveMarkers/ui/script_component.hpp b/addons/savemarkers/ui/script_component.hpp
similarity index 100%
rename from addons/saveMarkers/ui/script_component.hpp
rename to addons/savemarkers/ui/script_component.hpp
diff --git a/addons/steamevents/$PBOPREFIX$ b/addons/steamevents/$PBOPREFIX$
new file mode 100644
index 0000000..8d21025
--- /dev/null
+++ b/addons/steamevents/$PBOPREFIX$
@@ -0,0 +1 @@
+z\fpa\addons\steamevents
diff --git a/addons/steamevents/CfgEventHandlers.hpp b/addons/steamevents/CfgEventHandlers.hpp
new file mode 100644
index 0000000..2e069dd
--- /dev/null
+++ b/addons/steamevents/CfgEventHandlers.hpp
@@ -0,0 +1,5 @@
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        clientInit = QUOTE(call COMPILE_SCRIPT(XEH_postClientInit));
+    };
+};
diff --git a/addons/steamevents/SteamManagerConfig.hpp b/addons/steamevents/SteamManagerConfig.hpp
new file mode 100644
index 0000000..1c44ab1
--- /dev/null
+++ b/addons/steamevents/SteamManagerConfig.hpp
@@ -0,0 +1,41 @@
+class SteamManagerConfig {
+    class GameRecording {
+        class GVAR(uncon) {
+            scope = 2; // Can be modded to 1 or 0 to disable the event. Must be 2 to be visible
+            title = "Uncon Event";
+            description = "%1 at %2"; // Format string, arguments are passed by eventArguments
+            icon = "a3_revive"; // Icon is enum, there is hardcoded set of available icons
+            priority = 40; // See ISteamTimeline documentation
+        };
+        class GVAR(missionEnd): GVAR(uncon) {
+            title = "Mission End";
+            description = "End of mission (%1)";
+            icon = "a3_challenge_timer";
+        };
+        class GVAR(aceThrow): GVAR(uncon) {
+            title = "Grenade Thrown";
+            description = "%1 thrown";
+            icon = "a3_grenade_throw";
+            priority = 20;
+        };
+        class GVAR(vehicle): GVAR(uncon) {
+            title = "Vehicle";
+            description = "Got %1 %2";
+            icon = "a3_vehicle_driver";
+            priority = 20;
+        };
+
+        class GVAR(mission): GVAR(uncon) {
+            title = "Mission";
+            description = "%1";
+            icon = "a3_steam_info";
+        };
+
+        class UnitKilled {
+            scope = 0; // hide vanilla event
+        };
+        class GVAR(UnitKilled): UnitKilled {
+            scope = 2;
+        };
+    };
+};
diff --git a/addons/steamevents/XEH_postClientInit.sqf b/addons/steamevents/XEH_postClientInit.sqf
new file mode 100644
index 0000000..614130e
--- /dev/null
+++ b/addons/steamevents/XEH_postClientInit.sqf
@@ -0,0 +1,56 @@
+#include "script_component.hpp"
+
+if (!hasInterface || profileNamespace getVariable [QGVAR(disable), false]) exitWith {};
+
+GVAR(delayedEvents) = [];
+DFUNC(addDelayedEvents) = {
+    {
+        _x params ["_time", "_event", "_params"];
+        private _relativeTime = _time - diag_tickTime; // negative time
+        steamGameRecordingEvent [_event, 0, _params, _relativeTime];
+    } forEach GVAR(delayedEvents);
+    GVAR(delayedEvents) = [];
+    INFO("Added Steam Events");
+};
+addMissionEventHandler ["Ended", {
+    params ["_endType"];
+    steamGameRecordingEvent [QGVAR(missionEnd), 0, [[CBA_missionTime] call CBA_fnc_formatElapsedTime]];
+    [] call FUNC(addDelayedEvents)
+}];
+
+["ace_unconscious", {
+    params ["_unit", "_uncon"];
+    if (_unit != ACE_player) exitWith {};
+    if (_uncon) then {
+        steamGameRecordingEvent [QGVAR(uncon), 0, ["Knocked unconcious", [CBA_missionTime, "M:SS"] call CBA_fnc_formatElapsedTime]];
+    } else {
+        steamGameRecordingEvent [QGVAR(uncon), 0, ["Woke up", [CBA_missionTime, "M:SS"] call CBA_fnc_formatElapsedTime]];
+    };
+}] call CBA_fnc_addEventHandler;
+
+["ace_throwableThrown", {
+    params ["_unit", "_activeThrowable"];
+    if (_unit != ACE_player) exitWith {}; // this should always be false
+    switch (true) do {
+        case (_activeThrowable isKindOf "ACE_G_Handflare_White"): {steamGameRecordingEvent [QGVAR(aceThrow), 0, ["Hand flare"]];};
+        case (_activeThrowable isKindOf "SmokeShell"): {steamGameRecordingEvent [QGVAR(aceThrow), 0, ["Smoke grenade"]];};
+        case (_activeThrowable isKindOf "ACE_SatchelCharge_Remote_Ammo_Thrown"): {steamGameRecordingEvent [QGVAR(aceThrow), 0, ["Explosive charge"]];};
+        default {steamGameRecordingEvent [QGVAR(aceThrow), 0, ["Hand grenade"]];};
+    };
+}] call CBA_fnc_addEventHandler;
+
+["ace_killtracker_kill", {
+    params ["_name", "", "_unit"];
+    private _distance = ace_player distance _unit;
+    GVAR(delayedEvents) pushBack [diag_tickTime, QGVAR(UnitKilled), [_name, _distance toFixed 0]];
+}] call CBA_fnc_addEventHandler;
+
+["vehicle", {
+    params ["_unit", "_vehicle", "_oldVehicle"];
+    if (_unit != ACE_player) exitWith {}; // kind of redundant aint it?
+    if (_unit isEqualTo _vehicle) then {
+        steamGameRecordingEvent [QGVAR(vehicle), 0, ["out of", getText (configOf _oldVehicle >> "displayName")]];
+    } else {
+        steamGameRecordingEvent [QGVAR(vehicle), 0, ["into", getText (configOf _vehicle >> "displayName")]];
+    };
+}] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/steamevents/config.cpp b/addons/steamevents/config.cpp
new file mode 100644
index 0000000..6f4bafb
--- /dev/null
+++ b/addons/steamevents/config.cpp
@@ -0,0 +1,17 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = QUOTE(COMPONENT_NAME);
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"fpa_main"};
+        author = "diwako";
+        authorUrl = "";
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
+#include "SteamManagerConfig.hpp"
diff --git a/addons/steamevents/script_component.hpp b/addons/steamevents/script_component.hpp
new file mode 100644
index 0000000..2b0e031
--- /dev/null
+++ b/addons/steamevents/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT steamevents
+#include "\z\fpa\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\z\fpa\addons\main\script_macros.hpp"
diff --git a/include/A3/Ui_f/hpp/defineDIKCodes.inc b/include/A3/Ui_f/hpp/defineDIKCodes.inc
index c641d60..d9ae327 100644
--- a/include/A3/Ui_f/hpp/defineDIKCodes.inc
+++ b/include/A3/Ui_f/hpp/defineDIKCodes.inc
@@ -97,6 +97,16 @@
 #define DIK_F14             0x65    /*                     (NEC PC98) */
 #define DIK_F15             0x66    /*                     (NEC PC98) */
 
+#define DIK_F16             0x67
+#define DIK_F17             0x68
+#define DIK_F18             0x69
+#define DIK_F19             0x6A
+#define DIK_F20             0x6B
+#define DIK_F21             0x6C
+#define DIK_F22             0x6D
+#define DIK_F23             0x6E
+#define DIK_F24             0x76
+
 #define DIK_KANA            0x70    /* (Japanese keyboard)            */
 #define DIK_ABNT_C1         0x73    /* / ? on Portugese (Brazilian) keyboards */
 #define DIK_CONVERT         0x79    /* (Japanese keyboard)            */
diff --git a/include/A3/Ui_f/hpp/defineResincl.inc b/include/A3/Ui_f/hpp/defineResincl.inc
index bc336fb..63b9e0d 100644
--- a/include/A3/Ui_f/hpp/defineResincl.inc
+++ b/include/A3/Ui_f/hpp/defineResincl.inc
@@ -313,6 +313,8 @@ enum
 #define CT_ITEMSLOT         103
 #define CT_CHECKBOX         77
 #define CT_VEHICLE_DIRECTION 105
+#define CT_WEBBROWSER       106
+#define CT_EXTENSION        107
 
 // Static styles
 #define ST_POS            0x0F
@@ -408,6 +410,8 @@ enum
 #define IDC_RESTART       5
 #define IDC_USER_BUTTON   6
 #define IDC_EXIT_TO_MAIN  7
+#define IDC_EXIT_QUIT     8
+#define IDC_USER_BUTTON2  9
 
 // my own control window for tests
 #define IDC_MY_FIRST_LISTBOX    110
@@ -1022,6 +1026,9 @@ enum
 #define IDC_MAIN_QUICKPLAY          154
 #define IDC_MAIN_UNIT               155
 
+#define IDC_MAIN_INFO_BRANCH		156
+#define IDC_MAIN_BRANCH_NAME		160
+
 #define IDC_MAIN_CARDAS_CUDL        199 // muj vlastni cudl
 
 #define IDC_MAIN_VIDEOCONTROL       3335
@@ -1378,6 +1385,7 @@ enum
 #define IDC_OPTIONS_PP_DOF_SLIDER            1317
 #define IDC_OPTIONS_PP_DOF_VALUE             1318
 #define IDC_OPTIONS_PP_CAUSTICS              1319
+#define IDC_OPTIONS_PP_HAZE                  1329
 #define IDC_OPTIONS_PP_SHARPEN_SLIDER        1320
 #define IDC_OPTIONS_PP_SHARPEN_VALUE         1321
 #define IDC_OPTIONS_PP_COLOR_CORRECTIONS     1322
@@ -1413,6 +1421,7 @@ enum
 #define IDC_OPTIONS_WIND_INFLUENCE_DYN_RTD  149
 #define IDC_OPTIONS_AUTO_TRIM_RTD           150
 #define IDC_OPTIONS_STRESS_DAMAGE_RTD       151
+#define IDC_OPTIONS_WEBBROWSER				152
 
 #define IDC_PARTICLES_EFFECTS         143
 #define IDC_OPTIONS_DYNAMIC_LIGHTS    144
@@ -1673,8 +1682,8 @@ enum
 #define IDC_MULTI_FULL_FILTER         151
 #define IDC_MULTI_TYPE_FILTER         152
 #define IDC_MP_NEXT_SESSION           153
-#define IDC_MULTI_BATTLEYE_FILTER     154
-#define IDC_MULTI_EXPANSIONS_FILTER   155
+
+
 #define IDC_MULTI_FAVORITE_COLUMN     156
 #define IDC_MULTI_FAVORITE_ICON       157
 #define IDC_MULTI_SERVER_COUNT        158
@@ -1696,7 +1705,7 @@ enum
 #define IDC_MP_QUICK_BEST_SERVER      112
 #define IDC_MP_QUICK_FIND_SERVER      113
 #define IDC_MP_QUICK_SHOW_SERVERS     114
-#define IDC_MP_QUICK_SHOW_SERVERS     114
+
 #define IDC_MP_QUICK_MODE_TITLE       115
 #define IDC_MP_QUICK_MODE_PICTURE     116
 #define IDC_MP_QUICK_MODE_DESCRIPTION 117
@@ -3133,7 +3142,7 @@ enum
 
 
 //A3 credits
-#define ONBUTTONCLICK_START_CREDITS "0 = _this spawn (uiNamespace getVariable 'bis_fnc_credits');"
+#define ONBUTTONCLICK_START_CREDITS "0 = _this spawn (uinamespace getvariable 'bis_fnc_credits');"
 
 
 // Hitzone types
diff --git a/include/x/cba/addons/main/script_macros_common.hpp b/include/x/cba/addons/main/script_macros_common.hpp
index 2683f3b..8aab821 100644
--- a/include/x/cba/addons/main/script_macros_common.hpp
+++ b/include/x/cba/addons/main/script_macros_common.hpp
@@ -464,8 +464,7 @@ Macros: TRACE_n()
 Author:
     Spooner
 ------------------------------------------- */
-#define PFORMAT_1(MESSAGE,A) \
-    format ['%1: A=%2', MESSAGE, RETNIL(A)]
+#define PFORMAT_1(MESSAGE,A) format ['%1: A=%2', MESSAGE, RETNIL(A)]
 
 #define PFORMAT_2(MESSAGE,A,B) \
     format ['%1: A=%2, B=%3', MESSAGE, RETNIL(A), RETNIL(B)]
@@ -965,8 +964,8 @@ Macro: PREP()
 //#define PREP(var1) PREP_SYS(PREFIX,COMPONENT_F,var1)
 
 #ifdef DISABLE_COMPILE_CACHE
-    #define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
-    #define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preProcessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
+    #define PREP(var1) TRIPLES(ADDON,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
+    #define PREPMAIN(var1) TRIPLES(PREFIX,fnc,var1) = compile preprocessFileLineNumbers 'PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))'
 #else
     #define PREP(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(ADDON,fnc,var1)'] call SLX_XEH_COMPILE_NEW
     #define PREPMAIN(var1) ['PATHTO_SYS(PREFIX,COMPONENT_F,DOUBLES(fnc,var1))', 'TRIPLES(PREFIX,fnc,var1)'] call SLX_XEH_COMPILE_NEW
@@ -1335,7 +1334,7 @@ Macros: PARAMS_n()
 
 /* -------------------------------------------
 Macro: DEFAULT_PARAM()
-    DEPRECATED - Use param/params commands added in Arma 3 1.48
+    DEPRECATED - Use param/params commands added in Arma 3 1.48 - Will not work with HEMTT 1.13.2+
 
     Getting a default function parameter. This may be used together with <PARAMS_n()> to have a mix of required and
     optional parameters.
@@ -1833,3 +1832,26 @@ Macro: FILE_EXISTS
     commy2
 ------------------------------------------- */
 #define FILE_EXISTS(FILE) (fileExists (FILE))
+
+/* -------------------------------------------
+Macro: QADDON, QQADDON
+
+Description:
+    Quoted Variant of ADDON
+
+Parameters:
+
+Examples:
+    (begin example)
+    QUOTE(configName _x isEqualTo QUOTE(QUOTE(abe_banana))) configClasses (configFile >> QADDON)
+    (end)
+
+Author:
+    OverlordZorn
+------------------------------------------- */
+#ifndef QADDON
+    #define QADDON QUOTE(ADDON)
+#endif
+#ifndef QQADDON
+    #define QQADDON QUOTE(QUOTE(ADDON))
+#endif