diff --git a/addons/cargo/ACE_Settings.hpp b/addons/cargo/ACE_Settings.hpp
index c8865f2097..574000155e 100644
--- a/addons/cargo/ACE_Settings.hpp
+++ b/addons/cargo/ACE_Settings.hpp
@@ -4,6 +4,6 @@ class ACE_Settings {
         description = CSTRING(ModuleSettings_enable_Description);
         typeName = "BOOL";
         value = 1;
-        category = CSTRING(settingsCategory);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
 };
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index d5572741da..25bd441b90 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -4,7 +4,7 @@ class CfgVehicles {
         scope = 2;
         displayName = CSTRING(SettingsModule_DisplayName);
         icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa));
-        category = "ACE";
+        category = "ACE_Logistics";
         function = QFUNC(moduleSettings);
         functionPriority = 1;
         isGlobal = 1;
diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml
index 57ee916156..f80787911e 100644
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Cargo">
         <Key ID="STR_ACE_Cargo_loadObject">
@@ -16,9 +16,6 @@
         <Key ID="STR_ACE_Cargo_labelSpace">
             <English>Cargo space left: %1</English>
         </Key>
-        <Key ID="STR_ACE_Cargo_settingsCategory">
-            <English>Cargo</English>
-        </Key>
         <Key ID="STR_ACE_Cargo_ModuleSettings_enable">
             <English>Enable Cargo</English>
         </Key>
diff --git a/addons/main/CfgModuleCategories.hpp b/addons/main/CfgModuleCategories.hpp
index 5297ec1e99..a3dd65c544 100644
--- a/addons/main/CfgModuleCategories.hpp
+++ b/addons/main/CfgModuleCategories.hpp
@@ -5,4 +5,7 @@ class CfgFactionClasses {
         priority = 2;
         side = 7;
     };
+    class ACE_Logistics: ACE {
+        displayName = CSTRING(Category_Logistics);
+    };
 };
