diff --git a/MACRO_DOCS.md b/MACRO_DOCS.md
index 836912769..02613c257 100644
--- a/MACRO_DOCS.md
+++ b/MACRO_DOCS.md
@@ -286,13 +286,13 @@ The following grammar is supported:
     COMMAND = set module.MODULEID.xceleration <exponent 0-1.0 (FLOAT)>
     COMMAND = set module.MODULEID.caretSpeedDivisor <1-100 (FLOAT)>
     COMMAND = set module.MODULEID.scrollSpeedDivisor <1-100 (FLOAT)>
-    COMMAND = set module.MODULEID.zoomSpeedDivisor <1-100 (FLOAT)>
-    COMMAND = set module.MODULEID.axisLockStrength <0-1.0 (FLOAT)>
-    COMMAND = set module.MODULEID.axisLockStrengthFirstTick <0-1.0 (FLOAT)>
+    COMMAND = set module.MODULEID.axisLockSkew <0-2.0 (FLOAT)>
+    COMMAND = set module.MODULEID.axisLockFirstTickSkew <0-2.0 (FLOAT)>
     COMMAND = set module.MODULEID.scrollAxisLock BOOLEAN
     COMMAND = set module.MODULEID.cursorAxisLock BOOLEAN
     COMMAND = set module.MODULEID.swapAxes BOOLEAN
     COMMAND = set module.MODULEID.invertScrollDirection BOOLEAN
+    COMMAND = set module.touchpad.pinchZoomDivisor <1-100 (FLOAT)>
     #NOTIMPLEMENTED COMMAND = set secondaryRoles
     COMMAND = set mouseKeys.{move|scroll}.initialSpeed <px/s, -100/20 (NUMBER)>
     COMMAND = set mouseKeys.{move|scroll}.baseSpeed <px/s, -800/20 (NUMBER)>
@@ -309,10 +309,11 @@ The following grammar is supported:
     COMMAND = set setEmergencyKey KEYID
     COMMAND = set macroEngine.scheduler {blocking|preemptive}
     COMMAND = set macroEngine.batchSize <number of commands to execute per one update cycle NUMBER>
-    COMMAND = set navigationModeAction.{caret|media|zoom}.{DIRECTION} {MACROID|none}
+    COMMAND = set navigationModeAction.NAVIGATIONMODECUSTOM.{DIRECTION} {MACROID|none}
     COMMAND = set keymapAction.LAYERID.KEYID {MACROID|none}
     COMMAND = set backlight.strategy { functional | constantRgb }
     COMMAND = set backlight.constantRgb.rgb <number 0-255 (NUMBER)> <number 0-255 (NUMBER)> <number 0-255 (NUMBER)><number 0-255 (NUMBER)>
+    COMMAND = set modifierLayerTriggers.{shift|alt|super|control} {left|right|both}
     CONDITION = {ifShortcut | ifNotShortcut} [IFSHORTCUTFLAGS]* [KEYID]+
     CONDITION = {ifGesture | ifNotGesture} [IFSHORTCUTFLAGS]* [KEYID]+
     CONDITION = {ifPrimary | ifSecondary}
@@ -326,7 +327,7 @@ The following grammar is supported:
     CONDITION = {ifPendingKeyReleased | ifNotPendingKeyReleased} <queue idx (NUMBER)>
     CONDITION = {ifPlaytime | ifNotPlaytime} <timeout in ms (NUMBER)>
     CONDITION = {ifShift | ifAlt | ifCtrl | ifGui | ifAnyMod | ifNotShift | ifNotAlt | ifNotCtrl | ifNotGui | ifNotAnyMod}
-    CONDITION = {ifRegEq | ifNotRegEq} <register index (NUMBER)> <value (NUMBER)>
+    CONDITION = {ifRegEq | ifNotRegEq | ifRegGt | ifRegLt} <register index (NUMBER)> <value (NUMBER)>
     CONDITION = {ifKeymap | ifNotKeymap} KEYMAPID
     CONDITION = {ifLayer | ifNotLayer} LAYERID
     CONDITION = {ifRecording | ifNotRecording}
@@ -336,7 +337,7 @@ The following grammar is supported:
     MODIFIER = final
     IFSHORTCUTFLAGS = noConsume | transitive | anyOrder | orGate | timeoutIn <time in ms (NUMBER)> | cancelIn <time in ms(NUMBER)>
     DIRECTION = {left|right|up|down}
-    LAYERID = {fn|mouse|mod|base}|last|previous
+    LAYERID = {fn|mouse|mod|base|fn2|fn3|fn4|fn5|alt|shift|super|control}|last|previous
     KEYMAPID = <abbrev>|last
     MACROID = last|CHAR|NUMBER
     NUMBER = [0-9]+ | -[0-9]+ | #<register idx (NUMBER)> | #key | @<relative macro action index(NUMBER)> | %<key idx in postponer queue (NUMBER)>
@@ -346,8 +347,9 @@ The following grammar is supported:
     KEYID = <id of hardware key obtained by resolveNextKeyId (NUMBER)>
     LABEL = <string identifier>
     SHORTCUT = MODMASK- | MODMASK-KEY | KEY
-    MODMASK = [MODMASK]+ | [L|R]{S|C|A|G} | {p|r|h|t} | s
-    NAVIGATIONMODE = cursor | scroll | caret | media | zoom | none
+    MODMASK = [MODMASK]+ | [L|R]{S|C|A|G} | {p|r|h|t} | {s|i|o}
+    NAVIGATIONMODE = cursor | scroll | caret | media | zoom | zoomPc | zoomMac | none
+    NAVIGATIONMODECUSTOM = caret | media | zoomPc | zoomMac
     MODULEID = trackball | touchpad | trackpoint | keycluster
     KEY = CHAR|KEYABBREV
     ADDRESS = LABEL|NUMBER
@@ -414,7 +416,14 @@ The following grammar is supported:
   - `MODMASK` meaning:
     - `{S|C|A|G}` - Shift Control Alt Gui
     - `[L|R]` - Left Right (which hand side modifier should be used)
-    - `s` - sticky 
+    - `{s|i|o}` - modifiers (ctrl, alt, shift, gui) exist in three composition modes within UHK - sticky, input, output:
+        - sticky modifiers are modifiers of composite shortcuts. These are applied only until next key press. In certain contexts, they will take effect even after their activation key was released (e.g., to support alt + tab on non-base layers).
+        - input modifiers are queried by `ifMod` conditions, and can be suppressed by `suppressMods`.
+        - output modifiers are ignored by `ifMod` conditions, and are not suppressed by `suppressMods`.
+        By default:
+        - modifiers of normal non-macro scancode actions are treated as `sticky` when accompanied by a scancode. 
+        - normal non-macro modifiers (not accompanied by a scancode) are treated as `input` by default.
+        - macro modifiers are treated as `output`.
     - `{p|r|h|t}` - press release hold tap - by default corresponds to the command used to invoke the sequence, but can be overriden for any.
 
 ### Control flow, macro execution (aka "functions"):
@@ -530,6 +539,7 @@ Conditions are checked before processing the rest of the command. If the conditi
 - `ifPlaytime/ifNotPlaytime <timeout in ms>` is true if at least `timeout` milliseconds passed since macro was started.
 - `ifShift/ifAlt/ifCtrl/ifGui/ifAnyMod/ifNotShift/ifNotAlt/ifNotCtrl/ifNotGui/ifNotAnyMod` is true if either right or left modifier was held in the previous update cycle. This does not indicate modifiers which were triggered from macroes. 
 - `{ifRegEq|ifNotRegEq} <register inex> <value>` will test if the value in the register identified by first argument equals second argument.
