diff --git a/boards/beaglebone/ai-64/01-introduction.rst b/boards/beaglebone/ai-64/01-introduction.rst
index a7a247616ab61f3547f9608632361fe6bdbaffb9..a8579697b6ff7b9d4b83149360e547a4777a392f 100644
--- a/boards/beaglebone/ai-64/01-introduction.rst
+++ b/boards/beaglebone/ai-64/01-introduction.rst
@@ -18,9 +18,19 @@ their own board or add their own circuitry.
     foundation for experimentation and learning how to program the processor and to access the 
     peripherals by the creation of your own software and hardware.
 
+.. table::
+   :align: center
+   :widths: auto
 
+   +----------------------------------------------------+---------------------------------------------------------+
+   | .. image:: media/front.*                           | .. image:: media/back.*                                 |
+   |    :width: 700                                     |       :width: 700                                       |
+   |    :align: center                                  |       :align: center                                    |
+   |    :alt: BeagleBone AI-64 front                    |       :alt: BeagleBone AI-64 back                       |
+   +----------------------------------------------------+---------------------------------------------------------+
 
-.. _beaglebone-compatibility:
+
+.. _bbai64-beaglebone-compatibility:
 
 BeagleBone Compatibility
 -------------------------
@@ -67,7 +77,7 @@ much as possible. There are several significant differences between the three de
    add cape compatibility details
 
 
-.. _beaglebone-ai-64-features-and-specificationd:
+.. _bbai64-features-and-specificationd:
 
 BeagleBone AI-64 Features and Specification
 ---------------------------------------------
@@ -92,9 +102,10 @@ description of the major components and interfaces that make up the board.
     +-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
     | **PMIC**                | TPS65941213 and TPS65941111 PMICs regulator and one additional LDO.                                                                     |
     +-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
-    | **Debug Support**       | 2x 3 pin 3.3V TTL header                                                                                                                |
-    |                         |     1. WKUP_UART0: Wake-up domain serial port                                                                                           |
-    |                         |     2. UART0: Main domain serial port                                                                                                   |
+    | **Debug Support**       | 2x 3 pin 3.3V TTL header:                                                                                                               |
+    |                         |    1. WKUP_UART0: Wake-up domain serial port                                                                                            |
+    |                         |    2. UART0: Main domain serial port                                                                                                    |
+    +                         +-----------------------------------------------------------------------------------------------------------------------------------------+
     |                         | 10-pin JTAG TAG-CONNECT footprint                                                                                                       |
     +-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
     | **Power Source**        | USB C or DC Jack (5V @ >3A)                                                                                                             |
@@ -125,7 +136,7 @@ description of the major components and interfaces that make up the board.
     +-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 
 
-.. _board-component-locations:
+.. _bbai64-component-locations:
 
 Board Component Locations
 ----------------------------
@@ -133,36 +144,94 @@ Board Component Locations
 This section describes the key components on the board. It provides information on their location 
 and function. Familiarize yourself with the various components on the board.
 
-.. _board-components:
+.. _bbai64-components:
 
 Board components
 -----------------
 
