diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
index 13f63c04..09837b4d 100644
--- a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
+++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst
@@ -54,7 +54,7 @@ Follow these steps to install |CL| on the target system:
    Select :guilabel:`Clear Linux OS for Intel Architecture` and press the
    :kbd:`Enter` key or wait five seconds to automatically select it.
 
-   .. figure:: figures/cmi1.png
+   .. figure:: figures/bare-metal-install-1.png
       :scale: 50 %
       :alt: Clear Linux boot menu
 
@@ -64,7 +64,7 @@ Follow these steps to install |CL| on the target system:
    Architecture Installer` menu as shown in figure 2 and explains how to
    navigate through the |CL| installer setup menus.
 
-   .. figure:: figures/cmi2.png
+   .. figure:: figures/bare-metal-install-2.png
       :scale: 50 %
       :alt: Clear Linux OS for Intel Architecture Installer
 
@@ -76,7 +76,7 @@ Follow these steps to install |CL| on the target system:
    up the keyboard layout that you will be using to navigate within the |CL|
    installer setup menus.
 
-   .. figure:: figures/cmi3.png
+   .. figure:: figures/bare-metal-install-3.png
       :scale: 50 %
       :alt: Keyboard Selection
 
@@ -95,7 +95,7 @@ where the installer image is located. Once the connection to the |CL| update
 server is established, you will see a screen similar to the one shown in
 figure 4:
 
-.. figure:: figures/cmi4.png
+.. figure:: figures/bare-metal-install-4.png
    :scale: 50 %
    :alt: Network Requirements
 
@@ -136,7 +136,7 @@ Choose Clear Linux installer action
 The :guilabel:`Choose Action` menu is where you can choose to install, repair,
 open a shell, or exit the |CL| installer.  This menu is shown in figure 5:
 
-.. figure:: figures/cmi5.png
+.. figure:: figures/bare-metal-install-5.png
    :scale: 50 %
    :alt: Choose Action
 
@@ -166,7 +166,7 @@ open a shell, or exit the |CL| installer.  This menu is shown in figure 5:
    functionality and then select the :guilabel:`< Next >` button to advance to
    the next menu item.
 
-   .. figure:: figures/cmi3of6.png
+   .. figure:: figures/bare-metal-install-6.png
       :scale: 50 %
       :alt: Stability Enhancement Program
 
@@ -187,7 +187,7 @@ Figure 7 shows the next step of the |CL| installer:
 **automatically** or **manually**.  To end the installer process and shut down
 the system, select the :guilabel:`< Exit >` button.
 
-.. figure:: figures/cai4of6.png
+.. figure:: figures/bare-metal-install-7.png
    :scale: 50 %
    :alt: Choose installation type
 
@@ -225,7 +225,7 @@ The :guilabel:`Choose target device for installation` screen shown in figure 8
 appears.  Move the cursor to the desired target and press the :kbd:`Enter`
 key.
 
-.. figure:: figures/cai5of6.png
+.. figure:: figures/bare-metal-install-8.png
    :scale: 50 %
    :alt: Choose target device for installation
 
@@ -237,7 +237,7 @@ With all the |CL| installer setup information gathered for the automatic
 installation option, the |CL| Installer prompts you to begin the actual
 installation as shown in figure 9.
 
-.. figure:: figures/cai6of6.png
+.. figure:: figures/bare-metal-install-9.png
    :scale: 50 %
    :alt: Begin installation
 
@@ -253,7 +253,7 @@ Once all steps have completed, you will see the `:guilabel:`Successful
 installation` status message and the :guilabel:`< Ok >` button is highlighted
 as shown in figure 10. Press the :kbd:`Enter` key to continue.
 
-.. figure:: figures/caisuccess.png
+.. figure:: figures/bare-metal-install-10.png
    :scale: 50 %
    :alt: Installation complete
 
@@ -263,7 +263,7 @@ Figure 11 shows the installer's final screen prompting you that the
 installation completed successfully and the system will reboot. Press the
 :kbd:`Enter` key and remove the USB media while the system restarts.
 
-.. figure:: figures/cairestart.png
+.. figure:: figures/bare-metal-install-11.png
    :scale: 50 %
    :alt: Successful installation
 
@@ -275,7 +275,7 @@ Set up your root account
 Once the |CL| installation is complete and the system boots, a full screen
 console requests your login: as shown in figure 12:
 
-.. figure:: figures/cairoot.png
+.. figure:: figures/bare-metal-install-12.png
    :scale: 50 %
    :alt: Login screen
 
diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst
index 0117546a..2435d651 100644
--- a/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst
+++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst
@@ -23,7 +23,7 @@ Begin the manual installation process
 #. Move the cursor to the :guilabel:`< Manual(Advanced) >` menu item
    and press the :kbd:`Enter` key.
 
-   .. figure:: figures/cmi7.png
+   .. figure:: figures/bare-metal-manual-install-1.png
       :scale: 50 %
       :alt: Choose installation Type
 
@@ -32,7 +32,7 @@ Begin the manual installation process
 #. This will bring you to the :guilabel:`Choose partitioning method` screen as
    shown in figure 2.
 
-   .. figure:: figures/cmi5of13.png
+   .. figure:: figures/bare-metal-manual-install-2.png
       :scale: 50 %
       :alt: Choose partitioning method
 
@@ -70,7 +70,7 @@ to install |CL| onto.
       to highlight the :guilabel:`< Previous >` button and press :kbd:`Enter`
       to return to the previous menu.
 
-.. figure:: figures/cmi6of13.png
+.. figure:: figures/bare-metal-manual-install-3.png
    :scale: 50 %
    :alt: Choose target device for installation
 
@@ -83,7 +83,7 @@ to install |CL| onto.
    highlight the :guilabel:`< Yes >` button and press :kbd:`Enter` to proceed
    to the next step.
 
-   .. figure:: figures/cmi7of13.png
+   .. figure:: figures/bare-metal-manual-install-4.png
       :scale: 50 %
       :alt: Device installation warning
 
