diff --git a/docs/source/samples/06_rgb_full_resolution_saver.rst b/docs/source/samples/06_rgb_full_resolution_saver.rst
index 76fc66a41..91e74db8f 100644
--- a/docs/source/samples/06_rgb_full_resolution_saver.rst
+++ b/docs/source/samples/06_rgb_full_resolution_saver.rst
@@ -1,13 +1,13 @@
06 - RGB Full Resolution Saver
==============================
-This example does its best to save full-resolution 3840x2160 .png files as fast at it can from the
+This example does its best to save full-resolution 3840x2160 .jpeg files as fast at it can from the
RGB sensor. It serves as an example of recording high resolution to disk for the purposes of
high-resolution ground-truth data. We also recently added the options to save isp - YUV420p
uncompressed frames, processed by ISP, and raw - BayerRG (R_Gr_Gb_B), as read from sensor,
10-bit packed. See here for the pull request on this capability.
-Be careful, this example saves full resolution .png pictures to your host storage. So if you leave
+Be careful, this example saves full resolution .jpeg pictures to your host storage. So if you leave
it running, you could fill up your storage on your host.
Demo
diff --git a/docs/source/samples/14_color_camera_control.rst b/docs/source/samples/14_color_camera_control.rst
deleted file mode 100644
index a76f6cfb3..000000000
--- a/docs/source/samples/14_color_camera_control.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-14.1 - Color Camera Control
-===========================
-
-This example shows how to control the device-side crop and camera triggers.
-An output is a displayed RGB cropped frame, that can be manipulated using the following keys:
-
-#. `a` will move the crop left
-#. `d` will move the crop right
-#. `w` will move the crop up
-#. `s` will move the crop down
-#. `c` will trigger a `still` event, causing the current frame to be captured and sent over `still` output from camera node
-#. `t` will trigger autofocus
-#. `f` will trigger autofocus continuously
-#. `e` will trigger autoexposure
-#. `i` and `o` will decrease/increase the exposure time
-#. `k` and `l` will decrease/increase the sensitivity iso
-#. `,` and `.` will decrease/increase the focus range
-
-Demo
-####
-
-.. raw:: html
-
-
-
-
-
-Setup
-#####
-
-.. include:: /includes/install_from_pypi.rst
-
-Source code
-###########
-
-Also `available on GitHub `__
-
-.. literalinclude:: ../../../examples/14_1_color_camera_control.py
- :language: python
- :linenos:
-
-.. include:: /includes/footer-short.rst
diff --git a/docs/source/samples/21_mobilenet_decoding_on_device.rst b/docs/source/samples/21_mobilenet_decoding_on_device.rst
deleted file mode 100644
index c0f945164..000000000
--- a/docs/source/samples/21_mobilenet_decoding_on_device.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-21 - RGB & MobilenetSSD decoding on device
-==========================================
-
-This demo was migrated to :ref:`08 - RGB & MobilenetSSD`
-
-.. include:: /includes/footer-short.rst
diff --git a/docs/source/tutorials/code_samples.rst b/docs/source/tutorials/code_samples.rst
index b3db9d745..ceb40787e 100644
--- a/docs/source/tutorials/code_samples.rst
+++ b/docs/source/tutorials/code_samples.rst
@@ -9,4 +9,43 @@ Code samples
../samples/*
-Code samples are used for automated testing.
+Code samples are used for automated testing. They are also a great starting point for the gen2 API.
+
+.. rubric:: List of code samples
+
+- :ref:`01 - RGB Preview` - Displays a small preview of the RGB camera
+- :ref:`02 - Mono Preview` - Displays right/left mono cameras
+- :ref:`03 - Depth Preview` - Displays colorized stereo disparity
+- :ref:`04 - RGB Encoding` - Encodes RGB (1080P, 30FPS) into :code:`.h265` and saves it on the host
+- :ref:`05 - RGB & Mono Encoding`- Encodes RGB (1080P, 30FPS) and both mono streams (720P, 30FPS) into :code:`.h265`/:code:`.h264` and saves them on the host
+- :ref:`06 - RGB Full Resolution Saver` - Saves full resolution RGB images (4k) on the host (:code:`.jpeg`)
+- :ref:`07 - Mono Full Resolution Saver` - Saves mono (720P) images to the host (:code:`.png`)
+- :ref:`08 - RGB & MobilenetSSD` - Runs MobileNetSSD on RGB frames and displays detections on the frame
+- :ref:`09 - Mono & MobilenetSSD` - Runs MobileNetSSD on mono frames and displays detections on the frame
+- :ref:`10 - Mono & MobilenetSSD & Depth` - Runs MobileNetSSD on mono frames and displays detections on mono/disparity frames
+- :ref:`11 - RGB & Encoding & Mono & MobilenetSSD` - Runs MobileNetSSD on mono frames and displays detections on the frame + encodes RGB to :code:`.h265`
+- :ref:`12 - RGB Encoding & Mono with MobilenetSSD & Depth` - A combination of **04** and **10** code samples
+- :ref:`13 - Encoding Max Limit` - Encodes RGB (4k 25FPS) and both mono streams (720P, 25FPS) into :code:`.h265`/:code:`.h264` and saves them on the host
+- :ref:`14.1 - Color Camera Control` - Demonstrates how to control the color camera (crop, focus, exposure, sensitivity) from the host
+- :ref:`14.2 - Mono Camera Control` - Demonstrates how to control the mono camera (crop, exposure, sensitivity) from the host
+- :ref:`14.3 - Depth Crop Control` - Demonstrates how to control cropping of depth frames from the host
+- :ref:`15 - 4K RGB MobileNetSSD` - Runs MobileNetSSD on RGB frames and displays detections on both preview and 4k frames
+- :ref:`16 - Device Queue Event` - Demonstrates how to use device queue events
+- :ref:`17 - Video & MobilenetSSD` - Runs MobileNetSSD on the video from the host
+- :ref:`18 - RGB Encoding with MobilenetSSD` - Runs MobileNetSSD on RGB frames and encodes FUll-HD RGB into :code:`.h265` and saves it on the host
+- :ref:`19 - Mono Camera Control` - Demonstrates how to control the mono camera (exposure, sensitivity) from the host
+- :ref:`20 - Color Rotate Warp` - Demonstrates how to rotate, mirror, flip or perform perspective transform on a frame
+- :ref:`22.1 - RGB & TinyYoloV3 decoding on device` - Runs YoloV3 on RGB frames and displays detections on the frame
+- :ref:`22.2 - RGB & TinyYoloV4 decoding on device` - Runs YoloV4 on RGB frames and displays detections on the frame
+- :ref:`23 - Auto Exposure on ROI` - Demonstrates how to use auto exposure based on the selected ROI
+- :ref:`24 - OpenCV support` - Demonstrates how to retrieve an image frame as an OpenCV frame
+- :ref:`25 - System information` - Displays device system information (memory/cpu usage, temperature)
+- :ref:`26.1 - RGB & MobilenetSSD with spatial data` - Displays RGB frames with MobileNet detections and spatial coordinates on them
+- :ref:`26.2 - Mono & MobilenetSSD with spatial data` - Displays mono frames with MobileNet detections and spatial coordinates on them
+- :ref:`26.3 - RGB & TinyYolo with spatial data`- Displays RGB frames with Yolo detections and spatial coordinates on them
+- :ref:`27 - Spatial location calculator` - Demonstrates how to use the spatial location calculator
+- :ref:`28 - Camera video high resolution` - Demonstrates how to use the video output of the color camera
+- :ref:`29.1 - Object tracker on RGB camera` - Performs object tracking from the color camera
+- :ref:`29.2 - Spatial object tracker on RGB camera` - Performs object tracking and also provides spatial coordinates
+- :ref:`29.3 - Object tracker on video` - Performs object tracking from the video
+- :ref:`30 - Stereo Depth from host` - Generates stereo depth frame from a set of mono images from the host
diff --git a/examples/12_rgb_encoding_mono_mobilenet_depth.py b/examples/12_rgb_encoding_mono_mobilenet_depth.py
index a77dfe734..c17027fc2 100755
--- a/examples/12_rgb_encoding_mono_mobilenet_depth.py
+++ b/examples/12_rgb_encoding_mono_mobilenet_depth.py
@@ -110,7 +110,7 @@ def frameNorm(frame, bbox):
videoFile = open('video.h265', 'wb')
cv2.namedWindow("right", cv2.WINDOW_NORMAL)
cv2.namedWindow("manip", cv2.WINDOW_NORMAL)
- cv2.namedWindow("depth", cv2.WINDOW_NORMAL)
+ cv2.namedWindow("disparity", cv2.WINDOW_NORMAL)
while True:
inRight = qRight.tryGet()