diff --git a/ggdt/tests/graphics_indexed.rs b/ggdt/tests/graphics_indexed.rs
index 2fc95a2..e62abdf 100644
--- a/ggdt/tests/graphics_indexed.rs
+++ b/ggdt/tests/graphics_indexed.rs
@@ -76,8 +76,8 @@ fn pixel_addressing() {
 		}
 	}
 
-	let path = reference_file(Path::new("pixel_addressing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("pixel_addressing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -128,8 +128,8 @@ fn pixel_drawing() {
 		screen.set_pixel(160, i + 234, 15);
 	}
 
-	let path = reference_file(Path::new("pixel_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("pixel_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -153,8 +153,8 @@ fn blended_pixel_drawing() {
 		screen.set_blended_pixel(160, i + 234, 15, &blend_map);
 	}
 
-	let path = reference_file(Path::new("blended_pixel_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_pixel_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -174,8 +174,8 @@ fn horiz_line_drawing() {
 	screen.horiz_line(100, 200, -10, 6);
 	screen.horiz_line(20, 80, 250, 7);
 
-	let path = reference_file(Path::new("horiz_line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("horiz_line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -194,8 +194,8 @@ fn blended_horiz_line_drawing() {
 	screen.blended_horiz_line(100, 200, -10, 6, &blend_map);
 	screen.blended_horiz_line(20, 80, 250, 7, &blend_map);
 
-	let path = reference_file(Path::new("blended_horiz_line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_horiz_line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -214,8 +214,8 @@ fn vert_line_drawing() {
 	screen.vert_line(-17, 10, 20, 6);
 	screen.vert_line(400, 100, 300, 7);
 
-	let path = reference_file(Path::new("vert_line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("vert_line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -234,8 +234,8 @@ fn blended_vert_line_drawing() {
 	screen.blended_vert_line(-17, 10, 20, 6, &blend_map);
 	screen.blended_vert_line(400, 100, 300, 7, &blend_map);
 
-	let path = reference_file(Path::new("blended_vert_line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_vert_line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -271,8 +271,8 @@ fn line_drawing() {
 	screen.line(-100, 120, -100, 239, 3);
 	screen.line(320, 99, 320, 199, 5);
 
-	let path = reference_file(Path::new("line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -308,8 +308,8 @@ fn blended_line_drawing() {
 	screen.blended_line(-100, 120, -100, 239, 3, &blend_map);
 	screen.blended_line(320, 99, 320, 199, 5, &blend_map);
 
-	let path = reference_file(Path::new("blended_line_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_line_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -336,8 +336,8 @@ fn rect_drawing() {
 	screen.rect(300, 20, 340, -20, 13);
 	screen.rect(20, 220, -20, 260, 14);
 
-	let path = reference_file(Path::new("rect_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("rect_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -364,8 +364,8 @@ fn blended_rect_drawing() {
 	screen.blended_rect(300, 20, 340, -20, 13, &blend_map);
 	screen.blended_rect(20, 220, -20, 260, 14, &blend_map);
 
-	let path = reference_file(Path::new("blended_rect_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_rect_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -392,8 +392,8 @@ fn filled_rect_drawing() {
 	screen.filled_rect(300, 20, 340, -20, 13);
 	screen.filled_rect(20, 220, -20, 260, 14);
 
-	let path = reference_file(Path::new("filled_rect_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("filled_rect_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -420,8 +420,8 @@ fn blended_filled_rect_drawing() {
 	screen.blended_filled_rect(300, 20, 340, -20, 13, &blend_map);
 	screen.blended_filled_rect(20, 220, -20, 260, 14, &blend_map);
 
-	let path = reference_file(Path::new("blended_filled_rect_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_filled_rect_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -443,8 +443,8 @@ fn circle_drawing() {
 	screen.circle(319, 1, 22, 9);
 	screen.circle(2, 242, 19, 10);
 
-	let path = reference_file(Path::new("circle_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("circle_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -466,8 +466,8 @@ fn filled_circle_drawing() {
 	screen.filled_circle(319, 1, 22, 9);
 	screen.filled_circle(2, 242, 19, 10);
 
-	let path = reference_file(Path::new("filled_circle_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("filled_circle_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -517,8 +517,8 @@ fn text_drawing() {
 	screen.print_string(message, 360, 120, FontRenderOpts::Color(7), &font);
 	screen.print_string(message, 200, 250, FontRenderOpts::Color(8), &font);
 
-	let path = reference_file(Path::new("text_drawing.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("text_drawing.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -600,8 +600,8 @@ fn solid_blits() {
 	screen.blit(Solid, &bmp16, 196, 238);
 	screen.blit(Solid, &bmp16, 226, 240);
 
-	let path = reference_file(Path::new("solid_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("solid_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -667,8 +667,8 @@ fn blended_solid_blits() {
 	screen.blit(SolidBlended { blend_map: blend_map.clone() }, &bmp16, 196, 238);
 	screen.blit(SolidBlended { blend_map: blend_map.clone() }, &bmp16, 226, 240);
 
-	let path = reference_file(Path::new("blended_solid_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_solid_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -731,8 +731,8 @@ fn solid_flipped_blits() {
 	screen.blit(SolidFlipped { horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238);
 	screen.blit(SolidFlipped { horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("solid_flipped_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("solid_flipped_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -795,8 +795,8 @@ fn blended_solid_flipped_blits() {
 	screen.blit(SolidFlippedBlended { horizontal_flip: true, vertical_flip: false, blend_map: blend_map.clone() }, &bmp, 196, 238);
 	screen.blit(SolidFlippedBlended { horizontal_flip: false, vertical_flip: true, blend_map: blend_map.clone() }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("blended_solid_flipped_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_solid_flipped_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -859,8 +859,8 @@ fn solid_offset_blits() {
 	screen.blit(SolidOffset(22), &bmp, 196, 238);
 	screen.blit(SolidOffset(22), &bmp, 226, 240);
 
-	let path = reference_file(Path::new("solid_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("solid_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -923,8 +923,8 @@ fn solid_flipped_offset_blits() {
 	screen.blit(SolidFlippedOffset { offset: 22, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238);
 	screen.blit(SolidFlippedOffset { offset: 22, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("solid_flipped_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("solid_flipped_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -990,8 +990,8 @@ fn transparent_blits() {
 	screen.blit(Transparent(0), &bmp16, 196, 238);
 	screen.blit(Transparent(0), &bmp16, 226, 240);
 
-	let path = reference_file(Path::new("transparent_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1057,8 +1057,8 @@ fn blended_transparent_blits() {
 	screen.blit(TransparentBlended { transparent_color: 0, blend_map: blend_map.clone() }, &bmp16, 196, 238);
 	screen.blit(TransparentBlended { transparent_color: 0, blend_map: blend_map.clone() }, &bmp16, 226, 240);
 
-	let path = reference_file(Path::new("blended_transparent_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_transparent_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1121,8 +1121,8 @@ fn transparent_flipped_blits() {
 	screen.blit(TransparentFlipped { transparent_color: 0, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238);
 	screen.blit(TransparentFlipped { transparent_color: 0, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("transparent_flipped_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_flipped_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1185,8 +1185,8 @@ fn blended_transparent_flipped_blits() {
 	screen.blit(TransparentFlippedBlended { transparent_color: 0, horizontal_flip: true, vertical_flip: false, blend_map: blend_map.clone() }, &bmp, 196, 238);
 	screen.blit(TransparentFlippedBlended { transparent_color: 0, horizontal_flip: false, vertical_flip: true, blend_map: blend_map.clone() }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("blended_transparent_flipped_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_transparent_flipped_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1249,8 +1249,8 @@ fn transparent_offset_blits() {
 	screen.blit(TransparentOffset { transparent_color: 0, offset: 22 }, &bmp, 196, 238);
 	screen.blit(TransparentOffset { transparent_color: 0, offset: 22 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("transparent_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1313,8 +1313,8 @@ fn transparent_flipped_offset_blits() {
 	screen.blit(TransparentFlippedOffset { transparent_color: 0, offset: 22, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238);
 	screen.blit(TransparentFlippedOffset { transparent_color: 0, offset: 22, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("transparent_flipped_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_flipped_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1377,8 +1377,8 @@ fn transparent_single_blits() {
 	screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 196, 238);
 	screen.blit(TransparentSingle { transparent_color: 0, draw_color: 22 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("transparent_single_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_single_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1441,8 +1441,8 @@ fn transparent_flipped_single_blits() {
 	screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: true, vertical_flip: false }, &bmp, 196, 238);
 	screen.blit(TransparentFlippedSingle { transparent_color: 0, draw_color: 22, horizontal_flip: false, vertical_flip: true }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("transparent_flipped_single_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("transparent_flipped_single_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1505,8 +1505,8 @@ fn rotozoom_blits() {
 	screen.blit(RotoZoom { angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 196, 238);
 	screen.blit(RotoZoom { angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("rotozoom_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("rotozoom_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1569,8 +1569,8 @@ fn blended_rotozoom_blits() {
 	screen.blit(RotoZoomBlended { angle: 1.3, scale_x: 1.0, scale_y: 1.0, blend_map: blend_map.clone() }, &bmp, 196, 238);
 	screen.blit(RotoZoomBlended { angle: 1.3, scale_x: 1.0, scale_y: 1.0, blend_map: blend_map.clone() }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("blended_rotozoom_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_rotozoom_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1633,8 +1633,8 @@ fn rotozoom_offset_blits() {
 	screen.blit(RotoZoomOffset { angle: 1.3, scale_x: 1.0, scale_y: 1.0, offset: 22 }, &bmp, 196, 238);
 	screen.blit(RotoZoomOffset { angle: 1.3, scale_x: 1.0, scale_y: 1.0, offset: 22 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("rotozoom_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("rotozoom_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1697,8 +1697,8 @@ fn rotozoom_transparent_blits() {
 	screen.blit(RotoZoomTransparent { transparent_color: 0, angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 196, 238);
 	screen.blit(RotoZoomTransparent { transparent_color: 0, angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("rotozoom_transparent_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("rotozoom_transparent_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1761,8 +1761,8 @@ fn blended_rotozoom_transparent_blits() {
 	screen.blit(RotoZoomTransparentBlended { transparent_color: 0, angle: 1.3, scale_x: 1.0, scale_y: 1.0, blend_map: blend_map.clone() }, &bmp, 196, 238);
 	screen.blit(RotoZoomTransparentBlended { transparent_color: 0, angle: 1.3, scale_x: 1.0, scale_y: 1.0, blend_map: blend_map.clone() }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("blended_rotozoom_transparent_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("blended_rotozoom_transparent_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
@@ -1825,8 +1825,8 @@ fn rotozoom_transparent_offset_blits() {
 	screen.blit(RotoZoomTransparentOffset { transparent_color: 0, offset: 22, angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 196, 238);
 	screen.blit(RotoZoomTransparentOffset { transparent_color: 0, offset: 22, angle: 1.3, scale_x: 1.0, scale_y: 1.0 }, &bmp, 226, 240);
 
-	let path = reference_file(Path::new("rotozoom_transparent_offset_blits.pcx"));
-	//screen.to_pcx_file(path.as_path(), &palette).unwrap();
+	let path = reference_file(Path::new("rotozoom_transparent_offset_blits.png"));
+	//screen.to_png_file(path.as_path(), &palette).unwrap();
 	assert!(verify_visual(&screen, &palette, &path), "bitmap differs from source image: {:?}", path);
 }
 
diff --git a/ggdt/tests/ref/indexed/blended_filled_rect_drawing.pcx b/ggdt/tests/ref/indexed/blended_filled_rect_drawing.pcx
deleted file mode 100644
index 25f2b95..0000000
Binary files a/ggdt/tests/ref/indexed/blended_filled_rect_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_filled_rect_drawing.png b/ggdt/tests/ref/indexed/blended_filled_rect_drawing.png
new file mode 100644
index 0000000..eec6185
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_filled_rect_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/blended_horiz_line_drawing.pcx b/ggdt/tests/ref/indexed/blended_horiz_line_drawing.pcx
deleted file mode 100644
index a5a5934..0000000
Binary files a/ggdt/tests/ref/indexed/blended_horiz_line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_horiz_line_drawing.png b/ggdt/tests/ref/indexed/blended_horiz_line_drawing.png
new file mode 100644
index 0000000..eb15157
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_horiz_line_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/blended_line_drawing.pcx b/ggdt/tests/ref/indexed/blended_line_drawing.pcx
deleted file mode 100644
index 7a5b085..0000000
Binary files a/ggdt/tests/ref/indexed/blended_line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_line_drawing.png b/ggdt/tests/ref/indexed/blended_line_drawing.png
new file mode 100644
index 0000000..47783ac
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_line_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/blended_pixel_drawing.pcx b/ggdt/tests/ref/indexed/blended_pixel_drawing.pcx
deleted file mode 100644
index 6696eb0..0000000
Binary files a/ggdt/tests/ref/indexed/blended_pixel_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_pixel_drawing.png b/ggdt/tests/ref/indexed/blended_pixel_drawing.png
new file mode 100644
index 0000000..b258138
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_pixel_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/blended_rect_drawing.pcx b/ggdt/tests/ref/indexed/blended_rect_drawing.pcx
deleted file mode 100644
index fdee796..0000000
Binary files a/ggdt/tests/ref/indexed/blended_rect_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_rect_drawing.png b/ggdt/tests/ref/indexed/blended_rect_drawing.png
new file mode 100644
index 0000000..ae74446
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_rect_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/blended_rotozoom_blits.pcx b/ggdt/tests/ref/indexed/blended_rotozoom_blits.pcx
deleted file mode 100644
index 477c12e..0000000
Binary files a/ggdt/tests/ref/indexed/blended_rotozoom_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_rotozoom_blits.png b/ggdt/tests/ref/indexed/blended_rotozoom_blits.png
new file mode 100644
index 0000000..4dd4eeb
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_rotozoom_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.pcx b/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.pcx
deleted file mode 100644
index 13bc054..0000000
Binary files a/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.png b/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.png
new file mode 100644
index 0000000..9d5e5d4
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_rotozoom_transparent_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_solid_blits.pcx b/ggdt/tests/ref/indexed/blended_solid_blits.pcx
deleted file mode 100644
index f67bd54..0000000
Binary files a/ggdt/tests/ref/indexed/blended_solid_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_solid_blits.png b/ggdt/tests/ref/indexed/blended_solid_blits.png
new file mode 100644
index 0000000..af8b6e7
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_solid_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_solid_flipped_blits.pcx b/ggdt/tests/ref/indexed/blended_solid_flipped_blits.pcx
deleted file mode 100644
index fd39cb8..0000000
Binary files a/ggdt/tests/ref/indexed/blended_solid_flipped_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_solid_flipped_blits.png b/ggdt/tests/ref/indexed/blended_solid_flipped_blits.png
new file mode 100644
index 0000000..4342fc8
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_solid_flipped_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_transparent_blits.pcx b/ggdt/tests/ref/indexed/blended_transparent_blits.pcx
deleted file mode 100644
index 9162f3f..0000000
Binary files a/ggdt/tests/ref/indexed/blended_transparent_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_transparent_blits.png b/ggdt/tests/ref/indexed/blended_transparent_blits.png
new file mode 100644
index 0000000..6a7c866
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_transparent_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.pcx b/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.pcx
deleted file mode 100644
index 4e84bb6..0000000
Binary files a/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.png b/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.png
new file mode 100644
index 0000000..2c238ab
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_transparent_flipped_blits.png differ
diff --git a/ggdt/tests/ref/indexed/blended_vert_line_drawing.pcx b/ggdt/tests/ref/indexed/blended_vert_line_drawing.pcx
deleted file mode 100644
index 2e9d2c5..0000000
Binary files a/ggdt/tests/ref/indexed/blended_vert_line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/blended_vert_line_drawing.png b/ggdt/tests/ref/indexed/blended_vert_line_drawing.png
new file mode 100644
index 0000000..0e6e2e9
Binary files /dev/null and b/ggdt/tests/ref/indexed/blended_vert_line_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/circle_drawing.pcx b/ggdt/tests/ref/indexed/circle_drawing.pcx
deleted file mode 100644
index 645b964..0000000
Binary files a/ggdt/tests/ref/indexed/circle_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/circle_drawing.png b/ggdt/tests/ref/indexed/circle_drawing.png
new file mode 100644
index 0000000..24d3c7d
Binary files /dev/null and b/ggdt/tests/ref/indexed/circle_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/filled_circle_drawing.pcx b/ggdt/tests/ref/indexed/filled_circle_drawing.pcx
deleted file mode 100644
index 423271c..0000000
Binary files a/ggdt/tests/ref/indexed/filled_circle_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/filled_circle_drawing.png b/ggdt/tests/ref/indexed/filled_circle_drawing.png
new file mode 100644
index 0000000..4fba036
Binary files /dev/null and b/ggdt/tests/ref/indexed/filled_circle_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/filled_rect_drawing.pcx b/ggdt/tests/ref/indexed/filled_rect_drawing.pcx
deleted file mode 100644
index 2952710..0000000
Binary files a/ggdt/tests/ref/indexed/filled_rect_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/filled_rect_drawing.png b/ggdt/tests/ref/indexed/filled_rect_drawing.png
new file mode 100644
index 0000000..d1d0103
Binary files /dev/null and b/ggdt/tests/ref/indexed/filled_rect_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/horiz_line_drawing.pcx b/ggdt/tests/ref/indexed/horiz_line_drawing.pcx
deleted file mode 100644
index 87126bd..0000000
Binary files a/ggdt/tests/ref/indexed/horiz_line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/horiz_line_drawing.png b/ggdt/tests/ref/indexed/horiz_line_drawing.png
new file mode 100644
index 0000000..db707b6
Binary files /dev/null and b/ggdt/tests/ref/indexed/horiz_line_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/line_drawing.pcx b/ggdt/tests/ref/indexed/line_drawing.pcx
deleted file mode 100644
index c4ee098..0000000
Binary files a/ggdt/tests/ref/indexed/line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/line_drawing.png b/ggdt/tests/ref/indexed/line_drawing.png
new file mode 100644
index 0000000..3fd63cf
Binary files /dev/null and b/ggdt/tests/ref/indexed/line_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/pixel_addressing.pcx b/ggdt/tests/ref/indexed/pixel_addressing.pcx
deleted file mode 100644
index ccc5851..0000000
Binary files a/ggdt/tests/ref/indexed/pixel_addressing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/pixel_addressing.png b/ggdt/tests/ref/indexed/pixel_addressing.png
new file mode 100644
index 0000000..0bfef6f
Binary files /dev/null and b/ggdt/tests/ref/indexed/pixel_addressing.png differ
diff --git a/ggdt/tests/ref/indexed/pixel_drawing.pcx b/ggdt/tests/ref/indexed/pixel_drawing.pcx
deleted file mode 100644
index 41e1fe4..0000000
Binary files a/ggdt/tests/ref/indexed/pixel_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/pixel_drawing.png b/ggdt/tests/ref/indexed/pixel_drawing.png
new file mode 100644
index 0000000..618f9de
Binary files /dev/null and b/ggdt/tests/ref/indexed/pixel_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/rect_drawing.pcx b/ggdt/tests/ref/indexed/rect_drawing.pcx
deleted file mode 100644
index dbfde84..0000000
Binary files a/ggdt/tests/ref/indexed/rect_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/rect_drawing.png b/ggdt/tests/ref/indexed/rect_drawing.png
new file mode 100644
index 0000000..11115fd
Binary files /dev/null and b/ggdt/tests/ref/indexed/rect_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_blits.pcx b/ggdt/tests/ref/indexed/rotozoom_blits.pcx
deleted file mode 100644
index f94a521..0000000
Binary files a/ggdt/tests/ref/indexed/rotozoom_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_blits.png b/ggdt/tests/ref/indexed/rotozoom_blits.png
new file mode 100644
index 0000000..f36f474
Binary files /dev/null and b/ggdt/tests/ref/indexed/rotozoom_blits.png differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_offset_blits.pcx b/ggdt/tests/ref/indexed/rotozoom_offset_blits.pcx
deleted file mode 100644
index 6f28082..0000000
Binary files a/ggdt/tests/ref/indexed/rotozoom_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_offset_blits.png b/ggdt/tests/ref/indexed/rotozoom_offset_blits.png
new file mode 100644
index 0000000..8defd16
Binary files /dev/null and b/ggdt/tests/ref/indexed/rotozoom_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_transparent_blits.pcx b/ggdt/tests/ref/indexed/rotozoom_transparent_blits.pcx
deleted file mode 100644
index fe941ae..0000000
Binary files a/ggdt/tests/ref/indexed/rotozoom_transparent_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_transparent_blits.png b/ggdt/tests/ref/indexed/rotozoom_transparent_blits.png
new file mode 100644
index 0000000..57d9df4
Binary files /dev/null and b/ggdt/tests/ref/indexed/rotozoom_transparent_blits.png differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.pcx b/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.pcx
deleted file mode 100644
index 853bff8..0000000
Binary files a/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.png b/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.png
new file mode 100644
index 0000000..f12aa63
Binary files /dev/null and b/ggdt/tests/ref/indexed/rotozoom_transparent_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/solid_blits.pcx b/ggdt/tests/ref/indexed/solid_blits.pcx
deleted file mode 100644
index 1eb6825..0000000
Binary files a/ggdt/tests/ref/indexed/solid_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/solid_blits.png b/ggdt/tests/ref/indexed/solid_blits.png
new file mode 100644
index 0000000..34c93b6
Binary files /dev/null and b/ggdt/tests/ref/indexed/solid_blits.png differ
diff --git a/ggdt/tests/ref/indexed/solid_flipped_blits.pcx b/ggdt/tests/ref/indexed/solid_flipped_blits.pcx
deleted file mode 100644
index d45349a..0000000
Binary files a/ggdt/tests/ref/indexed/solid_flipped_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/solid_flipped_blits.png b/ggdt/tests/ref/indexed/solid_flipped_blits.png
new file mode 100644
index 0000000..3f9cb61
Binary files /dev/null and b/ggdt/tests/ref/indexed/solid_flipped_blits.png differ
diff --git a/ggdt/tests/ref/indexed/solid_flipped_offset_blits.pcx b/ggdt/tests/ref/indexed/solid_flipped_offset_blits.pcx
deleted file mode 100644
index 5c35990..0000000
Binary files a/ggdt/tests/ref/indexed/solid_flipped_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/solid_flipped_offset_blits.png b/ggdt/tests/ref/indexed/solid_flipped_offset_blits.png
new file mode 100644
index 0000000..ce391c7
Binary files /dev/null and b/ggdt/tests/ref/indexed/solid_flipped_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/solid_offset_blits.pcx b/ggdt/tests/ref/indexed/solid_offset_blits.pcx
deleted file mode 100644
index 3b5a19c..0000000
Binary files a/ggdt/tests/ref/indexed/solid_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/solid_offset_blits.png b/ggdt/tests/ref/indexed/solid_offset_blits.png
new file mode 100644
index 0000000..dac916e
Binary files /dev/null and b/ggdt/tests/ref/indexed/solid_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/text_drawing.pcx b/ggdt/tests/ref/indexed/text_drawing.pcx
deleted file mode 100644
index cd2c924..0000000
Binary files a/ggdt/tests/ref/indexed/text_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/text_drawing.png b/ggdt/tests/ref/indexed/text_drawing.png
new file mode 100644
index 0000000..15cd095
Binary files /dev/null and b/ggdt/tests/ref/indexed/text_drawing.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_blits.pcx b/ggdt/tests/ref/indexed/transparent_blits.pcx
deleted file mode 100644
index a6b6f76..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_blits.png b/ggdt/tests/ref/indexed/transparent_blits.png
new file mode 100644
index 0000000..b14de53
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_blits.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_blits.pcx b/ggdt/tests/ref/indexed/transparent_flipped_blits.pcx
deleted file mode 100644
index e74342e..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_flipped_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_blits.png b/ggdt/tests/ref/indexed/transparent_flipped_blits.png
new file mode 100644
index 0000000..dfc9f0a
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_flipped_blits.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.pcx b/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.pcx
deleted file mode 100644
index e5be590..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.png b/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.png
new file mode 100644
index 0000000..441c67c
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_flipped_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_single_blits.pcx b/ggdt/tests/ref/indexed/transparent_flipped_single_blits.pcx
deleted file mode 100644
index 03aa333..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_flipped_single_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_flipped_single_blits.png b/ggdt/tests/ref/indexed/transparent_flipped_single_blits.png
new file mode 100644
index 0000000..6746a2c
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_flipped_single_blits.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_offset_blits.pcx b/ggdt/tests/ref/indexed/transparent_offset_blits.pcx
deleted file mode 100644
index 5d58f9f..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_offset_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_offset_blits.png b/ggdt/tests/ref/indexed/transparent_offset_blits.png
new file mode 100644
index 0000000..392f71b
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_offset_blits.png differ
diff --git a/ggdt/tests/ref/indexed/transparent_single_blits.pcx b/ggdt/tests/ref/indexed/transparent_single_blits.pcx
deleted file mode 100644
index 03c3995..0000000
Binary files a/ggdt/tests/ref/indexed/transparent_single_blits.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/transparent_single_blits.png b/ggdt/tests/ref/indexed/transparent_single_blits.png
new file mode 100644
index 0000000..b6f806d
Binary files /dev/null and b/ggdt/tests/ref/indexed/transparent_single_blits.png differ
diff --git a/ggdt/tests/ref/indexed/vert_line_drawing.pcx b/ggdt/tests/ref/indexed/vert_line_drawing.pcx
deleted file mode 100644
index 5d13fb4..0000000
Binary files a/ggdt/tests/ref/indexed/vert_line_drawing.pcx and /dev/null differ
diff --git a/ggdt/tests/ref/indexed/vert_line_drawing.png b/ggdt/tests/ref/indexed/vert_line_drawing.png
new file mode 100644
index 0000000..40c63f4
Binary files /dev/null and b/ggdt/tests/ref/indexed/vert_line_drawing.png differ