-:ref:`board-components-figure` below shows the locations of the connectors, LEDs, and switches on the PCB layout of the board.
-
-.. _board-components-figure:
-
-.. figure:: media/ch04/components.*
-   :width: 400px
-   :align: center 
-   
-   BeagleBone AI-64 board components
-
-* **DC Power** is the main DC input that accepts 5V power.
-* **Power Button** alerts the processor to initiate the power down sequence and is used to power down the board.
-* **GigaBit Ethernet** is the connection to the LAN.
-* **Serial Debug ports** WKUP_UART0 for early boot from the management MCU and UART0 is for the main processor.
-* **USB Client** is a USB-C connection to a PC that can also power the board.
-* **BOOT switch** can be used to force a boot from the microSD card if the power is cycled on the board, removing power and reapplying the power to the board.
-* There are five green **LEDs** that can be used by the user.
-* **Reset Button** allows the user to reset the processor.
-* **microSD** slot is where a microSD card can be installed.
-* **miniDP** connector is where the display is connected to.
-* **USB Host** can be connected different USB interfaces such as Wi-Fi, Bluetooth, Keyboard, etc.
-
-On bottom side we have,
-
-* **TI TDA4VM** processor.
-* **4GB LPDDR4** Dual Data Rate RAM memory.
-* **Ethernet PHY** physical interface to the network.
-* **eMMC** onboard MMC chip that holds up to 16GB of data.
+This section describes the key components on the board, their location and function.
+
+.. tabs::
+
+   .. group-tab:: Front components location
+
+    .. figure:: media/components/front.*
+        :width: 1240
+        :align: center
+        :alt: BeagleBone AI-64 board front components location
+        
+        BeagleBone AI-64 board front components location
+
+
+    .. table:: BeagleBone AI-64 board front components location
+        :align: center
+            
+        +----------------------------+---------------------------------------------------------------------------+
+        | Feature                    | Description                                                               |
+        +============================+===========================================================================+
+        | User & power LEDs          | USR0 - USR4 user LEDs & Power (Board ON) LED indicator                    |
+        +----------------------------+---------------------------------------------------------------------------+
+        | UART debug ports           | 3pin Wake-up domain and Main domain UART debug ports                      |
+        +----------------------------+---------------------------------------------------------------------------+
+        | USB C                      | Power, connectivity, and board flashing.                                  |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Barrel jack                | Power input (accepts 5V power)                                            |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Mini-Display port          | Output for Display/Monitor connection                                     |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Dual USB-A                 | 5Gbps USB-A ports for peripherals (Wi-Fi, Bluetooth, Keyboard, etc)       |
+        +----------------------------+---------------------------------------------------------------------------+
+        | GigaBit Ethernet           | 1Gb/s Wired internet connectivity                                         |
+        +----------------------------+---------------------------------------------------------------------------+
+        | mikroBUS Shuttle           | 16pin mikroBUS Shuttle connector for interfacing mikroE click boards      |
+        +----------------------------+---------------------------------------------------------------------------+
+        | P8 & P9 cape header        | Expansion headers for BeagleBone capes.                                   |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Reset button               | Press to reset BeagleBone AI-64 board (TDA4VM SoC)                        |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Power button               | Press to shut-down (OFF), hold down to boot (ON)                          |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Boot button                | Boot selection button (force to boot from microSD if power is cycled)     |
+        +----------------------------+---------------------------------------------------------------------------+
+        | M.2 Key E                  | PCIE M.2 Key E connector                                                  |
+        +----------------------------+---------------------------------------------------------------------------+
+
+   .. group-tab:: Back components location
+
+    .. figure:: media/components/back.*
+        :width: 1240
+        :align: center
+        :alt: BeagleBone AI-64 board back components location
+        
+        BeagleBone AI-64 board back components location
+
+
+    .. table:: BeagleBone AI-64 board back components location
+        :align: center
+            
+        +----------------------------+---------------------------------------------------------------------------+
+        | Feature                    | Description                                                               |
+        +============================+===========================================================================+
+        | microSD                    | Micro SD Card holder                                                      |
+        +----------------------------+---------------------------------------------------------------------------+
+        | JTAG debug port            | Tag-Connect JTAG (TDA4Vm) debug port                                      |
+        +----------------------------+---------------------------------------------------------------------------+
+        | Fan connector              | PWM controllable 4pin fan connector                                       |
+        +----------------------------+---------------------------------------------------------------------------+
+        | DP83867E                   | Ethernet PHY                                                              |
+        +----------------------------+---------------------------------------------------------------------------+
+        | TUSB8041                   | USB 3.0 hub IC                                                            |
+        +----------------------------+---------------------------------------------------------------------------+
+        | TDA4VM                     | Dual Arm® Cortex®-A72 SoC and C7x DSP with deep-learning, vision and MMA  |
+        +----------------------------+---------------------------------------------------------------------------+
+        | PMIC                       | Power management TPS65941213 (PMIC-A) & TPS65941111 (PMIC-B)              |
+        +----------------------------+---------------------------------------------------------------------------+
+        | 16GB eMMC                  | Flash storage                                                             |
+        +----------------------------+---------------------------------------------------------------------------+
+        | 4GB RAM                    | 4GB LPDDR4 RAM                                                            |
+        +----------------------------+---------------------------------------------------------------------------+
+        | DSI                        | MIPI Display connector                                                    |
+        +----------------------------+---------------------------------------------------------------------------+
+        | CSI0 & CSI1                | MIPI Camera connectors                                                    |
+        +----------------------------+---------------------------------------------------------------------------+
+ 
\ No newline at end of file
diff --git a/boards/beaglebone/ai-64/02-quick-start.rst b/boards/beaglebone/ai-64/02-quick-start.rst
index f03f3d21db316f8de867f36566f8f82355504ec6..162a29a38ccfb8583375133c03c3ef499e189755 100644
--- a/boards/beaglebone/ai-64/02-quick-start.rst
+++ b/boards/beaglebone/ai-64/02-quick-start.rst
@@ -1,4 +1,4 @@
-.. _connecting-up-your-beaglebone-ai-64:
+.. _bbai64-quick-start:
 
 Quick Start Guide
 ##################