+- `{ifRegGt|ifRegLt} <register inex> <value>` will test if the value in the register identified by first argument is greater than/less than second argument.
 - `{ifKeymap|ifNotKeymap|ifLayer|ifNotLayer} <value>` will test if the current Keymap/Layer are equals to the first argument (uses the same parsing rule as `switchKeymap` and `switchLayer`.
 - `ifRecording/ifNotRecording` and `ifRecordingId/ifNotRecordingId MACROID` test if the runtime macro recorder is in recording state. 
 - `ifShortcut/ifNotShortcut [IFSHORTCUTFLAGS]* [KEYID]*` will wait for next keypresses and compare them to the argument. See postponer mechanism section.
@@ -565,7 +575,7 @@ Macro slots are identified by a single character or a number or `#key` (meaning
 For the purpose of toggling functionality on and off, and for global constants management, we provide 32 numeric registers (namely of type int32_t). 
 
 - `setReg <register index> <value>` will set register identified by index to value.
-- `ifRegEq|ifNotRegEq` see CONDITION section
+- `ifRegEq|ifNotRegEq|ifRegGt|ifRegLt` see CONDITION section
 - `{addReg|subReg|mulReg} <register index> <value>` adds value to the register 
 - Register values can also be used in place of all numeric arguments by prefixing register index by '#'. E.g., waiting until release or for amount of time defined by reg 1 can be achieved by `delayUntilReleaseMax #1`
 
@@ -624,25 +634,31 @@ For the purpose of toggling functionality on and off, and for global constants m
       - at 6000 px/s, speed multiplier is 4x
       - not recommended - the curve will behave in very non-linear fashion.
 - `set module.MODULEID.{caretSpeedDivisor|scrollSpeedDivisor|zoomSpeedDivisor|swapAxes|invertScrollDirection}` modifies scrolling and caret behaviour:
-    - `caretSpeedDivisor` (default: 16) is used to divide input in caret mode. This means that per one tick, you have to move by 16 pixels (or whatever the unit is). (This is furthermore modified by axisLocking strength, as well as acceleration.)
-    - `scrollSpeedDivisor` (default: 8) is used to divide input in scroll mode. This means that while scrolling, every 8 pixels produce one scroll tick. (This is furthermore modified by axisLocking strength, as well as acceleration.)
-    - `zoomSpeedDivisor` (default: 4 (?)) is used specifically for touchpad's zoom gesture, therefore its default value is supposed to be quite nonstandard.
+    - `caretSpeedDivisor` (default: 16) is used to divide input in caret mode. This means that per one tick, you have to move by 16 pixels (or whatever the unit is). (This is furthermore modified by axisLocking skew, as well as acceleration.)
+    - `scrollSpeedDivisor` (default: 8) is used to divide input in scroll mode. This means that while scrolling, every 8 pixels produce one scroll tick. (This is furthermore modified by axisLocking skew, as well as acceleration.)
+    - `pinchZoomDivisor` (default: 4 (?)) is used specifically for touchpad's zoom gesture, therefore its default value is nonstandard. Only valid for touchpad.
     - `swapAxes` swaps x and y coordinates of the module. Intened use is for keycluster trackball, since sideways scrolling is easier.
     - `invertScrollDirection` inverts scroll direction...
 
-- `set module.MODULEID.{axisLockStrength|axisLockStrengthFirstTick|cursorAxisLockEnabled|scrollAxisLockEnabled}` control axis locking feature:
+- `set module.MODULEID.{axisLockSkew|axisLockFirstTickSkew|cursorAxisLock|scrollAxisLock}` control axis locking feature:
 
-  When you first move in navigation mode that has axis locking enabled, axis is locked to one of the axes. Furthermore, as long as this axis is active, the other axis input is multiplied by `1 - axisLockStrength` and gets zeroed with every successfull tick. This means that in order to change locked direction (with 0.5 value), you have to produce stroke that goes at least twice as fast in the non-locked direction compared to the locked one. This also means that axis locking with strength 0 still affects behaviour, because it always picks only one of the two axes and zeroes the other.
+  When you first move in navigation mode that has axis locking enabled, axis is locked to one of the axes. Axis locking behaviour is defined by two characteristis:
 
-  Behaviour of first tick (the one that initiates mechanism) can be controlled independently.
+  - axis skew: when axis is locked, the secondary axis value is multiplied by `axisLockSkew`. This means that in order to change locked direction (with 0.5 value), you have to produce stroke that goes at least twice as fast in the non-locked direction compared to the locked one. 
+  - secondary axis zeroing: whenever the locked (primary) axis produces an event, the 
 
-  By default, axis locking is enabled in caret and media mode for right hand modules, and for scroll, caret and media modes for keycluster. Caret and media mode require axis locking for their function. 
+  Behaviour of first tick (the one that initiates mechanism) can be controlled independently. The first tick (the first event produced when axis is not yet locked) skew is applied to *both* the axis. This allows following tweaks:
 
-  - `axisLockStrength` controls caret axis locking. Defaults to 0.5, valid values are 0-1.0.
-    When you first move in navigation mode that has axis locking enabled, axis is locked to one of the axes. Furthermore, as long as this axis is active, the other axis input is multiplied by `1 - axisLockStrength` and gets zeroed with every tick. This means that in order to change locked direction (with 0.5 value), you have to produce stroke that goes at least twice as fast in the non-locked direction compared to the locked one.
-  - `axisLockStrengthFirstTick` - same meaning as `axisLockStrength`, but controls whether axis locking applies on first tick. Nonzero value means that firt tick will require a "push" before cursor starts moving. 
-  - `cursorAxisLockEnabled BOOLEAN` - turns axis locking on for cursor mode. Not recommended, but possible.
-  - `scrollAxisLockEnabled BOOLEAN` - turns axis locking on for scroll mode. Default for keycluster trackball.
+  - use `axisLockFirstTickSkew = 0.5` in order to require stronger "push" at the beginning of movement. Useful for the mini trackball, since it is likely to produce an unwanted move event when you try  to just click it. With `0.5` value, it will require two roll events to activate.
+  - use `axisLockFirstTickSkew = 2.0` in order to make the first event more responsive. E.g., caret mode will make the fist character move even with a very gently push, while consecutive activations will need greater momentum.
+
+  By default, axis locking is enabled in scroll and discreet modes for right hand modules, and for scroll, caret and media modes for keycluster.
+
+  - `axisLockSkew` controls caret axis locking. Defaults to 0.5, valid/reasonable values are 0-100, centered around 1.
+  - `axisLockFirstTickSkew` - same meaning as `axisLockSkew`, but controls how axis locking applies on first tick. Nonzero value means that firt tick will require a "push" before cursor starts moving. Or will require less "force" if the value is greater than 1.
+  - `cursorAxisLock BOOLEAN` - turns axis locking on for cursor mode. Not recommended, but possible.
+  - `scrollAxisLock BOOLEAN` - turns axis locking on for scroll mode. Default for keycluster trackball.
+  - `caretAxisLock BOOLEAN` - turns axis locking on for all discrete modes. 
 
 - Remapping keys:
   - `set navigationModeAction.{caret|media}.{DIRECTION|none} MACROID` can be used to customize caret or media mode behaviour by binding directions to macros. This action is global and reversible only by powercycling.
@@ -669,6 +685,9 @@ For the purpose of toggling functionality on and off, and for global constants m
     - `backlight.strategy { functional | constantRgb }` sets backlight strategy.
     - `backlight.constantRgb.rgb NUMBER NUMBER NUMBER` allows setting custom constant colour for entire keyboard. E.g.: `set backlight.strategy constantRgb; set backlight.constantRgb.rgb 255 0 0` to make entire keyboard shine red.
 
+- modifier layer triggers:
+    - `set modifierLayerTriggers.{shift|alt|super|control} { left | right | both }` controls whether modifier layers are triggered by left or right or either of the modifiers.
+
 ### Argument parsing rules:
 
 - `NUMBER` is parsed as a 32 bit signed integer and then assigned into the target variable. However, the target variable is often only 8 or 16 bit unsigned. If a number is prefixed with '#', it is interpretted as a register address (index). If a number is prefixed with '@', current macro index is added to the final value. `#key` returns activation key's hardware id. If prefixed with `%`, returns keyid of nth press event in the postponer queue (e.g., `%0` returns `KEYID` of first key which is postponed but not yet activated).
@@ -697,7 +716,8 @@ UHK modules feature four navigation modes, which are mapped by layer and module.
 - **Scroll mode** - in this mode, module can be used to scroll. Default mode for mod layer. This means that apart from switching layer, your mod layer switches also make your right hand modules act as very comfortable scroll wheels. Sensitivity is controlled by the `scrollSpeedDivisor` value.
 - **Caret mode** - in this mode, module produces arrow key taps. This can be used to move comfortably in text editor, since in this mode, cursor is also locked to one of the two directions, preventing unwanted line changes. Sensitivity is controlled by the `caretSpeedDivisor`, `axisLockStrengthFirstTick` and `axisLockStrength`.
 - **Media mode** - in this mode, up/down directions control volume (via media key scancodes), while horizontal play/pause and switch to next track. At the moment, this mode is not enabled by default on any layer. Sensitivity is shared with the caret mode.
-- **Zoom mode** - in this mode, `Ctrl +`/`Ctrl -` shortcuts are produced. This mode serves specifically to implement touchpad's gesture.
+- **Zoom mode pc / mac** - in this mode, `Ctrl +`/`Ctrl -` or `Alt +`/`Alt -` shortcuts are produced. 
+- **Zoom mode** - This mode serves specifically to implement touchpad's gesture. It alternates actions of zoomPc and zoomMac modes.
 
 Caret and media modes can be customized by `set navigationModeAction` command.
 
diff --git a/doc/agent-onInit.png b/doc/agent-onInit.png
new file mode 100644
index 000000000..fc99d6650
Binary files /dev/null and b/doc/agent-onInit.png differ
diff --git a/doc/index.html b/doc/index.html
new file mode 100644
index 000000000..e45c24c30
--- /dev/null
+++ b/doc/index.html
@@ -0,0 +1,763 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="style.css">
+        <title>UHK firmware smart macro reference</title>
+    </head>
+
+<body>
+<div class="container-fluid">
+
+<h1>Smart macro quick start guide</h1>
+
+<p>Smart macros enable advanced customizations of the UHK and its modules.</p>
+
+<h2>Terminology</h2>
+
+<img src="agent-onInit.png">
+
+<p>A <strong>macro event</strong> is a specially named macro, such as <code>$onInit</code>, that is executed on select occasions.</p>
+
+<p>A <strong>command action</strong> is a macro action that is interpreted by the UHK firmware. A macro can have any number of macro commands, but it's usually practical to have only one.</p>
+
+<p>A <strong>macro command</strong>, such as <code>set module.trackball.baseSpeed 1</code>, is a command, which is interpreted in a command action.</p>
+
+<h1>Macro events</h1>
+
+<p>The <code>$onInit</code> macro event is triggered when the UHK powers up.</p>
+
+<p>The <code>$onKeymapChange {keymapId}</code> event is triggered when the relevant keymap, such as <code>QWR</code>, is activated.</p>
+
+When the UHK powers up or its configuration gets saved, first <code>$onInit</code> gets triggered, then <code>$onKeymapChange {keymapId}</code>.
+
+<h1>Macro commands</h1>
+
+<p>In a command action, you can add any number of macro commands, one per line. Comments are allowed following the <code>#</code> character in any line.</p>
+
+<p>Following is the list of available macro commands.</p>
+
+<h2>printStatus</h2>
+
+<p>When the UHK encounters an invalid macro command, the LED display will display ERR, and the status buffer will contain the error message. This command "types" the content of the status buffer for debugging purposes.</p>
+
+<p>We recommend binding this command to a key, such as <key>Fn+`</key> for easy accessibility and triggering it in a text editor when encountering an error.</p>
+
+<h2>set</h2>
+
+<p>The <code>set</code> command sets variables that affect the behavior of the UHK and its modules. This command has many different parameters which are explaned below.</p>
+
+<h3>set &raquo; module speeds</h3>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th scope="col"></th>
+            <th scope="col">Trackball</th>
+            <th scope="col">Trackpoint</th>
+            <th scope="col">Touchpad</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Base speed</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Speed</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Acceleration</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Caret speed divisor</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Scroll speed divisor</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>set &raquo; module axis locking</h3>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th scope="col"></th>
+            <th scope="col">Trackball</th>
+            <th scope="col">Trackpoint</th>
+            <th scope="col">Touchpad</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Axis lock skew</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Axis lock first tick skew</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+            <td class="no-wrap"><input type="range">1.0</td>
+        </tr>
+        <tr>
+            <td>Scroll axis lock enabled</td>
+            <td><input type="checkbox"></td>
+            <td><input type="checkbox"></td>
+            <td><input type="checkbox"></td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>set &raquo; module scroll direction</h3>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th scope="col"></th>
+            <th scope="col">Key cluster</th>
+            <th scope="col">Trackball</th>
+            <th scope="col">Trackpoint</th>
+            <th scope="col">Touchpad</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Invert scroll direction</td>
+            <td><input type="checkbox"></td>
+            <td><input type="checkbox"></td>
+            <td><input type="checkbox"></td>
+            <td><input type="checkbox"></td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>set &raquo; key cluster settings</h3>
+
+<p><input type="checkbox"> swapAxes</p>
+
+<h3>set &raquo; touchpad settings</h3>
+
+<p><input type="checkbox"> pinchZoomDivisor</p>
+
+<h3>set &raquo; module navigation modes</h3>
+
+<p>UHK modules feature the following navigation modes, which are mapped by layer and module:</p>
+
+<ul>
+    <li><strong>Cursor mode</strong>: In this mode, the module controls mouse movement. This is the default mode for all modules except key clusters trackball, which scrolls by default.</li>
+    <li><strong>Scroll mode</strong>: In this mode, the module can be used to scroll. Default mode for the Mod layer. This means that apart from switching layer, your Mod layer switches also make your right hand modules act as scroll wheels.</li>
+    <li><strong>Caret mode</strong>: In this mode, the module produces arrow key taps. This can be used to move in text editors.</li>
+    <li><strong>Media mode</strong>: In this mode, the module controls volume via up/down directions and  while horizontal play/pause and switch to next track. At the moment, this mode is not enabled by default on any layer.</li>
+    <li><strong>Zoom mode pc / mac</strong>: in this mode, Ctrl +/Ctrl - or Alt +/Alt - shortcuts are produced.</li>
+    <li><strong>Zoom mode</strong>: This mode serves specifically to implement touchpad's gesture. It alternates actions of zoomPc and zoomMac modes.</li>
+    </ul>
+
+Syntax is <code>set module.{moduleId}.{layerId} {navigationMode}</code><br>
+
+<ul>
+<li><code>{moduleId}</code> is of <code>keycluster</code>, <code>trackball</code>, <code>trackpoint</code>, <code>touchpad</code></li>
+<li><code>{layerId}</code> is of <code>base</code>, <code>mod</code>, <code>mouse</code>, <code>fn</code>, <code>fn2</code>, <code>fn3</code>, <code>fn4</code>, <code>shift</code>, <code>ctrl</code>, <code>alt</code>, <code>super</code></li>
+<li><code>{navigationMode}</code> is of <code>cursor</code>, <code>scroll</code>, <code>caret</code>, <code>media</code>, <code>zoom</code>, <code>zoomPc</code>, <code>zoomMac</code>, <code>none</code></li>
+</ul>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th scope="col">Layer</th>
+            <th scope="col">Key cluster</th>
+            <th scope="col">Trackball</th>
+            <th scope="col">Trackpoint</th>
+            <th scope="col">Touchpad</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <th scope="row">Base</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option selected>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option selected>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option selected>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option selected>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Mod</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option selected>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option selected>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option selected>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option selected>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Mouse</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Fn</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option selected>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option selected>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option selected>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option selected>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Fn2</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Fn3</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Fn4</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Shift</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Ctrl</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Alt</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">Super</th>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+            <td>
+                <select class="form-select" aria-label="Default select example">
+                    <option>Cursor</option>
+                    <option>Scroll</option>
+                    <option>Caret</option>
+                    <option>Media</option>
+                    <option>Zoom</option>
+                    <option>Zoom PC</option>
+                    <option>Zoom Mac</option>
+                    <option selected>None</option>
+                </select>
+            </td>
+        </tr>
+    </tbody>
+  </table>
+
+<pre>
+set module.keycluster.navigationMode.base scroll
+</pre>
+
+</div>
+</body>
+</html>
diff --git a/doc/package.json b/doc/package.json
new file mode 100644
index 000000000..80cef1201
--- /dev/null
+++ b/doc/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "bootstrap": "^5.1.3",
+    "vue": "^3.2.31"
+  }
+}
diff --git a/doc/style.css b/doc/style.css
new file mode 100644
index 000000000..47908455d
--- /dev/null
+++ b/doc/style.css
@@ -0,0 +1,25 @@
+pre {
+    background-color: #eee;
+}
+
+img {
+    max-width: 100%;
+    padding: 10px 0;
+}
+
+.no-wrap {
+    white-space: nowrap;
+}
+
+table.table td {
+    vertical-align: middle;
+}
+
+table.table input[type="checkbox"] {
+    width: 20px;
+    height: 20px;
+}
+
+table.table input[type="range"] {
+    margin-right: 10px;
+}
diff --git a/right/src/caret_config.c b/right/src/caret_config.c
index c3549d007..557c6d64c 100644
--- a/right/src/caret_config.c
+++ b/right/src/caret_config.c
@@ -1,6 +1,7 @@
 #include "caret_config.h"
 #include "arduino_hid/ConsumerAPI.h"
 #include "arduino_hid/SystemAPI.h"
+#include "macros.h"
 
 caret_configuration_t caretMediaMode = {
     .axisActions = { //axis array
@@ -29,7 +30,20 @@ caret_configuration_t caretCaretMode = {
     }
 };
 
-caret_configuration_t zoomMode = {
+caret_configuration_t zoomMacMode = {
+    .axisActions = { //axis array
+        { // horizontal axis
+            .positiveAction = { .type = KeyActionType_None },
+            .negativeAction = { .type = KeyActionType_None },
+        },
+        { // vertical axis
+            .positiveAction = { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Basic, .scancode = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE, .modifiers = HID_KEYBOARD_MODIFIER_LEFTGUI}},
+            .negativeAction = { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Basic, .scancode = HID_KEYBOARD_SC_EQUAL_AND_PLUS, .modifiers = HID_KEYBOARD_MODIFIER_LEFTGUI | HID_KEYBOARD_MODIFIER_LEFTSHIFT}},
+        }
+    }
+};
+
+caret_configuration_t zoomPcMode = {
     .axisActions = { //axis array
         { // horizontal axis
             .positiveAction = { .type = KeyActionType_None },
@@ -48,10 +62,13 @@ caret_configuration_t* GetModuleCaretConfiguration(int8_t moduleId, navigation_m
             return &caretCaretMode;
         case NavigationMode_Media:
             return &caretMediaMode;
-        case NavigationMode_Zoom:
-            return &zoomMode;
+        case NavigationMode_ZoomPc:
+            return &zoomPcMode;
+        case NavigationMode_ZoomMac:
+            return &zoomMacMode;
         default:
-            return &caretCaretMode;
+            Macros_ReportErrorNum("Mode referenced in in valid context:", mode);
+            return NULL;
     }
 }
 
diff --git a/right/src/config_parser/parse_keymap.c b/right/src/config_parser/parse_keymap.c
index 7e2ab14d6..e6e6fd589 100644
--- a/right/src/config_parser/parse_keymap.c
+++ b/right/src/config_parser/parse_keymap.c
@@ -163,6 +163,10 @@ static parser_error_t parseLayer(config_buffer_t *buffer, uint8_t layer)
         }
     }
 
+    if (!ParserRunDry) {
+        LayerConfig[layer].layerIsDefined = true;
+    }
+
     parser_error_t errorCode;
     uint16_t moduleCount = ReadCompactLength(buffer);
 
@@ -203,6 +207,9 @@ parser_error_t ParseKeymap(config_buffer_t *buffer, uint8_t keymapIdx, uint8_t k
         AllKeymaps[keymapIdx].abbreviation = abbreviation;
         AllKeymaps[keymapIdx].abbreviationLen = abbreviationLen;
         AllKeymaps[keymapIdx].offset = offset;
+        for (uint8_t layerIdx = 0; layerIdx < LayerId_Count; layerIdx++) {
+            LayerConfig[layerIdx].layerIsDefined = false;
+        }
         if (isDefault) {
             DefaultKeymapIndex = keymapIdx;
         }
diff --git a/right/src/config_parser/parse_macro.c b/right/src/config_parser/parse_macro.c
index 9e30c9eac..4b8cd89f6 100644
--- a/right/src/config_parser/parse_macro.c
+++ b/right/src/config_parser/parse_macro.c
@@ -22,8 +22,9 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macr
     macroAction->key.action = action;
     macroAction->key.type = type;
     macroAction->key.scancode = scancode;
-    macroAction->key.modifierMask = modifierMask;
-    macroAction->key.sticky = false;
+    macroAction->key.outputModMask = modifierMask;
+    macroAction->key.inputModMask = 0;
+    macroAction->key.stickyModMask = 0;
     return ParserError_Success;
 }
 
diff --git a/right/src/key_action.h b/right/src/key_action.h
index a6da2b3f5..412abbc0f 100644
--- a/right/src/key_action.h
+++ b/right/src/key_action.h
@@ -67,6 +67,11 @@
         };
     } ATTR_PACKED key_action_t;
 
+    typedef struct {
+        key_action_t action;
+        uint8_t modifierLayerMask;
+    } ATTR_PACKED key_action_cached_t;
+
 // Variables:
 
     void UpdateActiveUsbReports(void);
diff --git a/right/src/layer.c b/right/src/layer.c
new file mode 100644
index 000000000..2fee698a7
--- /dev/null
+++ b/right/src/layer.c
@@ -0,0 +1,22 @@
+#include "layer.h"
+#include "lufa/HIDClassCommon.h"
+
+layer_config_t LayerConfig[LayerId_Count] = {
+    { .layerIsDefined = true, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = true, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = true, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = true, .exactModifierMatch = false, .modifierLayerMask = 0},
+
+    // fn2 - fn5
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = 0},
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = 0},
+
+    // Shift, Control, Alt, Super
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = HID_KEYBOARD_MODIFIER_LEFTSHIFT | HID_KEYBOARD_MODIFIER_RIGHTSHIFT },
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_RIGHTCTRL },
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = HID_KEYBOARD_MODIFIER_LEFTALT | HID_KEYBOARD_MODIFIER_RIGHTALT },
+    { .layerIsDefined = false, .exactModifierMatch = false, .modifierLayerMask = HID_KEYBOARD_MODIFIER_LEFTGUI | HID_KEYBOARD_MODIFIER_RIGHTGUI },
+};
+
diff --git a/right/src/layer.h b/right/src/layer.h
index 6ea1e9759..f312b39cc 100644
--- a/right/src/layer.h
+++ b/right/src/layer.h
@@ -1,8 +1,13 @@
 #ifndef __SRC_LAYER_H__
 #define __SRC_LAYER_H__
 
-// layer.c code was refactored into layer_switcher.h
+#include <stdint.h>
+#include <stdbool.h>
+#include "attributes.h"
 
+// Macros:
+
+#define IS_MODIFIER_LAYER(L) (LayerId_Shift <= (L) && (L) <= LayerId_Super)
 
 // Typedefs:
 
@@ -23,4 +28,14 @@
         LayerId_Count = LayerId_Last + 1,
     } layer_id_t;
 
+    typedef struct {
+        uint8_t modifierLayerMask;
+        bool layerIsDefined : 1;
+        bool exactModifierMatch : 1;
+    } ATTR_PACKED layer_config_t;
+
+// Variables:
+
+    extern layer_config_t LayerConfig[LayerId_Count];
+
 #endif
diff --git a/right/src/layer_switcher.c b/right/src/layer_switcher.c
index 91f83d9ce..5b67719aa 100644
--- a/right/src/layer_switcher.c
+++ b/right/src/layer_switcher.c
@@ -1,15 +1,18 @@
 #include "layer_switcher.h"
+#include "layer.h"
 #include "ledmap.h"
 #include "timer.h"
 #include "macros.h"
 #include "debug.h"
 #include "led_display.h"
+#include "usb_report_updater.h"
 
 uint16_t DoubleTapSwitchLayerTimeout = 400;
 uint16_t DoubleTapSwitchLayerReleaseTimeout = 200;
 
 layer_id_t ActiveLayer = LayerId_Base;
 bool ActiveLayerHeld = false;
+uint8_t ActiveLayerModifierMask = 0;
 
 static layer_id_t toggledLayer = LayerId_Base;
 static layer_id_t heldLayer = LayerId_Base;
@@ -159,19 +162,40 @@ void LayerSwitcher_HoldLayer(layer_id_t layer) {
     }
 }
 
+static bool layerMeetsHoldConditions(uint8_t layer, uint8_t* maskOutput) {
+    if (heldLayers[layer]) {
+        return true;
+    }
+    layer_config_t* cfg = &LayerConfig[layer];
+    if (cfg->layerIsDefined && cfg->modifierLayerMask) {
+        uint8_t maskOverlap = cfg->modifierLayerMask & InputModifiersPrevious;
+        if (maskOverlap == cfg->modifierLayerMask || (!cfg->exactModifierMatch && maskOverlap)) {
+            if (maskOutput != NULL) {
+                *maskOutput = maskOverlap;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
 // Gathers states set by LayerSwitcher_HoldLayer during previous update cycle and updates heldLayer.
 void LayerSwitcher_UpdateActiveLayer() {
     layer_id_t previousHeldLayer = heldLayer;
-    if(!heldLayers[heldLayer]) {
+    if (!layerMeetsHoldConditions(heldLayer, NULL)) {
         heldLayer = LayerId_Base;
     }
     for (layer_id_t layerId = LayerId_Mod; layerId < LayerId_Count; layerId++) {
-        if (heldLayers[layerId] && heldLayer == LayerId_Base) {
+        bool heldLayerCanBeOverriden = heldLayer == LayerId_Base || (IS_MODIFIER_LAYER(heldLayer) && !IS_MODIFIER_LAYER(layerId));
+        if (heldLayerCanBeOverriden && layerMeetsHoldConditions(layerId, &ActiveLayerModifierMask)) {
             heldLayer = layerId;
         }
         heldLayers[layerId] = false;
     }
-    if(previousHeldLayer != heldLayer) {
+    if (!LayerConfig[heldLayer].modifierLayerMask) {
+        ActiveLayerModifierMask = 0;
+    }
+    if (previousHeldLayer != heldLayer) {
         updateActiveLayer();
     }
 }
diff --git a/right/src/layer_switcher.h b/right/src/layer_switcher.h
index bffb0c311..351fef9f6 100644
--- a/right/src/layer_switcher.h
+++ b/right/src/layer_switcher.h
@@ -10,6 +10,7 @@
 // Macros:
 
 // Variables:
+    extern uint8_t ActiveLayerModifierMask;
     extern layer_id_t ActiveLayer;
     extern bool ActiveLayerHeld;
     extern uint16_t DoubleTapSwitchLayerTimeout;
diff --git a/right/src/led_display.c b/right/src/led_display.c
index cd2ebdf21..db991d412 100644
--- a/right/src/led_display.c
+++ b/right/src/led_display.c
@@ -78,32 +78,32 @@ static const uint16_t letterToSegmentMap[] = {
     0b00000000000000, // ^
     0b10000000000000, // _
     0b00000000000100, // `
-    0b00000000000000, // a
-    0b00000000000000, // b
-    0b00000000000000, // c
-    0b00000000000000, // d
-    0b00000000000000, // e
-    0b00000000000000, // f
-    0b00000000000000, // g
-    0b00000000000000, // h
-    0b00000000000000, // i
-    0b00000000000000, // j
-    0b00000000000000, // k
-    0b00000000000000, // l
-    0b00000000000000, // m
-    0b00000000000000, // n
-    0b00000000000000, // o
-    0b00000000000000, // p
-    0b00000000000000, // q
-    0b00000000000000, // r
-    0b00000000000000, // s
-    0b00000000000000, // t
-    0b00000000000000, // u
-    0b00000000000000, // v
-    0b00000000000000, // w
-    0b00000000000000, // x
-    0b00000000000000, // y
-    0b00000000000000, // z
+    0b01000111100011, // a (shown as A) - show lower-case letters as upper-case ones
+    0b11010010101001, // b (...)
+    0b10000100000011, // c
+    0b11010000101001, // d
+    0b10000111000011, // e
+    0b00000111000011, // f
+    0b11000110000011, // g
+    0b01000111100010, // h
+    0b10010000001001, // i
+    0b11000000100000, // j
+    0b00100101010010, // k
+    0b10000100000010, // l
+    0b01000100110110, // m
+    0b01100100100110, // n
+    0b11000100100011, // o
+    0b00000111100011, // p
+    0b11100100100011, // q
+    0b00100111100011, // r
+    0b11000011000011, // s
+    0b00010000001001, // t
+    0b11000100100010, // u
+    0b00001100010010, // v
+    0b01101100100010, // w
+    0b00101000010100, // x
+    0b00010000010100, // y
+    0b10001000010001, // z
     0b00100001010000, // {
     0b00010000001000, // |
     0b00001010000100, // }
diff --git a/right/src/lufa/HIDClassCommon.h b/right/src/lufa/HIDClassCommon.h
index 892ca8c48..1a6789632 100644
--- a/right/src/lufa/HIDClassCommon.h
+++ b/right/src/lufa/HIDClassCommon.h
@@ -86,6 +86,15 @@
         #define HID_KEYBOARD_MODIFIER_RIGHTGUI                    (1 << 7)
         //@}
 
+        /** \name Keyboard Standard Report LED Usage IDs */
+        //@{
+        #define HID_LED_UID_NUMLOCK                          1
+        #define HID_LED_UID_CAPSLOCK                         2
+        #define HID_LED_UID_SCROLLLOCK                       3
+        #define HID_LED_UID_COMPOSE                          4
+        #define HID_LED_UID_KANA                             5
+        //@}
+
         /** \name Keyboard Standard Report LED Masks */
         //@{
         /** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */
diff --git a/right/src/macro_recorder.c b/right/src/macro_recorder.c
index 4e52c8799..f4485ad3b 100644
--- a/right/src/macro_recorder.c
+++ b/right/src/macro_recorder.c
@@ -15,8 +15,8 @@
  *     - 1 bit = left shift
  *     - 1 bit = right shift
  *     - both = full mod mask follow
- *   - 3 bits= number of scancodes
- * - further bytes mod mask and scancodes as specified by header
+ *   - 3 bits = number of scancodes, 7 = full size follows
+ * - further bytes: mod mask and scancodes as specified by header
  */
 
 bool RuntimeMacroPlaying = false;
@@ -154,7 +154,7 @@ static void playReport(usb_basic_keyboard_report_t *report)
         break;
     case BasicKeyboardSimple:
         memset(report, 0, sizeof *report);
-        report->scancodes[0] = readByte();
+        UsbBasicKeyboard_AddScancode(report, readByte());
         break;
     case BasicKeyboard:
         memset(report, 0, sizeof *report);
@@ -162,7 +162,7 @@ static void playReport(usb_basic_keyboard_report_t *report)
             uint8_t size = readByte();
             report->modifiers = readByte();
             for (int i = 0; i < size; i++) {
-                report->scancodes[i] = readByte();
+                UsbBasicKeyboard_AddScancode(report, readByte());
             }
         }
         break;
@@ -208,38 +208,41 @@ static bool playRuntimeMacroContinue(usb_basic_keyboard_report_t* report)
     return RuntimeMacroPlaying;
 }
 
