diff --git a/addons/spectator/UI/interface.hpp b/addons/spectator/UI/interface.hpp
index 9ba1c072c3..f744f58143 100644
--- a/addons/spectator/UI/interface.hpp
+++ b/addons/spectator/UI/interface.hpp
@@ -1,9 +1,9 @@
 class RscButtonMenu;
 class RscControlsGroupNoScrollbars;
 class RscFrame;
+class RscListNBox;
 class RscMapControl;
 class RscPicture;
-class RscStructuredText;
 class RscText;
 class RscTree;
 
@@ -194,6 +194,15 @@ class GVAR(interface) {
                     sizeEx = H_PART(1);
                     text = CSTRING(HelpTitle);
                 };
+                class helpContent: RscListNBox {
+                    idc = IDC_HELP_LIST;
+                    x = W_PART(1);
+                    y = H_PART(2);
+                    W = W_PART(22);
+                    H = H_PART(21);
+                    default = 1;
+                    columns[] = {0.01,0.5};
+                };
             };
         };
     };
diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index c45f50a3b1..87994ae84a 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -101,6 +101,21 @@ switch (toLower _mode) do {
         // Handle the toolbar values
         [FUNC(handleToolbar), 0, _display] call CBA_fnc_addPerFrameHandler;
 
+        // Populate the help splash
+        {
+            ((_display displayCtrl IDC_HELP) controlsGroupCtrl IDC_HELP_LIST) lnbAddRow _x;
+        } forEach [
+            [localize LSTRING(freeCamForward),"W"],
+            [localize LSTRING(freeCamBackward),"S"],
+            [localize LSTRING(freeCamLeft),"A"],
+            [localize LSTRING(freeCamRight),"D"],
+            [localize LSTRING(freeCamUp),"Q"],
+            [localize LSTRING(freeCamDown),"Z"],
+            [localize LSTRING(freeCamVision),"N"],
+            [localize LSTRING(freeCamSpeed),"Scrollwheel"],
+            [localize LSTRING(freeCamZoom),"Ctrl + Scrollwheel"]
+        ];
+
         // Hacky way to enable keybindings
         //_display displayAddEventHandler ["KeyUp", {[_this,'keyup'] call CBA_events_fnc_keyHandler}];
         //_display displayAddEventHandler ["KeyDown", {[_this,'keydown'] call CBA_events_fnc_keyHandler}];
diff --git a/addons/spectator/initKeybinds.sqf b/addons/spectator/initKeybinds.sqf
deleted file mode 100644
index aa2a137ef3..0000000000
--- a/addons/spectator/initKeybinds.sqf
+++ /dev/null
@@ -1,1333 +0,0 @@
-/*
-    Author:
-    voiper
-*/
-
-#include "script_component.hpp"
-#include "\a3\editor_f\Data\Scripts\dikCodes.h"
-
-#define MOD QUOTE(ACE3 Spectator)
-#define ESCAPE if (isNil QGVAR(cam)) exitWith {false}
-
-/*
-    Rationale for so many GVARs: In Keydown EHs, held keys have a ~0.5s pause before
-    they start repeating, which is bad UX for camera movement; with these GVARs, a
-    PFH (one in fnc_camera) immediately reacts to when their value changes, and starts
-    repeating on the next frame.
-*/
-
-[MOD, QGVAR(keyNameCamMoveForward), localize LSTRING(keyCamMoveForward),
-{
-    ESCAPE;
-    GVAR(keyCamMoveForward) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveForward) = false;
-    false
-},
-[DIK_W, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamMoveBackward), localize LSTRING(keyCamMoveBackward),
-{
-    ESCAPE;
-    GVAR(keyCamMoveBackward) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveBackward) = false;
-    false
-},
-[DIK_S, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamMoveLeft), localize LSTRING(keyCamMoveLeft),
-{
-    ESCAPE;
-    GVAR(keyCamMoveLeft) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveLeft) = false;
-    false
-},
-[DIK_A, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamMoveRight), localize LSTRING(keyCamMoveRight),
-{
-    ESCAPE;
-    GVAR(keyCamMoveRight) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveRight) = false;
-    false
-},
-[DIK_D, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamMoveUp), localize LSTRING(keyCamMoveUp),
-{
-    ESCAPE;
-    GVAR(keyCamMoveUp) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveUp) = false;
-    false
-},
-[DIK_Q, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamMoveDown), localize LSTRING(keyCamMoveDown),
-{
-    ESCAPE;
-    GVAR(keyCamMoveDown) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamMoveDown) = false;
-    false
-},
-[DIK_Z, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotUp), localize LSTRING(keyCamRotUp),
-{
-    ESCAPE;
-    GVAR(keyCamRotUp) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotUp) = false;
-    false
-},
-[DIK_NUMPAD8, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotDown), localize LSTRING(keyCamRotDown),
-{
-    ESCAPE;
-    GVAR(keyCamRotDown) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotDown) = false;
-    false
-},
-[DIK_NUMPAD2, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotLeft), localize LSTRING(keyCamRotLeft),
-{
-    ESCAPE;
-    GVAR(keyCamRotLeft) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotLeft) = false;
-    false
-},
-[DIK_NUMPAD4, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotRight), localize LSTRING(keyCamRotRight),
-{
-    ESCAPE;
-    GVAR(keyCamRotRight) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotRight) = false;
-    false
-},
-[DIK_NUMPAD6, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotUpLeft), localize LSTRING(keyCamRotUpLeft),
-{
-    ESCAPE;
-    GVAR(keyCamRotUpLeft) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotUpLeft) = false;
-    false
-},
-[DIK_NUMPAD7, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotUpRight), localize LSTRING(keyCamRotUpRight),
-{
-    ESCAPE;
-    GVAR(keyCamRotUpRight) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotUpRight) = false;
-    false
-},
-[DIK_NUMPAD9, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotDownLeft), localize LSTRING(keyCamRotDownLeft),
-{
-    ESCAPE;
-    GVAR(keyCamRotDownLeft) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotDownLeft) = false;
-    false
-},
-[DIK_NUMPAD1, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotDownRight), localize LSTRING(keyCamRotDownRight),
-{
-    ESCAPE;
-    GVAR(keyCamRotDownRight) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotDownRight) = false;
-    false
-},
-[DIK_NUMPAD3, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamBankLeft), localize LSTRING(keyCamBankLeft),
-{
-    ESCAPE;
-    GVAR(keyCamBankLeft) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamBankLeft) = false;
-    false
-},
-[DIK_DIVIDE, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamBankRight), localize LSTRING(keyCamBankRight),
-{
-    ESCAPE;
-    GVAR(keyCamBankRight) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamBankRight) = false;
-    false
-},
-[DIK_MULTIPLY, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotMore), localize LSTRING(keyCamRotMore),
-{
-    ESCAPE;
-    GVAR(keyCamRotMore) = true;
-    //true to block default behaviour
-    true
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotMore) = false;
-    false
-},
-[DIK_NUMPAD0, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamRotLess), localize LSTRING(keyCamRotLess),
-{
-    ESCAPE;
-    GVAR(keyCamRotLess) = true;
-    //true to block default behaviour
-    true
-},
-{
-    ESCAPE;
-    GVAR(keyCamRotLess) = false;
-    false
-},
-[DIK_DECIMAL, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamBankMod), localize LSTRING(keyCamBankMod),
-{
-    ESCAPE;
-    GVAR(keyCamBankMod) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyCamBankMod) = false;
-    false
-},
-[DIK_LSHIFT, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamReset), localize LSTRING(keyCamReset),
-{
-    ESCAPE;
-    _cam = GVAR(cam);
-    _dir = getDir _cam;
-    if (!isNull GVAR(attach)) then {_dir = _dir - getDir GVAR(attach)};
-    GVAR(vector) =  [_dir, 0, 0];
-    [_cam, GVAR(vector)] call BIS_fnc_setObjectRotation;
-    GVAR(fov) = 0.7;
-    _cam camPrepareFOV GVAR(fov);
-    _cam camCommitPrepared 0;
-    false
-},
-{
-    false
-},
-[DIK_NUMPAD5, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamLock), localize LSTRING(keyCamLock),
-{
-    ESCAPE;
-    if !GVAR(cameraOn) exitWith {};
-    ["CameraMode", ["Lock"]] call FUNC(camera);
-    false
-},
-{
-    false
-},
-[DIK_SPACE, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCamAttach), localize LSTRING(keyCamAttach),
-{
-    ESCAPE;
-    if !GVAR(cameraOn) exitWith {};
-    ["CameraMode", ["Attach"]] call FUNC(camera);
-    false
-},
-{
-    false
-},
-[DIK_SPACE, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameUnitNext), localize LSTRING(keyUnitNext),
-{
-    ESCAPE;
-    ["CameraMode", ["NewUnit", 1]] call FUNC(camera);
-    false
-},
-{
-    false
-},
-[DIK_RIGHT, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameUnitPrevious), localize LSTRING(keyUnitPrevious),
-{
-    ESCAPE;
-    ["CameraMode", ["NewUnit", -1]] call FUNC(camera);
-    false
-},
-{
-    false
-},
-[DIK_LEFT, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNamePOVup), localize LSTRING(keyPOVup),
-{
-    ESCAPE;
-    if (isNull GVAR(unit)) exitWith {};
-    _lock = GVAR(lock) select 0;
-    if (_lock > -1) then {["CameraMode", ["Lock"]] call FUNC(camera)};
-    if (!isNull GVAR(attach)) then {
-        ["CameraMode", ["Attach"]] call FUNC(camera);
-    };
-    if GVAR(cameraOn) then {
-        ["CameraMode", ["Third"]] call FUNC(camera);
-    } else {
-        if GVAR(third) then {
-            ["CameraMode", ["First"]] call FUNC(camera);
-        };
-    };
-    false
-},
-{
-    false
-},
-[DIK_UP, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNamePOVdown), localize LSTRING(keyPOVdown),
-{
-    ESCAPE;
-    if (isNull GVAR(unit)) exitWith {};
-    _lock = GVAR(lock) select 0;
-    if (_lock > -1) then {["CameraMode", ["Lock"]] call FUNC(camera)};
-    if (!isNull GVAR(attach)) then {
-        ["CameraMode", ["Attach"]] call FUNC(camera);
-    };
-    if !GVAR(cameraOn) then {
-        if !GVAR(third) then {
-            ["CameraMode", ["Third"]] call FUNC(camera);
-        } else {
-            ["CameraMode", ["Free"]] call FUNC(camera);
-        };
-    };
-    false
-},
-{
-    false
-},
-[DIK_DOWN, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot1), localize LSTRING(keySaveSpot1),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 0]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F1, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot2), localize LSTRING(keySaveSpot2),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 1]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F2, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot3), localize LSTRING(keySaveSpot3),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 2]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F3, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot4), localize LSTRING(keySaveSpot4),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 3]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F4, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot5), localize LSTRING(keySaveSpot5),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 4]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F5, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot6), localize LSTRING(keySaveSpot6),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 5]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F6, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot7), localize LSTRING(keySaveSpot7),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 6]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F7, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot8), localize LSTRING(keySaveSpot8),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 7]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F8, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot9), localize LSTRING(keySaveSpot9),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 8]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F9, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot10), localize LSTRING(keySaveSpot10),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 9]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F10, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot11), localize LSTRING(keySaveSpot11),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 10]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F11, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveSpot12), localize LSTRING(keySaveSpot12),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveSpot", 11]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F12, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot1), localize LSTRING(keyLoadSpot1),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 0]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F1, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot2), localize LSTRING(keyLoadSpot2),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 1]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F2, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot3), localize LSTRING(keyLoadSpot3),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 2]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F3, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot4), localize LSTRING(keyLoadSpot4),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 3]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F4, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot5), localize LSTRING(keyLoadSpot5),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 4]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F5, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot6), localize LSTRING(keyLoadSpot6),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 5]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F6, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot7), localize LSTRING(keyLoadSpot7),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 6]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F7, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot8), localize LSTRING(keyLoadSpot8),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 7]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F8, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot9), localize LSTRING(keyLoadSpot9),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 8]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F9, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot10), localize LSTRING(keyLoadSpot10),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 9]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F10, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot11), localize LSTRING(keyLoadSpot11),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 10]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F11, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadSpot12), localize LSTRING(keyLoadSpot12),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadSpot", 11]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_F12, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit1), localize LSTRING(keySaveUnit1),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 0]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_1, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit2), localize LSTRING(keySaveUnit2),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 1]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_2, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit3), localize LSTRING(keySaveUnit3),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 2]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_3, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit4), localize LSTRING(keySaveUnit4),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 3]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_4, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit5), localize LSTRING(keySaveUnit5),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 4]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_5, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit6), localize LSTRING(keySaveUnit6),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 5]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_6, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit7), localize LSTRING(keySaveUnit7),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 6]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_7, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit8), localize LSTRING(keySaveUnit8),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 7]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_8, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit9), localize LSTRING(keySaveUnit9),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 8]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_9, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameSaveUnit10), localize LSTRING(keySaveUnit10),
-{
-    ESCAPE;
-    ["CameraSlot", ["SaveUnit", 9]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_0, [false, true, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit1), localize LSTRING(keyLoadUnit1),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 0]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_1, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit2), localize LSTRING(keyLoadUnit2),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 1]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_2, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit3), localize LSTRING(keyLoadUnit3),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 2]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_3, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit4), localize LSTRING(keyLoadUnit4),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 3]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_4, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit5), localize LSTRING(keyLoadUnit5),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 4]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_5, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit6), localize LSTRING(keyLoadUnit6),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 5]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_6, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit7), localize LSTRING(keyLoadUnit7),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 6]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_7, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit8), localize LSTRING(keyLoadUnit8),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 7]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_8, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit9), localize LSTRING(keyLoadUnit9),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 8]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_9, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameLoadUnit10), localize LSTRING(keyLoadUnit10),
-{
-    ESCAPE;
-    ["CameraSlot", ["LoadUnit", 9]] call FUNC(camera);
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_0, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFOVup), localize LSTRING(keyFOVup),
-{
-    ESCAPE;
-    GVAR(keyFOVup) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyFOVup) = false;
-    false
-},
-[DIK_ADD, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFOVdown), localize LSTRING(keyFOVdown),
-{
-    ESCAPE;
-    GVAR(keyFOVdown) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyFOVdown) = false;
-    false
-},
-[DIK_SUBTRACT, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFOVreset), localize LSTRING(keyFOVreset),
-{
-    ESCAPE;
-    GVAR(fov) = 0.7;
-    GVAR(cam) camPrepareFOV GVAR(fov);
-    GVAR(cam) camCommitPrepared 0;
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_NUMPADENTER, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFocusUp), localize LSTRING(keyFocusUp),
-{
-    ESCAPE;
-    GVAR(keyFocusUp) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyFocusUp) = false;
-    false
-},
-[DIK_EQUALS, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFocusDown), localize LSTRING(keyFocusDown),
-{
-    ESCAPE;
-    GVAR(keyFocusDown) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyFocusDown) = false;
-    false
-},
-[DIK_MINUS, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFocusReset), localize LSTRING(keyFocusReset),
-{
-    ESCAPE;
-    GVAR(focus) = [-1, 1];
-    _cam camPrepareFocus GVAR(focus);
-    _cam camCommitPrepared 0;
-    false
-},
-{
-    false
-},
-[DIK_BACKSPACE, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameFocusInfinite), localize LSTRING(keyFocusInfinite),
-{
-    ESCAPE;
-    GVAR(focus) = [-1, -1];
-    _cam camPrepareFocus GVAR(focus);
-    _cam camCommitPrepared 0;
-    //true to block default behaviour
-    true
-},
-{
-    false
-},
-[DIK_BACKSPACE, [true, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameTimeAccUp), localize LSTRING(keyTimeAccUp),
-{
-    ESCAPE;
-    GVAR(keyTimeAccUp) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyTimeAccUp) = false;
-    false
-},
-[DIK_RBRACKET, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameTimeAccDown), localize LSTRING(keyTimeAccDown),
-{
-    ESCAPE;
-    GVAR(keyTimeAccDown) = true;
-    false
-},
-{
-    ESCAPE;
-    GVAR(keyTimeAccDown) = false;
-    false
-},
-[DIK_LBRACKET, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameTimeAccReset), localize LSTRING(keyTimeAccReset),
-{
-    ESCAPE;
-    if (!isMultiplayer) then {
-        GVAR(accTime) = 1;
-        setAccTime GVAR(accTime);
-    };
-    false
-},
-{
-    false
-},
-[DIK_BACKSLASH, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameToggleMarkers), localize LSTRING(keyToggleMarkers),
-{
-    ESCAPE;
-    GVAR(markers) = GVAR(markers) + 1;
-    if (GVAR(markers) > 3) then {GVAR(markers) = 0};
-    if (GVAR(markers) == 0) then {clearRadio};
-    false
-},
-{
-    false
-},
-[DIK_T, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameUnitList), localize LSTRING(keyUnitList),
-{
-    ESCAPE;
-    _map = uiNameSpace getVariable [QGVAR(map), findDisplay 12202];
-    if (!isNull _map) exitWith {};
-
-    _overlay = uiNamespace getVariable [QGVAR(overlay), findDisplay 12200];
-    if (isNull _overlay) then {
-        createDialog QGVAR(overlay);
-    } else {
-        closeDialog 0;
-    };
-    false
-},
-{
-    false
-},
-[DIK_U, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameCrosshair), localize LSTRING(keyCrosshair),
-{
-    ESCAPE;
-    _layer = [QGVAR(crosshair)] call BIS_fnc_rscLayer;
-    _xhair = uiNamespace getVariable QGVAR(crosshair);
-    if (isNull _xhair) then {
-        _layer cutRsc [QGVAR(crosshair), "PLAIN", 0, true];
-        call FUNC(crosshair);
-    } else {
-        _layer cutText ["", "PLAIN"];
-    };
-    false
-},
-{
-    false
-},
-[DIK_X, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameStatus), localize LSTRING(keyStatus),
-{
-    ESCAPE;
-    _layer = [QGVAR(compass)] call BIS_fnc_rscLayer;
-    if (isNull (uiNamespace getVariable QGVAR(compass))) then {
-        _layer cutRsc [QGVAR(compass), "PLAIN", 0, true];
-    } else {
-        _layer cutText ["", "PLAIN"];
-    };
-
-    _layer = [QGVAR(status)] call BIS_fnc_rscLayer;
-    if (isNull (uiNamespace getVariable QGVAR(status))) then {
-        _layer cutRsc [QGVAR(status), "PLAIN", 0, true];
-    } else {
-        _layer cutText ["", "PLAIN"];
-    };
-    false
-},
-{
-    false
-},
-[DIK_C, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameMap), localize LSTRING(keyMap),
-{
-    ESCAPE;
-    _map = uiNameSpace getVariable [QGVAR(map), findDisplay 12202];
-    if (isNull _map) then {
-        createDialog QGVAR(map);
-    } else {
-        closeDialog 0;
-    };
-    false
-},
-{
-    false
-},
-[DIK_M, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
-
-[MOD, QGVAR(keyNameVision), localize LSTRING(keyVision),
-{
-    ESCAPE;
-    GVAR(vision) = GVAR(vision) + 1;
-    if (GVAR(vision) > 4) then {GVAR(vision) = 0};
-    switch GVAR(vision) do {
-        case 0: {
-            camUseNVG false;
-            false SetCamUseTi 0;
-        };
-        case 1: {
-            camUseNVG true;
-            false SetCamUseTi 0;
-        };
-        case 2: {
-            camUseNVG false;
-            true SetCamUseTi 0;
-        };
-        case 3: {
-            camUseNVG false;
-            true SetCamUseTi 1;
-        };
-
-        case 4: {
-            camUseNVG false;
-            true SetCamUseTi 4;
-        };
-    };
-    false
-},
-{
-    false
-},
-[DIK_N, [false, false, false]],
-false,
-0] call CBA_fnc_addKeybind;
\ No newline at end of file
diff --git a/addons/spectator/script_component.hpp b/addons/spectator/script_component.hpp
index 27c7bda7c7..a726c6c67f 100644
--- a/addons/spectator/script_component.hpp
+++ b/addons/spectator/script_component.hpp
@@ -36,6 +36,8 @@
 #define IDC_COMP_270 5270
 
 #define IDC_HELP 7631
+#define IDC_HELP_LIST 7622
+
 #define IDC_MAP 6791
 
 #define IDC_TOOL 3000
diff --git a/addons/spectator/stringtable.xml b/addons/spectator/stringtable.xml
index d7d5cc7959..a581a519ea 100644
--- a/addons/spectator/stringtable.xml
+++ b/addons/spectator/stringtable.xml
@@ -100,267 +100,74 @@
             <English>Thermal</English>
         </Key>
 
-        <!-- Keybinds -->
-        <Key ID="STR_ACE_Spectator_keyCamMoveForward">
+        <!-- Controls -->
+        <Key ID="STR_ACE_Spectator_freeCamControls">
+            <English>Free Camera Controls</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_freeCamForward">
             <English>Move Camera Forward</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamMoveBackward">
+        <Key ID="STR_ACE_Spectator_freeCamBackward">
             <English>Move Camera Backward</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamMoveLeft">
+        <Key ID="STR_ACE_Spectator_freeCamLeft">
             <English>Move Camera Left</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamMoveRight">
+        <Key ID="STR_ACE_Spectator_freeCamRight">
             <English>Move Camera Right</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamMoveUp">
+        <Key ID="STR_ACE_Spectator_freeCamUp">
             <English>Move Camera Up</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamMoveDown">
+        <Key ID="STR_ACE_Spectator_freeCamDown">
             <English>Move Camera Down</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotUp">
-            <English>Angle Camera Up</English>
+        <Key ID="STR_ACE_Spectator_freeCamLock">
+            <English>Lock Camera to Target</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotDown">
-            <English>Angle Camera Down</English>
+        <Key ID="STR_ACE_Spectator_freeCamZoom">
+            <English>Zoom In/Out</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotLeft">
-            <English>Angle Camera Left</English>
+        <Key ID="STR_ACE_Spectator_freeCamSpeed">
+            <English>Speed Up/Down</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotRight">
-            <English>Angle Camera Right</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotUpLeft">
-            <English>Angle Camera Up + Left</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotUpRight">
-            <English>Angle Camera Up + Right</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotDownLeft">
-            <English>Angle Camera Down + Left</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotDownRight">
-            <English>Angle Camera Down + Right</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamBankLeft">
-            <English>Bank Camera Left</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamBankRight">
-            <English>Bank Camera Right</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotMore">
-            <English>Angle/Bank Camera Faster (keyboard only)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamRotLess">
-            <English>Angle/Bank Camera Slower (keyboard only)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamBankMod">
-            <English>Bank Camera Modifier (with mouse)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamReset">
-            <English>Reset Camera Angle</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamLock">
-            <English>Follow Target or Position</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCamAttach">
-            <English>Attach Camera to Object</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot1">
-            <English>Save Position #1</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot2">
-            <English>Save Position #2</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot3">
-            <English>Save Position #3</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot4">
-            <English>Save Position #4</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot5">
-            <English>Save Position #5</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot6">
-            <English>Save Position #6</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot7">
-            <English>Save Position #7</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot8">
-            <English>Save Position #8</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot9">
-            <English>Save Position #9</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot10">
-            <English>Save Position #10</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot11">
-            <English>Save Position #11</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveSpot12">
-            <English>Save Position #12</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot1">
-            <English>Restore Position #1</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot2">
-            <English>Restore Position #2</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot3">
-            <English>Restore Position #3</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot4">
-            <English>Restore Position #4</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot5">
-            <English>Restore Position #5</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot6">
-            <English>Restore Position #6</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot7">
-            <English>Restore Position #7</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot8">
-            <English>Restore Position #8</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot9">
-            <English>Restore Position #9</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot10">
-            <English>Restore Position #10</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot11">
-            <English>Restore Position #11</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadSpot12">
-            <English>Restore Position #12</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit1">
-            <English>Save Unit #1</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit2">
-            <English>Save Unit #2</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit3">
-            <English>Save Unit #3</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit4">
-            <English>Save Unit #4</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit5">
-            <English>Save Unit #5</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit6">
-            <English>Save Unit #6</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit7">
-            <English>Save Unit #7</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit8">
-            <English>Save Unit #8</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit9">
-            <English>Save Unit #9</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keySaveUnit10">
-            <English>Save Unit #10</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit1">
-            <English>Restore Unit #1</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit2">
-            <English>Restore Unit #2</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit3">
-            <English>Restore Unit #3</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit4">
-            <English>Restore Unit #4</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit5">
-            <English>Restore Unit #5</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit6">
-            <English>Restore Unit #6</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit7">
-            <English>Restore Unit #7</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit8">
-            <English>Restore Unit #8</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit9">
-            <English>Restore Unit #9</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyLoadUnit10">
-            <English>Restore Unit #10</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFOVup">
-            <English>Increase FOV</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFOVdown">
-            <English>Decrease FOV</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFOVreset">
-            <English>Reset FOV</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFocusUp">
-            <English>Increase Focal Distance (PP must be enabled)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFocusDown">
-            <English>Decrease Focal Distance (PP must be enabled)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFocusReset">
-            <English>Reset Focal Distance (PP must be enabled)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyFocusInfinite">
-            <English>Disable Focus</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyTimeAccUp">
-            <English>Increase Time Acceleration (SP only)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyTimeAccDown">
-            <English>Decrease Time Acceleration (SP only)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyTimeAccReset">
-            <English>Reset Time Acceleration (SP only)</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyToggleMarkers">
-            <English>Toggle 2D/3D Marker Mode</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyUnitList">
-            <English>Toggle Unit List</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyCrosshair">
-            <English>Toggle Crosshair</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyStatus">
-            <English>Toggle Status Overlay</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyMap">
-            <English>Toggle Map</English>
-        </Key>
-        <Key ID="STR_ACE_Spectator_keyVision">
+        <Key ID="STR_ACE_Spectator_freeCamVision">
             <English>Toggle Vision Mode</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyUnitNext">
-            <English>Switch to Next Unit</English>
+
+        <Key ID="STR_ACE_Spectator_uiToggleInterface">
+            <English>Toggle Interface</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyUnitPrevious">
-            <English>Switch to Previous Unit</English>
+        <Key ID="STR_ACE_Spectator_uiToggleIcons">
+            <English>Toggle Unit Icons</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyPOVup">
-            <English>Unit POV In</English>
+        <Key ID="STR_ACE_Spectator_uiToggleUnits">
+            <English>Toggle Unit List</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyPOVdown">
-            <English>Unit POV Out</English>
+        <Key ID="STR_ACE_Spectator_uiToggleTools">
+            <English>Toggle Toolbar</English>
         </Key>
-        <Key ID="STR_ACE_Spectator_keyExit">
-            <English>Exit Camera Key (mission dependent)</English>
+        <Key ID="STR_ACE_Spectator_uiToggleCompass">
+            <English>Toggle Compass</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_uiToggleMap">
+            <English>Toggle Map</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_uiToggleHelp">
+            <English>Toggle Help</English>
+        </Key>
+
+        <Key ID="STR_ACE_Spectator_prevCam">
+            <English>Next Camera</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_prevCam">
+            <English>Previous Camera</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_nextUnit">
+            <English>Next Unit</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_prevUnit">
+            <English>Previous Unit</English>
         </Key>
     </Package>
 </Project>