@@ -109,7 +109,7 @@ bundles and optionally create a static IP address for your system.
    cmdline:` field and then press the :kbd:`Tab` key to move to the
    :guilabel:`< Next >` button and press :kbd:`Enter`.
 
-   .. figure:: figures/cmi8of13.png
+   .. figure:: figures/bare-metal-manual-install-5.png
       :scale: 50 %
       :alt: Append to kernel cmdline
 
@@ -121,7 +121,7 @@ bundles and optionally create a static IP address for your system.
    :kbd:`Tab` key to move to the :guilabel:`< Next >` button and press
    :kbd:`Enter`.
 
-   .. figure:: figures/cmi9of13.png
+   .. figure:: figures/bare-metal-manual-install-6.png
       :scale: 50 %
       :alt: Configure Hostname
 
@@ -137,7 +137,7 @@ bundles and optionally create a static IP address for your system.
    at this time, select :guilabel:`< No user creation (login as root) >` to
    skip this step and proceed to the :guilabel:`Bundle selector` menu.
 
-   .. figure:: figures/cmi10of13.png
+   .. figure:: figures/bare-metal-manual-install-7.png
       :scale: 50 %
       :alt: User configuration
 
@@ -146,15 +146,14 @@ bundles and optionally create a static IP address for your system.
 #. To create a user you will be presented with the second :guilabel:`User
    configuration` menu shown in figure 8. You are only required to fill in the
    :guilabel:`Username`, :guilabel:`Password` and :guilabel:`Confirm password`
-   fields. To give this user administrative privileges, select the
-   :guilabel:`Add user to the sudoers?` field to add this user to the
-   ``wheel`` group. This will enable using the :command:`sudo` command for
-   this new user.
+   fields. To give the user administrative privileges, select the
+   :guilabel:`Add user to the sudoers?` field to add the user to the ``wheel``
+   group. This enables using the :command:`sudo` command for the new user.
 
    Once you have entered all the data for this menu, press the :kbd:`Tab` key
    to highlight the :guilabel:`< Next >` button and press :kbd:`Enter`.
 
-   .. figure:: figures/cmi10of13a.png
+   .. figure:: figures/bare-metal-manual-install-8.png
       :scale: 50 %
       :alt: User configuration - create user
 
@@ -162,13 +161,13 @@ bundles and optionally create a static IP address for your system.
 
 #. The :guilabel:`Bundle selector` menu shown in figure 9 will allow you to
    add additional software bundles to your initial |CL| installation. In this
-   example we will select all additional bundles offered by pressing the
+   example we select all additional bundles offered by pressing the
    :kbd:`Tab` key to go to each field and pressing the :kbd:`Spacebar` or the
    :kbd:`Enter` key to select each bundle. This menu will also list the
    additional :guilabel:` --- required ---` software bundles that will be
    installed during the |CL| installation.
 
-   .. figure:: figures/cmi11of13.png
+   .. figure:: figures/bare-metal-manual-install-9.png
       :scale: 50 %
       :alt: Bundle selector
 
@@ -183,11 +182,10 @@ Target system network configuration
 
 The final step of the installer setup process before the actual installation
 of |CL| begins, is to set up the :guilabel:`Network configuration`. This menu
-is shown in figure 10. For this guide installation we will select
-:guilabel:`< Use DHCP >` to have an IP address automatically assigned when the
-system boots up.
+is shown in figure 10. We will select :guilabel:`< Use DHCP >` to have an IP
+address automatically assigned when the system boots up.
 
-.. figure:: figures/cmi12of13.png
+.. figure:: figures/bare-metal-manual-install-10.png
    :scale: 50 %
    :alt: Network configuration
 
@@ -204,7 +202,7 @@ With all the |CL| installer setup information gathered for the manual
 installation option, the |CL| Installer prompts you to begin the actual
 installation as shown in figure 11.
 
-.. figure:: figures/cmi13of13.png
+.. figure:: figures/bare-metal-manual-install-11.png
    :scale: 50 %
    :alt: Begin installation
 
@@ -216,7 +214,7 @@ When you are satisfied with the information you have entered, select the
 |CL| Installation begins and each step shows its status as it progresses
 through the manual installation process as shown in figure 12.
 
-.. figure:: figures/cmi17.png
+.. figure:: figures/bare-metal-manual-install-12.png
    :scale: 50 %
    :alt: Installation status
 
@@ -226,7 +224,7 @@ Once all steps have completed, you will see the ``Successful installation``
 status message and the :guilabel:`< Ok >` button is highlighted as shown in
 figure 13. Press the :kbd:`Enter` key to continue.
 
-.. figure:: figures/cmi18.png
+.. figure:: figures/bare-metal-manual-install-13.png
    :scale: 50 %
    :alt: Installation complete
 
@@ -236,7 +234,7 @@ Figure 14 shows the installer's final screen prompting you that the
 installation completed successfully and the system will reboot. Press the
 :kbd:`Enter` key and remove the USB media while the system restarts.
 
-.. figure:: figures/cmi19.png
+.. figure:: figures/bare-metal-manual-install-14.png
    :scale: 50 %
    :alt: Successful Installation
 
@@ -246,17 +244,17 @@ Once the |CL| installation is complete and the system boots, you will be
 presented with the Gnome Desktop sign-in screen to begin using your system as
 shown in figure 15:
 
-   .. figure:: figures/cmi20.png
+   .. figure:: figures/bare-metal-manual-install-15.png
       :scale: 50 %
       :alt: Gnome sign-in screen
 
       Figure 15: :guilabel:`Gnome sign-in screen`
 
-Click on the :guilabel:`username` that you created earlier, enter the password
-that was also created and you will logged into the system. The Gnome 3
-desktop will appear as shown in figure 16:
+Click on the :guilabel:`username` that you created, enter the password and you
+will be logged into the system. The Gnome 3 desktop will appear as shown in
+figure 16:
 
-.. figure:: figures/cmi22.png
+.. figure:: figures/bare-metal-manual-install-16.png
    :scale: 50 %
    :alt: Gnome Desktop Manager
 
diff --git a/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst b/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst
index ec7112e2..4350068f 100755
--- a/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst
+++ b/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst
@@ -18,7 +18,7 @@ guide and intend to :ref:`install Clear Linux manually
 menu item on the :guilabel:`Choose Installation Type` |CL| Installer setup
 menu as shown in figure 1:
 
-.. figure:: figures/cmi-step4.png
+.. figure:: figures/cgdisk-manual-install-1.png
    :scale: 50 %
    :alt: Choose installation Type
 
@@ -39,7 +39,7 @@ and we will use the entire drive for this |CL| installation.
    select the :guilabel:`< Manually configure mounts and partitions >` menu
    item to manually partition your hard drive.
 
-   .. figure:: figures/cmi-step5.png
+   .. figure:: figures/cgdisk-manual-install-2.png
       :scale: 50 %
       :alt: Choose partitioning method
 
@@ -47,21 +47,21 @@ and we will use the entire drive for this |CL| installation.
 
    This will show the current device on your system that you can partition. In
    this example, shown in figure 3, :file:`/dev/sda` is available but
-   currently does not have any partitions defined.
+   does not have any partitions defined.
 
 #. Select the :guilabel:`< Partition /dev/sda >` menu item and press
    :kbd:`Enter` to begin the process of modifying this disk.
 
