diff --git a/Makefile b/Makefile
index 921e99f..88d3046 100755
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,18 @@
 SHELL=/bin/sh
 
 
+lineplot = ploticus -eps -tightcrop -o $(1).eps lineplot.plo infile=$(2) \
+	title=$(3) ytitle=$(4) ymin=$(5) ymax=$(6); \
+	epstopdf $(1).eps; \
+	rm -f $(1).eps
+
+
+
 GRAPHICS:=ImageGeneration-full.png GoogleMap-full.png \
 	jpeg_detail.png overlay_detail.png \
-	tasmania_stats.pdf
+	tasmania_stats.pdf data_size.pdf data_generation_time.pdf \
+	page_load_time.pdf combined_time.pdf real_memory.pdf virtual_memory.pdf \
+	data_server.pdf image_server.pdf model_interaction.pdf shared.pdf
 
 
 Map_Visualisation.pdf: Map_Visualisation.tex Map_Visualisation.bib $(GRAPHICS)
@@ -22,33 +31,28 @@
 overlay_detail.png: PointOverlay-full.png
 	convert -crop 180x95+150+95 $< $@
 
-throughput.eps: barchart.plo
-	ploticus -eps -tightcrop -o $@ $< yrange="0 2.25" ystubfmt="%2.1f" ylabel="Throughput (bps)" field=throughput
+data_size.pdf: d_data_size.txt lineplot.plo
+	$(call lineplot,$*,$<,'Size of Generated Data','Data size (kB)',0.1,200000)
 
-movement-time.eps: barchart.plo
-	ploticus -eps -tightcrop -o $@ $< yrange="0 2.25" ystubfmt="%2.1f" ylabel="Movement time (s)" field=movement_time
+data_generation_time.pdf: d_data_generation_time.txt lineplot.plo
+	$(call lineplot,$*,$<,'Data Generation Time','Average time to generate data at server (s)',0.001,2000)
 
-error-rate.eps: barchart.plo
-	ploticus -eps -tightcrop -o $@ $< yrange="0 155" ystubfmt="%g" ylabel="Error rate (%)" field=error_rate
+page_load_time.pdf: d_page_load_time.txt lineplot.plo
+	$(call lineplot,$*,$<,'Map Display Time','Average time to display map at client (s)',0.001,2000)
 
-combobox-learning.eps: linechart.plo
-	ploticus -eps -tightcrop -o $@ $< field1=combo_mouse_move field2=combo_touch_move label1=Mouse label2=Touch
+combined_time.pdf: d_combined_time.txt lineplot.plo
+	$(call lineplot,$*,$<,'Combined Page Load Time','Average time to generate data and display map (s)',0.001,2000)
 
-checkbox-learning.eps: linechart.plo
-	ploticus -eps -tightcrop -o $@ $< field1=check_mouse_move field2=check_touch_move label1=Mouse label2=Touch
+real_memory.pdf: d_real_memory.txt lineplot.plo
+	$(call lineplot,$*,$<,'Real Memory Usage','Application real memory size (MB)',10,2000)
 
-variation-text-mouse.eps: variation.plo
-	ploticus -eps -tightcrop -o $@ $< device=mouse target=text
+virtual_memory.pdf: d_virtual_memory.txt lineplot.plo
+	$(call lineplot,$*,$<,'Virtual Memory Usage','Application virtual memory size (MB)',50,1200)
 
-variation-text-touch.eps: variation.plo
-	ploticus -eps -tightcrop -o $@ $< device=touch target=text
-
-variation-combo-mouse.eps: variation.plo
-	ploticus -eps -tightcrop -o $@ $< device=mouse target=combo
-
-variation-combo-touch.eps: variation.plo
-	ploticus -eps -tightcrop -o $@ $< device=touch target=combo
-
+%.pdf: %.svg
+	inkscape --file=$< --export-text-to-path --without-gui --export-eps=$*.eps
+	ps2eps --ignoreBB --nohires --loose --gsbbox < $*.eps | ps2pdf -dEPSCrop - $@
+	rm -f $*.eps
 
 clean:
 	rm -f *.aux *.bbl *.blg *.log *.dvi *.ps Map_Visualisation.pdf