@@ -16,7 +16,7 @@ All the :ref:`BeagleBone AI-64 connections ports` we will use in this chapter ar
 .. _BeagleBone AI-64 connections ports:
 
 .. figure:: media/ch03/ports.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    BeagleBone AI-64 connections ports
@@ -37,7 +37,7 @@ a developer experience where the board can be used immediately with no other equ
 .. _bbai-64-pacakage:
 
 .. figure:: media/ch03/bbai64-in-box.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    BeagleBone AI-64 box content
@@ -79,7 +79,7 @@ In this configuration, the board is powered by the PC via a single USB cable. Th
 .. _tethered-figure:
 
 .. figure:: media/ch03/usb-tethering.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Tethered Configuration
@@ -100,7 +100,7 @@ Connect the Cable to the Board
 .. _usb-c-connect-figure:
 
 .. figure:: media/ch03/usb-c-connection.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    USB Connection to the Board
@@ -110,7 +110,7 @@ Connect the Cable to the Board
 .. _usb-a-connect-figure:
 
 .. figure:: media/ch03/usb-a-connection.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    USB Connection to the PC/Laptop
@@ -120,7 +120,7 @@ Connect the Cable to the Board
 .. _power-led-figure:
 
 .. figure:: media/ch03/power-led.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Board Power LED
@@ -130,7 +130,7 @@ Connect the Cable to the Board
 .. _boot-status-figure:
 
 .. figure:: media/ch03/led-pattern.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Board Boot Status
@@ -157,7 +157,7 @@ In this configuration, the board works more like a PC, totally free from any con
 .. _desktop-config-figure:
 
 .. figure:: media/ch03/desktop-configuration.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Desktop Configuration
@@ -188,7 +188,7 @@ Connecting Up the Board
 .. _display-cable-figure,miniDP-DP or active miniDP-HDMI cable connection figure:
 
 .. figure:: media/ch03/monitor-cable.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Connect miniDP-DP or active miniDP-HDMI cable to BeagleBone AI-64
@@ -198,7 +198,7 @@ Connecting Up the Board
 .. _display-adapters-figure:
 
 .. figure:: media/ch03/display-adapters.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Display adapters
@@ -209,7 +209,7 @@ Connecting Up the Board
 .. _keyboard-mouse-figure:
 
 .. figure:: media/ch03/mouse-keyboard.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Keyboard and Mouse
@@ -223,7 +223,7 @@ standard 100M Ethernet cable should work.
 .. _ethernet-cable-figure:
 
 .. figure:: media/ch03/ethernet-cable.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Ethernet Cable Connection
@@ -234,7 +234,7 @@ standard 100M Ethernet cable should work.
 .. _barrel-jack-figure:
 
 .. figure:: media/ch03/barrel-jack.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    External DC Power
@@ -244,7 +244,7 @@ standard 100M Ethernet cable should work.
 .. _miniDP-figure:
 
 .. figure:: media/ch03/miniDP-connector.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    Connect miniDP to DP or active miniDP to HDMI Cable to the Board
@@ -258,7 +258,7 @@ As soon as the power is applied to the board, it will start the booting up proce
 .. _LEDs-figure,BeagleBone AI-64 LEDs figure:
 
 .. figure:: media/ch03/leds.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    BeagleBone AI-64 LEDs
@@ -282,7 +282,7 @@ meanings in the image that is shipped with the board once the Linux kernel has b
 .. _figure-16:
 
 .. figure:: media/ch03/xfce-desktop.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    BeagleBone XFCE Desktop Screen
