diff --git a/README.md b/README.md
index 13c795c..ebed1f2 100644
--- a/README.md
+++ b/README.md
@@ -5,89 +5,69 @@ RC(ELRS)/USB Joystick with 2 hall effect gimbals, 2 hat switches and 25 buttons
 ## Layout
 
 ```cpp
-USB Joystick Layer 0
---------------------------------------------------------------
-| FnL |  B1 |               | B21 |              | B5  | FnR | 
---------------------------------------------------------------
-|     |  B2 |  B3 | MoL |            | MoR | B7  | B6  |     |
-|                                                            |
-|                 | B4  |            | B8  |                 |
-|                 | B17 |            | B18 |                 |
-|      Z/RZ                                        X/Y       |
-|                 | H1U |            | H2U |                 |
-|           | H1L | H1B | H1R || H2L | H2B | H2R |           |
-|                 | H1D |            | H2D |                 |
---------------------------------------------------------------
+Button index map:
+---------------------------------------------------------------
+|  0 L|  1 U|               |  2  |               |  3 L|  4 U|
+---------------------------------------------------------------
+|     |  5  |  6  |  7  |             | 12  | 11  | 10  |     |
+|                                                             |
+|                 |  8  |             | 13  |                 |
+|                 |  9  |             | 14  |                 |
+|      X1/Y1                                       X2/Y2      |
+|                 | 16  |             | 21  |                 |
+|           | 19  | 15  | 17  | | 24  | 20  | 22  |           |
+|                 | 18  |             | 23  |                 |
+---------------------------------------------------------------
 
-USB Joystick Layer 1 (FnL)
---------------------------------------------------------------
-| FnL |  B9 |              | B21 |               | B5  | FnR | 
---------------------------------------------------------------
-|     | B10 | B11 | MoL |            | MoR | B7  | B6  |     |
-|                                                            |
-|                 | B12 |            | B8  |                 |
-|                 | B19 |            | B18 |                 |
-|      Z/RZ                                        X/Y       |
-|                 | H3U |            | H2U |                 |
-|           | H3L | H3B | H3R || H2L | H2B | H2R |           |
-|                 | H3D |            | H2D |                 |
---------------------------------------------------------------
+USB HID joystick map:
+---------------------------------------------------------------
+| B1 L| B2 U|               | B3  |               | B4 L| B5 U|
+---------------------------------------------------------------
+|     | B6  | B7  | B8/16|           |B13/17| B12 | B11 |     |
+|                                                             |
+|                 | B9  |             | B14 |                 |
+|                 | B10 |             | B15 |                 |
+|      X1/Y1                                       X2/Y2      |
+|                 | H1U |             | H2U |                 |
+|           | H1L | B18 | H1R | | H2L | B19 | H2R |           |
+|                 | H1D |             | H2D |                 |
+---------------------------------------------------------------
+Button (Switch) 7 changes following:
+* hat1 => hat3 (button press B20).
+Button (switch) 12 changes following:
+* B4 => B21
+* B5 => B22
+* B14 => B23
+* B15 => B24
+* hat2 => hat4 (button bpress B25)
 
-USB Joystick Layer 2 (FnR)
---------------------------------------------------------------
-| FnL |  B1 |              | B21 |               | B13 | FnR | 
---------------------------------------------------------------
-|     |  B2 |  B3 | MoL |            | MoR | B15 | B14 |     |
-|                                                            |
-|                 | B4  |            | B16 |                 |
-|                 | B17 |            | B20 |                 |
-|      Z/RZ                                    X(RX)/Y(RY)   |
-|                 | H1U |            | H4U |                 |
-|           | H1L | H1B | H1R || H4L | H4B | H4R |           |
-|                 | H1D |            | H4D |                 |
---------------------------------------------------------------
+ELRS channel map (+ = ON, - = OFF, CHxP/M/Z = trim)
+---------------------------------------------------------------
+|CH7-L|CH7+U|               |  -  |               |CH8-L|CH8+U|
+---------------------------------------------------------------
+|     | THL | CH9 | CH5 |             | CH6 |CH11-|CH11+|     |
+|                                                             |
+|                 |CH10+|             |CH12+|                 |
+|                 |CH10-|             |CH12-|                 |
+|     CH1/CH2                                     CH3/CH4     |
+|                 |  -  |             |CH4P |                 |
+|           |CH1M |CH12Z|CH1P | |CH3M |CH34Z|CH3P |           |
+|                 |  -  |             |CH4M |                 |
+---------------------------------------------------------------
 
-USB Joystick Layer 3 (FnL + FnR)
---------------------------------------------------------------
-| FnL |  B9 |              | B21 |               | B13 | FnR | 
---------------------------------------------------------------
-|     | B10 | B11 | MoL |            | MoR | B15 | B14 |     |
-|                                                            |
-|                 | B12 |            | B16 |                 |
-|                 | B19 |            | B20 |                 |
-|      Z/RZ                                    X(RX)/Y(RY)   |
-|                 | H3U |            | H4U |                 |
-|           | H3L | H3B | H3R || H4L | H4B | H4R |           |
-|                 | H3D |            | H4D |                 |
---------------------------------------------------------------
-
-ELRS Layer
---------------------------------------------------------------
-| CH7 OFF | CH7 ON |       |  --  |        | CH8 ON | CH8 OFF| 
---------------------------------------------------------------
-| | CH9 ON  | CH9 OFF  | CH5 |  | CH6 | CH10 OFF  | CH10 ON  |
-|                                                            |
-|               |  CH11 ON  |    |  CH12 ON  |               |
-|               |  CH11 OFF  |  |  CH12 OFF  |               |
-|  X(CH1)/Y(CH2)                              X(CH3)/Y(CH4)  |
-|                 | LTU |            | RTU |                 |
-|           | LTL | LTC | LTR || RTL | RTC | RTR |           |
-|                 | LTD |            | RTD |                 |
---------------------------------------------------------------
-
-Config Layer
---------------------------------------------------------------
-| BOOT | CAL |           |  CONFIG  |           | USB | ELRS | 
---------------------------------------------------------------
-| | -- | -- | -- |                          | -- | -- | -- | |
-|                                                            |
-|                 | --- |            | --- |                 |
-|                 | --- |            | --- |                 |
-|  X(CH1)/Y(CH2)                              X(CH3)/Y(CH4)  |
-|                 | --- |            | --- |                 |
-|           | --- | --- | --- || --- | --- | --- |           |
-|                 | --- |            | --- |                 |
---------------------------------------------------------------
+Config Layer (holding CONFIG button)
+---------------------------------------------------------------
+|BOOT L| CAL U|           | CONFIG |            | USB L|ELRS U|
+---------------------------------------------------------------
+|     | THL-| THL+|  -  |             |  -  |  -  |  -  |     |
+|                                                             |
+|                 |  -  |             |  -  |                 |
+|                 |  -  |             |  -  |                 |
+|        -/-                                        -/-       |
+|                 |  -  |             |  -  |                 |
+|           |  -  |  -  |  -  | |  -  |  -  |  -  |           |
+|                 |  -  |             |  -  |                 |
+---------------------------------------------------------------
 
 ```