diff --git a/docs/tools/pluto-m2k/building_the_image.rst b/docs/tools/pluto-m2k/building_the_image.rst
index cce5de46..ac7037d0 100644
--- a/docs/tools/pluto-m2k/building_the_image.rst
+++ b/docs/tools/pluto-m2k/building_the_image.rst
@@ -1,7 +1,7 @@
 .. _pluto-m2k building_the_image:
 
 Building the Firmware Image
-===========================
+"""""""""""""""""""""""""""
 
 It is recommenced to use the pre-build images, which can be
 found at :git-plutosdr-fw:`PlutoSDR Firmware releases <releases/latest+>`.
@@ -17,7 +17,7 @@ testing your image, so if something goes wrong - its a quick power cycle to fix
 things.
 
 Prerequisites
--------------
+=============
 
 #. Make sure to download, or upgrade your
    :ref:`Sources <pluto-m2k obtaining_the_sources>`
@@ -71,7 +71,7 @@ Firmware Image.
    $    u-boot-tools bc python cpio zip unzip file wget
 
 Building
---------
+========
 
 .. hint::
 
@@ -112,7 +112,7 @@ packages from the WEB.
 before you type ``make``.
 
 Build Artifacts
-~~~~~~~~~~~~~~~
+---------------
 
 .. shell::
 
@@ -142,7 +142,7 @@ Build Artifacts
           -rw-rw-r-- 1 michael  16K Apr 19 17:39 zynq-pluto-sdr-revb.dtb
 
 Testing on the target
-~~~~~~~~~~~~~~~~~~~~~
+---------------------
 
 There is a script in the :git-plutosdr_scripts:`plutosdr_scripts <+>` repo
 that will quickly download a build artifact (the ``pluto.dfu`` file) to an USB
@@ -162,7 +162,7 @@ not a persistent update over power cycles or further reboots.
         Linux pluto 5.4.0-00535-g9c04de11ae53 #1 SMP PREEMPT Tue Feb 15 16:17:50 EST 2022 armv7l GNU/Linux
 
 Main targets
-~~~~~~~~~~~~
+------------
 
 .. list-table::
    :header-rows: 1
@@ -186,7 +186,7 @@ Main targets
      - ZIP archive containg u-boot and Vivao TCL used for JATG bootstrapping
 
 Other intermediate targets
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------
 
 .. list-table::
    :header-rows: 1
@@ -223,7 +223,7 @@ Other intermediate targets
      - Device Tree Blob for Rev.B
 
 How does it work
-================
+----------------
 
 .. warning::
 
diff --git a/docs/tools/pluto/users/index.rst b/docs/tools/pluto/users/index.rst
index 6de441e0..06b8f680 100644
--- a/docs/tools/pluto/users/index.rst
+++ b/docs/tools/pluto/users/index.rst
@@ -43,20 +43,20 @@ Contents
 #. :dokuwiki:`Quick Start <university/tools/pluto/users/quick_start>`
 #. Intro to the Software. Installing Device Drivers on:
 
-   #. :dokuwiki:`Windows </drivers/windows>`
-   #. :dokuwiki:`Linux </drivers/linux>`
-   #. :dokuwiki:`MAC </drivers/osx>`
+   #. :ref:`Windows <pluto-m2k drivers windows>`
+   #. :ref:`Linux <pluto-m2k drivers linux>`
+   #. :ref:`MAC <pluto-m2k drivers osx>`
 
 #. Upgrading the the ADALM-PLUTO :dokuwiki:`Firmware <university/tools/pluto/users/firmware>` .
 #. :dokuwiki:`Calibrating <university/tools/pluto/users/calibration>` the ADALM-PLUTO.
 #. :dokuwiki:`Customizing <university/tools/pluto/users/customizing>` the ADALM-PLUTO.
 #. Once the driver are configured and set up, you can interact with the
-   `ADALM-PLUTO <adi>ADALM-PLUTO>`__ Active Learning Module from:
+   :adi:`ADALM-PLUTO` Active Learning Module from:
 
    #. :dokuwiki:`IIO oscilloscope </resources/tools-software/linux-software/iio_oscilloscope>`
    #. `gqrx <http://gqrx.dk/>`__, an open source software defined radio receiver
       (SDR) powered by the GNU Radio
-   #. `Official support for MATLAB and Simulink <mw>hardware-support/adalm-pluto-radio.html>`__
+   #. :mw:`Official support for MATLAB and Simulink <hardware-support/adalm-pluto-radio.html>`
    #. :dokuwiki:`MATLAB IIO Bindings </resources/tools-software/linux-software/libiio/clients/matlab_simulink>`
    #. :dokuwiki:`GNU Radio </resources/tools-software/linux-software/gnuradio>`
    #. `SDRangel <https://github.com/f4exb/sdrangel>`__, an Open Source Qt5 /