diff --git a/boards/beaglebone/ai-64/03-design-and-specifications.rst b/boards/beaglebone/ai-64/03-design-and-specifications.rst
index 79f1a8115e5772cb9b1a22c9e38e6ba42b0ad3a1..37ab0ed066681fb5f588bbd7ac9134fd65f9221b 100644
--- a/boards/beaglebone/ai-64/03-design-and-specifications.rst
+++ b/boards/beaglebone/ai-64/03-design-and-specifications.rst
@@ -1,4 +1,4 @@
-.. _beaglebone-ai-64-design:
+.. _bbai64-design:
 
 Design and Specifications
 ##########################
@@ -16,7 +16,7 @@ diagram of BeagleBone AI-64 board surrounding TDA4VM SoC.
 .. _BeagleBone_AI-64-block-diagram:
 
 .. figure:: media/ch05/board-block-diagram.*
-   :width: 400px
+   :width: 740px
    :align: center 
    
    BeagleBone AI-64 Key Components
diff --git a/boards/beaglebone/ai-64/04-connectors-and-pinouts.rst b/boards/beaglebone/ai-64/04-expansion.rst
similarity index 99%
rename from boards/beaglebone/ai-64/04-connectors-and-pinouts.rst
rename to boards/beaglebone/ai-64/04-expansion.rst
index ac6f742ffd423bfb127c51e5adce30d4be9d4020..dac7baaab128d0a922165d03e149f057bf0098ee 100644
--- a/boards/beaglebone/ai-64/04-connectors-and-pinouts.rst
+++ b/boards/beaglebone/ai-64/04-expansion.rst
@@ -1,8 +1,34 @@
-.. _beaglebone-ai-64-expansion:
+.. _bbai64-expansion:
 
 Expansion
 ############
 
+Pinout Diagrams
+***************
+
+Choose the cape header to see respective pinout diagram.
+
+.. tabs::
+
+   .. group-tab:: P8 cape header
+
+        .. figure:: media/pinout/BeagleBone-AI-64-P8.*
+            :align: center
+            :alt: BeagleBone AI-64 P8 cape header pinout
+
+            BeagleBone AI-64 P8 cape header pinout
+
+
+   .. group-tab:: P9 cape header
+
+        .. figure:: media/pinout/BeagleBone-AI-64-P9.*
+            :align: center
+            :alt: BeagleBone AI-64 P9 cape header pinout
+
+            BeagleBone AI-64 P9 cape header pinout
+
+.. _beaglebone-ai-64-connectors:
+
 Cape Header Connectors
 **********************
 
@@ -39,7 +65,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -767,7 +793,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -2153,7 +2179,7 @@ RANDOM PRU STUFF THAT MIGHT NEED A HOME
 BeagleBone AI-64 and on which connector and pins they are accessible
 from. Some signals are accessible on the same pins.
 
-.. _table-11,Table 11:
+.. _table-11:
 
 .. list-table:: PRU0 and PRU1 Access
    :header-rows: 1
diff --git a/boards/beaglebone/ai-64/06-support.rst b/boards/beaglebone/ai-64/06-support.rst
index 15643d88980a3741ff69a8875b42f9c7b429354f..2e16c4adfafb4d7925486240dc7753389d55244f 100644
--- a/boards/beaglebone/ai-64/06-support.rst
+++ b/boards/beaglebone/ai-64/06-support.rst
@@ -1,4 +1,4 @@
-.. _beaglebone-ai-64-support-information:
+.. _bbai64-support:
 
 Additional Support Information
 ##############################