-   .. figure:: figures/cmi-step6.png
+   .. figure:: figures/cgdisk-manual-install-3.png
       :scale: 50 %
       :alt: Choose a drive to partition using cgdisk tool
 
       Figure 3: :guilabel:`Choose a drive to partition using cgdisk tool`
 
-   The :command:`cgdisk` application will start and display the current
+   The :command:`cgdisk` application will start and display the
    settings for :file:`/dev/sda` as shown in figure 4.
 
-   .. figure:: figures/cgd-1.png
+   .. figure:: figures/cgdisk-manual-install-4.png
       :scale: 50 %
       :alt: cgdisk
 
@@ -83,7 +83,7 @@ For a complete understanding of these partitions, you can review the
 Create EFI boot partition
 =========================
 
-#. With the current free space highlighted in the :command:`cgdisk` utility,
+#. With the free space highlighted in the :command:`cgdisk` utility,
    you can either select the :guilabel:`[ New ]` button and press :kbd:`Enter`
    or press the :kbd:`N` key to begin the process of defining a new
    partition.
@@ -100,7 +100,7 @@ Create EFI boot partition
    enter ``512M`` and press :kbd:`Enter` to create a partition that is 512MB
    in size. This is shown in figure 5:
 
-   .. figure:: figures/cgd-2.png
+   .. figure:: figures/cgdisk-manual-install-5.png
       :scale: 50 %
       :alt: cgdisk - New
 
@@ -113,7 +113,7 @@ Create EFI boot partition
    :abbr:`GUID (Globally unique identifier)` for *GPT partition types*. This
    is shown in figure 6:
 
-   .. figure:: figures/cgd-3.png
+   .. figure:: figures/cgdisk-manual-install-6.png
       :scale: 50 %
       :alt: cgdisk - hex codes for partition types
 
@@ -125,7 +125,7 @@ Create EFI boot partition
    * 8200 - Linux swap
    * 8300 - Linux filesystem
 
-#. Since we are currently creating the EFI boot partition, enter ``ef00`` as
+#. Since we are creating the EFI boot partition, enter ``ef00`` as
    the hexcode for this partition and press :kbd:`Enter`.
 
 #. The final field to enter is the partition name. enter ``boot`` and press
@@ -133,7 +133,7 @@ Create EFI boot partition
    the first partition will be displayed as a 512MiB partition type of
    ``EFI System`` and a partition name of ``boot`` as shown in figure 7:
 
-   .. figure:: figures/cgd-5.png
+   .. figure:: figures/cgdisk-manual-install-7.png
       :scale: 50 %
       :alt: cgdisk - boot partition defined
 
@@ -152,7 +152,7 @@ in `Rod Smith's Partitioning advice about alignment`_.
    bottom of the partition list before you begin to create the Linux swap
    partition. This is shown in figure 8:
 
-   .. figure:: figures/cgd-6.png
+   .. figure:: figures/cgdisk-manual-install-8.png
       :scale: 50 %
       :alt: cgdisk - free space selection
 
@@ -171,7 +171,7 @@ in `Rod Smith's Partitioning advice about alignment`_.
 
    Your :command:`cgdisk` partition list should now look like figure 9.
 
-   .. figure:: figures/cgd-8.png
+   .. figure:: figures/cgdisk-manual-install-9.png
       :scale: 50 %
       :alt: cgdisk - swap partition defined
 
@@ -198,7 +198,7 @@ be used as the root mount point for you |CL| installation.
    With all the partitions now defined, you should see a list similar to what
    is shown in figure 10:
 
-   .. figure:: figures/cgd-9.png
+   .. figure:: figures/cgdisk-manual-install-10.png
       :scale: 50 %
       :alt: cgdisk - defined partitions
 
@@ -222,7 +222,7 @@ be used as the root mount point for you |CL| installation.
 
 #. Move your cursor to the :guilabel:`< Next >` button and press :kbd:`Enter`.
 
-   .. figure:: figures/cmi-step6-done.png
+   .. figure:: figures/cgdisk-manual-install-11.png
       :scale: 50 %
       :alt: defined partitions
 
@@ -234,7 +234,7 @@ Set mount points
 The :guilabel:`Set mount points` menu will set the mount points that the |CL|
 installer will use for your |CL| installation and is shown in figure 12.
 
-.. figure:: figures/cmi-step7-start.png
+.. figure:: figures/cgdisk-manual-install-12.png
    :scale: 50 %
    :alt: Set mount points
 
@@ -250,7 +250,7 @@ partitions and select to format them.
    enable formatting the partition by checking the :guilabel:`[ ] Format`
    toggle field as shown in figure 13:
 
