diff --git a/hardware/diskimages.rst b/hardware/diskimages.rst
index 927d955..608a5f3 100644
--- a/hardware/diskimages.rst
+++ b/hardware/diskimages.rst
@@ -3,52 +3,105 @@ Disk images
 
 86Box supports a large variety of disk image formats for the emulated storage drives.
 
-.. |86f| replace:: :doc:`../dev/formats/86f`
-.. |hdx| replace:: :doc:`../dev/formats/hdx`
+.. raw:: html
+  
+  <style>
+    /* There's no getting around Sphinx automatically sizing columns without some CSS.
+       It's that kind of recurring issue a lot of people had but nobody ever addressed. */
+    table.docutils.colwidths-given > tbody > tr > td:not(:last-child),
+    table.docutils:not(.colwidths-given) > tbody > tr > td {
+      white-space: nowrap;
+    }
+    table.docutils.colwidths-given > colgroup > col:not(:last-child),
+    table.docutils:not(.colwidths-given) > colgroup > col {
+      width: 0 !important;
+    }
+  </style>
 
 Hard disk images
 ----------------
 
 Supported formats:
 
-+-----------------+--------------+
-|Format           |File extension|
-+=================+==============+
-|**Raw image**    |Many *        |
-+-----------------+--------------+
-|Japanese FDI     |.hdi          |
-+-----------------+--------------+
-||hdx|            |.hdx          |
-+-----------------+--------------+
-|Virtual Hard Disk|.vhd          |
-+-----------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
 
-\* Raw image extensions recognized by 86Box include: .hdd .ima .img
+  * - Format
+    - File extension
+    - Notes
+
+  * - Raw image
+    - Many
+    - Extensions include: .hdd .ima .img
+
+  * - Japanese FDI
+    - .hdi
+    -
+
+  * - :doc:`../dev/formats/hdx`
+    - .hdx
+    -
+
+  * - Virtual Hard Disk
+    - .vhd
+    - Fixed, Dynamic and Differencing VHDs are supported through the `MiniVHD <https://github.com/shermp/MiniVHD>`_ library.
 
 Hard disk size limits
 ^^^^^^^^^^^^^^^^^^^^^
 
 There are limits to how big of a hard disk an emulated machine can accept. Such limits will vary depending on the machine's BIOS. The table below lists all important limits applicable to the IDE bus:
 
-+----------------+---------+---------+-----+-------+
-|Limit           |Disk size|Cylinders|Heads|Sectors|
-+================+=========+=========+=====+=======+
-|20-bit CHS      |504 MB   |1024     |16   |63     |
-+----------------+---------+---------+-----+-------+
-|12-bit cylinder |2015 MB  |4095     |16   |63     |
-+----------------+---------+---------+-----+-------+
-|ECHS translation|4032 MB  |1024     |128  |63     |
-+----------------+---------+---------+-----+-------+
-|Revised ECHS    |7560 MB  |1024     |240  |63     |
-+----------------+---------+---------+-----+-------+
-|LBA translation |8032 MB  |1024     |255  |63     |
-+----------------+---------+---------+-----+-------+
-|16-bit cylinder |32255 MB |65535    |16   |63     |
-+----------------+---------+---------+-----+-------+
-|28-bit CHS      |130558 MB|65535    |255  |63     |
-+----------------+---------+---------+-----+-------+
-|86Box           |131071 MB|Not applicable         |
-+----------------+---------+-----------------------+
+.. list-table::
+  :header-rows: 1
+
+  * - Limit
+    - Disk size
+    - Cylinders
+    - Heads
+    - Sectors
+
+  * - 20-bit CHS
+    - 504 MB
+    - 1024
+    - 16
+    - 63
+
+  * - 12-bit cylinder
+    - 2015 MB
+    - 4095
+    - 16
+    - 63
+
+  * - ECHS translation
+    - 4032 MB
+    - 1024
+    - 128
+    - 63
+
+  * - Revised ECHS
+    - 7560 MB
+    - 1024
+    - 240
+    - 63
+
+  * - LBA translation
+    - 8064 MB
+    - 1024
+    - 256
+    - 63
+
+  * - 16-bit cylinder
+    - 32255 MB
+    - 65535
+    - 16
+    - 63
+
+  * - 28-bit LBA
+    - 131071 MB
+    - 65536
+    - 16
+    - 256
 
 The maximum supported disk image size for IDE or SCSI is 131071 MB. Disk overlay software such as *Ontrack Disk Manager* can work around BIOS limits and allow booting of IDE hard drives within the 131071 MB limit, with the same caveats as using such software on a real machine.
 
@@ -57,33 +110,57 @@ Floppy disk images
 
 Supported formats:
 