diff --git a/boards/beaglebone/ai-64/index.rst b/boards/beaglebone/ai-64/index.rst
index 6c85a3fdc7b46fe35d7f6422995ca655b2d7585b..9d2291455d17171203d85f3ed9292fdc9013bba3 100644
--- a/boards/beaglebone/ai-64/index.rst
+++ b/boards/beaglebone/ai-64/index.rst
@@ -30,19 +30,121 @@ hardware examples and dozens of readily available embedded expansion options ava
             * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai-64>`__
             * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
             * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
-            * For export, emissions and other compliance, see :ref:`beaglebone-ai-64-support-information`
+            * For export, emissions and other compliance, see :ref:`bbai64-support`
 
 .. image:: media/bbai64-45-front.jpg
-   :width: 400px
+   :width: 740px
    :align: center
-   :alt: Fig: BeagleBone AI-64 front at 45° angle
+   :alt: BeagleBone AI-64 front at 45° angle
+
+.. only:: html
+
+  .. grid:: 1 1 2 3
+    :margin: 4 4 0 0
+    :gutter: 4
+
+    .. grid-item-card::
+        :link: bbai64-introduction
+        :link-type: ref
+
+        **1. Introduction**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/01-introduction.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter01 thumbnail
+        
+        +++
+
+        Introduction to BeagleBone AI-64 board with information on each component 
+        location on both front and back of the board.
+
+    .. grid-item-card:: 
+        :link: bbai64-quick-start
+        :link-type: ref
+
+        **2. Quick start**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/02-quick-start.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter02 thumbnail
+
+        +++
+
+        Getting started guide to enable you to start building your projects 
+        in no time.
+
+    .. grid-item-card:: 
+        :link: bbai64-design
+        :link-type: ref
+
+        **3. Design & Specifications**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/03-design-and-specifications.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter03 thumbnail
+
+        +++
+
+        Hardware and mechanical design and specifications of BeagleBone AI-64 board 
+        for those who want to know their board inside and out.
+
+    .. grid-item-card:: 
+        :link: bbai64-expansion
+        :link-type: ref
+
+        **4. Expansion**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/04-connectors-and-pinouts.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter04 thumbnail
+
+        +++
+
+        Connector pinout diagrams with expansion details so that you can 
+        easily debug your connections and create custom expansion hardware.
+        
+    .. grid-item-card::
+        :link: bbai64-demos-and-tutorials
+        :link-type: ref
+
+        **5. Demos**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/05-demos-and-tutorials.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter5 thumbnail
+
+        +++
+
+        Demos and tutorials to quickly learn about BeagleBone AI-64 capabilities.
+
+    .. grid-item-card::
+        :link: bbai64-support
+        :link-type: ref
+
+        **6. Support**
+        ^^^
+
+        .. image:: media/chapter-thumbnails/06-support.*
+            :align: center
+            :alt: BeagleBone AI-64 Chapter6 thumbnail
+
+        +++
+
+        Additional supporting information, images, documents, change history and
+        hardware & software repositories including issue trackers.
 
 .. toctree::
    :maxdepth: 1
+   :hidden:
 
    01-introduction
    02-quick-start
    03-design-and-specifications
-   04-connectors-and-pinouts
+   04-expansion
    05-demos-and-tutorials
    06-support
diff --git a/boards/beaglebone/ai-64/media/components/front.jpg b/boards/beaglebone/ai-64/media/components/front.jpg
index e92ebf3f81c0ac575fcdeea6ec82178b06fb1b7c..1ca304e06f5e10eb7f08934f7b6a25d93c39717c 100644
Binary files a/boards/beaglebone/ai-64/media/components/front.jpg and b/boards/beaglebone/ai-64/media/components/front.jpg differ
diff --git a/boards/beaglebone/ai-64/media/components/front.png b/boards/beaglebone/ai-64/media/components/front.png
index 2640d392cbf5ab3050a01b69a4a7331666dfcaff..85b678d3f44fcbe00028d46749f124dd7d1b8f09 100644
Binary files a/boards/beaglebone/ai-64/media/components/front.png and b/boards/beaglebone/ai-64/media/components/front.png differ
diff --git a/boards/beaglebone/ai-64/media/components/front.webp b/boards/beaglebone/ai-64/media/components/front.webp
index 0cfd3792cded0bd6bed83450c0b010ef5c9a07d3..15aa6f95b1873d11bc3682cf32cd0e2466e23c32 100644
Binary files a/boards/beaglebone/ai-64/media/components/front.webp and b/boards/beaglebone/ai-64/media/components/front.webp differ
diff --git a/boards/beaglev/ahead/01-introduction.rst b/boards/beaglev/ahead/01-introduction.rst
index fe4d203ef8784a70f7c13c9fa2c19bfac8458cc6..cc5c2e3ad37b394d3fee4b1618d02eeb1c4df279 100644
--- a/boards/beaglev/ahead/01-introduction.rst
+++ b/boards/beaglev/ahead/01-introduction.rst
@@ -174,7 +174,7 @@ Back components location
     +----------------------------+---------------------------------------------------------------------------+
     | Mini HDMI                  | HDMI connector                                                            |
     +----------------------------+---------------------------------------------------------------------------+
-    | microSD                    | SDCard holder                                                             |
+    | microSD                    | Micro SD card holder                                                      |
     +----------------------------+---------------------------------------------------------------------------+
     | 4GB RAM                    | 2 x 2GB LPDDR4 RAM                                                        |
     +----------------------------+---------------------------------------------------------------------------+
diff --git a/boards/beaglev/ahead/04-expansion.rst b/boards/beaglev/ahead/04-expansion.rst
index 4f0159f9c11cc702a3ce43b8460e1839b446bc97..009f0ab064a8717bc4957f9e773c375a7c20ea82 100644
--- a/boards/beaglev/ahead/04-expansion.rst
+++ b/boards/beaglev/ahead/04-expansion.rst
@@ -38,7 +38,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -485,7 +485,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to direcly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
diff --git a/boards/beaglev/fire/03-design.rst b/boards/beaglev/fire/03-design.rst
index 8de6907e0f85bbb4b95153d69a210ed3c5b74b51..c36908d872d733aac201c43c77f3e8b8f4c17660 100644
--- a/boards/beaglev/fire/03-design.rst
+++ b/boards/beaglev/fire/03-design.rst
@@ -172,7 +172,7 @@ P8 & P9 cape header pins
 
     P8 cape header
 
-.. figure:: media/hardware-design/p8-header.*
+.. figure:: media/hardware-design/p9-header.*
     :width: 570
     :align: center
     :alt: P9 cape header
diff --git a/boards/beaglev/fire/05-demos.rst b/boards/beaglev/fire/05-demos.rst
index 56b95dc0c02c5dc147c305615bbcc5b84d0c2315..c318c38ca1cfd58905562383f2583d855daf2092 100644
--- a/boards/beaglev/fire/05-demos.rst
+++ b/boards/beaglev/fire/05-demos.rst
@@ -19,3 +19,4 @@ Demos
     demos-and-tutorials/gateware/index
     demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board
     demos-and-tutorials/gateware/gateware-full-flow
+    demos-and-tutorials/gateware/gateware-tcl-scripts-structure
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
index e00bea74049d8922da4241d1bb15568a6159fa66..7dd296786dadd406bd6b8f24c55ab3baefb52442 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-full-build-flow:
+
 Gateware Full Build Flow
 ########################
 
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
index 31c9bc75051bbe6fe076d34008125ac9565a9115..c38cb1543b844f22cd55b090d26aa4a77156dcd3 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-tcl-scripts-structure:
+
 Gateware TCL Scripts Structure
 ##############################
 
diff --git a/boards/capes/cape-interface-spec.rst b/boards/capes/cape-interface-spec.rst
index 2943bb157eccae6e9e4f2964351886fa3c769223..beb41b18707d31cdedc1bca21ea9a0e2f33b36a7 100644
--- a/boards/capes/cape-interface-spec.rst
+++ b/boards/capes/cape-interface-spec.rst
@@ -490,7 +490,7 @@ Cape interface specification provides |I2C| controller device links for userspac
 |I2C| overlay example
 =====================
 
-.. code-block::
+.. code-block:: devicetree
    :linenos:
    :caption: Example device tree overlay to enable I2C driver
    :name: bone_cape_spec_i2c_example
diff --git a/books/beaglebone-cookbook/02sensors/sensors.rst b/books/beaglebone-cookbook/02sensors/sensors.rst
index ef9f0b667f759ae76a69e71e0b080cb9c84d80b7..521f9bd147ed4e8c34eafda14df666993d9a05f9 100644
--- a/books/beaglebone-cookbook/02sensors/sensors.rst
+++ b/books/beaglebone-cookbook/02sensors/sensors.rst
@@ -124,7 +124,7 @@ By default, it takes you to your home directory. Notice that the prompt has chan
 - Press ^S (Ctrl-S) to save the file. (You can also go to the File menu in VSC and select Save to save the file, but Ctrl-S is easier.) Even easier, VSC can be configured to autosave every so many seconds.
 - In the *bash* tab, enter the following commands:
 
-.. code-block::
+.. code-block:: bash
 
   debian@beaglebone:beaglebone-cookbook/code/02sensors$ ./pushbutton.py
   data= 0
diff --git a/books/beaglebone-cookbook/04motors/motors.rst b/books/beaglebone-cookbook/04motors/motors.rst
index 0879e86ca56d259fcca805012fc64bb9397f54fa..d28b0465c69566ceac13ec0e62edcacefb51ca27 100644
--- a/books/beaglebone-cookbook/04motors/motors.rst
+++ b/books/beaglebone-cookbook/04motors/motors.rst
@@ -143,6 +143,7 @@ Combine the code from :ref:`digital_rotaryEncoder_js` and :ref:`motors_servo`.
 .. _py_servoEncoder_code:
 
 .. literalinclude:: ../code/04motors/servoEncoder.py
+   :language: python
    :caption: Code for driving a servo motor with a rotary encorder(servoEncoder.py)
    :linenos:
 
diff --git a/conf.py b/conf.py
index 927f3a5980f9c0561f00bb0d82614f4740759aec..5acdb58f5c162175af2ed3380c2baec1f7b37adc 100644
--- a/conf.py
+++ b/conf.py
@@ -65,7 +65,7 @@ exhale_args = {
 primary_domain = 'cpp'
 highlight_language = 'cpp'
 
-todo_include_todos = True
+todo_include_todos = False
 
 # Update (HTML) supported_image_types selection priority order
 from sphinx.builders.html import StandaloneHTMLBuilder
@@ -78,7 +78,7 @@ LaTeXBuilder.supported_image_types = ['application/pdf', 'image/jpg', 'image/jpe
 
 templates_path = ['_templates']
 
-source_suffix = ['.rst', '.md']
+source_suffix = ['.rst']
 numfig = True
 navigation_with_keys = True
 
diff --git a/gitlab-build.sh b/gitlab-build.sh
index d0032fa8d14d1324bbca4a9e648fdd2ca0cf5d85..a8154e3ac803d8dd11469745cc9491851df6c7b0 100755
--- a/gitlab-build.sh
+++ b/gitlab-build.sh
@@ -54,12 +54,12 @@ HERE
 
 	echo "**** make html ****"
 	# Build and serve HTML
-	make html BUILDDIR=public/$VER_DIR $1
+	make html BUILDDIR=public/$VER_DIR
 	mv public/$VER_DIR/html/* public/$VER_DIR/
 
 	echo "**** make latexpdf ****"
 	# Build, optimize, and serve PDF
-	make latexpdf BUILDDIR=public/$VER_DIR $1
+	make latexpdf BUILDDIR=public/$VER_DIR
 
 	echo "**** pdfcpu ****"
 	if [ "x${CI_RUNNER_EXECUTABLE_ARCH}" == "xlinux/arm64" ] ; then
@@ -138,7 +138,8 @@ elif [ "$CI_COMMIT_TAG" != "" ]; then
 		export VER_DIR=$GIT_BRANCH
 		export PAGES_SLUG=$GIT_BRANCH
 	fi
-	do_build -D todo_include_todos=False
+	export SPHINXOPTS="-D todo_include_todos=False"
+	do_build
 else
 	echo "***** Not on a branch or tag *****"
 fi
diff --git a/intro/contribution/index.rst b/intro/contribution/index.rst
index fcaeeacb8993645e5efe94f5be9e1f0ae54e26f7..72d3a956669b5974c8e74a1781b0da4988307619 100644
--- a/intro/contribution/index.rst
+++ b/intro/contribution/index.rst
@@ -107,8 +107,7 @@ Articles on contribution
 
 .. toctree::
    :maxdepth: 1
-
-   /CONTRIBUTING
+   
    git-usage
    style
    rst-cheat-sheet
diff --git a/projects/librobotcontrol b/projects/librobotcontrol
index 1974b76fd578ff9f5d1481ebd34f6801b9edeb6a..1606554843c2b53ab7ca0817868fb32e9f3e6b21 160000
--- a/projects/librobotcontrol
+++ b/projects/librobotcontrol
@@ -1 +1 @@
-Subproject commit 1974b76fd578ff9f5d1481ebd34f6801b9edeb6a
+Subproject commit 1606554843c2b53ab7ca0817868fb32e9f3e6b21