diff --git a/FP_Template.VR/gear/loadouts/empty_template.sqf b/FP_Template.VR/gear/loadouts/empty_template.sqf
index 67b81d9..fcd94e2 100644
--- a/FP_Template.VR/gear/loadouts/empty_template.sqf
+++ b/FP_Template.VR/gear/loadouts/empty_template.sqf
@@ -9,7 +9,7 @@ _COMMON_HEADGEARS = [];
 _COMMON_BP = "";
 
 _COMMON_NVG = ""; // can be: pvs14, pvs15, gen1, gen2, gen3, gen4, wide, blufor, opfor, indep. check fn_addNVG.sqf
-_COMMON_ITEMS = ["ACRE_PRC343", ["HandGrenade", 2], ["SmokeShellGreen", 2], "ItemMap","ItemCompass","ItemWatch", "ItemRadio", ["ACE_fieldDressing", 2], "ACE_Morphine"];
+_COMMON_ITEMS = ["ItemMap","ItemCompass","ItemWatch", "ACRE_PRC343", ["HandGrenade", 2], ["SmokeShellGreen", 2], ["ACE_fieldDressing", 2], "ACE_Morphine"];
 
 _COMMON_RIFLE = "";
 _COMMON_RIFLE_ATTACHMENTS = [];
@@ -94,11 +94,11 @@ _ENGI_BP_ITEMS = [["ToolKit", 1], ["SatchelCharge_Remote_Mag", 1], ["DemoCharge_
 // ==================
 // Assign the stuff
 // ==================
-switch _kit do {
+switch (toUpper _kit) do {
 
     case "PLT"; // fall through to SQL
     case "SQL": {
-        private _h = if (_kit == "PLT") then {_PLT_HEADGEAR} else {_SQL_HEADGEAR};
+        private _h = [_PLT_HEADGEAR, _SQL_HEADGEAR] select (_kit == "SQL");
 
         [_unit, [_SQL_UNIFORM, _SQL_VEST, _h, _SQL_BP]] call FP_fnc_addContainers;
         [_unit, [[_COMMON_MAG_GL, 7], [_COMMON_MAG_GL_T, 4], _COMMON_GL_NADES]] call FP_fnc_addToContainers;
@@ -119,7 +119,7 @@ switch _kit do {
     };
 
     case "RIFLEMAN": {
-        [_unit, [_COMMON_UNIFORMS, _MED_VEST, _MED_HEADGEAR, _MED_BP]] call FP_fnc_addContainers;
+        [_unit, [_COMMON_UNIFORMS, _MED_VEST, _MED_HEADGEAR, _COMMON_BP]] call FP_fnc_addContainers;
         [_unit, [[_COMMON_MAG, 6], [_COMMON_MAG_T, 4]]] call FP_fnc_addToContainers;
         [_unit, [_COMMON_RIFLE, _COMMON_RIFLE_ATTACHMENTS]] call FP_fnc_addWeapon;
     };
@@ -201,9 +201,12 @@ switch _kit do {
 // ==================
 // Runs for everyone
 // ==================
+
 [_unit, _COMMON_ITEMS] call FP_fnc_addToContainers;
 
 [_unit, [_COMMON_PISTOL_MAG, 2]] call FP_fnc_addToContainers;
 [_unit, _COMMON_PISTOL] call FP_fnc_addWeapon;
 
-[_unit, _COMMON_NVG] call FP_fnc_addNVG;
+if (_COMMON_NVG != "") then {
+    [_unit, _COMMON_NVG] call FP_fnc_addNVG;
+};
diff --git a/FP_Template.VR/gear/loadouts/m90_g3.sqf b/FP_Template.VR/gear/loadouts/m90_g3.sqf
index 904e486..e1c7202 100644
--- a/FP_Template.VR/gear/loadouts/m90_g3.sqf
+++ b/FP_Template.VR/gear/loadouts/m90_g3.sqf
@@ -94,7 +94,7 @@ _ENGI_BP_ITEMS = [["SatchelCharge_Remote_Mag", 2], ["DemoCharge_Remote_Mag", 2]]
 // ==================
 // Assign the stuff
 // ==================
-switch _kit do {
+switch (toUpper _kit) do {
 
     case "PLT"; // fall through to SQL
     case "SQL": {
diff --git a/FP_Template.VR/gear/loadouts/specops_divers_mp5.sqf b/FP_Template.VR/gear/loadouts/specops_divers_mp5.sqf
index 3be8617..0012d13 100644
--- a/FP_Template.VR/gear/loadouts/specops_divers_mp5.sqf
+++ b/FP_Template.VR/gear/loadouts/specops_divers_mp5.sqf
@@ -42,7 +42,7 @@ _SQL_ATTACHMENTS = ["hlc_muzzle_Tundra", "RH_peq2_top", "RH_LTdocterl"];
 // ==================
 // Assign the stuff
 // ==================
-switch _kit do {
+switch (toUpper _kit) do {
 
     case "PLT"; // fall through to SQL
     case "SQL": {
diff --git a/FP_Template.VR/gear/loadouts/vanilla_nato.sqf b/FP_Template.VR/gear/loadouts/vanilla_nato.sqf
index 95f656b..c831b75 100644
--- a/FP_Template.VR/gear/loadouts/vanilla_nato.sqf
+++ b/FP_Template.VR/gear/loadouts/vanilla_nato.sqf
@@ -95,7 +95,7 @@ _ENGI_BP_ITEMS = [["ToolKit", 1], ["SatchelCharge_Remote_Mag", 1], ["DemoCharge_
 // Assign the stuff
 // ==================
 
-switch _kit do {
+switch (toUpper _kit) do {
 
     case "PLT"; // fall through to SQL
     case "SQL":