diff --git a/index.md b/index.md
index 757a6676aab76026a7a68ae40c002a133318b4ce..6762e67ba4b00e04e49287c64b9b7e4c5010a242 100644
--- a/index.md
+++ b/index.md
@@ -67,48 +67,50 @@ acces for existing HMDs when not using NDA APIs remains a major blocker.
 
 These are the XR devices that are natively supported with open source drivers in Monado
 
-| Device | Rotation | Position | Distortion Correction | Additional Notes |
-|:------:|:--------:|:--------:|:---------------------:|:----------------:|
-| OSVR HDK 1.x, 2.x | Yes | No | No | Requires workaround on AMD GPUs[^yuv_edid]. Firmware fix available[^hdk_edid_fix] |
-| HTC Vive | Yes | LH 1.0: No | Yes | Supported by OpenHMD, Monado "vive", or Monado "survive" |
-| HTC Vive Pro | Yes | LH 1.0: No, LH 2.0: Early WIP| Yes | Supported by OpenHMD, Monado "vive", or Monado "survive" |
-| Valve Index | Yes | LH 1.0: No, LH 2.0: Early WIP | Yes | Supported by Monado "vive", or Monado "survive" |
-| North Star | Yes, with Intel Realsense T265* | Yes, with Intel Realsense T265* | Yes, 3D and 2D/Polynomial | |
-| Oculus Rift S | Yes | Experimental*, for headset | Imperfect | Controllers are rotationally tracked only |
-| PSVR | Yes | [Yes, with PS4 camera or generic stereo camera]({% link positional-tracking-psmove.md %}) | Yes | distortion correction is WIP. Requires workaround on AMD GPUs[^yuv_edid]. |
-| Playstation Move | Yes | [Yes, with PS4 or generic stereo camera]({% link positional-tracking-psmove.md %}) | - | rotational drift correction is WIP |
-| Hydra Controller | Yes | Yes | - | |
-| Daydream Controller | Yes | - | - | |
-| DIY arduino controller | Yes | - | - | |
-| Windows MR | Yes | Experimental* | Yes | HMD only, no controllers. Tested: HP Reverb, HP Reverb G2, Samsung Odyssey, Lenovo Explorer, others: *maybe*. |
-| Xreal Air | Yes | - | - | |
-| Xreal Air 2 | Yes | - | - | |
-| Xreal Air 2 Pro | Yes | - | - | |
-
-\* _Experimental 6DoF tracking support with external SLAM/VIO systems is upstreamed but still being worked on. Tested with RealSense D455 and Samsung Odyssey+, Reverb G2, Oculus Rift S._
+| Device | Tracking | OS  | Notes |
+|:------:|:--------:|:---:|:-----:|
+| OSVR HDK 1.x, 2.x | 3DoF | Linux | Requires workaround on AMD GPUs[^yuv_edid]. Firmware fix available[^hdk_edid_fix]. No distortion correction, [distortion correction WIP available](https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2198]) |
+| HTC Vive, HTC Vive Pro, Valve Index ("vive driver)| 3DoF, or 6DoF with Monado Basalt (Valve Index only) | Linux | |
+| North Star | 6DoF with Intel Realsense T265 on-device tracking, 6DoF with Monado Basalt | Linux | Both 3D and 2D/Polynomial distortion correction supported. |
+| Oculus Rift S | 6Dof with Monado Basalt | Linux | Controllers are 3DoF only [WIP 6DoF controller tracking branch available](https://gitlab.freedesktop.org/thaytan/monado/-/commits/dev-constellation-controller-tracking/). Imperfect distortion correction. |
+| PSVR | 3DoF, or [6DoF with PS4 camera or generic stereo camera]({% link positional-tracking-psmove.md %}) | Linux | distortion correction is WIP. Requires workaround on AMD GPUs[^yuv_edid]. |
+| Playstation Move | 3DoF, or [6DoF with PS4 or generic stereo camera]({% link positional-tracking-psmove.md %}) | Linux | rotational drift correction is WIP |
+| Hydra Controller | 6DoF | Linux | 6DoF tracking on device in firmware |
+| Daydream Controller | 3DoF | Linux | |
+| DIY arduino controller | 3DoF | Linux | |
+| Windows MR | 3DoF, or 6DoF with Monado Basalt | Linux, [Windows WIP, no direct mode](https://gitlab.freedesktop.org/monado/monado/-/issues/466#note_2733388) | Tested: HP Reverb, HP Reverb G2, Samsung Odyssey, Lenovo Explorer, others: *maybe*. Controllers are 3DoF only [WIP 6DoF controller tracking branch available](https://gitlab.freedesktop.org/thaytan/monado/-/commits/dev-constellation-controller-tracking/) |
+| Xreal Air | 3DoF | Linux | |
+| Xreal Air 2 | 3DoF | Linux | |
+| Xreal Air 2 Pro | 3DoF | Linux | |
+
+
+\* [Monado Basalt](https://gitlab.freedesktop.org/mateosss/basalt/): _Experimental 6DoF tracking support with external SLAM/VIO systems._
 
 Monado also leverages the open source drivers developed by the OpenHMD community
 for further HMD support.
+
 See the [OpenHMD support matrix](http://www.openhmd.net/index.php/devices/)
-for a list of devices supported through OpenHMD.
+for a list of devices supported through OpenHMD. Most notably, OpenHMD supports
+the Oculus Rift CV1 and Nolo CV1.
 
 The Direct-Tek WVR2 / VR-Tek Windows VR Glasses with the 2560x1440 resolution
 supported through OpenHMD requires a workaround on AMD GPUs[^yuv_edid].
 
-Other 3rd party open source drivers Monado currently wraps are
+XR devices that are supported by wrapping 3rd party open source drivers
 
-| 3rd party driver | Device | Rotation | Position | Distortion Correction | Additional Notes |
-|:----------------:|:------:|:--------:|:--------:|:---------------------:|:----------------:|
-| [libsurvive](https://github.com/cntools/libsurvive) | HTC Vive | Yes | Yes | Yes | [survive]({% link libsurvive.md %}) driver must be enabled at build time |
-| [libsurvive](https://github.com/cntools/libsurvive) | HTC Vive Pro | Yes | Yes | Yes | [survive]({% link libsurvive.md %}) driver must be enabled at build time |
-| [libsurvive](https://github.com/cntools/libsurvive) | Valve Index | Yes | Yes | Yes | [survive]({% link libsurvive.md %}) driver must be enabled at build time |
-| [librealsense](https://github.com/IntelRealSense/librealsense) | T265 realsense | Yes | Yes | - | proprietary on-device SLAM tracking |
+| Device | 3rd party driver | Tracking | Additional Notes |
+|:------:|:----------------:|:--------:|:--------:|:-----:|
+| HTC Vive, HTC Vive Pro, Valve Index | [libsurvive](https://github.com/collabora/libsurvive) | 6DoF with Lighthouse 1.0 and 2.0 | [survive]({% link libsurvive.md %}) driver must be enabled at build time |
+| T265 realsense | [librealsense](https://github.com/IntelRealSense/librealsense) | 6Dof with proprietary on-device SLAM tracking |
 
 Proprietary 3rd party drivers can also be integrated. Monado currently wraps these
 
-| proprietary 3rd party driver | Device | Rotation | Position | Distortion Correction | Additional Notes |
-|:----------------------------:|:------:|:--------:|:--------:|:---------------------:|:----------------:|
-| Ultraleap v2 | Leap Motion Controller | Yes | Yes | - | |
+| Device | proprietary 3rd party driver | Tracking | Additional Notes |
+|:------:|:----------------------------:|:--------:|:----------------:|
+| Leap Motion Controller | Ultraleap v2 | 6DoF Hand Tracking |  |
+| HTC Vive, HTC Vive Pro, Valve Index | steamvr_lh | 6DoF with Lighthouse 1.0 and 2.0 | Wraps SteamVR's proprietary lighthouse tracking |
+
+See also the XR Devices table in the [LVRA Wiki](https://lvra.gitlab.io/docs/hardware/#xr-devices) that also includes WIP and out of tree drivers.
 
 ### So what does that mean?