diff --git a/addons/main/CfgVehicleClasses.hpp b/addons/main/CfgVehicleClasses.hpp
new file mode 100644
index 0000000000..9aa807f3f5
--- /dev/null
+++ b/addons/main/CfgVehicleClasses.hpp
@@ -0,0 +1,5 @@
+class CfgVehicleClasses {
+    class ACE_Logistics_Items {
+        displayName = CSTRING(Category_Logistics);
+    };
+};
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index eb136f84cf..9399b14279 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "script_component.hpp"
 
 class CfgPatches {
     class ADDON {
@@ -587,3 +587,4 @@ class CfgSettings {
 };
 
 #include "CfgModuleCategories.hpp"
+#include "CfgVehicleClasses.hpp"
diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml
new file mode 100644
index 0000000000..482725a446
--- /dev/null
+++ b/addons/main/stringtable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="Main">
+        <Key ID="STR_ACE_Main_Category_Logistics">
+            <English>ACE Logistics</English>
+        </Key>
+    </Package>
+</Project>
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index 77cbc0961c..9e8618eb5c 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="OptionsMenu">
         <Key ID="STR_ACE_OptionsMenu_OpenConfigMenu">
@@ -349,5 +349,8 @@
             <English>All Categories</English>
             <Polish>Wszystkie kategorie</Polish>
         </Key>
+        <Key ID="STR_ACE_OptionsMenu_CategoryLogistics">
+            <English>Logistics</English>
+        </Key>
     </Package>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/addons/repair/ACE_Settings.hpp b/addons/repair/ACE_Settings.hpp
index e956e853de..48d3a9c0c6 100644
--- a/addons/repair/ACE_Settings.hpp
+++ b/addons/repair/ACE_Settings.hpp
@@ -5,7 +5,7 @@ class ACE_Settings {
         typeName = "BOOL";
         isClientSettable = 1;
         value = 1;
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(engineerSetting_Repair) {
         displayName = CSTRING(enginerSetting_Repair_name);
@@ -13,7 +13,7 @@ class ACE_Settings {
         typeName = "SCALAR";
         value = 1;
         values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(engineerSetting_Wheel) {
         displayName = CSTRING(enginerSetting_Wheel_name);
@@ -21,21 +21,21 @@ class ACE_Settings {
         typeName = "SCALAR";
         value = 0;
         values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(repairDamageThreshold) {
         displayName = CSTRING(repairDamageThreshold_name);
         description = CSTRING(repairDamageThreshold_description);
         typeName = "SCALAR";
         value = 0.6;
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(repairDamageThreshold_Engineer) {
         displayName = CSTRING(repairDamageThreshold_Engineer_name);
         description = CSTRING(repairDamageThreshold_Engineer_description);
         typeName = "SCALAR";
         value = 0.4;
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(consumeItem_ToolKit) {
         displayName = CSTRING(consumeItem_ToolKit_name);
@@ -43,7 +43,7 @@ class ACE_Settings {
         typeName = "SCALAR";
         value = 1;
         values[] = {ECSTRING(common,No), ECSTRING(common,Yes)};
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(fullRepairLocation) {
         displayName = CSTRING(fullRepairLocation);
@@ -51,7 +51,7 @@ class ACE_Settings {
         typeName = "SCALAR";
         value = 2;
         values[] = {CSTRING(useAnywhere), CSTRING(repairVehicleOnly), CSTRING(repairFacilityOnly), CSTRING(vehicleAndFacility), ECSTRING(common,Disabled)};
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
     class GVAR(engineerSetting_fullRepair) {
         displayName = CSTRING(engineerSetting_fullRepair_name);
@@ -59,6 +59,6 @@ class ACE_Settings {
         typeName = "SCALAR";
         value = 3;
         values[] = {CSTRING(engineerSetting_anyone), CSTRING(engineerSetting_EngineerOnly), CSTRING(engineerSetting_RepairSpecialistOnly)};
-        category = CSTRING(categoryName);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
     };
 };
diff --git a/addons/repair/CfgVehicleClasses.hpp b/addons/repair/CfgVehicleClasses.hpp
deleted file mode 100644
index 585b8f2858..0000000000
--- a/addons/repair/CfgVehicleClasses.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class CfgVehicleClasses {
-    class GVAR(items) {
-        displayName = "ACE";
-    };
-};
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
index f24cd9bc9a..7c465f50ce 100644
--- a/addons/repair/CfgVehicles.hpp
+++ b/addons/repair/CfgVehicles.hpp
@@ -16,12 +16,11 @@
 
 class CfgVehicles {
     class ACE_Module;
-    // @todo localization for all the modules
     class ACE_moduleRepairSettings: ACE_Module {
         scope = 2;
         displayName = CSTRING(moduleName);
-        icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));   //@todo
-        category = "ACE";
+        icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
+        category = "ACE_Logistics";
         function = QFUNC(moduleRepairSettings);
         functionPriority = 1;
         isGlobal = 1;
@@ -103,7 +102,7 @@ class CfgVehicles {
         scope = 2;
         displayName = CSTRING(AssignEngineerRole_Module_DisplayName);
         icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
-        category = "ACE";
+        category = "ACE_Logistics";
         function = QFUNC(moduleAssignEngineer);
         functionPriority = 10;
         isGlobal = 2;
@@ -147,7 +146,7 @@ class CfgVehicles {
         scope = 2;
         displayName = CSTRING(AssignRepairVehicle_Module_DisplayName);
         icon = QUOTE(PATHTOF(ui\Icon_Module_Repair_ca.paa));
-        category = "ACE";
+        category = "ACE_Logistics";
         function = QFUNC(moduleAssignRepairVehicle);
         functionPriority = 10;
         isGlobal = 2;
@@ -254,7 +253,7 @@ class CfgVehicles {
         icon = "iconObject_circle";
         mapSize = 0.7;
         accuracy = 0.2;
-        vehicleClass = QGVAR(items);
+        vehicleClass = "ACE_Logistics_Items";
         destrType = "DesturctNo";
     };
 
@@ -264,7 +263,7 @@ class CfgVehicles {
         author = "Hawkins";
         scope = 2;
         model = QUOTE(PATHTOF(data\ace_track.p3d));
-        displayName = "$STR_ACE_Repair_SpareTrack";
+        displayName = CSTRING(SpareTrack);
     };
 
     class ACE_Wheel: ACE_RepairItem_Base {
@@ -273,7 +272,7 @@ class CfgVehicles {
         author = "Hawkins";
         scope = 2;
         model = QUOTE(PATHTOF(data\ace_wheel.p3d));
-        displayName = "$STR_ACE_Repair_SpareWheel";
+        displayName = CSTRING(SpareWheel);
         picture = QUOTE(PATHTOF(ui\tire_ca.paa));
     };
 
diff --git a/addons/repair/config.cpp b/addons/repair/config.cpp
index d97f9e30e5..c7015f4650 100644
--- a/addons/repair/config.cpp
+++ b/addons/repair/config.cpp
@@ -12,11 +12,8 @@ class CfgPatches {
     };
 };
 
-#include "CfgEventHandlers.hpp"
-
-#include "CfgActions.hpp"
-#include "CfgVehicleClasses.hpp"
-#include "CfgVehicles.hpp"
-
-#include "ACE_Settings.hpp"
 #include "ACE_Repair.hpp"
+#include "ACE_Settings.hpp"
+#include "CfgEventHandlers.hpp"
+#include "CfgActions.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml
index ffafc56683..6f341f6484 100644
--- a/addons/repair/stringtable.xml
+++ b/addons/repair/stringtable.xml
@@ -635,8 +635,5 @@
         <Key ID="STR_ACE_Repair_AssignRepairFacility_Module_Description">
             <English>Assign one or multiple objects as a repair Facility</English>
         </Key>
-        <Key ID="STR_ACE_Repair_categoryName">
-            <English>Vehicle Repair</English>
-        </Key>
     </Package>
 </Project>