diff --git a/docs/hardware/devices/index.mdx b/docs/hardware/devices/index.mdx
index 480f2776..7a23fd34 100644
--- a/docs/hardware/devices/index.mdx
+++ b/docs/hardware/devices/index.mdx
@@ -11,11 +11,11 @@ sidebar_position: 1
Modular hardware system with Base, Core and Peripheral modules including the low-power and solar ready nRF52840-based Meshtastic Starter Kit (19007 & 4631).
[**WisBlock Core Modules**](./rak/core-module/)
-| Name | MCU | Radio | WiFi | BT | GPS |
-| :-- | :-- | :-- | :--: | :--: | :--: |
-| RAK4631 | nRF52840 | SX1262 | NO | 5.0 | add-on |
-| RAK11200 | ESP32 | add-on | 2.4 GHz b/g/n | 4.2 | add-on |
-| RAK11310 | RP2040 | SX1262 | NO | NO | add-on |
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:---------|:---------|:-------|:------------:|:---:|:------:|
+| RAK4631 | nRF52840 | SX1262 | NO | 5.0 | add-on |
+| RAK11200 | ESP32 | add-on | 2.4GHz b/g/n | 4.2 | add-on |
+| RAK11310 | RP2040 | SX1262 | NO | NO | add-on |
[**Base Boards**](./rak/base-board/)
RAK5005-O
@@ -39,13 +39,13 @@ RAK1906 Environment Sensor
### [LILYGO® T-Beam](./tbeam/)
Boards complete with GPS, 18650 battery holder, and optional screen.
-| Name | MCU | Radio | WiFi | BT | GPS |
-| :-- | :-- | :-- | :--: | :--: | :--: |
-| T-Beam v0.7 | ESP32 | SX1276| 2.4 GHz b/g/n | 4.2 | YES |
-| T-Beam v1.1 | ESP32 | SX1276 | 2.4 GHz b/g/n | 4.2 | YES |
-| T-Beam with M8N | ESP32 | SX1276
SX1262 | 2.4 GHz b/g/n | 4.2 | YES |
-| T-Beam S3-Core | ESP32-S3 | SX1262 | 2.4 GHz b/g/n | 4.2 | YES |
-| T-BeamSUPREME | ESP32-S3 | SX1262 | 2.4 GHz b/g/n | 4.2 | YES |
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:----------------|:---------|:------------------|:------------:|:---:|:---:|
+| T-Beam v0.7 | ESP32 | SX1276 | 2.4GHz b/g/n | 4.2 | YES |
+| T-Beam v1.1 | ESP32 | SX1276 | 2.4GHz b/g/n | 4.2 | YES |
+| T-Beam with M8N | ESP32 | SX1276
SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+| T-Beam S3-Core | ESP32-S3 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
+| T-BeamSUPREME | ESP32-S3 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
### [LILYGO® T-Echo](./techo/)
All-in-one unit with E-Ink screen, GPS and battery in injection-molded case. Features the low-power nRF52840 for long battery life.
@@ -54,44 +54,57 @@ All-in-one unit with E-Ink screen, GPS and battery in injection-molded case. Fe
| :-- | :-- | :-- | :--: | :--: | :--: |
| T-Echo | nRF52840 | SX1262 | NO | 5.0 | YES |
-### [LILYGO® LoRa](./lora/)
-Inexpensive basic ESP32-based boards.
+### LILYGO® T-Deck
+Standalone device with screen and keyboard
+
+| Name | MCU | Radio | WiFi | BT | GPS |
+| :-- | :-- | :-- | :--: | :--: | :--: |
+| T-Deck | ESP32-S3FN8 | SX1262 | YES | 5.0 | NO |
+
+### LILYGO® T-Watch S3
| Name | MCU | Radio | WiFi | BT | GPS |
| :-- | :-- | :-- | :--: | :--: | :--: |
-| LoRa32 V1 | ESP32 | SX127x | 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 V1.3 | ESP32 | SX127x | 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 V2.0 | ESP32 | SX127x | 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 V2.1-1.6 | ESP32 | SX127x| 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 V2.1-1.8 | ESP32 | SX1280 | 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 T3-S3 V1.0 | ESP32-S3 | SX1262
SX1276
SX1280 | 2.4 GHz b/g/n | 4.2 | NO |
+| T-Watch S3| ESP32-S3 | SX1262 | YES | 5.0 | NO |
+
+### [LILYGO® LoRa](./lora/)
+Inexpensive basic ESP32-based boards.
+
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:------------------|:---------|:-----------------------------|:------------:|:---:|:---:|
+| LoRa32 V1 | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 V1.3 | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 V2.0 | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 V2.1-1.6 | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 V2.1-1.8 | ESP32 | SX1280 | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 T3-S3 V1.0 | ESP32-S3 | SX1262
SX1276
SX1280 | 2.4GHz b/g/n | 5.0 | NO |
### [HELTEC® LoRa 32](./heltec/)
Inexpensive basic ESP32-based boards.
-| Name | MCU | Radio | WiFi | BT | GPS |
-| :-- | :-- | :-- | :--: | :--: | :--: |
-| LoRa32 V2.1 | ESP32 | SX127x | 2.4 GHz b/g/n | 4.2 | NO |
-| LoRa32 V3 | ESP32 | SX1262 | 2.4 GHz b/g/n | 4.2 | NO |
-| Wireless Stick Lite V3 | ESP32-S3FN8 | SX1262 | 2.4 GHz b/g/n | 4.2 | NO |
-| Wireless Tracker | ESP32-S3FN8 | SX1262 | 2.4 GHz b/g/n | 4.2 | YES |
-| Wireless Paper | ESP32-S3FN8 | SX1262 | 2.4 GHz b/g/n | 4.2 | NO |
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:-----------------------|:------------|:-------|:------------:|:---:|:---:|
+| LoRa32 V2.1 | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
+| LoRa32 V3 | ESP32 | SX1262 | 2.4GHz b/g/n | 4.2 | NO |
+| Wireless Stick Lite V3 | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
+| Wireless Tracker | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
+| Wireless Paper | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
### [Station G1](./station-g1/)
High power LoRa transceiver designed for Meshtastic Licensed HAM operation.
| Name | MCU | Radio | WiFi | BT | GPS |
| :-- | :-- | :-- | :--: | :--: | :--: |
-| Station G1 | ESP32 WROOM | SX1262 | 2.4 GHz b/g/n | 5.0 | UES |
+| Station G1 | ESP32 WROOM | SX1262 | 2.4GHz b/g/n | 4.2 | UES |
### [Nano Series](./nano/)
Portable and durable devices designed for Meshtastic.
-| Name | MCU | Radio | WiFi | BT | GPS |
-| :-- | :-- | :-- | :--: | :--: | :--: |
-| Nano G1 | ESP32 WROOM | SX1276 | 2.4 GHz b/g/n | 4.2 | YES |
-| Nano G1 Explorer | ESP32 WROOM | SX1262 | 2.4 GHz b/g/n | 4.2 | YES |
-| Nano G2 Ultra | NRF52840 | SX1262 | 2.4 GHz b/g/n | 5.0 | YES |
+| Name | MCU | Radio | WiFi | BT | GPS |
+|:-----------------|:------------|:-------|:------------:|:---:|:---:|
+| Nano G1 | ESP32 WROOM | SX1276 | 2.4GHz b/g/n | 4.2 | YES |
+| Nano G1 Explorer | ESP32 WROOM | SX1262 | 2.4GHz b/g/n | 4.2 | YES |
+| Nano G2 Ultra | NRF52840 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
### [Raspberry Pi Pico](./raspberry-pi/)
Fast versatile boards using the RP2040