diff --git a/source/vm-vmware-esxi.rst b/source/vm-vmware-esxi.rst
index 7f73b892..b7c5a6ca 100644
--- a/source/vm-vmware-esxi.rst
+++ b/source/vm-vmware-esxi.rst
@@ -1,69 +1,80 @@
 .. _vm-vmware-esxi:
 
-Using *VMware** ESXi guest
+Using VMware\* ESXi guest
 ##########################
 
 
-This topic, which is based on *VMware vSphere 6*, explains how to use Clear Linux* OS
-for Intel® Architecture as ESXi Guest.
+This section is based on *VMware vSphere 6* and explains how to use |CLOSIA|
+as ESXi Guest.
 
-Please ensure you have enabled `Intel® Virtualization Technology
-<http://www.intel.com/content/www/us/en/virtualization/virtualization-technology/intel-virtualization-technology.html>`_ 
-(Intel® VT) and `Intel® Virtualization Technology for Directed I/O
-<https://software.intel.com/en-us/articles/intel-virtualization-technology-for-directed-io-vt-d-enhancing-intel-platforms-for-efficient-virtualization-of-io-devices>`_ 
-(Intel® VT-d) in your BIOS/UEFI firmware configuration.
+Ensure `Intel® Virtualization Technology`_ (Intel® VT) and
+`Intel® Virtualization Technology for Directed I/O`_ (Intel® VT-d) are both
+enabled in your BIOS/UEFI firmware configuration.
 
 Run Clear Linux OS for Intel Architecture
 =========================================
 
-#. Download the `latest`_ |CL| **live** version (clear-XXXX-live.img.xz)
+#. Download the `latest`_ |CL| **live** version
+   :file:`clear-{release-number}-live.img.xz`.
 
 #. Decompress the downloaded image. Uncompressed image size is ~ **5GB**.
 
-   + On Linux ::
+   * On Linux:
 
-       $ xz -d clear-XXXX-live.img.xz
+      .. code-block:: console
 
-   + On Windows you can use `7zip`_.
+         $ xz -d clear-{release-number}-live.img.xz
 
-     - Right-click the file to *extract in the same directory*.
+   * On Windows, use `7zip`_.
+
+     - Right-click the file and select
+       :menuselection:`Extract in the same directory`.
 
        .. image:: _static/images/7zipwin.png
           :alt: 7zip extract here command
 
 #. Create a virtual machine with the following configuration:
 
-   - **Guest OS**: Linux, Distribution Other 3.x Linux (64-bits)
+   * :guilabel:`Guest OS`: Linux, Distribution: Other 3.x Linux (64-bits)
 
-   - **UEFI support**: Clear Linux uses `systemd-boot` as the UEFI boot manager
-     for EFI images. To add UEFI support,
-     find the settings for this option using the vSphere GUI; go
-     to the "Configuration settings of the virtual machine", " General Tab"
-     and select **EFI boot firmware**.
+   * :guilabel:`UEFI support`: |CL| uses `systemd-boot` as the UEFI
+     boot manager for EFI images. Add UEFI support. Find this option's
+     settings using the vSphere GUI. Go to the
+     :menuselection:`Configuration settings of the virtual machine-->General`
+     Tab and select :guilabel:`EFI boot firmware`.
 
-   - **SCSI Para-virtualized disk**: Convert to VMDK and attach the Clear
-     Linux image you downloaded above. To convert Clear Linux image to
-     VMware DisK (VMDK) you can use the
-     ``qemu-img`` command::
+   * :guilabel:`SCSI Para-virtualized disk`: Convert to
+      :abbr:`VMDK (VMware DisK)` and attach the |CL| image downloaded above.
 
-       $ qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic -o compat6 -p clear-vmware.img clear-vmware.vmdk
+      + On Linux, To convert Clear Linux image to VMDK\* you can use the
+        :command:`qemu-img` command:
 
-     * On Windows, you can convert the live image to VMDK format
-       (from RAW format to VMDK) with a tool like *VBoxManage* from
-       `VirtualBox`_. You can refer on
-       :ref:`how to create a VM on VirtualBox <create_vm_vbox>` as example.
+         .. code-block:: console
+
+            qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic -o compat6 -p clear-vmware.img clear-vmware.vmdk
+
+      + On Windows, convert the live image from RAW to VMDK format with a
+        tool like :program:`VBoxManage` from `VirtualBox`_. You can refer on
+        :ref:`how to create a VM on VirtualBox <create_vm_vbox>` as an
+        example.
 
 #. Transfer the Clear Linux image to the VMware ESXi server and use the
-   :command:`vmkfstools` command (you need to access to ESXi command line )::
+   :command:`vmkfstools` command. Access to ESXi command line is required:
 
-     $ vmkfstools -i clear-vmware.vmdk -d zeroedthick clear-vmware-fix.vmdk
+   .. code-block:: console
 
-#. Add the converted image to the guest by using VMware vSphere virtual
-   machine settings
+      vmkfstools -i clear-vmware.vmdk -d zeroedthick clear-vmware-fix.vmdk
 
-#. Start the virtual machine
+#. Add the converted image to the guest using the VMware vSphere virtual
+   machine settings.
+
+#. Start the virtual machine.
 
 .. _latest: https://download.clearlinux.org/image/
 .. _7zip: http://www.7-zip.org/
 .. _VirtualBox: https://www.virtualbox.org/
+.. _Intel® Virtualization Technology:
+   http://www.intel.com/content/www/us/en/virtualization/virtualization-technology/intel-virtualization-technology.html
+.. _Intel® Virtualization Technology for Directed I/O:
+   https://software.intel.com/en-us/articles/intel-virtualization-technology-for-directed-io-vt-d-enhancing-intel-platforms-for-efficient-virtualization-of-io-devices