diff --git a/docs/mynewt_faq/troubleshoot_faq.rst b/docs/mynewt_faq/troubleshoot_faq.rst
index 05f4c0e..c7c71bb 100644
--- a/docs/mynewt_faq/troubleshoot_faq.rst
+++ b/docs/mynewt_faq/troubleshoot_faq.rst
@@ -95,7 +95,7 @@
 
 **Q**: I got the following error using ``newt build``. How do I fix it?
 
-.. code-block:: console:
+.. code-block:: console
 
   Error: repos/apache-mynewt-core/sys/log/modlog/src/modlog.c: In function 'modlog_alloc':
   repos/apache-mynewt-core/sys/log/modlog/src/modlog.c:61:23: error: missing braces around initializer [-Werror=missing-braces]
diff --git a/docs/tutorials/ble/bleprph/bleprph-sections/bleprph-chr-access.rst b/docs/tutorials/ble/bleprph/bleprph-sections/bleprph-chr-access.rst
index b2beacf..67e8773 100644
--- a/docs/tutorials/ble/bleprph/bleprph-sections/bleprph-chr-access.rst
+++ b/docs/tutorials/ble/bleprph/bleprph-sections/bleprph-chr-access.rst
@@ -92,12 +92,12 @@
             }
         }
 
-    /* Unknown characteristic; the nimble stack should not have called this
-     * function.
-     */
-    assert(0);
-    return BLE_ATT_ERR_UNLIKELY;
-}
+        /* Unknown characteristic; the nimble stack should not have called this
+        * function.
+        */
+        assert(0);
+        return BLE_ATT_ERR_UNLIKELY;
+    }
 
 After you've taken a moment to examine the structure of this function,
 let's explore some details.
diff --git a/docs/tutorials/ble/eddystone.rst b/docs/tutorials/ble/eddystone.rst
index 4814844..b362cc9 100644
--- a/docs/tutorials/ble/eddystone.rst
+++ b/docs/tutorials/ble/eddystone.rst
@@ -332,7 +332,7 @@
         rc = ble_gap_adv_start(BLE_OWN_ADDR_RANDOM, NULL, BLE_HS_FOREVER,
                            &adv_params, NULL, NULL);
         assert(rc == 0);
-} 
+    } 
 
 Conclusion
 ~~~~~~~~~~
diff --git a/docs/tutorials/blinky/arduino_zero.rst b/docs/tutorials/blinky/arduino_zero.rst
index d100a67..b4d1e3d 100644
--- a/docs/tutorials/blinky/arduino_zero.rst
+++ b/docs/tutorials/blinky/arduino_zero.rst
@@ -335,17 +335,17 @@
 Run the ``newt load arduino_boot`` command again after erasing the
 board.
 