-+--------------------+--------------+
-|Format              |File extension|
-+====================+==============+
-|**Raw image**       |Many *        |
-+--------------------+--------------+
-||86f|               |.86f          |
-+--------------------+--------------+
-|CopyQM              |.cq / .cqm    |
-+--------------------+--------------+
-|DiskDupe            |.ddi          |
-+--------------------+--------------+
-|EZ-DisKlone Plus    |.fdf          |
-+--------------------+--------------+
-|Formatted Disk Image|.fdi          |
-+--------------------+--------------+
-|HxC MFM             |.mfm          |
-+--------------------+--------------+
-|ImageDisk           |.imd          |
-+--------------------+--------------+
-|Japanese FDI        |.fdi          |
-+--------------------+--------------+
-|PCjs JSON           |.json         |
-+--------------------+--------------+
-|Teledisk            |.td0          |
-+--------------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
 
-\* Raw image extensions recognized by 86Box include: .bin .dsk .flp .hdm .ima .img .vfd .xdf
+  * - Format
+    - File extension
+    - Notes
+
+  * - Raw image
+    - Many
+    - Extensions include: .bin .dsk .flp .hdm .ima .img .vfd .xdf
+
+  * - :doc:`../dev/formats/86f`
+    - .86f
+    - Once loaded, any image can be converted to 86F through the :ref:`status bar <usage/statusbar:|floppy_35| |floppy_525| Floppy drives>` or :ref:`Media menu <usage/menubar:Media>`.
+
+  * - CopyQM
+    - .cq / .cqm
+    -
+
+  * - DiskDupe
+    - .ddi
+    -
+
+  * - EZ-DisKlone plus
+    - .fdf
+    -
+
+  * - Formatted Disk Image
+    - .fdi
+    - Read only.
+
+  * - HxC MFM
+    - .mfm
+    - Read only.
+
+  * - ImageDisk
+    - .imd
+    -
+
+  * - Japanese FDI
+    - .fdi
+    -
+
+  * - PCjs JSON
+    - .json
+    - Read only. PCjs 1.0 format only; 2.0 not supported yet.
+
+  * - Teledisk
+    - .td0
+    - Read only.
 
 Floppy disk detection
 ^^^^^^^^^^^^^^^^^^^^^
@@ -103,30 +180,42 @@ MO / ZIP removable disk images
 
 Supported formats:
 
-+---------------------+--------------+
-|Format               |File extension|
-+=====================+==============+
-|**Raw image**        |Many *        |
-+---------------------+--------------+
-|Japanese FDI         |.mdi (MO)     |
-|                     +--------------+
-|                     |.zdi (ZIP)    |
-+---------------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
 
-\* Raw image extensions recognized by 86Box include: .ima .img
+  * - Format
+    - File extension
+    - Notes
+
+  * - Raw image
+    - Many
+    - Extensions include: .ima .img
+
+  * - Japanese FDI
+    - .mdi / .zdi
+    - .mdi for MO, .zdi for ZIP.
 
 CD-ROM / DVD-ROM optical disc images
 ------------------------------------
 
 Supported formats:
 
-+---------------------+--------------+
-|Format               |File extension|
-+=====================+==============+
-|Cue sheet            |.cue + .bin   |
-+---------------------+--------------+
-|ISO                  |.iso          |
-+---------------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
+
+  * - Format
+    - File extension
+    - Notes
+
+  * - Cue sheet
+    - .cue + .bin
+    - :ref:`Audio tracks are supported. <hardware/diskimages:CD audio>`
+
+  * - ISO
+    - .iso
+    -
 
 CD audio
 ^^^^^^^^
@@ -140,29 +229,45 @@ Cassette tape images
 
 Supported formats:
 
-+---------------------+--------------+
-|Format               |File extension|
-+=====================+==============+
-|**Raw PCM audio**    |Many *        |
-+---------------------+--------------+
-|PCE cassette         |.cas          |
-+---------------------+--------------+
-|Wave audio           |.wav          |
-+---------------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
 
-\* Raw audio extensions recognized by 86Box include: .pcm .raw
+  * - Format
+    - File extension
+    - Notes
+
+  * - Raw PCM audio
+    - Many
+    - Extensions include: .pcm .raw
+
+      Audio format must be unsigned 8-bit mono.
+
+  * - PCE cassette
+    - .cas
+    -
+
+  * - Wave audio
+    - .wav
+    - Audio format must be unsigned 8-bit mono.
 
 PCjr cartridge images
 ---------------------
 
 Supported formats:
 
-+---------------------+--------------+
-|Format               |File extension|
-+=====================+==============+
-|**Raw image**        |Many *        |
-+---------------------+--------------+
-|JRipCart             |.jrc          |
-+---------------------+--------------+
+.. list-table::
+  :header-rows: 1
+  :widths: 1 1 999
 
-\* Raw image extensions recognized by 86Box include: .a .b .bin
+  * - Format
+    - File extension
+    - Notes
+
+  * - Raw image
+    - Many
+    - Extensions include: .a .b .bin
+
+  * - JRipCart
+    - .jrc
+    -