diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index aed69a7d35..0479fcab80 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -161,32 +161,32 @@ IMAGES_EN+= wine/wine-config-6.png
 IMAGES_EN+= wine/wine-config-7.png
 IMAGES_EN+= wine/winetricks-run-1.png
 IMAGES_EN+= wine/winetricks-run-2.png
-IMAGES_EN+= wine/winetricks-menu-1.jpg
-IMAGES_EN+= wine/winetricks-uninstall-1.jpg
-IMAGES_EN+= wine/winetricks-uninstall-2.jpg
-IMAGES_EN+= wine/winetricks-uninstall-3.jpg
-IMAGES_EN+= wine/homura-launch-1.jpg
-IMAGES_EN+= wine/homura-run-2.jpg
-IMAGES_EN+= wine/homura-run-3.jpg
-IMAGES_EN+= wine/homura-install-1.jpg
-IMAGES_EN+= wine/homura-install-2.jpg
-IMAGES_EN+= wine/homura-install-3.jpg
-IMAGES_EN+= wine/homura-install-4.jpg
-IMAGES_EN+= wine/homura-install-5.jpg
-IMAGES_EN+= wine/homura-install-6.jpg
-IMAGES_EN+= wine/homura-install-7.jpg
-IMAGES_EN+= wine/homura-install-8.jpg
-IMAGES_EN+= wine/homura-uninstall-1.jpg
-IMAGES_EN+= wine/homura-run-2.jpg
-IMAGES_EN+= wine/homura-run-3.jpg
+IMAGES_EN+= wine/winetricks-menu-1.png
+IMAGES_EN+= wine/winetricks-uninstall-1.png
+IMAGES_EN+= wine/winetricks-uninstall-2.png
+IMAGES_EN+= wine/winetricks-uninstall-3.png
+IMAGES_EN+= wine/homura-launch-1.png
+IMAGES_EN+= wine/homura-run-2.png
+IMAGES_EN+= wine/homura-run-3.png
+IMAGES_EN+= wine/homura-install-1.png
+IMAGES_EN+= wine/homura-install-2.png
+IMAGES_EN+= wine/homura-install-3.png
+IMAGES_EN+= wine/homura-install-4.png
+IMAGES_EN+= wine/homura-install-5.png
+IMAGES_EN+= wine/homura-install-6.png
+IMAGES_EN+= wine/homura-install-7.png
+IMAGES_EN+= wine/homura-install-8.png
+IMAGES_EN+= wine/homura-uninstall-1.png
+IMAGES_EN+= wine/homura-run-2.png
+IMAGES_EN+= wine/homura-run-3.png
 IMAGES_EN+= wine/winetricks-run-1.png
 IMAGES_EN+= wine/winetricks-run-2.png
 IMAGES_EN+= wine/winetricks-app-install-1.png
 IMAGES_EN+= wine/winetricks-app-install-2.png