-:red:`Reminder if you are using Docker`: When working with actual hardware,
-remember that each board has an ID. If you swap boards and do not
-refresh the USB Device Filter on the VirtualBox UI, the ID might be
-stale and the Docker instance may not be able to see the board
-correctly. For example, you may see an error message like
-``Error: unable to find CMSIS-DAP device`` when you try to load or run
-an image on the board. In that case, you need to click on the USB link
-in VirtualBox UI, remove the existing USB Device Filter (e.g. "Atmel
-Corp. EDBG CMSIS-DAP[0101]") by clicking on the "Removes selected USB
-filter" button, and add a new filter by clicking on the "Adds new USB
-filter" button.
+.. warning:: Reminder if you are using Docker: When working with actual hardware,
+    remember that each board has an ID. If you swap boards and do not
+    refresh the USB Device Filter on the VirtualBox UI, the ID might be
+    stale and the Docker instance may not be able to see the board
+    correctly. For example, you may see an error message like
+    ``Error: unable to find CMSIS-DAP device`` when you try to load or run
+    an image on the board. In that case, you need to click on the USB link
+    in VirtualBox UI, remove the existing USB Device Filter (e.g. "Atmel
+    Corp. EDBG CMSIS-DAP[0101]") by clicking on the "Removes selected USB
+    filter" button, and add a new filter by clicking on the "Adds new USB
+    filter" button.
 
 Run the Blinky Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/tutorials/devmgmt/add_newtmgr.rst b/docs/tutorials/devmgmt/add_newtmgr.rst
index 6b0f358..01b01a2 100644
--- a/docs/tutorials/devmgmt/add_newtmgr.rst
+++ b/docs/tutorials/devmgmt/add_newtmgr.rst
@@ -204,7 +204,7 @@
    $ newtmgr -c myconn echo hello
    hello
 
- Test your application to ensure that it can process a Newt Manager
+Test your application to ensure that it can process a Newt Manager
 command that is supported by a different package. Issue the ``stat``
 command to see the BLE stats.
 
diff --git a/docs/tutorials/other/unit_test.rst b/docs/tutorials/other/unit_test.rst
index b908eec..251b2c3 100644
--- a/docs/tutorials/other/unit_test.rst
+++ b/docs/tutorials/other/unit_test.rst
@@ -161,7 +161,7 @@
 We now have a working test suite with no tests. Let's make sure we get a
 passing result when we run ``newt test``:
 
-.. code-block:: c
+.. code-block:: console
 
     $ newt test time/datetime
     <build output>
diff --git a/docs/tutorials/repo/add_repos.rst b/docs/tutorials/repo/add_repos.rst
index 2b3d46b..8b5ee71 100644
--- a/docs/tutorials/repo/add_repos.rst
+++ b/docs/tutorials/repo/add_repos.rst
@@ -61,7 +61,7 @@
 View the ``project.yml`` section and you will see a line describing the
 repos:
 
-.. code-block:: console
+.. code-block:: yaml
 
     project.repositories:
         - apache-Mynewt-core
@@ -72,7 +72,8 @@
 If you wish to add additional repos, you would add additional lines to
 the ``project.repositories`` variable like this.
 
-.. code:: hl_lines="3"
+.. code-block:: yaml
+    :emphasize-lines: 3
 
     project.repositories:
         - apache-Mynewt-core
@@ -87,7 +88,7 @@
 
 In the same ``myproj`` above you will see the following repo descriptor.
 
-.. code-block:: console
+.. code-block:: yaml
 
     repository.apache-Mynewt-core:
         type: github
@@ -139,7 +140,7 @@
 An example of a ``project.yml`` file with two repositories is shown
 below:
 
-.. code-block:: console
+.. code-block:: yaml
 
     project.name: "my_project"
 
@@ -199,7 +200,7 @@
 
 Here is the ``repository.yml`` file from the apache-mynewt-core:
 
-.. code-block:: console
+.. code-block:: yaml
 
     repo.name: apache-mynewt-core
     repo.versions:
@@ -285,7 +286,7 @@
 repository. For example, let's say in a fictitious repository the
 following are defined.
 
-.. code-block:: console
+.. code-block:: yaml
 
     repo.versions:
         "0.8.0": "xxx_branch_0_8_0"
diff --git a/docs/tutorials/sensors/air_quality_ble.rst b/docs/tutorials/sensors/air_quality_ble.rst
index 499ea8e..9af23f1 100644
--- a/docs/tutorials/sensors/air_quality_ble.rst
+++ b/docs/tutorials/sensors/air_quality_ble.rst
@@ -201,6 +201,7 @@
     err:
         return (rc);
     }
+
 This one simply reads and updates the CO2 value and sends that over BLE to any connected clients instead.
 
 We can now build, create-image and load the app onto our nRF52DK board, and then connect and see the updated values! To view the results over Bluetooth, you can use LightBlue or any other application that can connect to, and read, Bluetooth data. By default, the device will show up as nimble-bleprph, since we used the ``bleprph`` app as our template. I've changed mine to something a bit more applicable: BLE CO2 Sensor.
diff --git a/docs/tutorials/sensors/nrf52_adc.rst b/docs/tutorials/sensors/nrf52_adc.rst
index 649d5d4..27ee869 100644
--- a/docs/tutorials/sensors/nrf52_adc.rst
+++ b/docs/tutorials/sensors/nrf52_adc.rst
@@ -51,7 +51,7 @@
 
 In your ``project.yml`` file, change the ``vers`` field under ``repository.apache-mynewt-core`` from ``1-latest`` to ``0-dev``. When you're done, your ``project.yml`` file should look like this:
 
-.. code-block:: console
+.. code-block:: yaml
 
     project.name: "my_project"
 
@@ -193,6 +193,7 @@
 version (e.g. 1.0.0) to the image.
 
 .. code-block:: console
+
     $ newt create-image nrf52_adc 1.0.0
     App image successfully generated: ~/dev/myadc/bin/nrf52_adc/apps/nrf52_adc/nrf52_adc.img
     Build manifest: ~/dev/myadc/bin/nrf52_adc/apps/nrf52_adc/manifest.json
diff --git a/docs/tutorials/sensors/sensor_bleprph_oic.rst b/docs/tutorials/sensors/sensor_bleprph_oic.rst
index 204c8fc..331ef9a 100644
--- a/docs/tutorials/sensors/sensor_bleprph_oic.rst
+++ b/docs/tutorials/sensors/sensor_bleprph_oic.rst
@@ -83,8 +83,8 @@
 do not need to include the ``net/oic`` package as a dependency in this
 package.
 
-.. code-block:: console
-   :emphasize-lines: 13, 14
+.. code-block:: yaml
+   :emphasize-lines: 10, 11
    
     pkg.deps: 
         - kernel/os
@@ -94,9 +94,6 @@
         - net/nimble/host/services/gatt
         - net/nimble/host/store/ram 
         - net/nimble/transport/ram
-
- 
-
              ...
         - hw/sensor
         - hw/sensor/creator
@@ -121,17 +118,17 @@
    Apps on the iOS and Android devices only sees 128 bit UUID
    advertisements.
 
-.. code-block:: console
+.. code-block:: yaml
    :emphasize-lines: 4, 5, 6, 7, 8
 
      syscfg.vals: 
-            ...
+         ...
 
-    SENSOR_OIC: 1
-    OC_SERVER: 1
-    FLOAT_USER: 1
-    ADVERTISE_128BIT_UUID: 1
-    ADVERTISE_16BIT_UUID: 0
+         SENSOR_OIC: 1
+         OC_SERVER: 1
+         FLOAT_USER: 1
+         ADVERTISE_128BIT_UUID: 1
+         ADVERTISE_16BIT_UUID: 0
 
 Step 4: Modifying main.c
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -158,8 +155,8 @@
 Add the sensor package header file ``sensor/sensor.h`` below
 ``#include "bleprph.h"`` file:
 
-.. code-block:: console
-   :emphasize-lines: 4
+.. code-block:: c
+   :emphasize-lines: 3
 
     #include "bleprph.h"
 
@@ -173,13 +170,13 @@
 1. Delete the code segment that creates the OIC device and resource.
 The lines to delete are highlighted below:
 
-.. code-block:: console
+.. code-block:: c
    :emphasize-lines: 4, 6, 7, 8, 10, 11, 12, 13, 15, 16, 17, 18, 19
 
      static void 
      omgr_app_init(void) 
      {
-         oc\_resource_t *res;
+         oc_resource_t *res;
 
          oc_init_platform("MyNewt", NULL, NULL);
          oc_add_device("/oic/d", "oic.d.light", "MynewtLed", "1.0", "1.0", NULL,
diff --git a/docs/tutorials/sensors/sensor_nrf52_drv2605.rst b/docs/tutorials/sensors/sensor_nrf52_drv2605.rst
index 2ea24d0..652d742 100644
--- a/docs/tutorials/sensors/sensor_nrf52_drv2605.rst
+++ b/docs/tutorials/sensors/sensor_nrf52_drv2605.rst
@@ -111,7 +111,7 @@
     $
 
 Step 2: Creating an Application Image and loading it
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This tutorial assumes you have a functioning bootloader as taught in
 :doc:`add an offboard sensor <sensor_nrf52_bno055>`
diff --git a/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst b/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
index 6c125d2..d49b66d 100644
--- a/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
+++ b/docs/tutorials/sensors/sensor_thingy_lis2dh12_onb.rst
@@ -510,7 +510,7 @@
 
 
     int 
-    main(int argc, char \*\*argv) 
+    main(int argc, char **argv) 
     { 
         int rc;