-   .. figure:: figures/cmi-step7-boot.png
+   .. figure:: figures/cgdisk-manual-install-13.png
       :scale: 50 %
       :alt: Set mount point of sda1
 
@@ -260,7 +260,7 @@ partitions and select to format them.
    :guilabel:`sda3` menu entry and entering the information shown in figure 14
    to set the :file:`/` root directory and enable formatting:
 
-   .. figure:: figures/cmi-step7-root.png
+   .. figure:: figures/cgdisk-manual-install-14.png
       :scale: 50 %
       :alt: Set mount point of sda3
 
@@ -268,7 +268,7 @@ partitions and select to format them.
 
    The final :guilabel:`Set mount points` menu item will look like figure 15:
 
-   .. figure:: figures/cmi-step7-done.png
+   .. figure:: figures/cgdisk-manual-install-15.png
       :scale: 50 %
       :alt: Set mount point completed
 
@@ -280,7 +280,7 @@ partitions and select to format them.
    :kbd:`Enter` to accept these changes and move on to the next step of the
    |CL| manual install process.
 
-   .. figure:: figures/cmi7of13.png
+   .. figure:: figures/cgdisk-manual-install-16.png
       :scale: 50 %
       :alt: Warning
 
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi1.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi1.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-1.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/caisuccess.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-10.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/caisuccess.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-10.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cairestart.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-11.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cairestart.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-11.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cairoot.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-12.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cairoot.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-12.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi2.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi2.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-2.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi3.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-3.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi3.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-3.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi4.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-4.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi4.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-4.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi5.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-5.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi5.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-5.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi3of6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-6.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi3of6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-6.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cai4of6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-7.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cai4of6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-7.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cai5of6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-8.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cai5of6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-8.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cai6of6.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-9.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cai6of6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-install-9.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step4.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-1.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step4.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-1.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi12of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-10.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi12of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-10.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi13of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-11.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi13of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-11.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi17.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-12.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi17.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-12.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi18.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-13.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi18.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-13.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi19.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-14.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi19.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-14.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi20.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-15.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi20.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-15.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi22.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-16.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi22.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-16.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi5of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-2.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi5of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-2.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi6of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-3.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi6of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-3.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi7of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-4.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi7of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-4.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi8of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-5.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi8of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-5.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi9of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-6.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi9of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-6.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi10of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-7.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi10of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-7.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi10of13a.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-8.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi10of13a.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-8.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi11of13.png b/source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-9.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi11of13.png
rename to source/clear-linux/get-started/bare-metal-install/figures/bare-metal-manual-install-9.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-4.png b/source/clear-linux/get-started/bare-metal-install/figures/cgd-4.png
deleted file mode 100755
index 0d0f6cff..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/cgd-4.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-7.png b/source/clear-linux/get-started/bare-metal-install/figures/cgd-7.png
deleted file mode 100755
index b49cb49a..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/cgd-7.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi7.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-1.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi7.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-1.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-9.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-10.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-9.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-10.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step6-done.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-11.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step6-done.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-11.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-start.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-12.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-start.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-12.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-boot.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-13.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-boot.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-13.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-root.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-14.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-root.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-14.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-done.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-15.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step7-done.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-15.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-16.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-16.png
new file mode 100644
index 00000000..a5897712
Binary files /dev/null and b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-16.png differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step5.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-2.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step5.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-2.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi-step6.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-3.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cmi-step6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-3.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-1.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-4.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-1.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-4.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-2.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-5.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-2.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-5.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-3.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-6.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-3.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-6.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-5.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-7.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-5.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-7.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-6.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-8.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-6.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-8.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cgd-8.png b/source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-9.png
old mode 100755
new mode 100644
similarity index 100%
rename from source/clear-linux/get-started/bare-metal-install/figures/cgd-8.png
rename to source/clear-linux/get-started/bare-metal-install/figures/cgdisk-manual-install-9.png
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi12of13static.png b/source/clear-linux/get-started/bare-metal-install/figures/cmi12of13static.png
deleted file mode 100755
index 0daccd28..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/cmi12of13static.png and /dev/null differ
diff --git a/source/clear-linux/get-started/bare-metal-install/figures/cmi21.png b/source/clear-linux/get-started/bare-metal-install/figures/cmi21.png
deleted file mode 100755
index 177ebd85..00000000
Binary files a/source/clear-linux/get-started/bare-metal-install/figures/cmi21.png and /dev/null differ