-IMAGES_EN+= wine/winetricks-menu-1.jpg
-IMAGES_EN+= wine/winetricks-uninstall-1.jpg
-IMAGES_EN+= wine/winetricks-uninstall-2.jpg
-IMAGES_EN+= wine/winetricks-uninstall-3.jpg
+IMAGES_EN+= wine/winetricks-menu-1.png
+IMAGES_EN+= wine/winetricks-uninstall-1.png
+IMAGES_EN+= wine/winetricks-uninstall-2.png
+IMAGES_EN+= wine/winetricks-uninstall-3.png
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
diff --git a/share/images/books/handbook/wine/homura-install-1.jpg b/share/images/books/handbook/wine/homura-install-1.jpg
deleted file mode 100644
index b1bbb1912c..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-1.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-1.png b/share/images/books/handbook/wine/homura-install-1.png
new file mode 100644
index 0000000000..ff9dce77aa
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-1.png differ
diff --git a/share/images/books/handbook/wine/homura-install-10.png.jpg b/share/images/books/handbook/wine/homura-install-10.png.jpg
deleted file mode 100644
index 0ce1a86765..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-10.png.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-2.jpg b/share/images/books/handbook/wine/homura-install-2.jpg
deleted file mode 100644
index 5bd881d763..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-2.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-2.png b/share/images/books/handbook/wine/homura-install-2.png
new file mode 100644
index 0000000000..7e4b1c979c
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-2.png differ
diff --git a/share/images/books/handbook/wine/homura-install-3.jpg b/share/images/books/handbook/wine/homura-install-3.jpg
deleted file mode 100644
index db9549dd67..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-3.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-3.png b/share/images/books/handbook/wine/homura-install-3.png
new file mode 100644
index 0000000000..d9e72e1572
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-3.png differ
diff --git a/share/images/books/handbook/wine/homura-install-4.jpg b/share/images/books/handbook/wine/homura-install-4.jpg
deleted file mode 100644
index da8625e781..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-4.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-4.png b/share/images/books/handbook/wine/homura-install-4.png
new file mode 100644
index 0000000000..baefba0479
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-4.png differ
diff --git a/share/images/books/handbook/wine/homura-install-5.jpg b/share/images/books/handbook/wine/homura-install-5.jpg
deleted file mode 100644
index a2fc4cf3c7..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-5.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-5.png b/share/images/books/handbook/wine/homura-install-5.png
new file mode 100644
index 0000000000..08d38b564c
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-5.png differ
diff --git a/share/images/books/handbook/wine/homura-install-6.jpg b/share/images/books/handbook/wine/homura-install-6.jpg
deleted file mode 100644
index 2c36f824f9..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-6.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-6.png b/share/images/books/handbook/wine/homura-install-6.png
new file mode 100644
index 0000000000..562ca01750
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-6.png differ
diff --git a/share/images/books/handbook/wine/homura-install-7.jpg b/share/images/books/handbook/wine/homura-install-7.jpg
deleted file mode 100644
index 19e766f34d..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-7.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-7.png b/share/images/books/handbook/wine/homura-install-7.png
new file mode 100644
index 0000000000..a4fa6d1b0b
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-7.png differ
diff --git a/share/images/books/handbook/wine/homura-install-8.jpg b/share/images/books/handbook/wine/homura-install-8.jpg
deleted file mode 100644
index 60eb7ccb90..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-8.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-install-8.png b/share/images/books/handbook/wine/homura-install-8.png
new file mode 100644
index 0000000000..bfb4c145dd
Binary files /dev/null and b/share/images/books/handbook/wine/homura-install-8.png differ
diff --git a/share/images/books/handbook/wine/homura-install-9.png.jpg b/share/images/books/handbook/wine/homura-install-9.png.jpg
deleted file mode 100644
index 249cdb65cf..0000000000
Binary files a/share/images/books/handbook/wine/homura-install-9.png.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-launch-1.jpg b/share/images/books/handbook/wine/homura-launch-1.jpg
deleted file mode 100644
index 1f0d599e88..0000000000
Binary files a/share/images/books/handbook/wine/homura-launch-1.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-launch-1.png b/share/images/books/handbook/wine/homura-launch-1.png
new file mode 100644
index 0000000000..1263f68520
Binary files /dev/null and b/share/images/books/handbook/wine/homura-launch-1.png differ
diff --git a/share/images/books/handbook/wine/homura-run-2.jpg b/share/images/books/handbook/wine/homura-run-2.jpg
deleted file mode 100644
index 9db9614225..0000000000
Binary files a/share/images/books/handbook/wine/homura-run-2.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-run-2.png b/share/images/books/handbook/wine/homura-run-2.png
new file mode 100644
index 0000000000..30832d8270
Binary files /dev/null and b/share/images/books/handbook/wine/homura-run-2.png differ
diff --git a/share/images/books/handbook/wine/homura-run-3.jpg b/share/images/books/handbook/wine/homura-run-3.jpg
deleted file mode 100644
index f63b4267b0..0000000000
Binary files a/share/images/books/handbook/wine/homura-run-3.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-run-3.png b/share/images/books/handbook/wine/homura-run-3.png
new file mode 100644
index 0000000000..70b3454be0
Binary files /dev/null and b/share/images/books/handbook/wine/homura-run-3.png differ
diff --git a/share/images/books/handbook/wine/homura-run-4.png.jpg b/share/images/books/handbook/wine/homura-run-4.png.jpg
deleted file mode 100644
index 4eaca2960d..0000000000
Binary files a/share/images/books/handbook/wine/homura-run-4.png.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-uninstall-1.jpg b/share/images/books/handbook/wine/homura-uninstall-1.jpg
deleted file mode 100644
index 8d4ada30d6..0000000000
Binary files a/share/images/books/handbook/wine/homura-uninstall-1.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/homura-uninstall-1.png b/share/images/books/handbook/wine/homura-uninstall-1.png
new file mode 100644
index 0000000000..4b1d3ca3c2
Binary files /dev/null and b/share/images/books/handbook/wine/homura-uninstall-1.png differ
diff --git a/share/images/books/handbook/wine/winetricks-menu-1.jpg b/share/images/books/handbook/wine/winetricks-menu-1.jpg
deleted file mode 100644
index 3b4359e7f8..0000000000
Binary files a/share/images/books/handbook/wine/winetricks-menu-1.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/winetricks-menu-1.png b/share/images/books/handbook/wine/winetricks-menu-1.png
new file mode 100644
index 0000000000..93550d1a33
Binary files /dev/null and b/share/images/books/handbook/wine/winetricks-menu-1.png differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-1.jpg b/share/images/books/handbook/wine/winetricks-uninstall-1.jpg
deleted file mode 100644
index 5df6f43ffc..0000000000
Binary files a/share/images/books/handbook/wine/winetricks-uninstall-1.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-1.png b/share/images/books/handbook/wine/winetricks-uninstall-1.png
new file mode 100644
index 0000000000..7a0fc1a950
Binary files /dev/null and b/share/images/books/handbook/wine/winetricks-uninstall-1.png differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-2.jpg b/share/images/books/handbook/wine/winetricks-uninstall-2.jpg
deleted file mode 100644
index b3d98d256b..0000000000
Binary files a/share/images/books/handbook/wine/winetricks-uninstall-2.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-2.png b/share/images/books/handbook/wine/winetricks-uninstall-2.png
new file mode 100644
index 0000000000..0a9012b68c
Binary files /dev/null and b/share/images/books/handbook/wine/winetricks-uninstall-2.png differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-3.jpg b/share/images/books/handbook/wine/winetricks-uninstall-3.jpg
deleted file mode 100644
index a4c8c96677..0000000000
Binary files a/share/images/books/handbook/wine/winetricks-uninstall-3.jpg and /dev/null differ
diff --git a/share/images/books/handbook/wine/winetricks-uninstall-3.png b/share/images/books/handbook/wine/winetricks-uninstall-3.png
new file mode 100644
index 0000000000..d3fc563c9c
Binary files /dev/null and b/share/images/books/handbook/wine/winetricks-uninstall-3.png differ