diff --git a/config-tool-web/code.js b/config-tool-web/code.js
index c8997f42..b81b5af7 100644
--- a/config-tool-web/code.js
+++ b/config-tool-web/code.js
@@ -17,7 +17,7 @@ const DEFAULT_GPIO_DEBOUNCE_TIME = 5;
 const DEFAULT_SCALING = 1000;
 const DEFAULT_MACRO_ENTRY_DURATION = 1;
 
-const NLAYERS = 4;
+const NLAYERS = 8;
 const NMACROS = 32;
 const NEXPRESSIONS = 8;
 const MACRO_ITEMS_IN_PACKET = 6;
@@ -102,7 +102,7 @@ let target_modal = null;
 let extra_usages = { 'source': [], 'target': [] };
 let config = {
     'version': CONFIG_VERSION,
-    'unmapped_passthrough_layers': [0, 1, 2, 3],
+    'unmapped_passthrough_layers': [0, 1, 2, 3, 4, 5, 6, 7, 8],
     'partial_scroll_timeout': DEFAULT_PARTIAL_SCROLL_TIMEOUT,
     'tap_hold_threshold': DEFAULT_TAP_HOLD_THRESHOLD,
     'gpio_debounce_time_ms': DEFAULT_GPIO_DEBOUNCE_TIME,
diff --git a/config-tool-web/index.html b/config-tool-web/index.html
index 0ea63783..934cbd3a 100644
--- a/config-tool-web/index.html
+++ b/config-tool-web/index.html
@@ -91,6 +91,22 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
                         <input type="checkbox" id="unmapped_passthrough_checkbox3" class="form-check-input">
                         <label for="unmapped_passthrough_checkbox3" class="form-check-label">3</label>
                     </div>
+                    <div class="form-check form-check-inline">
+                        <input type="checkbox" id="unmapped_passthrough_checkbox4" class="form-check-input">
+                        <label for="unmapped_passthrough_checkbox4" class="form-check-label">4</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input type="checkbox" id="unmapped_passthrough_checkbox5" class="form-check-input">
+                        <label for="unmapped_passthrough_checkbox5" class="form-check-label">5</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input type="checkbox" id="unmapped_passthrough_checkbox6" class="form-check-input">
+                        <label for="unmapped_passthrough_checkbox6" class="form-check-label">6</label>
+                    </div>
+                    <div class="form-check form-check-inline">
+                        <input type="checkbox" id="unmapped_passthrough_checkbox7" class="form-check-input">
+                        <label for="unmapped_passthrough_checkbox7" class="form-check-label">7</label>
+                    </div>
                 </div>
                 <div class="row mt-3">
                     <div class="col-4 text-end">
@@ -290,7 +306,7 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
             </div>
             <div class="col-3">
                 <div class="d-flex lh-1 text-center">
-                    <div class="flex-fill row gx-1 justify-content-center">
+                    <div class="flex-fill row gx-1 w-25 justify-content-center">
                         <div class="col-auto">
                             <input class="form-check-input layer_checkbox0" type="checkbox" value="">
                             <br><span class="text-muted small">0</span>
@@ -307,6 +323,22 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
                             <input class="form-check-input layer_checkbox3" type="checkbox" value="">
                             <br><span class="text-muted small">3</span>
                         </div>
+                        <div class="col-auto">
+                            <input class="form-check-input layer_checkbox4" type="checkbox" value="">
+                            <br><span class="text-muted small">4</span>
+                        </div>
+                        <div class="col-auto">
+                            <input class="form-check-input layer_checkbox5" type="checkbox" value="">
+                            <br><span class="text-muted small">5</span>
+                        </div>
+                        <div class="col-auto">
+                            <input class="form-check-input layer_checkbox6" type="checkbox" value="">
+                            <br><span class="text-muted small">6</span>
+                        </div>
+                        <div class="col-auto">
+                            <input class="form-check-input layer_checkbox7" type="checkbox" value="">
+                            <br><span class="text-muted small">7</span>
+                        </div>
                     </div>
                     <div class="row gx-1">
                         <div class="col-auto ms-1" title="Sticky">
diff --git a/config-tool-web/usages.js b/config-tool-web/usages.js
index 37c4c869..a7ea084c 100644
--- a/config-tool-web/usages.js
+++ b/config-tool-web/usages.js
@@ -436,6 +436,10 @@ const common_target_usages = {
     "0xfff10001": { 'name': 'Layer 1', 'class': 'other' },
     "0xfff10002": { 'name': 'Layer 2', 'class': 'other' },
     "0xfff10003": { 'name': 'Layer 3', 'class': 'other' },
+    "0xfff10004": { 'name': 'Layer 4', 'class': 'other' },
+    "0xfff10005": { 'name': 'Layer 5', 'class': 'other' },
+    "0xfff10006": { 'name': 'Layer 6', 'class': 'other' },
+    "0xfff10007": { 'name': 'Layer 7', 'class': 'other' },      
     "0xfff20001": { 'name': 'Macro 1', 'class': 'other' },
     "0xfff20002": { 'name': 'Macro 2', 'class': 'other' },
     "0xfff20003": { 'name': 'Macro 3', 'class': 'other' },
diff --git a/firmware/src/remapper.cc b/firmware/src/remapper.cc
index 04de994d..1abe9c8f 100644
--- a/firmware/src/remapper.cc
+++ b/firmware/src/remapper.cc
@@ -28,7 +28,7 @@ const uint8_t H_RESOLUTION_BITMASK = (1 << 2);
 const uint32_t V_SCROLL_USAGE = 0x00010038;
 const uint32_t H_SCROLL_USAGE = 0x000C0238;
 
-const uint8_t NLAYERS = 4;
+const uint8_t NLAYERS = 8;
 const uint32_t LAYERS_USAGE_PAGE = 0xFFF10000;
 const uint32_t MACRO_USAGE_PAGE = 0xFFF20000;
 const uint32_t EXPR_USAGE_PAGE = 0xFFF30000;