+void writeReportScancodes(usb_basic_keyboard_report_t *report)
+{
+    UsbBasicKeyboard_ForeachScancode(report, &writeByte);
+}
+
 void MacroRecorder_RecordBasicReport(usb_basic_keyboard_report_t *report)
 {
     if (!RuntimeMacroRecording) {
         return;
     }
+
+    uint8_t sc = UsbBasicKeyboard_ScancodeCount(report);
+
     if (
-            (reportBufferLength + REPORT_BUFFER_SAFETY_MARGIN >= REPORT_BUFFER_MAX_LENGTH) ||
-            (recordingHeader->length >= REPORT_BUFFER_MAX_MACRO_LENGTH)
+            (reportBufferLength + 3 + sc > REPORT_BUFFER_MAX_LENGTH) ||
+            (recordingHeader->length + 1 > REPORT_BUFFER_MAX_MACRO_LENGTH)
     ) {
         recordRuntimeMacroEnd();
         discardLastHeaderSlot();
         return;
     }
-    if (report->modifiers == 0 && report->scancodes[0] == 0) {
+    if ((report->modifiers == 0) && (sc == 0)) {
         writeByte(BasicKeyboardEmpty);
         return;
     }
-    if (report->modifiers == 0 && report->scancodes[1] == 0) {
+    if ((report->modifiers == 0) && (sc == 1)) {
         writeByte(BasicKeyboardSimple);
-        writeByte(report->scancodes[0]);
+        writeReportScancodes(report);
         return;
     }
+
     writeByte(BasicKeyboard);
-    uint8_t size = 0;
-    while( size < USB_BASIC_KEYBOARD_MAX_KEYS && report->scancodes[size] != 0) {
-        size++;
-    }
-    writeByte(size);
+    writeByte(sc);
     writeByte(report->modifiers);
-    for (int i = 0; i < size; i++) {
-        writeByte(report->scancodes[i]);
-    }
+    writeReportScancodes(report);
 }
 
 void MacroRecorder_RecordDelay(uint16_t delay)
diff --git a/right/src/macro_set_command.c b/right/src/macro_set_command.c
index 4aaf07f83..35ac044a4 100644
--- a/right/src/macro_set_command.c
+++ b/right/src/macro_set_command.c
@@ -35,7 +35,7 @@ static void moduleNavigationMode(const char* arg1, const char *textEnd, module_c
     module->navigationModes[layerId] = modeId;
 }
 
-static void moduleSpeed(const char* arg1, const char *textEnd, module_configuration_t* module)
+static void moduleSpeed(const char* arg1, const char *textEnd, module_configuration_t* module, uint8_t moduleId)
 {
     const char* arg2 = NextTok(arg1, textEnd);
 
@@ -54,14 +54,14 @@ static void moduleSpeed(const char* arg1, const char *textEnd, module_configurat
     else if (TokenMatches(arg1, textEnd, "scrollSpeedDivisor")) {
         module->scrollSpeedDivisor = ParseFloat(arg2, textEnd);
     }
-    else if (TokenMatches(arg1, textEnd, "zoomSpeedDivisor")) {
-        module->zoomSpeedDivisor = ParseFloat(arg2, textEnd);
+    else if (TokenMatches(arg1, textEnd, "pinchZoomDivisor") && moduleId == ModuleId_TouchpadRight) {
+        module->pinchZoomSpeedDivisor = ParseFloat(arg2, textEnd);
     }
-    else if (TokenMatches(arg1, textEnd, "axisLockStrength")) {
-        module->axisLockSkew = 1.0f - ParseFloat(arg2, textEnd);
+    else if (TokenMatches(arg1, textEnd, "axisLockSkew")) {
+        module->axisLockSkew = ParseFloat(arg2, textEnd);
     }
-    else if (TokenMatches(arg1, textEnd, "axisLockStrengthFirstTick")) {
-        module->axisLockSkewFirstTick = 1.0f - ParseFloat(arg2, textEnd);
+    else if (TokenMatches(arg1, textEnd, "axisLockFirstTickSkew")) {
+        module->axisLockFirstTickSkew = ParseFloat(arg2, textEnd);
     }
     else if (TokenMatches(arg1, textEnd, "cursorAxisLockEnabled")) {
         module->cursorAxisLock = Macros_ParseBoolean(arg2, textEnd);
@@ -92,7 +92,7 @@ static void module(const char* arg1, const char *textEnd)
         moduleNavigationMode(arg3, textEnd, module);
     }
     else {
-        moduleSpeed(arg2, textEnd, module);
+        moduleSpeed(arg2, textEnd, module, moduleId);
     }
 }
 
@@ -296,6 +296,49 @@ static void keymapAction(const char* arg1, const char *textEnd)
     }
 }
 
+static void modLayerTriggers(const char* arg1, const char *textEnd)
+{
+    const char* specifier = NextTok(arg1, textEnd);
+    uint8_t layerId = Macros_ParseLayerId(arg1, textEnd);
+    uint8_t left = 0;
+    uint8_t right = 0;
+
+    switch (layerId) {
+    case LayerId_Shift:
+        left = HID_KEYBOARD_MODIFIER_LEFTSHIFT ;
+        right = HID_KEYBOARD_MODIFIER_RIGHTSHIFT ;
+        break;
+    case LayerId_Control:
+        left = HID_KEYBOARD_MODIFIER_LEFTCTRL ;
+        right = HID_KEYBOARD_MODIFIER_RIGHTCTRL ;
+        break;
+    case LayerId_Alt:
+        left = HID_KEYBOARD_MODIFIER_LEFTALT ;
+        right = HID_KEYBOARD_MODIFIER_RIGHTALT ;
+        break;
+    case LayerId_Super:
+        left = HID_KEYBOARD_MODIFIER_LEFTGUI ;
+        right = HID_KEYBOARD_MODIFIER_RIGHTGUI ;
+        break;
+    default:
+        Macros_ReportError("This layer does not allow modifier triggers.", arg1, specifier);
+        return;
+    }
+
+    if (TokenMatches(specifier, textEnd, "left")) {
+        LayerConfig[layerId].modifierLayerMask = left;
+    }
+    else if (TokenMatches(specifier, textEnd, "right")) {
+        LayerConfig[layerId].modifierLayerMask = right;
+    }
+    else if (TokenMatches(specifier, textEnd, "both")) {
+        LayerConfig[layerId].modifierLayerMask = left | right;
+    }
+    else {
+        Macros_ReportError("Specifier not recognized", specifier, textEnd);
+    }
+}
+
 macro_result_t MacroSetCommand(const char* arg1, const char *textEnd)
 {
     const char* arg2 = NextTok(arg1, textEnd);
@@ -321,6 +364,9 @@ macro_result_t MacroSetCommand(const char* arg1, const char *textEnd)
     else if (TokenMatches(arg1, textEnd, "backlight")) {
         backlight(proceedByDot(arg1, textEnd), textEnd);
     }
+    else if (TokenMatches(arg1, textEnd, "modifierLayerTriggers")) {
+        modLayerTriggers(proceedByDot(arg1, textEnd), textEnd);
+    }
     else if (TokenMatches(arg1, textEnd, "diagonalSpeedCompensation")) {
         DiagonalSpeedCompensation = Macros_ParseBoolean(arg2, textEnd);
     }
diff --git a/right/src/macro_shortcut_parser.c b/right/src/macro_shortcut_parser.c
index 350ff4c11..41afd8f01 100644
--- a/right/src/macro_shortcut_parser.c
+++ b/right/src/macro_shortcut_parser.c
@@ -367,16 +367,18 @@ static macro_action_t parseSingleChar(char c)
     action.type = MacroActionType_Key;
     action.key.type = KeystrokeType_Basic;
     action.key.scancode = MacroShortcutParser_CharacterToScancode(c);
-    action.key.modifierMask = MacroShortcutParser_CharacterToShift(c) ? HID_KEYBOARD_MODIFIER_LEFTSHIFT : 0;
+    action.key.outputModMask = MacroShortcutParser_CharacterToShift(c) ? HID_KEYBOARD_MODIFIER_LEFTSHIFT : 0;
     return action;
 }
 
 static void parseMods(const char* str, const char* strEnd, macro_action_t* action)
 {
     const char* orig = str;
-    uint8_t modMask = 0;
+    uint8_t inputModMask = 0;
+    uint8_t outputModMask = 0;
+    uint8_t stickyModMask = 0;
+    uint8_t* modMask = &outputModMask;
     bool left = true;
-    bool sticky = false;
     macro_sub_action_t actionType = action->key.action;
     while(str < strEnd) {
         switch(*str) {
@@ -387,24 +389,30 @@ static void parseMods(const char* str, const char* strEnd, macro_action_t* actio
             left = false;
             break;
         case 'S':
-            modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTSHIFT : HID_KEYBOARD_MODIFIER_RIGHTSHIFT;
+            *modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTSHIFT : HID_KEYBOARD_MODIFIER_RIGHTSHIFT;
             left = true;
             break;
         case 'C':
-            modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTCTRL : HID_KEYBOARD_MODIFIER_RIGHTCTRL;
+            *modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTCTRL : HID_KEYBOARD_MODIFIER_RIGHTCTRL;
             left = true;
             break;
         case 'A':
-            modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTALT : HID_KEYBOARD_MODIFIER_RIGHTALT;
+            *modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTALT : HID_KEYBOARD_MODIFIER_RIGHTALT;
             left = true;
             break;
         case 'W':
         case 'G':
-            modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTGUI : HID_KEYBOARD_MODIFIER_RIGHTGUI;
+            *modMask |= left ? HID_KEYBOARD_MODIFIER_LEFTGUI : HID_KEYBOARD_MODIFIER_RIGHTGUI;
             left = true;
             break;
         case 's':
-            sticky = true;
+            modMask = &stickyModMask;
+            break;
+        case 'i':
+            modMask = &inputModMask;
+            break;
+        case 'o':
+            modMask = &outputModMask;
             break;
         case 'p':
             actionType = MacroSubAction_Press;
@@ -425,11 +433,12 @@ static void parseMods(const char* str, const char* strEnd, macro_action_t* actio
         str++;
     }
 
-    if (action->type != MacroActionType_Key && modMask != 0) {
+    if (action->type != MacroActionType_Key && inputModMask != 0) {
         Macros_ReportError("This action is not allowed to have modifiers!", str, strEnd);
     } else {
-        action->key.modifierMask = modMask;
-        action->key.sticky = sticky;
+        action->key.inputModMask = inputModMask;
+        action->key.outputModMask = outputModMask;
+        action->key.stickyModMask = stickyModMask;
     }
     action->key.action = actionType;
 }
diff --git a/right/src/macros.c b/right/src/macros.c
index f726be490..cbb0beabe 100644
--- a/right/src/macros.c
+++ b/right/src/macros.c
@@ -7,6 +7,7 @@
 #include "config_parser/parse_macro.h"
 #include "config_parser/config_globals.h"
 #include "timer.h"
+#include "usb_interfaces/usb_interface_basic_keyboard.h"
 #include "keymap.h"
 #include "usb_report_updater.h"
 #include "led_display.h"
@@ -110,16 +111,8 @@ static void addBasicScancode(uint8_t scancode)
     if (!scancode) {
         return;
     }
-    for (uint8_t i = 0; i < USB_BASIC_KEYBOARD_MAX_KEYS; i++) {
-        if (s->ms.macroBasicKeyboardReport.scancodes[i] == scancode) {
-            return;
-        }
-    }
-    for (uint8_t i = 0; i < USB_BASIC_KEYBOARD_MAX_KEYS; i++) {
-        if (!s->ms.macroBasicKeyboardReport.scancodes[i]) {
-            s->ms.macroBasicKeyboardReport.scancodes[i] = scancode;
-            break;
-        }
+    if (!UsbBasicKeyboard_ContainsScancode(&s->ms.macroBasicKeyboardReport, scancode)) {
+        UsbBasicKeyboard_AddScancode(&s->ms.macroBasicKeyboardReport, scancode);
     }
 }
 
@@ -128,22 +121,19 @@ static void deleteBasicScancode(uint8_t scancode)
     if (!scancode) {
         return;
     }
-    for (uint8_t i = 0; i < USB_BASIC_KEYBOARD_MAX_KEYS; i++) {
-        if (s->ms.macroBasicKeyboardReport.scancodes[i] == scancode) {
-            s->ms.macroBasicKeyboardReport.scancodes[i] = 0;
-            return;
-        }
-    }
+    UsbBasicKeyboard_RemoveScancode(&s->ms.macroBasicKeyboardReport, scancode);
 }
 
-static void addModifiers(uint8_t modifiers)
+static void addModifiers(uint8_t inputModifiers, uint8_t outputModifiers)
 {
-    s->ms.macroBasicKeyboardReport.modifiers |= modifiers;
+    s->ms.inputModifierMask |= inputModifiers;
+    s->ms.macroBasicKeyboardReport.modifiers |= outputModifiers;
 }
 
-static void deleteModifiers(uint8_t modifiers)
+static void deleteModifiers(uint8_t inputModifiers, uint8_t outputModifiers)
 {
-    s->ms.macroBasicKeyboardReport.modifiers &= ~modifiers;
+    s->ms.inputModifierMask &= ~inputModifiers;
+    s->ms.macroBasicKeyboardReport.modifiers &= ~outputModifiers;
 }
 
 static void addMediaScancode(uint16_t scancode)
@@ -182,17 +172,7 @@ static void addSystemScancode(uint8_t scancode)
     if (!scancode) {
         return;
     }
-    for (uint8_t i = 0; i < USB_SYSTEM_KEYBOARD_MAX_KEYS; i++) {
-        if (s->ms.macroSystemKeyboardReport.scancodes[i] == scancode) {
-            return;
-        }
-    }
-    for (uint8_t i = 0; i < USB_SYSTEM_KEYBOARD_MAX_KEYS; i++) {
-        if (!s->ms.macroSystemKeyboardReport.scancodes[i]) {
-            s->ms.macroSystemKeyboardReport.scancodes[i] = scancode;
-            break;
-        }
-    }
+    UsbSystemKeyboard_AddScancode(&s->ms.macroSystemKeyboardReport, scancode);
 }
 
 static void deleteSystemScancode(uint8_t scancode)
@@ -200,12 +180,7 @@ static void deleteSystemScancode(uint8_t scancode)
     if (!scancode) {
         return;
     }
-    for (uint8_t i = 0; i < USB_SYSTEM_KEYBOARD_MAX_KEYS; i++) {
-        if (s->ms.macroSystemKeyboardReport.scancodes[i] == scancode) {
-            s->ms.macroSystemKeyboardReport.scancodes[i] = 0;
-            return;
-        }
-    }
+    UsbSystemKeyboard_RemoveScancode(&s->ms.macroSystemKeyboardReport, scancode);
 }
 
 static void addScancode(uint16_t scancode, keystroke_type_t type)
@@ -296,9 +271,10 @@ static macro_result_t processKey(macro_action_t macro_action)
     s->ms.reportsUsed = true;
     macro_sub_action_t action = macro_action.key.action;
     keystroke_type_t type = macro_action.key.type;
-    uint8_t modifierMask = macro_action.key.modifierMask;
+    uint8_t outputModMask = macro_action.key.outputModMask;
+    uint8_t inputModMask = macro_action.key.inputModMask;
     uint16_t scancode = macro_action.key.scancode;
-    bool isSticky = macro_action.key.sticky;
+    bool stickyModMask = macro_action.key.stickyModMask;
 
     s->as.actionPhase++;
 
@@ -307,9 +283,9 @@ static macro_result_t processKey(macro_action_t macro_action)
         case MacroSubAction_Tap:
             switch(s->as.actionPhase) {
                 case 1:
-                    addModifiers(modifierMask);
-                    if (isSticky) {
-                        ActivateStickyMods(s->ms.currentMacroKey, modifierMask);
+                    addModifiers(inputModMask, outputModMask);
+                    if (stickyModMask) {
+                        ActivateStickyMods(s->ms.currentMacroKey, stickyModMask);
                     }
                     return MacroResult_Blocking;
                 case 2:
@@ -323,7 +299,7 @@ static macro_result_t processKey(macro_action_t macro_action)
                     deleteScancode(scancode, type);
                     return MacroResult_Blocking;
                 case 4:
-                    deleteModifiers(modifierMask);
+                    deleteModifiers(inputModMask, outputModMask);
                     return MacroResult_Blocking;
                 case 5:
                     s->as.actionPhase = 0;
@@ -336,7 +312,7 @@ static macro_result_t processKey(macro_action_t macro_action)
                     deleteScancode(scancode, type);
                     return MacroResult_Blocking;
                 case 2:
-                    deleteModifiers(modifierMask);
+                    deleteModifiers(inputModMask, outputModMask);
                     return MacroResult_Blocking;
                 case 3:
                     s->as.actionPhase = 0;
@@ -346,9 +322,9 @@ static macro_result_t processKey(macro_action_t macro_action)
         case MacroSubAction_Press:
             switch (s->as.actionPhase) {
                 case 1:
-                    addModifiers(modifierMask);
-                    if (isSticky) {
-                        ActivateStickyMods(s->ms.currentMacroKey, modifierMask);
+                    addModifiers(inputModMask, outputModMask);
+                    if (stickyModMask) {
+                        ActivateStickyMods(s->ms.currentMacroKey, stickyModMask);
                     }
                     return MacroResult_Blocking;
                 case 2:
@@ -597,7 +573,6 @@ static macro_result_t dispatchText(const char* text, uint16_t textLen)
     } else {
         dispatchMutex = s;
     }
-    uint8_t max_keys = USB_BASIC_KEYBOARD_MAX_KEYS/2;
     char character = 0;
     uint8_t scancode = 0;
     uint8_t mods = 0;
@@ -613,8 +588,8 @@ static macro_result_t dispatchText(const char* text, uint16_t textLen)
     // containing only old modifiers. Then set new modifiers and send that new report.
     // Just then continue.
     if (mods != s->ms.macroBasicKeyboardReport.modifiers) {
-        if (s->as.dispatchData.reportIdx != 0) {
-            s->as.dispatchData.reportIdx = 0;
+        if (s->as.dispatchData.reportState != REPORT_EMPTY) {
+            s->as.dispatchData.reportState = REPORT_EMPTY;
             clearScancodes();
             return MacroResult_Blocking;
         } else {
@@ -626,15 +601,15 @@ static macro_result_t dispatchText(const char* text, uint16_t textLen)
     // If all characters have been sent, finish.
     if (s->as.dispatchData.textIdx == textLen) {
         s->as.dispatchData.textIdx = 0;
-        s->as.dispatchData.reportIdx = max_keys;
+        s->as.dispatchData.reportState = REPORT_FULL;
         memset(&s->ms.macroBasicKeyboardReport, 0, sizeof s->ms.macroBasicKeyboardReport);
         dispatchMutex = NULL;
         return MacroResult_Finished;
     }
 
     // Whenever the report is full, we clear the report and send it empty before continuing.
-    if (s->as.dispatchData.reportIdx == max_keys) {
-        s->as.dispatchData.reportIdx = 0;
+    if (s->as.dispatchData.reportState == REPORT_FULL) {
+        s->as.dispatchData.reportState = REPORT_EMPTY;
 
         memset(&s->ms.macroBasicKeyboardReport, 0, sizeof s->ms.macroBasicKeyboardReport);
         return MacroResult_Blocking;
@@ -643,15 +618,15 @@ static macro_result_t dispatchText(const char* text, uint16_t textLen)
     // If current character is already contained in the report, we need to
     // release it first. We do so by artificially marking the report
     // full. Next call will do rest of the work for us.
-    for (uint8_t i = 0; i < s->as.dispatchData.reportIdx; i++) {
-        if (s->ms.macroBasicKeyboardReport.scancodes[i] == scancode) {
-            s->as.dispatchData.reportIdx = max_keys;
-            return MacroResult_Blocking;
-        }
+    if (UsbBasicKeyboard_ContainsScancode(&s->ms.macroBasicKeyboardReport, scancode)) {
+        s->as.dispatchData.reportState = REPORT_FULL;
+        return MacroResult_Blocking;
     }
 
     // Send the scancode.
-    s->ms.macroBasicKeyboardReport.scancodes[s->as.dispatchData.reportIdx++] = scancode;
+    UsbBasicKeyboard_AddScancode(&s->ms.macroBasicKeyboardReport, scancode);
+    s->as.dispatchData.reportState = UsbBasicKeyboard_IsFullScancodes(&s->ms.macroBasicKeyboardReport) ?
+            REPORT_FULL : REPORT_PARTIAL;
     ++s->as.dispatchData.textIdx;
     return MacroResult_Blocking;
 }
@@ -1269,7 +1244,7 @@ static bool processIfDoubletapCommand(bool negate)
 
 static bool processIfModifierCommand(bool negate, uint8_t modmask)
 {
-    return ((HardwareModifierStatePrevious & modmask) > 0) != negate;
+    return ((InputModifiersPrevious & modmask) > 0) != negate;
 }
 
 static bool processIfRecordingCommand(bool negate)
@@ -1320,6 +1295,21 @@ static bool processIfRegEqCommand(bool negate, const char* arg1, const char *arg
     }
 }
 
+static bool processIfRegInequalityCommand(bool greaterThan, const char* arg1, const char *argEnd)
+{
+    uint8_t address = parseNUM(arg1, argEnd);
+    uint8_t param = parseNUM(NextTok(arg1, argEnd), argEnd);
+    if (validReg(address)) {
+        if (greaterThan) {
+            return regs[address] > param;
+        } else {
+            return regs[address] < param;
+        }
+    } else {
+        return false;
+    }
+}
+
 static bool processIfKeymapCommand(bool negate, const char* arg1, const char *argEnd)
 {
     uint8_t queryKeymapIdx = parseKeymapId(arg1, argEnd);
@@ -2227,6 +2217,20 @@ static macro_result_t processCommand(const char* cmd, const char* cmdEnd)
                 cmd = NextTok(arg1, cmdEnd); //shift by 2
                 arg1 = NextTok(cmd, cmdEnd);
             }
+            else if (TokenMatches(cmd, cmdEnd, "ifRegGt")) {
+                if (!processIfRegInequalityCommand(true, arg1, cmdEnd) && !s->as.currentConditionPassed) {
+                    return MacroResult_Finished;
+                }
+                cmd = NextTok(arg1, cmdEnd); //shift by 2
+                arg1 = NextTok(cmd, cmdEnd);
+            }
+            else if (TokenMatches(cmd, cmdEnd, "ifRegLt")) {
+                if (!processIfRegInequalityCommand(false, arg1, cmdEnd) && !s->as.currentConditionPassed) {
+                    return MacroResult_Finished;
+                }
+                cmd = NextTok(arg1, cmdEnd); //shift by 2
+                arg1 = NextTok(cmd, cmdEnd);
+            }
             else if (TokenMatches(cmd, cmdEnd, "ifKeymap")) {
                 if (!processIfKeymapCommand(false, arg1, cmdEnd) && !s->as.currentConditionPassed) {
                     return MacroResult_Finished;
diff --git a/right/src/macros.h b/right/src/macros.h
index 22946fa9c..2f8ea7bef 100644
--- a/right/src/macros.h
+++ b/right/src/macros.h
@@ -80,8 +80,9 @@
                 macro_sub_action_t action;
                 keystroke_type_t type;
                 uint16_t scancode;
-                uint8_t modifierMask;
-                bool sticky;
+                uint8_t outputModMask;
+                uint8_t stickyModMask;
+                uint8_t inputModMask;
             } ATTR_PACKED key;
             struct {
                 macro_sub_action_t action;
@@ -142,6 +143,7 @@
             bool wakeMeOnTime : 1;
             bool wakeMeOnKeystateChange: 1;
 
+            uint8_t inputModifierMask;
             usb_mouse_report_t macroMouseReport;
             usb_basic_keyboard_report_t macroBasicKeyboardReport;
             usb_media_keyboard_report_t macroMediaKeyboardReport;
@@ -154,7 +156,11 @@
             union {
                 struct {
                     uint16_t textIdx;
-                    uint8_t reportIdx;
+                    enum {
+                        REPORT_EMPTY = 0,
+                        REPORT_PARTIAL,
+                        REPORT_FULL
+                    } reportState : 8;
                 } dispatchData;
 
                 struct {
diff --git a/right/src/module.c b/right/src/module.c
index 22bdc2694..c559d450e 100644
--- a/right/src/module.c
+++ b/right/src/module.c
@@ -9,11 +9,12 @@ module_configuration_t ModuleConfigurations[ModuleId_ModuleCount] = {
         .xceleration = 0.0,
         .scrollSpeedDivisor = 5.0f,
         .caretSpeedDivisor = 5.0f,
-        .zoomSpeedDivisor = 5.0f,
+        .pinchZoomSpeedDivisor = 5.0f,
         .axisLockSkew = 0.5f,
-        .axisLockSkewFirstTick = 0.5f,
+        .axisLockFirstTickSkew = 0.5f,
         .cursorAxisLock = false,
         .scrollAxisLock = true,
+        .caretAxisLock = true,
         .swapAxes = false,
         .invertScrollDirection = false,
         .navigationModes = {
@@ -29,11 +30,12 @@ module_configuration_t ModuleConfigurations[ModuleId_ModuleCount] = {
         .xceleration = 1.0, // min:0.0, opt:0.5/1.0, max:2.0
         .scrollSpeedDivisor = 8.0f,
         .caretSpeedDivisor = 16.0f,
-        .zoomSpeedDivisor = 4.0f,
+        .pinchZoomSpeedDivisor = 4.0f,
         .axisLockSkew = 0.5f,
-        .axisLockSkewFirstTick = 1.0f,
+        .axisLockFirstTickSkew = 2.0f,
         .cursorAxisLock = false,
-        .scrollAxisLock = false,
+        .scrollAxisLock = true,
+        .caretAxisLock = true,
         .swapAxes = false,
         .invertScrollDirection = false,
         .navigationModes = {
@@ -49,11 +51,12 @@ module_configuration_t ModuleConfigurations[ModuleId_ModuleCount] = {
         .xceleration = 0.0, // min:0.0, opt:0.0, max:2.0
         .scrollSpeedDivisor = 8.0f,
         .caretSpeedDivisor = 16.0f,
-        .zoomSpeedDivisor = 4.0f,
+        .pinchZoomSpeedDivisor = 4.0f,
         .axisLockSkew = 0.5f,
-        .axisLockSkewFirstTick = 1.0f,
+        .axisLockFirstTickSkew = 2.0f,
         .cursorAxisLock = false,
-        .scrollAxisLock = false,
+        .scrollAxisLock = true,
+        .caretAxisLock = true,
         .swapAxes = false,
         .invertScrollDirection = false,
         .navigationModes = {
@@ -69,11 +72,12 @@ module_configuration_t ModuleConfigurations[ModuleId_ModuleCount] = {
         .xceleration = 1.0, // min:0.0, opt:0.5/1.0, max:2.0
         .scrollSpeedDivisor = 8.0f,
         .caretSpeedDivisor = 16.0f,
-        .zoomSpeedDivisor = 4.0f,
+        .pinchZoomSpeedDivisor = 4.0f,
         .axisLockSkew = 0.5f,
-        .axisLockSkewFirstTick = 1.0f,
+        .axisLockFirstTickSkew = 2.0f,
         .cursorAxisLock = false,
-        .scrollAxisLock = false,
+        .scrollAxisLock = true,
+        .caretAxisLock = true,
         .swapAxes = false,
         .invertScrollDirection = false,
         .navigationModes = {
@@ -89,11 +93,12 @@ module_configuration_t ModuleConfigurations[ModuleId_ModuleCount] = {
         .xceleration = 5.0, // min:0.1, opt:5.0, max:10.0
         .scrollSpeedDivisor = 8.0f,
         .caretSpeedDivisor = 16.0f,
-        .zoomSpeedDivisor = 4.0f,
+        .pinchZoomSpeedDivisor = 4.0f,
         .axisLockSkew = 0.5f,
-        .axisLockSkewFirstTick = 1.0f,
+        .axisLockFirstTickSkew = 1.0f,
         .cursorAxisLock = false,
         .scrollAxisLock = false,
+        .caretAxisLock = true,
         .swapAxes = false,
         .invertScrollDirection = false,
         .navigationModes = {
diff --git a/right/src/module.h b/right/src/module.h
index 3f263c749..2dbc1e759 100644
--- a/right/src/module.h
+++ b/right/src/module.h
@@ -19,6 +19,8 @@
         NavigationMode_Caret,
         NavigationMode_Media,
         NavigationMode_Zoom,
+        NavigationMode_ZoomPc,
+        NavigationMode_ZoomMac,
         NavigationMode_None,
     } navigation_mode_t;
 
@@ -34,15 +36,16 @@
         // navigation mode configurations
         float scrollSpeedDivisor;
         float caretSpeedDivisor;
-        float zoomSpeedDivisor;
+        float pinchZoomSpeedDivisor;
 
         float axisLockSkew;
-        float axisLockSkewFirstTick;
+        float axisLockFirstTickSkew;
 
         navigation_mode_t navigationModes[LayerId_Count];
 
         bool scrollAxisLock;
         bool cursorAxisLock;
+        bool caretAxisLock;
         bool swapAxes;
         bool invertScrollDirection;
     } module_configuration_t;
diff --git a/right/src/mouse_controller.c b/right/src/mouse_controller.c
index c82f45f52..9782f2181 100644
--- a/right/src/mouse_controller.c
+++ b/right/src/mouse_controller.c
@@ -21,6 +21,7 @@
 #include "macros.h"
 #include "debug.h"
 #include "postponer.h"
+#include "layer.h"
 #include "secondary_role_driver.h"
 
 static uint32_t mouseUsbReportUpdateTime = 0;
@@ -65,20 +66,33 @@ mouse_kinetic_state_t MouseScrollState = {
     .axisSkew = 1.0f,
 };
 
-module_kinetic_state_t moduleKineticState = {
+module_kinetic_state_t leftModuleKineticState = {
     .currentModuleId = 0,
     .currentNavigationMode = 0,
 
     .caretAxis = CaretAxis_None,
     .caretFakeKeystate = {},
-    .caretAction = &CurrentKeymap[0][0][0],
+    .caretAction.action = { .type = KeyActionType_None },
     .xFractionRemainder = 0.0f,
     .yFractionRemainder = 0.0f,
     .lastUpdate = 0,
 };
 
-static void processAxisLocking(float x, float y, float speed, int16_t yInversion, float speedDivisor, float axisLockSkew, float axisLockSkewFirstTick, module_kinetic_state_t* ks, bool continuous);
+module_kinetic_state_t rightModuleKineticState = {
+    .currentModuleId = 0,
+    .currentNavigationMode = 0,
+
+    .caretAxis = CaretAxis_None,
+    .caretFakeKeystate = {},
+    .caretAction.action = { .type = KeyActionType_None },
+    .xFractionRemainder = 0.0f,
+    .yFractionRemainder = 0.0f,
+    .lastUpdate = 0,
+};
+
+static void processAxisLocking( float x, float y, float speed, int16_t yInversion, float speedDivisor, bool axisLockEnabled, float axisLockSkew, float axisLockSkewFirstTick, module_kinetic_state_t* ks, bool continuous);
 static void handleRunningCaretModeAction(module_kinetic_state_t* ks);
+static void handleSimpleRunningAction(module_kinetic_state_t* ks);
 
 static void updateOneDirectionSign(int8_t* sign, int8_t expectedSign, uint8_t expectedState, uint8_t otherState) {
     if (*sign == expectedSign && !ActiveMouseStates[expectedState]) {
@@ -393,6 +407,36 @@ static void processTouchpadActions() {
     KeyStates[SlotId_RightModule][1].hardwareSwitchState = TouchpadEvents.twoFingerTap;
 }
 
+static void progressZoomAction(module_kinetic_state_t* ks) {
+    bool actionIsInactive = ks->caretFakeKeystate.current == false && ks->caretFakeKeystate.previous == false;
+
+    // progress to next phase/mode
+    if (actionIsInactive) {
+        ks->zoomPhase++;
+        uint8_t mode = 0;
+        switch(ks->zoomPhase) {
+        case 1:
+            mode = NavigationMode_ZoomPc;
+            break;
+        case 2:
+            mode = NavigationMode_ZoomMac;
+            break;
+        case 3:
+            ks->zoomActive = false;
+            ks->zoomPhase = false;
+            ks->zoomSign = 0;
+            return;
+        }
+
+        caret_configuration_t* currentCaretConfig = GetModuleCaretConfiguration(ks->currentModuleId, mode);
+        caret_dir_action_t* dirActions = &currentCaretConfig->axisActions[CaretAxis_Vertical];
+        ks->caretAction.action = ks->zoomSign > 0 ? dirActions->positiveAction : dirActions->negativeAction;
+    }
+
+    // progress current action
+    handleSimpleRunningAction(ks);
+}
+
 static void handleNewCaretModeAction(caret_axis_t axis, uint8_t resultSign, int16_t value, module_kinetic_state_t* ks) {
     switch(ks->currentNavigationMode) {
         case NavigationMode_Cursor: {
@@ -405,30 +449,58 @@ static void handleNewCaretModeAction(caret_axis_t axis, uint8_t resultSign, int1
             ActiveUsbMouseReport->wheelY += axis == CaretAxis_Vertical ? value : 0;
             break;
         }
-        case NavigationMode_Zoom:
+        case NavigationMode_ZoomMac:
+        case NavigationMode_ZoomPc:
         case NavigationMode_Media:
         case NavigationMode_Caret: {
             caret_configuration_t* currentCaretConfig = GetModuleCaretConfiguration(ks->currentModuleId, ks->currentNavigationMode);
             caret_dir_action_t* dirActions = &currentCaretConfig->axisActions[ks->caretAxis];
-            ks->caretAction = resultSign > 0 ? &dirActions->positiveAction : &dirActions->negativeAction;
+            ks->caretAction.action = resultSign > 0 ? dirActions->positiveAction : dirActions->negativeAction;
             ks->caretFakeKeystate.current = true;
-            ApplyKeyAction(&ks->caretFakeKeystate, ks->caretAction, ks->caretAction);
+            ApplyKeyAction(&ks->caretFakeKeystate, &ks->caretAction, &ks->caretAction.action);
             break;
         }
+        case NavigationMode_Zoom:
+            if (axis != CaretAxis_Vertical) {
+                return;
+            }
+            ks->zoomActive = 1;
+            ks->zoomPhase = 0;
+            ks->zoomSign = resultSign;
+            progressZoomAction(ks);
+            break;
         case NavigationMode_None:
             break;
     }
 }
 
-static void handleRunningCaretModeAction(module_kinetic_state_t* ks) {
+static void handleSimpleRunningAction(module_kinetic_state_t* ks) {
     bool tmp = ks->caretFakeKeystate.current;
     ks->caretFakeKeystate.current = !ks->caretFakeKeystate.previous;
     ks->caretFakeKeystate.previous = tmp;
-    ApplyKeyAction(&ks->caretFakeKeystate, ks->caretAction, ks->caretAction);
+    ApplyKeyAction(&ks->caretFakeKeystate, &ks->caretAction, &ks->caretAction.action);
 }
 
-static void processAxisLocking(float x, float y, float speed, int16_t yInversion, float speedDivisor, float axisLockSkew, float axisLockSkewFirstTick, module_kinetic_state_t* ks, bool continuous)
-{
+static void handleRunningCaretModeAction(module_kinetic_state_t* ks) {
+    if (ks->zoomActive) {
+        progressZoomAction(ks);
+    } else {
+        handleSimpleRunningAction(ks);
+    }
+}
+
+static void processAxisLocking(
+        float x,
+        float y,
+        float speed,
+        int16_t yInversion,
+        float speedDivisor,
+        bool axisLockEnabled,
+        float axisLockSkew,
+        float axisLockSkewFirstTick,
+        module_kinetic_state_t* ks,
+        bool continuous
+) {
     //optimize this out if nothing is going on
     if (x == 0 && y == 0 && ks->caretAxis == CaretAxis_None) {
         return;
@@ -436,7 +508,13 @@ static void processAxisLocking(float x, float y, float speed, int16_t yInversion
 
     //unlock axis if inactive for some time and re-activate tick trashold`
     if (x != 0 || y != 0) {
-        if (Timer_GetElapsedTime(&ks->lastUpdate) > 500 && ks->caretAxis != CaretAxis_None) {
+        if (
+                Timer_GetElapsedTime(&ks->lastUpdate) > 500
+                && ks->caretAxis != CaretAxis_None
+                && ks->zoomActive == false
+                && ks->caretFakeKeystate.current == false
+                && ks->caretFakeKeystate.previous == false
+        ) {
             ks->xFractionRemainder = 0;
             ks->yFractionRemainder = 0;
             ks->caretAxis = CaretAxis_None;
@@ -449,7 +527,11 @@ static void processAxisLocking(float x, float y, float speed, int16_t yInversion
     float caretXModeMultiplier;
     float caretYModeMultiplier;
 
-    if(ks->caretAxis == CaretAxis_None) {
+    if (!axisLockEnabled) {
+        caretXModeMultiplier = 1.0f;
+        caretYModeMultiplier =  1.0f;
+    }
+    else if (ks->caretAxis == CaretAxis_None) {
         caretXModeMultiplier = axisLockSkewFirstTick;
         caretYModeMultiplier = axisLockSkewFirstTick;
     } else {
@@ -460,18 +542,30 @@ static void processAxisLocking(float x, float y, float speed, int16_t yInversion
     ks->xFractionRemainder += x * speed / speedDivisor * caretXModeMultiplier;
     ks->yFractionRemainder += y * speed / speedDivisor * caretYModeMultiplier;
 
-
     //If there is an ongoing action, just handle that action via a fake state. Ensure that full lifecycle of a key gets executed.
-    if (ks->caretFakeKeystate.current || ks->caretFakeKeystate.previous) {
+    if (ks->caretFakeKeystate.current || ks->caretFakeKeystate.previous || ks->zoomActive) {
         handleRunningCaretModeAction(ks);
     }
     //If we want to start a new action (new "tick")
     else {
-        // determine current axis properties and setup indirections for easier handling
-        caret_axis_t axisCandidate = ks->caretAxis == CaretAxis_Inactive ? CaretAxis_Vertical : ks->caretAxis;
+        // determine default axis
+        caret_axis_t axisCandidate;
+
+        if ( ks->caretAxis == CaretAxis_Inactive ) {
+            float absX = ABS(ks->xFractionRemainder);
+            float absY = ABS(ks->yFractionRemainder);
+            axisCandidate = absX > absY ? CaretAxis_Horizontal : CaretAxis_Vertical;
+        } else {
+            axisCandidate = ks->caretAxis;
+        }
+
+        // setup the indirections
+
         float* axisFractionRemainders [CaretAxis_Count] = {&ks->xFractionRemainder, &ks->yFractionRemainder};
         float axisIntegerParts [CaretAxis_Count] = { 0, 0 };
 
+        // determine integer parts
+
         modff(ks->xFractionRemainder, &axisIntegerParts[CaretAxis_Horizontal]);
         modff(ks->yFractionRemainder, &axisIntegerParts[CaretAxis_Vertical]);
 
@@ -486,18 +580,34 @@ static void processAxisLocking(float x, float y, float speed, int16_t yInversion
 
         // handle the action
         if ( axisCandidate < CaretAxis_Count ) {
-            ks->caretAxis = axisCandidate;
             float sgn = axisIntegerParts[axisCandidate] > 0 ? 1 : -1;
             int8_t currentAxisInversion = axisCandidate == CaretAxis_Vertical ? yInversion : 1;
             float consumedAmount = continuous ? axisIntegerParts[axisCandidate] : sgn;
-            *axisFractionRemainders[1 - axisCandidate] = 0.0f;
             *axisFractionRemainders[axisCandidate] -= consumedAmount;
+            if (axisLockEnabled) {
+                // if not axis locking, than allow accumulation of secondary axis
+                *axisFractionRemainders[1 - axisCandidate] = 0.0f;
+            }
+            if (ks->caretAxis == CaretAxis_None) {
+                // zero state after first tick, in order to support
+                // skews greater than 1
+                *axisFractionRemainders[CaretAxis_Vertical] = 0.0f;
+                *axisFractionRemainders[CaretAxis_Horizontal] = 0.0f;
+            }
+            ks->caretAxis = axisCandidate;
+
             handleNewCaretModeAction(ks->caretAxis, sgn*currentAxisInversion, consumedAmount*currentAxisInversion, ks);
         }
     }
 }
 
-static void processModuleKineticState(float x, float y, module_configuration_t* moduleConfiguration, module_kinetic_state_t* ks) {
+static void processModuleKineticState(
+        float x,
+        float y,
+        module_configuration_t* moduleConfiguration,
+        module_kinetic_state_t* ks,
+        uint8_t forcedNavigationMode
+ ) {
     float speed;
 
     bool moduleYInversion = ks->currentModuleId == ModuleId_KeyClusterLeft || ks->currentModuleId == ModuleId_TouchpadRight;
@@ -518,7 +628,7 @@ static void processModuleKineticState(float x, float y, module_configuration_t*
                 ActiveUsbMouseReport->x += xIntegerPart;
                 ActiveUsbMouseReport->y -= yInversion*yIntegerPart;
             } else {
-                processAxisLocking(x, y, speed, yInversion, 1.0f, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockSkewFirstTick, ks, true);
+                processAxisLocking(x, y, speed, yInversion, 1.0f, true, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockFirstTickSkew, ks, true);
             }
             break;
         }
@@ -533,16 +643,20 @@ static void processModuleKineticState(float x, float y, module_configuration_t*
                 ActiveUsbMouseReport->wheelX += xIntegerPart;
                 ActiveUsbMouseReport->wheelY += yInversion*yIntegerPart;
             } else {
-                processAxisLocking(x, y, speed, yInversion, moduleConfiguration->scrollSpeedDivisor, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockSkewFirstTick, ks, true);
+                processAxisLocking(x, y, speed, yInversion, moduleConfiguration->scrollSpeedDivisor, true, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockFirstTickSkew, ks, true);
             }
             break;
         }
         case NavigationMode_Zoom:
-            processAxisLocking(x, y, speed, yInversion, moduleConfiguration->zoomSpeedDivisor, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockSkewFirstTick, ks, false);
-            break;
+        case NavigationMode_ZoomPc:
+        case NavigationMode_ZoomMac:
         case NavigationMode_Media:
-        case NavigationMode_Caret:
-            processAxisLocking(x, y, speed, yInversion, moduleConfiguration->caretSpeedDivisor, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockSkewFirstTick, ks, false);
+        case NavigationMode_Caret:;
+            // forced zoom = touchpad pinch zoom; it needs special coefficient
+            // forced scroll = touchpad scroll;
+            bool isPinchGesture = forcedNavigationMode == NavigationMode_Zoom;
+            float speedDivisor = isPinchGesture ? moduleConfiguration->pinchZoomSpeedDivisor : moduleConfiguration->caretSpeedDivisor;
+            processAxisLocking(x, y, speed, yInversion, speedDivisor, moduleConfiguration->caretAxisLock, moduleConfiguration->axisLockSkew, moduleConfiguration->axisLockFirstTickSkew, ks, false);
             break;
         case NavigationMode_None:
             break;
@@ -568,9 +682,14 @@ static layer_id_t determineEffectiveLayer() {
     return secondaryRoleResolutionInProgress ? SECONDARY_ROLE_LAYER_TO_LAYER_ID(SecondaryRolePreview) : ActiveLayer;
 }
 
-static void processModuleActions(uint8_t moduleId, float x, float y, uint8_t forcedNavigationMode)
-{
+static void processModuleActions(
+        uint8_t moduleId,
+        float x,
+        float y,
+        uint8_t forcedNavigationMode
+) {
     module_configuration_t *moduleConfiguration = GetModuleConfiguration(moduleId);
+    module_kinetic_state_t *ks = moduleId == ModuleId_KeyClusterLeft ? &leftModuleKineticState : &rightModuleKineticState;
 
     navigation_mode_t navigationMode;
 
@@ -581,27 +700,32 @@ static void processModuleActions(uint8_t moduleId, float x, float y, uint8_t for
     }
 
     bool moduleIsActive = x != 0 || y != 0;
-    bool keystateOwnerDiffers = moduleKineticState.currentModuleId != moduleId || moduleKineticState.currentNavigationMode != navigationMode;
-    bool keyActionIsNotActive = moduleKineticState.caretFakeKeystate.current == false && moduleKineticState.caretFakeKeystate.previous == false;
+    bool keystateOwnerDiffers = ks->currentModuleId != moduleId || ks->currentNavigationMode != navigationMode;
+    bool keyActionIsNotActive = true
+        && ks->caretFakeKeystate.current == false
+        && ks->caretFakeKeystate.previous == false
+        && ks->zoomActive == 0;
 
     if (moduleIsActive && keystateOwnerDiffers && keyActionIsNotActive) {
-        // Currently, we share the state among modules & navigation modes, and reset it whenever the user starts to use other mode.
-        resetKineticModuleState(&moduleKineticState);
+        // Currently, we share the state among (different right-hand) modules &
+        // navigation modes, and reset it whenever the user starts to use other
+        // mode.
+        resetKineticModuleState(ks);
 
-        moduleKineticState.currentModuleId = moduleId;
-        moduleKineticState.currentNavigationMode = navigationMode;
+        ks->currentModuleId = moduleId;
+        ks->currentNavigationMode = navigationMode;
     }
 
-    if (moduleKineticState.currentModuleId == moduleId && moduleKineticState.currentNavigationMode == navigationMode) {
-        if(moduleConfiguration->swapAxes) {
-            float tmp = x;
-            x = y;
-            y = tmp;
-        }
-
-        //we want to process kinetic state even if x == 0 && y == 0, at least as long as caretAxis != CaretAxis_None because of fake key states that may be active.
-        processModuleKineticState(x, y, moduleConfiguration, &moduleKineticState);
+    if(moduleConfiguration->swapAxes) {
+        float tmp = x;
+        x = y;
+        y = tmp;
     }
+
+    //we want to process kinetic state even if x == 0 && y == 0, at least as
+    //long as caretAxis != CaretAxis_None because of fake key states that may
+    //be active.
+    processModuleKineticState(x, y, moduleConfiguration, ks, forcedNavigationMode);
 }
 
 void MouseController_ProcessMouseActions()
diff --git a/right/src/mouse_controller.h b/right/src/mouse_controller.h
index 6d5de0bdd..ed7eebc5a 100644
--- a/right/src/mouse_controller.h
+++ b/right/src/mouse_controller.h
@@ -9,6 +9,7 @@
 // Macros:
 
     #define ACTIVE_MOUSE_STATES_COUNT (SerializedMouseAction_Last + 1)
+    #define ABS(A) ((A) < 0 ? (-A) : (A))
 
 // Typedefs:
 
@@ -44,7 +45,7 @@
     } mouse_kinetic_state_t;
 
     typedef struct {
-        key_action_t* caretAction;
+        key_action_cached_t caretAction;
         key_state_t caretFakeKeystate;
         float xFractionRemainder;
         float yFractionRemainder;
@@ -53,6 +54,9 @@
         uint8_t caretAxis;
         uint8_t currentModuleId;
         uint8_t currentNavigationMode;
+        uint8_t zoomPhase;
+        uint8_t zoomSign;
+        bool zoomActive;
     } module_kinetic_state_t;
 
 // Variables:
diff --git a/right/src/str_utils.c b/right/src/str_utils.c
index 9afae5189..27b00229a 100644
--- a/right/src/str_utils.c
+++ b/right/src/str_utils.c
@@ -236,6 +236,12 @@ navigation_mode_t ParseNavigationModeId(const char* arg1, const char* cmdEnd)
     else if (TokenMatches(arg1, cmdEnd, "zoom")) {
         return NavigationMode_Zoom;
     }
+    else if (TokenMatches(arg1, cmdEnd, "zoomPc")) {
+        return NavigationMode_ZoomPc;
+    }
+    else if (TokenMatches(arg1, cmdEnd, "zoomMac")) {
+        return NavigationMode_ZoomMac;
+    }
     else if (TokenMatches(arg1, cmdEnd, "none")) {
         return NavigationMode_None;
     }
diff --git a/right/src/usb_api.h b/right/src/usb_api.h
index 94a532c72..562a2eda8 100644
--- a/right/src/usb_api.h
+++ b/right/src/usb_api.h
@@ -3,6 +3,7 @@
 
 // Includes:
 
+    #include <stdbool.h>
     #include "usb.h"
     #include "usb_device.h"
     #include "ksdk_usb/usb_device_class.h"
@@ -13,6 +14,9 @@
 
 // Macros:
 
+    #define USB_ALIGNMENT           __attribute__((aligned(4))) // required by USB DMA engine
+    #define USB_DESC_STORAGE_TYPE   const uint8_t USB_ALIGNMENT
+
     // General constants
 
     #define USB_DEVICE_CLASS 0x00
@@ -63,4 +67,21 @@
     #define HID_RI_COLLECTION_APPLICATION 0x01
     #define HID_RI_COLLECTION_LOGICAL     0x02
 
+// Functions:
+    static inline bool test_bit(unsigned nr, const uint8_t *addr)
+    {
+        const uint8_t *p = addr;
+        return ((1UL << (nr & 7)) & (p[nr >> 3])) != 0;
+    }
+    static inline void set_bit(unsigned nr, uint8_t *addr)
+    {
+        uint8_t *p = (uint8_t *)addr;
+        p[nr >> 3] |= (1UL << (nr & 7));
+    }
+    static inline void clear_bit(unsigned nr, uint8_t *addr)
+    {
+        uint8_t *p = (uint8_t *)addr;
+        p[nr >> 3] &= ~(1UL << (nr & 7));
+    }
+
 #endif
diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index c006a7ca5..200142642 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -307,5 +307,6 @@ void InitUsb(void)
     uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
     NVIC_EnableIRQ((IRQn_Type)irqNumber);
 
+    FMC->PFAPR |= (1 << FMC_PFAPR_M3AP_SHIFT) | (1 << FMC_PFAPR_M4AP_SHIFT); // allow USB controller to read from Flash
     USB_DeviceRun(UsbCompositeDevice.deviceHandle);
 }
diff --git a/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.c b/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.c
deleted file mode 100644
index b5634c7fe..000000000
--- a/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "usb_api.h"
-#include "usb_descriptor_basic_keyboard_report.h"
-
-uint8_t UsbBasicKeyboardReportDescriptor[USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD),
-    HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-
-        // Modifiers
-        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
-        HID_RI_USAGE_MINIMUM(8, 0xE0),
-        HID_RI_USAGE_MAXIMUM(8, 0xE7),
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-        HID_RI_REPORT_SIZE(8, 0x01),
-        HID_RI_REPORT_COUNT(8, 0x08),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-        // Reserved for future use, always 0
-        HID_RI_REPORT_COUNT(8, 0x01),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-        // LED status - Num lock, Caps lock, Scroll lock, Compose, Kana
-        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_LEDS),
-        HID_RI_USAGE_MINIMUM(8, 0x01),
-        HID_RI_USAGE_MAXIMUM(8, 0x05),
-        HID_RI_REPORT_COUNT(8, 0x05),
-        HID_RI_REPORT_SIZE(8, 0x01),
-        HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-
-        // LED status padding
-        HID_RI_REPORT_COUNT(8, 0x01),
-        HID_RI_REPORT_SIZE(8, 0x03),
-        HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
-
-        // Scancodes
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0xFF),
-        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
-        HID_RI_USAGE_MINIMUM(8, 0x00),
-        HID_RI_USAGE_MAXIMUM(8, 0xFF),
-        HID_RI_REPORT_COUNT(8, USB_BASIC_KEYBOARD_MAX_KEYS),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
-
-    HID_RI_END_COLLECTION(0),
-};
diff --git a/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.h b/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.h
index 61f7b44b9..e9397e536 100644
--- a/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.h
+++ b/right/src/usb_descriptors/usb_descriptor_basic_keyboard_report.h
@@ -1,13 +1,103 @@
 #ifndef __USB_DESCRIPTOR_BASIC_KEYBOARD_REPORT_H__
 #define __USB_DESCRIPTOR_BASIC_KEYBOARD_REPORT_H__
 
+// Includes:
+
+    #include "usb_api.h"
+    #include "lufa/HIDClassCommon.h"
+
 // Macros:
 
-    #define USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 64
-    #define USB_BASIC_KEYBOARD_MAX_KEYS 6
+    #define USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (sizeof(UsbBasicKeyboardReportDescriptor))
+
+    #define USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE   (HID_KEYBOARD_SC_LEFT_CONTROL)
+    #define USB_BASIC_KEYBOARD_MAX_MODIFIERS_SCANCODE   (HID_KEYBOARD_SC_RIGHT_GUI)
+    #if (USB_BASIC_KEYBOARD_MAX_MODIFIERS_SCANCODE - USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE + 1) != 8
+        #error USB_BASIC_KEYBOARD modifiers range invalid, adjust report layout and report descriptor
+    #endif
+
+    // the first 4 codes are error codes, so not needed in bitmask
+    #define USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE    (HID_KEYBOARD_SC_A)
+    // this bitfield goes up all the way until the modifiers
+    #define USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE    (USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE - 1)
+
+    #define USB_BASIC_KEYBOARD_BITFIELD_COUNT           (USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE - USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE + 1)
+    #define USB_BASIC_KEYBOARD_BITFIELD_LENGTH          ((USB_BASIC_KEYBOARD_BITFIELD_COUNT + 7) / 8)
+
+    #if USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE < 0x65
+        #warning USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE less than maximum standard keyboard scancodes
+    #endif
+
+    #define USB_BASIC_KEYBOARD_REPORT_LENGTH (1 + USB_BASIC_KEYBOARD_BITFIELD_LENGTH)
+    #if USB_BASIC_KEYBOARD_REPORT_LENGTH > 64
+        #error USB_BASIC_KEYBOARD_REPORT_LENGTH greater than max usb report length (64)
+    #endif
 
 // Variables:
 
-    extern uint8_t UsbBasicKeyboardReportDescriptor[USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH];
+    static USB_DESC_STORAGE_TYPE UsbBasicKeyboardReportDescriptor[] = {
+        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
+        HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD),
+        HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
+
+            // Modifiers
+            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
+            HID_RI_USAGE_MINIMUM(8, USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE),
+            HID_RI_USAGE_MAXIMUM(8, USB_BASIC_KEYBOARD_MAX_MODIFIERS_SCANCODE),
+            HID_RI_LOGICAL_MINIMUM(8, 0),
+            HID_RI_LOGICAL_MAXIMUM(8, 1),
+            HID_RI_REPORT_SIZE(8, 1),
+            HID_RI_REPORT_COUNT(8, 8),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+    #if 0 // legacy
+            // Reserved for future use, always 0
+            HID_RI_REPORT_COUNT(8, 1),
+            HID_RI_REPORT_SIZE(8, 8),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
+
+            // Scancodes
+            HID_RI_LOGICAL_MINIMUM(8, 0x00),
+            HID_RI_LOGICAL_MAXIMUM(16, 0xFF),
+            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
+            HID_RI_USAGE_MINIMUM(8, 0x00),
+            HID_RI_USAGE_MAXIMUM(8, 0xFF),
+            HID_RI_REPORT_COUNT(8, USB_BASIC_KEYBOARD_MAX_KEYS),
+            HID_RI_REPORT_SIZE(8, 8),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
+    #else
+            // Scancode Bitmask
+            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_KEY_CODES),
+            HID_RI_USAGE_MINIMUM(8, USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE),
+            HID_RI_USAGE_MAXIMUM(8, USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE),
+            HID_RI_LOGICAL_MINIMUM(8, 0),
+            HID_RI_LOGICAL_MAXIMUM(8, 1),
+            HID_RI_REPORT_SIZE(8, 1),
+            HID_RI_REPORT_COUNT(8, USB_BASIC_KEYBOARD_BITFIELD_COUNT),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+    #if (USB_BASIC_KEYBOARD_BITFIELD_COUNT % 8 != 0)
+            // Padding
+            HID_RI_REPORT_COUNT(8, 1),
+            HID_RI_REPORT_SIZE(8, 8 - (USB_BASIC_KEYBOARD_BITFIELD_COUNT % 8)),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
+    #endif
+    #endif
+
+            // LED status - Num lock, Caps lock, Scroll lock, Compose, Kana
+            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_LEDS),
+            HID_RI_USAGE_MINIMUM(8, HID_LED_UID_NUMLOCK),
+            HID_RI_USAGE_MAXIMUM(8, HID_LED_UID_KANA),
+            HID_RI_REPORT_COUNT(8, 5),
+            HID_RI_REPORT_SIZE(8, 1),
+            HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+            // LED status padding
+            HID_RI_REPORT_COUNT(8, 1),
+            HID_RI_REPORT_SIZE(8, 3),
+            HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
+
+        HID_RI_END_COLLECTION(0),
+    };
 
 #endif
diff --git a/right/src/usb_descriptors/usb_descriptor_configuration.c b/right/src/usb_descriptors/usb_descriptor_configuration.c
index 164d76f71..0f6390e75 100644
--- a/right/src/usb_descriptors/usb_descriptor_configuration.c
+++ b/right/src/usb_descriptors/usb_descriptor_configuration.c
@@ -3,7 +3,7 @@
 #include "usb_descriptor_mouse_report.h"
 #include "usb_descriptor_generic_hid_report.h"
 
-uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = {
+USB_DESC_STORAGE_TYPE UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = {
 
     // Configuration descriptor
     USB_DESCRIPTOR_LENGTH_CONFIGURE,
@@ -186,7 +186,7 @@ usb_status_t USB_DeviceGetConfigurationDescriptor(
     usb_device_handle handle, usb_device_get_configuration_descriptor_struct_t *configurationDescriptor)
 {
     if (USB_COMPOSITE_CONFIGURATION_INDEX > configurationDescriptor->configuration) {
-        configurationDescriptor->buffer = UsbConfigurationDescriptor;
+        configurationDescriptor->buffer = (uint8_t*)UsbConfigurationDescriptor;
         configurationDescriptor->length = USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH;
         return kStatus_USB_Success;
     }
diff --git a/right/src/usb_descriptors/usb_descriptor_configuration.h b/right/src/usb_descriptors/usb_descriptor_configuration.h
index d5fa96ac5..1511b1841 100644
--- a/right/src/usb_descriptors/usb_descriptor_configuration.h
+++ b/right/src/usb_descriptors/usb_descriptor_configuration.h
@@ -18,7 +18,7 @@
 
 // Variables:
 
-    extern uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH];
+    extern USB_DESC_STORAGE_TYPE UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH];
 
 // Functions:
 
diff --git a/right/src/usb_descriptors/usb_descriptor_device.c b/right/src/usb_descriptors/usb_descriptor_device.c
index 46c0c12ba..e543f287f 100644
--- a/right/src/usb_descriptors/usb_descriptor_device.c
+++ b/right/src/usb_descriptors/usb_descriptor_device.c
@@ -2,7 +2,7 @@
 #include "usb_composite_device.h"
 #include "usb_descriptor_strings.h"
 
-uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
+USB_DESC_STORAGE_TYPE UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
     USB_DESCRIPTOR_LENGTH_DEVICE,
     USB_DESCRIPTOR_TYPE_DEVICE,
     USB_SHORT_GET_LOW(USB_DEVICE_SPECIFICATION_VERSION),
@@ -26,7 +26,7 @@ uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
 usb_status_t USB_DeviceGetDeviceDescriptor(
     usb_device_handle handle, usb_device_get_device_descriptor_struct_t *deviceDescriptor)
 {
-    deviceDescriptor->buffer = UsbDeviceDescriptor;
+    deviceDescriptor->buffer = (uint8_t*)UsbDeviceDescriptor;
     deviceDescriptor->length = USB_DESCRIPTOR_LENGTH_DEVICE;
     return kStatus_USB_Success;
 }
diff --git a/right/src/usb_descriptors/usb_descriptor_generic_hid_report.c b/right/src/usb_descriptors/usb_descriptor_generic_hid_report.c
deleted file mode 100644
index 9dd825f98..000000000
--- a/right/src/usb_descriptors/usb_descriptor_generic_hid_report.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "usb_api.h"
-#include "usb_interfaces/usb_interface_generic_hid.h"
-#include "usb_descriptor_generic_hid_report.h"
-
-uint8_t UsbGenericHidReportDescriptor[USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(16, (0xFF00 | USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX)),
-    HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION),
-    HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-
-        // Input flowing from device to host
-        HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN),
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0xFF),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_REPORT_COUNT(8, USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-        // Output flowing from host to device
-        HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT),
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0xFF),
-        HID_RI_REPORT_SIZE(8, 0x08),
-        HID_RI_REPORT_COUNT(8, USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE),
-        HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-
-    HID_RI_END_COLLECTION(0)
-};
diff --git a/right/src/usb_descriptors/usb_descriptor_generic_hid_report.h b/right/src/usb_descriptors/usb_descriptor_generic_hid_report.h
index d69a66c4d..1988c9190 100644
--- a/right/src/usb_descriptors/usb_descriptor_generic_hid_report.h
+++ b/right/src/usb_descriptors/usb_descriptor_generic_hid_report.h
@@ -1,9 +1,14 @@
 #ifndef __USB_DESCRIPTOR_GENERIC_HID_REPORT_H__
 #define __USB_DESCRIPTOR_GENERIC_HID_REPORT_H__
 
+// Includes:
+
+    #include "usb_api.h"
+    #include "usb_interfaces/usb_interface_generic_hid.h"
+
 // Macros:
 
-    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH 34
+    #define USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH (sizeof(UsbGenericHidReportDescriptor))
 
     #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX 0x00
     #define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION 0x01
@@ -12,6 +17,28 @@
 
 // Variables:
 
-    extern uint8_t UsbGenericHidReportDescriptor[USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH];
+    static USB_DESC_STORAGE_TYPE UsbGenericHidReportDescriptor[] = {
+        HID_RI_USAGE_PAGE(16, (0xFF00 | USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX)),
+        HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION),
+        HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
+
+            // Input flowing from device to host
+            HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN),
+            HID_RI_LOGICAL_MINIMUM(8, 0x00),
+            HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+            HID_RI_REPORT_SIZE(8, 8),
+            HID_RI_REPORT_COUNT(8, USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+            // Output flowing from host to device
+            HID_RI_USAGE(8, USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT),
+            HID_RI_LOGICAL_MINIMUM(8, 0x00),
+            HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+            HID_RI_REPORT_SIZE(8, 8),
+            HID_RI_REPORT_COUNT(8, USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE),
+            HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+        HID_RI_END_COLLECTION(0)
+    };
 
 #endif
diff --git a/right/src/usb_descriptors/usb_descriptor_hid.c b/right/src/usb_descriptors/usb_descriptor_hid.c
index 1fc2974e6..8fcfbb58c 100644
--- a/right/src/usb_descriptors/usb_descriptor_hid.c
+++ b/right/src/usb_descriptors/usb_descriptor_hid.c
@@ -30,19 +30,19 @@ usb_status_t USB_DeviceGetHidDescriptor(
 
     switch (hidDescriptor->interfaceNumber) {
         case USB_GENERIC_HID_INTERFACE_INDEX:
-            hidDescriptor->buffer = &UsbConfigurationDescriptor[USB_GENERIC_HID_DESCRIPTOR_INDEX];
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_GENERIC_HID_DESCRIPTOR_INDEX];
             break;
         case USB_BASIC_KEYBOARD_INTERFACE_INDEX:
-            hidDescriptor->buffer = &UsbConfigurationDescriptor[USB_BASIC_KEYBOARD_HID_DESCRIPTOR_INDEX];
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_BASIC_KEYBOARD_HID_DESCRIPTOR_INDEX];
             break;
         case USB_MEDIA_KEYBOARD_INTERFACE_INDEX:
-            hidDescriptor->buffer = &UsbConfigurationDescriptor[USB_MEDIA_KEYBOARD_HID_DESCRIPTOR_INDEX];
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_MEDIA_KEYBOARD_HID_DESCRIPTOR_INDEX];
             break;
         case USB_SYSTEM_KEYBOARD_INTERFACE_INDEX:
-            hidDescriptor->buffer = &UsbConfigurationDescriptor[USB_SYSTEM_KEYBOARD_HID_DESCRIPTOR_INDEX];
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_SYSTEM_KEYBOARD_HID_DESCRIPTOR_INDEX];
             break;
         case USB_MOUSE_INTERFACE_INDEX:
-            hidDescriptor->buffer = &UsbConfigurationDescriptor[USB_MOUSE_HID_DESCRIPTOR_INDEX];
+            hidDescriptor->buffer = (uint8_t*)&UsbConfigurationDescriptor[USB_MOUSE_HID_DESCRIPTOR_INDEX];
             break;
         default:
             return kStatus_USB_InvalidRequest;
@@ -55,23 +55,23 @@ usb_status_t USB_DeviceGetHidReportDescriptor(
 {
     switch (hidReportDescriptor->interfaceNumber) {
         case USB_GENERIC_HID_INTERFACE_INDEX:
-            hidReportDescriptor->buffer = UsbGenericHidReportDescriptor;
+            hidReportDescriptor->buffer = (uint8_t*)UsbGenericHidReportDescriptor;
             hidReportDescriptor->length = USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH;
             break;
         case USB_BASIC_KEYBOARD_INTERFACE_INDEX:
-            hidReportDescriptor->buffer = UsbBasicKeyboardReportDescriptor;
+            hidReportDescriptor->buffer = (uint8_t*)UsbBasicKeyboardReportDescriptor;
             hidReportDescriptor->length = USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH;
             break;
         case USB_MEDIA_KEYBOARD_INTERFACE_INDEX:
-            hidReportDescriptor->buffer = UsbMediaKeyboardReportDescriptor;
+            hidReportDescriptor->buffer = (uint8_t*)UsbMediaKeyboardReportDescriptor;
             hidReportDescriptor->length = USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH;
             break;
         case USB_SYSTEM_KEYBOARD_INTERFACE_INDEX:
-            hidReportDescriptor->buffer = UsbSystemKeyboardReportDescriptor;
+            hidReportDescriptor->buffer = (uint8_t*)UsbSystemKeyboardReportDescriptor;
             hidReportDescriptor->length = USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH;
             break;
         case USB_MOUSE_INTERFACE_INDEX:
-            hidReportDescriptor->buffer = UsbMouseReportDescriptor;
+            hidReportDescriptor->buffer = (uint8_t*)UsbMouseReportDescriptor;
             hidReportDescriptor->length = USB_MOUSE_REPORT_DESCRIPTOR_LENGTH;
             break;
         default:
diff --git a/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.c b/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.c
deleted file mode 100644
index 009558ec0..000000000
--- a/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "usb_api.h"
-#include "usb_descriptor_media_keyboard_report.h"
-
-uint8_t UsbMediaKeyboardReportDescriptor[USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
-    HID_RI_USAGE(8, HID_RI_USAGE_CONSUMER_CONTROL),
-    HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-        // Media Keys
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(16, 0x03FF),
-        HID_RI_USAGE_MINIMUM(8, 0x00),
-        HID_RI_USAGE_MAXIMUM(16, 0x03FF),
-        HID_RI_REPORT_COUNT(8, USB_MEDIA_KEYBOARD_MAX_KEYS),
-        HID_RI_REPORT_SIZE(8, 0x10),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
-    HID_RI_END_COLLECTION(0),
-};
diff --git a/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.h b/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.h
index 3b17b4e60..9d8947d2d 100644
--- a/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.h
+++ b/right/src/usb_descriptors/usb_descriptor_media_keyboard_report.h
@@ -1,13 +1,31 @@
 #ifndef __USB_DESCRIPTOR_MEDIA_KEYBOARD_REPORT_H__
 #define __USB_DESCRIPTOR_MEDIA_KEYBOARD_REPORT_H__
 
+// Includes:
+
+    #include "usb_api.h"
+
 // Macros:
 
-    #define USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 23
+    #define USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (sizeof(UsbMediaKeyboardReportDescriptor))
     #define USB_MEDIA_KEYBOARD_MAX_KEYS 4
+    #define HID_CONSUMER_MAX_USAGE  0x03FF
 
 // Variables:
 
-    extern uint8_t UsbMediaKeyboardReportDescriptor[USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH];
+    static USB_DESC_STORAGE_TYPE UsbMediaKeyboardReportDescriptor[] = {
+        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
+        HID_RI_USAGE(8, HID_RI_USAGE_CONSUMER_CONTROL),
+        HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
+            // Media Keys
+            HID_RI_LOGICAL_MINIMUM(8, 0),
+            HID_RI_LOGICAL_MAXIMUM(16, HID_CONSUMER_MAX_USAGE),
+            HID_RI_USAGE_MINIMUM(8, 0),
+            HID_RI_USAGE_MAXIMUM(16, HID_CONSUMER_MAX_USAGE),
+            HID_RI_REPORT_COUNT(8, USB_MEDIA_KEYBOARD_MAX_KEYS),
+            HID_RI_REPORT_SIZE(8, 16),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
+        HID_RI_END_COLLECTION(0),
+    };
 
 #endif
diff --git a/right/src/usb_descriptors/usb_descriptor_mouse_report.c b/right/src/usb_descriptors/usb_descriptor_mouse_report.c
deleted file mode 100644
index 404cf2385..000000000
--- a/right/src/usb_descriptors/usb_descriptor_mouse_report.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "usb_api.h"
-#include "usb_descriptor_mouse_report.h"
-
-uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_MOUSE),
-    HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-        HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_POINTER),
-        HID_RI_COLLECTION(8, HID_RI_COLLECTION_PHYSICAL),
-
-            // Mouse buttons
-            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_BUTTONS),
-            HID_RI_USAGE_MINIMUM(8, 0x01),
-            HID_RI_USAGE_MAXIMUM(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
-            HID_RI_LOGICAL_MINIMUM(8, 0x00),
-            HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-            HID_RI_REPORT_COUNT(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
-            HID_RI_REPORT_SIZE(8, 0x01),
-            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-            // Mouse buttons padding
-            HID_RI_REPORT_COUNT(8, 0x01),
-            HID_RI_REPORT_SIZE(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS_PADDING),
-            HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-            // Mouse X and Y coordinates
-            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-            HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_X),
-            HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_Y),
-            HID_RI_LOGICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE),
-            HID_RI_LOGICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE),
-            HID_RI_PHYSICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_PHYSICAL_VALUE),
-            HID_RI_PHYSICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_PHYSICAL_VALUE),
-            HID_RI_REPORT_COUNT(8, 0x02),
-            HID_RI_REPORT_SIZE(8, 16),
-            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
-
-            HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
-
-                // Vertical wheel
-                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_WHEEL),
-                HID_RI_LOGICAL_MINIMUM(8, -127),
-                HID_RI_LOGICAL_MAXIMUM(8, 127),
-                HID_RI_PHYSICAL_MINIMUM(16, 127),
-                HID_RI_PHYSICAL_MAXIMUM(16, 127),
-                HID_RI_REPORT_COUNT(8, 0x01),
-                HID_RI_REPORT_SIZE(8, 0x08),
-                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
-
-            HID_RI_END_COLLECTION(0),
-
-            HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
-
-                // Horizontal wheel
-                HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
-                HID_RI_USAGE(16, HID_RI_USAGE_CONSUMER_AC_PAN),
-                HID_RI_LOGICAL_MINIMUM(8, -127),
-                HID_RI_LOGICAL_MAXIMUM(8, 127),
-                HID_RI_PHYSICAL_MINIMUM(16, 127),
-                HID_RI_PHYSICAL_MAXIMUM(16, 127),
-                HID_RI_REPORT_COUNT(8, 0x01),
-                HID_RI_REPORT_SIZE(8, 0x08),
-                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
-
-            HID_RI_END_COLLECTION(0),
-
-        HID_RI_END_COLLECTION(0),
-    HID_RI_END_COLLECTION(0)
-};
diff --git a/right/src/usb_descriptors/usb_descriptor_mouse_report.h b/right/src/usb_descriptors/usb_descriptor_mouse_report.h
index fc1240d3f..a1a159b34 100644
--- a/right/src/usb_descriptors/usb_descriptor_mouse_report.h
+++ b/right/src/usb_descriptors/usb_descriptor_mouse_report.h
@@ -1,9 +1,13 @@
 #ifndef __USB_DESCRIPTOR_MOUSE_REPORT_H__
 #define __USB_DESCRIPTOR_MOUSE_REPORT_H__
 
+// Includes:
+
+    #include "usb_api.h"
+
 // Macros:
 
-    #define USB_MOUSE_REPORT_DESCRIPTOR_LENGTH 103
+    #define USB_MOUSE_REPORT_DESCRIPTOR_LENGTH (sizeof(UsbMouseReportDescriptor))
 
     #define USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE -4096
     #define USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE 4096
@@ -17,6 +21,71 @@
 
 // Variables:
 
-    extern uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH];
+    static USB_DESC_STORAGE_TYPE UsbMouseReportDescriptor[] = {
+        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
+        HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_MOUSE),
+        HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
+            HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_POINTER),
+            HID_RI_COLLECTION(8, HID_RI_COLLECTION_PHYSICAL),
+
+                // Mouse buttons
+                HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_BUTTONS),
+                HID_RI_USAGE_MINIMUM(8, 1),
+                HID_RI_USAGE_MAXIMUM(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
+                HID_RI_LOGICAL_MINIMUM(8, 0),
+                HID_RI_LOGICAL_MAXIMUM(8, 1),
+                HID_RI_REPORT_COUNT(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
+                HID_RI_REPORT_SIZE(8, 1),
+                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+                // Mouse buttons padding
+                HID_RI_REPORT_COUNT(8, 1),
+                HID_RI_REPORT_SIZE(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS_PADDING),
+                HID_RI_INPUT(8, HID_IOF_CONSTANT),
+
+                // Mouse X and Y coordinates
+                HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
+                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_X),
+                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_Y),
+                HID_RI_LOGICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE),
+                HID_RI_LOGICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE),
+                HID_RI_PHYSICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_PHYSICAL_VALUE),
+                HID_RI_PHYSICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_PHYSICAL_VALUE),
+                HID_RI_REPORT_COUNT(8, 2),
+                HID_RI_REPORT_SIZE(8, 16),
+                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
+
+                HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
+
+                    // Vertical wheel
+                    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_WHEEL),
+                    HID_RI_LOGICAL_MINIMUM(8, -127),
+                    HID_RI_LOGICAL_MAXIMUM(8, 127),
+                    HID_RI_PHYSICAL_MINIMUM(16, -127),
+                    HID_RI_PHYSICAL_MAXIMUM(16, 127),
+                    HID_RI_REPORT_COUNT(8, 1),
+                    HID_RI_REPORT_SIZE(8, 8),
+                    HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
+
+                HID_RI_END_COLLECTION(0),
+
+                HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
+
+                    // Horizontal wheel
+                    HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
+                    HID_RI_USAGE(16, HID_RI_USAGE_CONSUMER_AC_PAN),
+                    HID_RI_LOGICAL_MINIMUM(8, -127),
+                    HID_RI_LOGICAL_MAXIMUM(8, 127),
+                    HID_RI_PHYSICAL_MINIMUM(16, -127),
+                    HID_RI_PHYSICAL_MAXIMUM(16, 127),
+                    HID_RI_REPORT_COUNT(8, 1),
+                    HID_RI_REPORT_SIZE(8, 8),
+                    HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
+
+                HID_RI_END_COLLECTION(0),
+
+            HID_RI_END_COLLECTION(0),
+        HID_RI_END_COLLECTION(0)
+    };
 
 #endif
diff --git a/right/src/usb_descriptors/usb_descriptor_strings.c b/right/src/usb_descriptors/usb_descriptor_strings.c
index 17cd9d6ce..dd7bb1adf 100644
--- a/right/src/usb_descriptors/usb_descriptor_strings.c
+++ b/right/src/usb_descriptors/usb_descriptor_strings.c
@@ -2,14 +2,14 @@
 #include "usb_descriptor_strings.h"
 #include "device.h"
 
-uint8_t UsbLanguageListStringDescriptor[USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH] = {
+USB_DESC_STORAGE_TYPE UsbLanguageListStringDescriptor[USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbLanguageListStringDescriptor),
     USB_DESCRIPTOR_TYPE_STRING,
     USB_SHORT_GET_LOW(USB_LANGUAGE_ID_UNITED_STATES),
     USB_SHORT_GET_HIGH(USB_LANGUAGE_ID_UNITED_STATES)
 };
 
-uint8_t UsbManufacturerString[USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH] = {
+USB_DESC_STORAGE_TYPE UsbManufacturerString[USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbManufacturerString),
     USB_DESCRIPTOR_TYPE_STRING,
     'U', 0x00U,
@@ -45,7 +45,7 @@ uint8_t UsbManufacturerString[USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH] = {
 #if DEVICE_ID == DEVICE_ID_UHK60V1
 
 #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH 20
-uint8_t UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
+USB_DESC_STORAGE_TYPE UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbProductString),
     USB_DESCRIPTOR_TYPE_STRING,
     'U', 0x00U,
@@ -62,7 +62,7 @@ uint8_t UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
 #elif DEVICE_ID == DEVICE_ID_UHK60V2
 
 #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH 20
-uint8_t UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
+USB_DESC_STORAGE_TYPE UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbProductString),
     USB_DESCRIPTOR_TYPE_STRING,
     'U', 0x00U,
@@ -78,13 +78,13 @@ uint8_t UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
 
 #endif
 
-uint32_t UsbStringDescriptorLengths[USB_STRING_DESCRIPTOR_COUNT] = {
+const uint32_t UsbStringDescriptorLengths[USB_STRING_DESCRIPTOR_COUNT] = {
     sizeof(UsbLanguageListStringDescriptor),
     sizeof(UsbManufacturerString),
     sizeof(UsbProductString),
 };
 
-uint8_t *UsbStringDescriptors[USB_STRING_DESCRIPTOR_COUNT] = {
+USB_DESC_STORAGE_TYPE *UsbStringDescriptors[USB_STRING_DESCRIPTOR_COUNT] = {
     UsbLanguageListStringDescriptor,
     UsbManufacturerString,
     UsbProductString,
@@ -94,12 +94,12 @@ usb_status_t USB_DeviceGetStringDescriptor(
     usb_device_handle handle, usb_device_get_string_descriptor_struct_t *stringDescriptor)
 {
     if (stringDescriptor->stringIndex == 0) {
-        stringDescriptor->buffer = UsbLanguageListStringDescriptor;
+        stringDescriptor->buffer = (uint8_t*)UsbLanguageListStringDescriptor;
         stringDescriptor->length = sizeof(UsbLanguageListStringDescriptor);
     } else if (stringDescriptor->languageId == USB_LANGUAGE_ID_UNITED_STATES &&
                stringDescriptor->stringIndex < USB_STRING_DESCRIPTOR_COUNT)
     {
-        stringDescriptor->buffer = UsbStringDescriptors[stringDescriptor->stringIndex];
+        stringDescriptor->buffer = (uint8_t*)UsbStringDescriptors[stringDescriptor->stringIndex];
         stringDescriptor->length = UsbStringDescriptorLengths[stringDescriptor->stringIndex];
     } else {
         return kStatus_USB_InvalidRequest;
diff --git a/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.c b/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.c
deleted file mode 100644
index ca927494b..000000000
--- a/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "usb_api.h"
-#include "usb_descriptor_system_keyboard_report.h"
-
-uint8_t UsbSystemKeyboardReportDescriptor[USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
-    HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_SYSTEM_CONTROL),
-    HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-        // System keys
-        HID_RI_LOGICAL_MINIMUM(8, 0x00),
-        HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-        HID_RI_USAGE_MINIMUM(8, 0x81), // SYSTEM_POWER_DOWN, SYSTEM_SLEEP and SYSTEM_WAKE_UP
-        HID_RI_USAGE_MAXIMUM(8, 0x83),
-        HID_RI_REPORT_SIZE(8, 1),
-        HID_RI_REPORT_COUNT(8, 3),
-        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-        // Padding
-        HID_RI_REPORT_SIZE(8, 1),
-        HID_RI_REPORT_COUNT(8, 5),
-        HID_RI_INPUT(8, HID_IOF_CONSTANT),
-    HID_RI_END_COLLECTION(0),
-};
diff --git a/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.h b/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.h
index 452be862f..89f8de058 100644
--- a/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.h
+++ b/right/src/usb_descriptors/usb_descriptor_system_keyboard_report.h
@@ -1,13 +1,43 @@
 #ifndef __USB_DESCRIPTOR_SYSTEM_KEYBOARD_REPORT_H__
 #define __USB_DESCRIPTOR_SYSTEM_KEYBOARD_REPORT_H__
 
+// Includes:
+
+    #include "usb_api.h"
+    #include "arduino_hid/SystemAPI.h"
+
 // Macros:
 
-    #define USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 27
-    #define USB_SYSTEM_KEYBOARD_MAX_KEYS 1
+    #define USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (sizeof(UsbSystemKeyboardReportDescriptor))
+    #define USB_SYSTEM_KEYBOARD_REPORT_LENGTH 1
+
+    #define USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE SYSTEM_POWER_DOWN
+    #define USB_SYSTEM_KEYBOARD_MAX_BITFIELD_SCANCODE SYSTEM_WAKE_UP
+
+    #if USB_SYSTEM_KEYBOARD_REPORT_LENGTH > 64
+        #error USB_SYSTEM_KEYBOARD_REPORT_LENGTH greater than max usb report length (64)
+    #endif
 
 // Variables:
 
-    extern uint8_t UsbSystemKeyboardReportDescriptor[USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH];
+    static USB_DESC_STORAGE_TYPE UsbSystemKeyboardReportDescriptor[] = {
+        HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
+        HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_SYSTEM_CONTROL),
+        HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
+            // System keys
+            HID_RI_LOGICAL_MINIMUM(8, 0),
+            HID_RI_LOGICAL_MAXIMUM(8, 1),
+            HID_RI_USAGE_MINIMUM(8, USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE),
+            HID_RI_USAGE_MAXIMUM(8, USB_SYSTEM_KEYBOARD_MAX_BITFIELD_SCANCODE),
+            HID_RI_REPORT_SIZE(8, 1),
+            HID_RI_REPORT_COUNT(8, 3),
+            HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
+
+            // Padding
+            HID_RI_REPORT_SIZE(8, 1),
+            HID_RI_REPORT_COUNT(8, 5),
+            HID_RI_INPUT(8, HID_IOF_CONSTANT),
+        HID_RI_END_COLLECTION(0),
+    };
 
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
index 31b222e29..2a4ece246 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
@@ -30,21 +30,30 @@ usb_hid_protocol_t UsbBasicKeyboardGetProtocol(void)
 
 usb_status_t UsbBasicKeyboardAction(void)
 {
+    usb_status_t usb_status = kStatus_USB_Error;
+
     if (!UsbCompositeDevice.attach) {
-        return kStatus_USB_Error; // The device is not attached
+        return usb_status; // The device is not attached
+    }
+
+    if (usbBasicKeyboardProtocol != ((usb_device_hid_struct_t*)UsbCompositeDevice.basicKeyboardHandle)->protocol) {
+        // The protocol changed while the report was assembled
+        UsbBasicKeyboardResetActiveReport();
+
+        // latch the active protocol to avoid ISR <-> Thread race
+        usbBasicKeyboardProtocol = ((usb_device_hid_struct_t*)UsbCompositeDevice.basicKeyboardHandle)->protocol;
+        return usb_status;
     }
 
-    usb_status_t usb_status = USB_DeviceHidSend(
+    usb_status = USB_DeviceHidSend(
         UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
-        (uint8_t *)ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
+        (uint8_t *)ActiveUsbBasicKeyboardReport, UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL ?
+                USB_BOOT_KEYBOARD_REPORT_LENGTH : USB_BASIC_KEYBOARD_REPORT_LENGTH);
     if (usb_status == kStatus_USB_Success) {
         UsbBasicKeyboardActionCounter++;
         SwitchActiveUsbBasicKeyboardReport();
     }
 
-    // latch the active protocol to avoid ISR <-> Thread race
-    usbBasicKeyboardProtocol = ((usb_device_hid_struct_t*)UsbCompositeDevice.basicKeyboardHandle)->protocol;
-
     return usb_status;
 }
 
@@ -136,3 +145,146 @@ usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, voi
 
     return error;
 }
+
+static void setRolloverError(usb_basic_keyboard_report_t* report)
+{
+    if (report->boot.scancodes[0] != HID_KEYBOARD_SC_ERROR_ROLLOVER) {
+        memset(report->boot.scancodes, HID_KEYBOARD_SC_ERROR_ROLLOVER, ARRAY_SIZE(report->boot.scancodes));
+    }
+}
+
+bool UsbBasicKeyboard_IsFullScancodes(const usb_basic_keyboard_report_t* report)
+{
+    if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        return report->boot.scancodes[ARRAY_SIZE(report->boot.scancodes) - 1] != 0;
+    } else {
+        return false;
+    }
+}
+
+bool UsbBasicKeyboard_AddScancode(usb_basic_keyboard_report_t* report, uint8_t scancode)
+{
+    if (scancode == 0)
+        return true;
+
+    if (UsbBasicKeyboard_IsModifier(scancode)) {
+        // modifiers are kept the same place in both report layouts
+        set_bit(scancode - USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE, &report->modifiers);
+        return true;
+    } else if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        for (uint8_t i = 0; i < ARRAY_SIZE(report->boot.scancodes); i++) {
+            if (report->boot.scancodes[i] == 0) {
+                report->boot.scancodes[i] = scancode;
+                return true;
+            }
+        }
+
+        setRolloverError(report);
+        return false;
+    } else if (UsbBasicKeyboard_IsInBitfield(scancode)) {
+        set_bit(scancode - USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE, report->bitfield);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void UsbBasicKeyboard_RemoveScancode(usb_basic_keyboard_report_t* report, uint8_t scancode)
+{
+    if (UsbBasicKeyboard_IsModifier(scancode)) {
+        // modifiers are kept the same place in both report layouts
+        clear_bit(scancode - USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE, &report->modifiers);
+    } else if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        for (uint8_t i = 0; i < ARRAY_SIZE(report->boot.scancodes); i++) {
+            if (report->boot.scancodes[i] == scancode) {
+                report->boot.scancodes[i] = 0;
+                return;
+            }
+        }
+    } else if (UsbBasicKeyboard_IsInBitfield(scancode)) {
+        clear_bit(scancode - USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE, report->bitfield);
+    }
+}
+
+bool UsbBasicKeyboard_ContainsScancode(const usb_basic_keyboard_report_t* report, uint8_t scancode)
+{
+    if (UsbBasicKeyboard_IsModifier(scancode)) {
+        // modifiers are kept the same place in both report layouts
+        return test_bit(scancode - USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE, &report->modifiers);
+    } else if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        for (uint8_t i = 0; i < ARRAY_SIZE(report->boot.scancodes); i++) {
+            if (report->boot.scancodes[i] == scancode) {
+                return true;
+            }
+        }
+        return false;
+    } else if (UsbBasicKeyboard_IsInBitfield(scancode)) {
+        return test_bit(scancode - USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE, report->bitfield);
+    } else {
+        return false;
+    }
+}
+
+size_t UsbBasicKeyboard_ScancodeCount(const usb_basic_keyboard_report_t* report)
+{
+    size_t size = 0;
+    if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        while ((size < ARRAY_SIZE(report->boot.scancodes)) && (report->boot.scancodes[size] != 0)) {
+            size++;
+        }
+    } else {
+        for (uint8_t i = 0; i < ARRAY_SIZE(report->bitfield); i++) {
+            for (uint8_t b = report->bitfield[i]; b > 0; b >>= 1) {
+                size += (b & 1);
+            }
+        }
+    }
+    return size;
+}
+
+void UsbBasicKeyboard_MergeReports(const usb_basic_keyboard_report_t* sourceReport, usb_basic_keyboard_report_t* targetReport)
+{
+    targetReport->modifiers |= sourceReport->modifiers;
+
+    if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        uint8_t idx, i = 0;
+
+        /* find empty position */
+        for (idx = 0; idx < ARRAY_SIZE(targetReport->boot.scancodes); idx++) {
+            if (targetReport->boot.scancodes[idx] == 0) {
+                break;
+            }
+        }
+        /* copy into empty positions */
+        while ((i < ARRAY_SIZE(sourceReport->boot.scancodes)) && (sourceReport->boot.scancodes[i] != 0) && (idx < ARRAY_SIZE(targetReport->boot.scancodes))) {
+            targetReport->boot.scancodes[idx++] = sourceReport->boot.scancodes[i++];
+        }
+
+        /* target is full, but source isn't copied -> set error */
+        if ((idx == ARRAY_SIZE(targetReport->boot.scancodes)) && (i < ARRAY_SIZE(sourceReport->boot.scancodes)) && (sourceReport->boot.scancodes[i] != 0)) {
+            setRolloverError(targetReport);
+        }
+    } else {
+        for (uint8_t i = 0; i < ARRAY_SIZE(targetReport->bitfield); i++) {
+            targetReport->bitfield[i] |= sourceReport->bitfield[i];
+        }
+    }
+}
+
+void UsbBasicKeyboard_ForeachScancode(const usb_basic_keyboard_report_t* report, void(*action)(uint8_t))
+{
+    // TODO: do we need to consider modifiers?
+    if (UsbBasicKeyboardGetProtocol() == USB_HID_BOOT_PROTOCOL) {
+        for (uint8_t i = 0; (i < ARRAY_SIZE(report->boot.scancodes)) && (report->boot.scancodes[i] != 0); i++) {
+            action(report->boot.scancodes[i]);
+        }
+    } else {
+        for (uint8_t i = 0; i < ARRAY_SIZE(report->bitfield); i++) {
+            for (uint8_t j = 0, b = report->bitfield[i]; b > 0; j++, b >>= 1) {
+                if (b & 1) {
+                    action(USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE + i * 8 + j);
+                }
+            }
+        }
+    }
+}
diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.h b/right/src/usb_interfaces/usb_interface_basic_keyboard.h
index 232f21e5f..b1a50c30b 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.h
@@ -19,8 +19,11 @@
     #define USB_BASIC_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
     #define USB_BASIC_KEYBOARD_INTERRUPT_IN_INTERVAL 1
 
-    #define USB_BASIC_KEYBOARD_REPORT_LENGTH 8
     #define USB_BASIC_KEYBOARD_OUT_REPORT_LENGTH 1
+
+    #define USB_BOOT_KEYBOARD_REPORT_LENGTH 8
+    #define USB_BOOT_KEYBOARD_MAX_KEYS 6
+
 // Typedefs:
 
     // Note: We support boot protocol mode in this interface, thus the keyboard
@@ -31,8 +34,13 @@
     // mode.
     typedef struct {
         uint8_t modifiers;
-        uint8_t reserved; // Always must be 0
-        uint8_t scancodes[USB_BASIC_KEYBOARD_MAX_KEYS];
+        union {
+            struct {
+                uint8_t reserved; // Always must be 0
+                uint8_t scancodes[USB_BOOT_KEYBOARD_MAX_KEYS];
+            } ATTR_PACKED boot;
+            uint8_t bitfield[USB_BASIC_KEYBOARD_BITFIELD_LENGTH];
+        }ATTR_PACKED;
     } ATTR_PACKED usb_basic_keyboard_report_t;
 
 // Variables:
@@ -50,4 +58,22 @@
     usb_status_t UsbBasicKeyboardCheckIdleElapsed();
     usb_status_t UsbBasicKeyboardCheckReportReady();
 
+    static inline bool UsbBasicKeyboard_IsModifier(uint8_t scancode)
+    {
+        return (scancode >= USB_BASIC_KEYBOARD_MIN_MODIFIERS_SCANCODE) &&
+               (scancode <= USB_BASIC_KEYBOARD_MAX_MODIFIERS_SCANCODE);
+    }
+    static inline bool UsbBasicKeyboard_IsInBitfield(uint8_t scancode)
+    {
+        return (scancode >= USB_BASIC_KEYBOARD_MIN_BITFIELD_SCANCODE) &&
+               (scancode <= USB_BASIC_KEYBOARD_MAX_BITFIELD_SCANCODE);
+    }
+    bool UsbBasicKeyboard_IsFullScancodes(const usb_basic_keyboard_report_t* report);
+    bool UsbBasicKeyboard_AddScancode(usb_basic_keyboard_report_t* report, uint8_t scancode);
+    void UsbBasicKeyboard_RemoveScancode(usb_basic_keyboard_report_t* report, uint8_t scancode);
+    bool UsbBasicKeyboard_ContainsScancode(const usb_basic_keyboard_report_t* report, uint8_t scancode);
+    size_t UsbBasicKeyboard_ScancodeCount(const usb_basic_keyboard_report_t* report);
+    void UsbBasicKeyboard_MergeReports(const usb_basic_keyboard_report_t* sourceReport, usb_basic_keyboard_report_t* targetReport);
+    void UsbBasicKeyboard_ForeachScancode(const usb_basic_keyboard_report_t* report, void(*action)(uint8_t));
+
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c
index 3ee412042..87201da75 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c
@@ -89,3 +89,33 @@ usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, voi
 
     return error;
 }
+
+bool UsbMediaKeyboard_AddScancode(usb_media_keyboard_report_t* report, uint8_t scancode)
+{
+    if (scancode == 0)
+        return true;
+
+    for (uint8_t i = 0; i < ARRAY_SIZE(report->scancodes); i++) {
+        if (report->scancodes[i] == 0) {
+            report->scancodes[i] = scancode;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void UsbMediaKeyboard_MergeReports(const usb_media_keyboard_report_t* sourceReport, usb_media_keyboard_report_t* targetReport)
+{
+    uint8_t idx, i = 0;
+    /* find empty position */
+    for (idx = 0; idx < ARRAY_SIZE(targetReport->scancodes); idx++) {
+        if (targetReport->scancodes[idx] == 0) {
+            break;
+        }
+    }
+    /* copy into empty positions */
+    while ((i < ARRAY_SIZE(sourceReport->scancodes)) && (sourceReport->scancodes[i] != 0) && (idx < ARRAY_SIZE(targetReport->scancodes))) {
+        targetReport->scancodes[idx++] = sourceReport->scancodes[i++];
+    }
+}
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.h b/right/src/usb_interfaces/usb_interface_media_keyboard.h
index 58db089a3..8a60ac598 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.h
@@ -40,4 +40,7 @@
     usb_status_t UsbMediaKeyboardCheckIdleElapsed();
     usb_status_t UsbMediaKeyboardCheckReportReady();
 
+    bool UsbMediaKeyboard_AddScancode(usb_media_keyboard_report_t* report, uint8_t scancode);
+    void UsbMediaKeyboard_MergeReports(const usb_media_keyboard_report_t* sourceReport, usb_media_keyboard_report_t* targetReport);
+
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c
index fc13fb43a..74b29376f 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c
@@ -88,3 +88,27 @@ usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, vo
 
     return error;
 }
+
+bool UsbSystemKeyboard_AddScancode(usb_system_keyboard_report_t* report, uint8_t scancode)
+{
+    if (!UsbSystemKeyboard_UsedScancode(scancode))
+        return false;
+
+    set_bit(scancode - USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE, report->bitfield);
+    return true;
+}
+
+void UsbSystemKeyboard_RemoveScancode(usb_system_keyboard_report_t* report, uint8_t scancode)
+{
+    if (!UsbSystemKeyboard_UsedScancode(scancode))
+        return;
+
+    clear_bit(scancode - USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE, report->bitfield);
+}
+
+void UsbSystemKeyboard_MergeReports(const usb_system_keyboard_report_t* sourceReport, usb_system_keyboard_report_t* targetReport)
+{
+    for (uint8_t i = 0; i < ARRAY_SIZE(targetReport->bitfield); i++) {
+        targetReport->bitfield[i] |= sourceReport->bitfield[i];
+    }
+}
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.h b/right/src/usb_interfaces/usb_interface_system_keyboard.h
index b23c74b1c..5007b64ef 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.h
@@ -19,12 +19,12 @@
     #define USB_SYSTEM_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
     #define USB_SYSTEM_KEYBOARD_INTERRUPT_IN_INTERVAL 1
 
-    #define USB_SYSTEM_KEYBOARD_REPORT_LENGTH 1
+    #define USB_SYSTEM_KEYBOARD_IS_IN_BITFIELD(scancode) (((scancode) >= USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE) && ((scancode) <= USB_SYSTEM_KEYBOARD_MAX_BITFIELD_SCANCODE)) 
 
 // Typedefs:
 
     typedef struct {
-        uint8_t scancodes[USB_SYSTEM_KEYBOARD_MAX_KEYS];
+        uint8_t bitfield[USB_SYSTEM_KEYBOARD_REPORT_LENGTH];
     } ATTR_PACKED usb_system_keyboard_report_t;
 
 // Variables:
@@ -41,4 +41,13 @@
     usb_status_t UsbSystemKeyboardCheckIdleElapsed();
     usb_status_t UsbSystemKeyboardCheckReportReady();
 
+    static inline bool UsbSystemKeyboard_UsedScancode(uint8_t scancode)
+    {
+        return (scancode >= USB_SYSTEM_KEYBOARD_MIN_BITFIELD_SCANCODE) &&
+               (scancode <= USB_SYSTEM_KEYBOARD_MAX_BITFIELD_SCANCODE);
+    }
+    bool UsbSystemKeyboard_AddScancode(usb_system_keyboard_report_t* report, uint8_t scancode);
+    void UsbSystemKeyboard_RemoveScancode(usb_system_keyboard_report_t* report, uint8_t scancode);
+    void UsbSystemKeyboard_MergeReports(const usb_system_keyboard_report_t* sourceReport, usb_system_keyboard_report_t* targetReport);
+
 #endif
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index ffde12924..3b1134a44 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -10,7 +10,6 @@
 #include "macros.h"
 #include "key_states.h"
 #include "right_key_matrix.h"
-#include "layer.h"
 #include "usb_report_updater.h"
 #include "timer.h"
 #include "config_parser/parse_keymap.h"
@@ -26,12 +25,25 @@
 #include "debug.h"
 
 bool TestUsbStack = false;
-static key_action_t actionCache[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
+static key_action_cached_t actionCache[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
 
 volatile uint8_t UsbReportUpdateSemaphore = 0;
 
-uint8_t HardwareModifierState;
-uint8_t HardwareModifierStatePrevious;
+// Modifiers can be applied as one of the following classes
+// - input:
+//   - affect "ifMod" (in next cycle)
+//   - can be suppressed
+//   - by default will be outputted into the report, unless supressed
+// - output:
+//   - do not affect "ifMod" conditions
+//   - will always be outputted into the report
+// - sticky mods:
+//   - these are stateful and change state so that modifiers of last pressed
+//     composite shortcut is applied
+
+uint8_t InputModifiers;
+uint8_t InputModifiersPrevious;
+uint8_t OutputModifiers;
 bool SuppressMods = false;
 bool SuppressKeys = false;
 sticky_strategy_t StickyModifierStrategy = Stick_Smart;
@@ -96,18 +108,15 @@ static void handleEventInterrupts(key_state_t *keyState) {
     }
 }
 
-uint8_t basicScancodeIndex = 0;
-static uint8_t mediaScancodeIndex = 0;
-static uint8_t systemScancodeIndex = 0;
-
 // Sticky modifiers are all "action modifiers" - i.e., modifiers of composed
-// keystrokes whose purpose is to activate concrete shortcut. They are
+// keystrokes whose purpose is to activate specific shortcut. They are
 // activated once on keydown, and reset when another key gets activated (even
 // if the activation key is still active).
 //
 // Depending on configuration, they may "stick" - i.e., live longer than their
 // activation key, either until next action, or until release of held layer.
 // (This serves for Alt+Tab style shortcuts.)
+static uint8_t stickyModifiersNegative;
 static uint8_t stickyModifiers;
 static key_state_t* stickyModifierKey;
 static bool    stickyModifierShouldStick;
@@ -149,65 +158,57 @@ static bool shouldStickAction(key_action_t * action)
     }
 }
 
-static void activateStickyMods(key_state_t *keyState, key_action_t *action)
+static void activateStickyMods(key_state_t *keyState, key_action_cached_t *action)
 {
-    stickyModifiers = action->keystroke.modifiers;
+    stickyModifiersNegative = action->modifierLayerMask;
+    stickyModifiers = action->action.keystroke.modifiers;
     stickyModifierKey = keyState;
-    stickyModifierShouldStick = shouldStickAction(action);
+    stickyModifierShouldStick = shouldStickAction(&action->action);
 }
 
 void ActivateStickyMods(key_state_t *keyState, uint8_t mods)
 {
+    stickyModifiersNegative = 0;
     stickyModifiers = mods;
     stickyModifierKey = keyState;
     stickyModifierShouldStick = true;
 }
 
-static void applyKeystrokePrimary(key_state_t *keyState, key_action_t *action)
+static void applyKeystrokePrimary(key_state_t *keyState, key_action_cached_t *cachedAction)
 {
     if (KeyState_Active(keyState)) {
+        key_action_t* action = &cachedAction->action;
         bool stickyModifiersChanged = false;
         if (action->keystroke.scancode) {
             // On keydown, reset old sticky modifiers and set new ones
             if (KeyState_ActivatedNow(keyState)) {
-                stickyModifiersChanged = action->keystroke.modifiers != stickyModifiers;
-                activateStickyMods(keyState, action);
+                stickyModifiersChanged |= action->keystroke.modifiers != stickyModifiers;
+                stickyModifiersChanged |= cachedAction->modifierLayerMask != stickyModifiersNegative;
+                activateStickyMods(keyState, cachedAction);
             }
         } else {
-            HardwareModifierState |= action->keystroke.modifiers;
+            InputModifiers |= action->keystroke.modifiers;
         }
         // If there are mods: first cycle send just mods, in next cycle start sending mods+scancode
         if (!stickyModifiersChanged || KeyState_ActivatedEarlier(keyState)) {
             switch (action->keystroke.keystrokeType) {
                 case KeystrokeType_Basic:
-                    if (action->keystroke.scancode == 0) {
-                        break;
-                    } else if (basicScancodeIndex < USB_BASIC_KEYBOARD_MAX_KEYS) {
-                        ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action->keystroke.scancode;
-                    } else if (ActiveUsbBasicKeyboardReport->scancodes[0] != HID_KEYBOARD_SC_ERROR_ROLLOVER) {
-                        memset(ActiveUsbBasicKeyboardReport->scancodes, HID_KEYBOARD_SC_ERROR_ROLLOVER,
-                                USB_BASIC_KEYBOARD_MAX_KEYS);
-                    }
+                    UsbBasicKeyboard_AddScancode(ActiveUsbBasicKeyboardReport, action->keystroke.scancode);
                     break;
                 case KeystrokeType_Media:
-                    if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) {
-                        break;
-                    }
-                    ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action->keystroke.scancode;
+                    UsbMediaKeyboard_AddScancode(ActiveUsbMediaKeyboardReport, action->keystroke.scancode);
                     break;
                 case KeystrokeType_System:
-                    if (systemScancodeIndex >= USB_SYSTEM_KEYBOARD_MAX_KEYS) {
-                        break;
-                    }
-                    ActiveUsbSystemKeyboardReport->scancodes[systemScancodeIndex++] = action->keystroke.scancode;
+                    UsbSystemKeyboard_AddScancode(ActiveUsbSystemKeyboardReport, action->keystroke.scancode);
                     break;
             }
         }
     } else if (KeyState_DeactivatedNow(keyState)) {
         if (stickyModifierKey == keyState && !stickyModifierShouldStick) {
             //disable the modifiers, but send one last report of modifiers without scancode
-            ActiveUsbBasicKeyboardReport->modifiers |= stickyModifiers;
+            OutputModifiers |= stickyModifiers;
             stickyModifiers = 0;
+            stickyModifiersNegative = 0;
         }
     }
 }
@@ -226,12 +227,13 @@ static void applyKeystrokeSecondary(key_state_t *keyState, key_action_t *action,
     }
 }
 
-static void applyKeystroke(key_state_t *keyState, key_action_t *action, key_action_t *actionBase)
+static void applyKeystroke(key_state_t *keyState, key_action_cached_t *cachedAction, key_action_t *actionBase)
 {
+    key_action_t* action = &cachedAction->action;
     if (action->keystroke.secondaryRole) {
         switch (SecondaryRoles_ResolveState(keyState, action->keystroke.secondaryRole)) {
             case SecondaryRoleState_Primary:
-                applyKeystrokePrimary(keyState, action);
+                applyKeystrokePrimary(keyState, cachedAction);
                 return;
             case SecondaryRoleState_Secondary:
                 applyKeystrokeSecondary(keyState, action, actionBase);
@@ -242,12 +244,14 @@ static void applyKeystroke(key_state_t *keyState, key_action_t *action, key_acti
                 return;
         }
     } else {
-        applyKeystrokePrimary(keyState, action);
+        applyKeystrokePrimary(keyState, cachedAction);
     }
 }
 
-void ApplyKeyAction(key_state_t *keyState, key_action_t *action, key_action_t *actionBase)
+void ApplyKeyAction(key_state_t *keyState, key_action_cached_t *cachedAction, key_action_t *actionBase)
 {
+    key_action_t* action = &cachedAction->action;
+
     if (KeyState_ActivatedNow(keyState)) {
         Macros_SignalInterrupt();
     }
@@ -255,12 +259,13 @@ void ApplyKeyAction(key_state_t *keyState, key_action_t *action, key_action_t *a
     switch (action->type) {
         case KeyActionType_Keystroke:
             if (KeyState_NonZero(keyState)) {
-                applyKeystroke(keyState, action, actionBase);
+                applyKeystroke(keyState, cachedAction, actionBase);
             }
             break;
         case KeyActionType_Mouse:
             if (KeyState_ActivatedNow(keyState)) {
                 stickyModifiers = 0;
+                stickyModifiersNegative = 0;
                 MouseController_ActivateDirectionSigns(action->mouseAction);
             }
             ActiveMouseStates[action->mouseAction]++;
@@ -273,6 +278,7 @@ void ApplyKeyAction(key_state_t *keyState, key_action_t *action, key_action_t *a
         case KeyActionType_SwitchKeymap:
             if (KeyState_ActivatedNow(keyState)) {
                 stickyModifiers = 0;
+                stickyModifiersNegative = 0;
                 SwitchKeymapById(action->switchKeymap.keymapId);
                 Macros_UpdateLayerStack();
             }
@@ -280,6 +286,7 @@ void ApplyKeyAction(key_state_t *keyState, key_action_t *action, key_action_t *a
         case KeyActionType_PlayMacro:
             if (KeyState_ActivatedNow(keyState)) {
                 stickyModifiers = 0;
+                stickyModifiersNegative = 0;
                 Macros_StartMacro(action->playMacro.macroId, keyState, 255, true);
             }
             break;
@@ -292,9 +299,6 @@ static void clearActiveReports(void)
     memset(ActiveUsbBasicKeyboardReport, 0, sizeof *ActiveUsbBasicKeyboardReport);
     memset(ActiveUsbMediaKeyboardReport, 0, sizeof *ActiveUsbMediaKeyboardReport);
     memset(ActiveUsbSystemKeyboardReport, 0, sizeof *ActiveUsbSystemKeyboardReport);
-    basicScancodeIndex = 0;
-    mediaScancodeIndex = 0;
-    systemScancodeIndex = 0;
 }
 
 
@@ -305,22 +309,13 @@ static void mergeReports(void)
             //if the macro ended right now, we still want to flush the last report
             MacroState[j].ms.reportsUsed &= MacroState[j].ms.macroPlaying;
             macro_state_t *s = &MacroState[j];
-            ActiveUsbBasicKeyboardReport->modifiers |= s->ms.macroBasicKeyboardReport.modifiers;
-            for ( int i = 0; i < USB_BASIC_KEYBOARD_MAX_KEYS && s->ms.macroBasicKeyboardReport.scancodes[i] != 0; i++) {
-                if( basicScancodeIndex < USB_BASIC_KEYBOARD_MAX_KEYS ) {
-                    ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = s->ms.macroBasicKeyboardReport.scancodes[i];
-                }
-            }
-            for ( int i = 0; i < USB_MEDIA_KEYBOARD_MAX_KEYS && s->ms.macroMediaKeyboardReport.scancodes[i] != 0 ; i++) {
-                if( mediaScancodeIndex < USB_MEDIA_KEYBOARD_MAX_KEYS ) {
-                    ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = s->ms.macroMediaKeyboardReport.scancodes[i];
-                }
-            }
-            for ( int i = 0; i < USB_SYSTEM_KEYBOARD_MAX_KEYS && s->ms.macroSystemKeyboardReport.scancodes[i] != 0; i++) {
-                if( systemScancodeIndex < USB_SYSTEM_KEYBOARD_MAX_KEYS ) {
-                    ActiveUsbSystemKeyboardReport->scancodes[systemScancodeIndex++] = s->ms.macroSystemKeyboardReport.scancodes[i];
-                }
-            }
+
+            UsbBasicKeyboard_MergeReports(&(s->ms.macroBasicKeyboardReport), ActiveUsbBasicKeyboardReport);
+            UsbMediaKeyboard_MergeReports(&(s->ms.macroMediaKeyboardReport), ActiveUsbMediaKeyboardReport);
+            UsbSystemKeyboard_MergeReports(&(s->ms.macroSystemKeyboardReport), ActiveUsbSystemKeyboardReport);
+
+            InputModifiers |= s->ms.inputModifierMask;
+
             ActiveUsbMouseReport->buttons |= s->ms.macroMouseReport.buttons;
             ActiveUsbMouseReport->x += s->ms.macroMouseReport.x;
             ActiveUsbMouseReport->y += s->ms.macroMouseReport.y;
@@ -328,9 +323,6 @@ static void mergeReports(void)
             ActiveUsbMouseReport->wheelY += s->ms.macroMouseReport.wheelY;
         }
     }
-    if(!SuppressMods) {
-        ActiveUsbBasicKeyboardReport->modifiers |= HardwareModifierState ;
-    }
 }
 
 static void commitKeyState(key_state_t *keyState, bool active)
@@ -373,10 +365,12 @@ static void handleUsbStackTestMode() {
         }
         if (simulateKeypresses) {
             isEven = !isEven;
-            ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE;
+            UsbBasicKeyboard_AddScancode(ActiveUsbBasicKeyboardReport,
+                    isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE);
             if (++mediaCounter % 200 == 0) {
                 isEvenMedia = !isEvenMedia;
-                ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = isEvenMedia ? MEDIA_VOLUME_DOWN : MEDIA_VOLUME_UP;
+                UsbMediaKeyboard_AddScancode(ActiveUsbMediaKeyboardReport,
+                        isEvenMedia ? MEDIA_VOLUME_DOWN : MEDIA_VOLUME_UP);
             }
             MouseMoveState.xOut = isEven ? -5 : 5;
         }
@@ -392,14 +386,16 @@ static void handleLayerChanges() {
     if(ActiveLayer != previousLayer) {
         previousLayer = ActiveLayer;
         stickyModifiers = 0;
+        stickyModifiersNegative = 0;
     }
 }
 
 static void updateActiveUsbReports(void)
 {
     clearActiveReports();
-    HardwareModifierStatePrevious = HardwareModifierState;
-    HardwareModifierState = 0;
+    InputModifiersPrevious = InputModifiers;
+    InputModifiers = 0;
+    OutputModifiers = 0;
     SuppressMods = false;
 
     if (MacroPlaying) {
@@ -412,10 +408,6 @@ static void updateActiveUsbReports(void)
 
     memcpy(ActiveMouseStates, ToggledMouseStates, ACTIVE_MOUSE_STATES_COUNT);
 
-    basicScancodeIndex = 0;
-    mediaScancodeIndex = 0;
-    systemScancodeIndex = 0;
-
     handleLayerChanges();
 
     if ( CurrentTime - LastUsbGetKeyboardStateRequestTimestamp < 2000) {
@@ -431,7 +423,7 @@ static void updateActiveUsbReports(void)
     for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
         for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
             key_state_t *keyState = &KeyStates[slotId][keyId];
-            key_action_t *action;
+            key_action_cached_t *cachedAction;
             key_action_t *actionBase;
 
             if(((uint8_t*)keyState)[1] == 0) {
@@ -442,26 +434,36 @@ static void updateActiveUsbReports(void)
 
             if (KeyState_NonZero(keyState)) {
                 if (KeyState_ActivatedNow(keyState)) {
+                    // cache action so that key's meaning remains the same as long
+                    // as it is pressed
+                    actionCache[slotId][keyId].modifierLayerMask = 0;
                     if (SleepModeActive) {
                         WakeUpHost();
                     }
                     if (Postponer_LastKeyLayer != 255 && PostponerCore_IsActive()) {
-                        actionCache[slotId][keyId] = CurrentKeymap[Postponer_LastKeyLayer][slotId][keyId];
+                        actionCache[slotId][keyId].action = CurrentKeymap[Postponer_LastKeyLayer][slotId][keyId];
                         Postponer_LastKeyLayer = 255;
+                    } else if (LayerConfig[ActiveLayer].modifierLayerMask != 0) {
+                        if (CurrentKeymap[ActiveLayer][slotId][keyId].type != KeyActionType_None) {
+                            actionCache[slotId][keyId].action = CurrentKeymap[ActiveLayer][slotId][keyId];
+                            actionCache[slotId][keyId].modifierLayerMask = ActiveLayerModifierMask;
+                        } else {
+                            actionCache[slotId][keyId].action = CurrentKeymap[LayerId_Base][slotId][keyId];
+                        }
                     } else {
-                        actionCache[slotId][keyId] = CurrentKeymap[ActiveLayer][slotId][keyId];
+                        actionCache[slotId][keyId].action = CurrentKeymap[ActiveLayer][slotId][keyId];
                     }
                     handleEventInterrupts(keyState);
                 }
 
-                action = &actionCache[slotId][keyId];
+                cachedAction = &actionCache[slotId][keyId];
                 actionBase = &CurrentKeymap[LayerId_Base][slotId][keyId];
 
                 //apply base-layer holds
                 applyLayerHolds(keyState, actionBase);
 
                 //apply active-layer action
-                ApplyKeyAction(keyState, action, actionBase);
+                ApplyKeyAction(keyState, cachedAction, actionBase);
 
                 keyState->previous = keyState->current;
             }
@@ -477,7 +479,10 @@ static void updateActiveUsbReports(void)
     // When a layer switcher key gets pressed along with another key that produces some modifiers
     // and the accomanying key gets released then keep the related modifiers active a long as the
     // layer switcher key stays pressed.  Useful for Alt+Tab keymappings and the like.
-    ActiveUsbBasicKeyboardReport->modifiers |= stickyModifiers;
+
+    uint8_t maskedInputMods = (~stickyModifiersNegative) & InputModifiers;
+    ActiveUsbBasicKeyboardReport->modifiers |= SuppressMods ? 0 : maskedInputMods;
+    ActiveUsbBasicKeyboardReport->modifiers |= OutputModifiers | stickyModifiers;
 }
 
 void justPreprocessInput(void) {
diff --git a/right/src/usb_report_updater.h b/right/src/usb_report_updater.h
index 0830a580d..85c8eb382 100644
--- a/right/src/usb_report_updater.h
+++ b/right/src/usb_report_updater.h
@@ -20,8 +20,9 @@
     extern uint32_t UsbReportUpdateCounter;
     extern volatile uint8_t UsbReportUpdateSemaphore;
     extern bool TestUsbStack;
-    extern uint8_t HardwareModifierState;
-    extern uint8_t HardwareModifierStatePrevious;
+    extern uint8_t InputModifiers;
+    extern uint8_t InputModifiersPrevious;
+    extern uint8_t OutputModifiers;
     extern bool SuppressMods;
     extern bool PostponeKeys;
     extern sticky_strategy_t StickyModifierStrategy;
@@ -37,6 +38,6 @@
     void ToggleMouseState(serialized_mouse_action_t action, bool activate);
     void ActivateKey(key_state_t *keyState, bool debounce);
     void ActivateStickyMods(key_state_t *keyState, uint8_t mods);
-    void ApplyKeyAction(key_state_t *keyState, key_action_t *action, key_action_t *actionBase);
+    void ApplyKeyAction(key_state_t *keyState, key_action_cached_t *cachedAction, key_action_t *actionBase);
 
 #endif
diff --git a/right/src/utils.c b/right/src/utils.c
index 7e04185d1..57e224445 100644
--- a/right/src/utils.c
+++ b/right/src/utils.c
@@ -36,13 +36,16 @@ void Utils_DecodeId(uint16_t keyid, uint8_t* outSlotId, uint8_t* outSlotIdx)
     *outSlotIdx = keyid%64;
 }
 
+static void Utils_SetStatusScancodeCharacter(uint8_t scancode)
+{
+    Macros_SetStatusChar(MacroShortcutParser_ScancodeToCharacter(scancode));
+}
+
 void Utils_reportReport(usb_basic_keyboard_report_t* report)
 {
     Macros_SetStatusString("Reporting ", NULL);
-    for ( int i = 0; i < USB_BASIC_KEYBOARD_MAX_KEYS; i++) {
-        if (report->scancodes[i] != 0) {
-            Macros_SetStatusChar(MacroShortcutParser_ScancodeToCharacter(report->scancodes[i]));
-        }
-    }
+
+    UsbBasicKeyboard_ForeachScancode(report, &Utils_SetStatusScancodeCharacter);
+
     Macros_SetStatusString("\n", NULL);
 }
diff --git a/scripts/package.json b/scripts/package.json
index 3e465c931..39e1248ed 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -16,10 +16,10 @@
     "commander": "^2.11.0",
     "shelljs": "^0.8.4"
   },
-  "firmwareVersion": "8.10.12",
+  "firmwareVersion": "9.0.0",
   "deviceProtocolVersion": "4.7.1",
   "moduleProtocolVersion": "4.1.0",
-  "userConfigVersion": "4.2.0",
+  "userConfigVersion": "5.0.0",
   "hardwareConfigVersion": "1.0.0",
   "smartMacrosVersion": "1.0.0",
   "devices": [
diff --git a/shared/versions.h b/shared/versions.h
index 13749db51..6125f265d 100644
--- a/shared/versions.h
+++ b/shared/versions.h
@@ -18,9 +18,9 @@
 
 // Variables:
 
-    #define FIRMWARE_MAJOR_VERSION 8
-    #define FIRMWARE_MINOR_VERSION 10
-    #define FIRMWARE_PATCH_VERSION 12
+    #define FIRMWARE_MAJOR_VERSION 9
+    #define FIRMWARE_MINOR_VERSION 0
+    #define FIRMWARE_PATCH_VERSION 0
 
     #define DEVICE_PROTOCOL_MAJOR_VERSION 4
     #define DEVICE_PROTOCOL_MINOR_VERSION 7
@@ -30,8 +30,8 @@
     #define MODULE_PROTOCOL_MINOR_VERSION 1
     #define MODULE_PROTOCOL_PATCH_VERSION 0
 
-    #define USER_CONFIG_MAJOR_VERSION 4
-    #define USER_CONFIG_MINOR_VERSION 2
+    #define USER_CONFIG_MAJOR_VERSION 5
+    #define USER_CONFIG_MINOR_VERSION 0
     #define USER_CONFIG_PATCH_VERSION 0
 
     #define HARDWARE_CONFIG_MAJOR_VERSION 1