diff --git a/Documentation/images/AddDive1.jpg b/Documentation/images/AddDive1.jpg
index 9c6af96c5..592ed66db 100644
Binary files a/Documentation/images/AddDive1.jpg and b/Documentation/images/AddDive1.jpg differ
diff --git a/Documentation/images/AddDive2.jpg b/Documentation/images/AddDive2.jpg
new file mode 100644
index 000000000..58a83e9ae
Binary files /dev/null and b/Documentation/images/AddDive2.jpg differ
diff --git a/Documentation/images/AddDive2.png b/Documentation/images/AddDive2.png
deleted file mode 100644
index 0958957c2..000000000
Binary files a/Documentation/images/AddDive2.png and /dev/null differ
diff --git a/Documentation/images/AddDive3.jpg b/Documentation/images/AddDive3.jpg
new file mode 100644
index 000000000..526b6ce2e
Binary files /dev/null and b/Documentation/images/AddDive3.jpg differ
diff --git a/Documentation/images/BlueEditBar.jpg b/Documentation/images/BlueEditBar.jpg
new file mode 100644
index 000000000..5b9ab2a97
Binary files /dev/null and b/Documentation/images/BlueEditBar.jpg differ
diff --git a/Documentation/images/BlueEditBar.png b/Documentation/images/BlueEditBar.png
deleted file mode 100644
index 6864d9950..000000000
Binary files a/Documentation/images/BlueEditBar.png and /dev/null differ
diff --git a/Documentation/images/Ceilings.png b/Documentation/images/Ceilings.png
new file mode 100644
index 000000000..b3eae8c04
Binary files /dev/null and b/Documentation/images/Ceilings.png differ
diff --git a/Documentation/images/Companion.jpg b/Documentation/images/Companion.jpg
new file mode 100644
index 000000000..419aeb519
Binary files /dev/null and b/Documentation/images/Companion.jpg differ
diff --git a/Documentation/images/CompletedDiveInfo.jpg b/Documentation/images/CompletedDiveInfo.jpg
new file mode 100644
index 000000000..62c6e0c3b
Binary files /dev/null and b/Documentation/images/CompletedDiveInfo.jpg differ
diff --git a/Documentation/images/CompletedDiveInfo.png b/Documentation/images/CompletedDiveInfo.png
deleted file mode 100644
index e87a9914d..000000000
Binary files a/Documentation/images/CompletedDiveInfo.png and /dev/null differ
diff --git a/Documentation/images/CylinderDataEntry1.jpg b/Documentation/images/CylinderDataEntry1.jpg
new file mode 100644
index 000000000..756c7acec
Binary files /dev/null and b/Documentation/images/CylinderDataEntry1.jpg differ
diff --git a/Documentation/images/CylinderDataEntry1.png b/Documentation/images/CylinderDataEntry1.png
deleted file mode 100644
index c9577cc1a..000000000
Binary files a/Documentation/images/CylinderDataEntry1.png and /dev/null differ
diff --git a/Documentation/images/CylinderDataEntry2.jpg b/Documentation/images/CylinderDataEntry2.jpg
new file mode 100644
index 000000000..fb3f9f4b7
Binary files /dev/null and b/Documentation/images/CylinderDataEntry2.jpg differ
diff --git a/Documentation/images/CylinderDataEntry2.png b/Documentation/images/CylinderDataEntry2.png
deleted file mode 100644
index 83043b180..000000000
Binary files a/Documentation/images/CylinderDataEntry2.png and /dev/null differ
diff --git a/Documentation/images/CylinderDataEntry3.jpg b/Documentation/images/CylinderDataEntry3.jpg
new file mode 100644
index 000000000..0a0943a7c
Binary files /dev/null and b/Documentation/images/CylinderDataEntry3.jpg differ
diff --git a/Documentation/images/CylinderDataEntry3.png b/Documentation/images/CylinderDataEntry3.png
deleted file mode 100644
index 63c365b1b..000000000
Binary files a/Documentation/images/CylinderDataEntry3.png and /dev/null differ
diff --git a/Documentation/images/DiveProfile1.jpg b/Documentation/images/DiveProfile1.jpg
new file mode 100644
index 000000000..0cf224555
Binary files /dev/null and b/Documentation/images/DiveProfile1.jpg differ
diff --git a/Documentation/images/DiveProfile1.png b/Documentation/images/DiveProfile1.png
deleted file mode 100644
index 97c09b594..000000000
Binary files a/Documentation/images/DiveProfile1.png and /dev/null differ
diff --git a/Documentation/images/DiveProfile2.jpg b/Documentation/images/DiveProfile2.jpg
new file mode 100644
index 000000000..94b828cd4
Binary files /dev/null and b/Documentation/images/DiveProfile2.jpg differ
diff --git a/Documentation/images/DiveProfile2.png b/Documentation/images/DiveProfile2.png
deleted file mode 100644
index cc4ab3a3a..000000000
Binary files a/Documentation/images/DiveProfile2.png and /dev/null differ
diff --git a/Documentation/images/DiveProfile3.jpg b/Documentation/images/DiveProfile3.jpg
new file mode 100644
index 000000000..b3eb773db
Binary files /dev/null and b/Documentation/images/DiveProfile3.jpg differ
diff --git a/Documentation/images/DiveProfile3.png b/Documentation/images/DiveProfile3.png
deleted file mode 100644
index ecbeb75f8..000000000
Binary files a/Documentation/images/DiveProfile3.png and /dev/null differ
diff --git a/Documentation/images/DiveProfile4.jpg b/Documentation/images/DiveProfile4.jpg
new file mode 100644
index 000000000..a015333a4
Binary files /dev/null and b/Documentation/images/DiveProfile4.jpg differ
diff --git a/Documentation/images/DiveProfile4.png b/Documentation/images/DiveProfile4.png
deleted file mode 100644
index 76356b801..000000000
Binary files a/Documentation/images/DiveProfile4.png and /dev/null differ
diff --git a/Documentation/images/DownloadGPS.jpg b/Documentation/images/DownloadGPS.jpg
new file mode 100644
index 000000000..9e3dadd6d
Binary files /dev/null and b/Documentation/images/DownloadGPS.jpg differ
diff --git a/Documentation/images/Downloading_GPS.png b/Documentation/images/Downloading_GPS.png
index 6bddedb61..ce92b2ed3 100644
Binary files a/Documentation/images/Downloading_GPS.png and b/Documentation/images/Downloading_GPS.png differ
diff --git a/Documentation/images/Downloading_GPS_2.png b/Documentation/images/Downloading_GPS_2.png
index 64078ad3c..6e51bbebf 100644
Binary files a/Documentation/images/Downloading_GPS_2.png and b/Documentation/images/Downloading_GPS_2.png differ
diff --git a/Documentation/images/Group2.jpg b/Documentation/images/Group2.jpg
new file mode 100644
index 000000000..b4669b1e1
Binary files /dev/null and b/Documentation/images/Group2.jpg differ
diff --git a/Documentation/images/Group2.png b/Documentation/images/Group2.png
deleted file mode 100644
index 37512f606..000000000
Binary files a/Documentation/images/Group2.png and /dev/null differ
diff --git a/Documentation/images/ImportFromDC1.jpg b/Documentation/images/ImportFromDC1.jpg
new file mode 100644
index 000000000..2381be1d2
Binary files /dev/null and b/Documentation/images/ImportFromDC1.jpg differ
diff --git a/Documentation/images/ImportFromDC1.png b/Documentation/images/ImportFromDC1.png
deleted file mode 100644
index 31f7def74..000000000
Binary files a/Documentation/images/ImportFromDC1.png and /dev/null differ
diff --git a/Documentation/images/ImportFromDC2.jpg b/Documentation/images/ImportFromDC2.jpg
new file mode 100644
index 000000000..3498225c4
Binary files /dev/null and b/Documentation/images/ImportFromDC2.jpg differ
diff --git a/Documentation/images/ImportFromDC2.png b/Documentation/images/ImportFromDC2.png
deleted file mode 100644
index 652c8b58e..000000000
Binary files a/Documentation/images/ImportFromDC2.png and /dev/null differ
diff --git a/Documentation/images/InfoBox.png b/Documentation/images/InfoBox.png
deleted file mode 100644
index 511f21432..000000000
Binary files a/Documentation/images/InfoBox.png and /dev/null differ
diff --git a/Documentation/images/InfoBox2.jpg b/Documentation/images/InfoBox2.jpg
new file mode 100644
index 000000000..ff2233a88
Binary files /dev/null and b/Documentation/images/InfoBox2.jpg differ
diff --git a/Documentation/images/SplitDive3a.jpg b/Documentation/images/SplitDive3a.jpg
new file mode 100644
index 000000000..301dc69a0
Binary files /dev/null and b/Documentation/images/SplitDive3a.jpg differ
diff --git a/Documentation/images/SplitDive3a.png b/Documentation/images/SplitDive3a.png
deleted file mode 100644
index 002e62f89..000000000
Binary files a/Documentation/images/SplitDive3a.png and /dev/null differ
diff --git a/Documentation/images/WeightsDataEntry1.jpg b/Documentation/images/WeightsDataEntry1.jpg
new file mode 100644
index 000000000..b3b6e3be3
Binary files /dev/null and b/Documentation/images/WeightsDataEntry1.jpg differ
diff --git a/Documentation/images/WeightsDataEntry1.png b/Documentation/images/WeightsDataEntry1.png
deleted file mode 100644
index b2fa98569..000000000
Binary files a/Documentation/images/WeightsDataEntry1.png and /dev/null differ
diff --git a/Documentation/images/WeightsDataEntry2.jpg b/Documentation/images/WeightsDataEntry2.jpg
new file mode 100644
index 000000000..15aa5bb63
Binary files /dev/null and b/Documentation/images/WeightsDataEntry2.jpg differ
diff --git a/Documentation/images/WeightsDataEntry2.png b/Documentation/images/WeightsDataEntry2.png
deleted file mode 100644
index 427276869..000000000
Binary files a/Documentation/images/WeightsDataEntry2.png and /dev/null differ
diff --git a/Documentation/images/WeightsDataEntry3.jpg b/Documentation/images/WeightsDataEntry3.jpg
new file mode 100644
index 000000000..7ab3cf9a7
Binary files /dev/null and b/Documentation/images/WeightsDataEntry3.jpg differ
diff --git a/Documentation/images/WeightsDataEntry3.png b/Documentation/images/WeightsDataEntry3.png
deleted file mode 100644
index 5b5da4a35..000000000
Binary files a/Documentation/images/WeightsDataEntry3.png and /dev/null differ
diff --git a/Documentation/images/companion_1.png b/Documentation/images/companion_1.png
deleted file mode 100644
index f853ae67d..000000000
Binary files a/Documentation/images/companion_1.png and /dev/null differ
diff --git a/Documentation/images/companion_2.png b/Documentation/images/companion_2.png
deleted file mode 100644
index ac9721678..000000000
Binary files a/Documentation/images/companion_2.png and /dev/null differ
diff --git a/Documentation/images/companion_3.png b/Documentation/images/companion_3.png
deleted file mode 100644
index 0b8eec213..000000000
Binary files a/Documentation/images/companion_3.png and /dev/null differ
diff --git a/Documentation/images/main_window.jpg b/Documentation/images/main_window.jpg
index cda17b634..06a191f4d 100644
Binary files a/Documentation/images/main_window.jpg and b/Documentation/images/main_window.jpg differ
diff --git a/Documentation/images/main_window.png b/Documentation/images/main_window.png
deleted file mode 100644
index 8f60f1a47..000000000
Binary files a/Documentation/images/main_window.png and /dev/null differ