diff --git a/doc/Makefile b/doc/Makefile
index 283475104..d9e830030 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,12 +3,12 @@ CONTENT=$(wildcard *.content)
 HTML=$(subst .content,.html,$(CONTENT))
 TARBALLS=$(wildcard gc_*.tgz)
 OTHER=logo.jpg sample.gp sample.png cpint.gp cpint.png \
-	screenshot-summary.png screenshot-plot.png \
-	screenshot-cpint.png screenshot-phist.png \
-	screenshot-download.png screenshot-weekly.png \
+	critical-power-plot.png histogram-analysis.png pf-pv-plot.png \
+	ride-plot.png ride-summary.png weekly-summary.png \
 	choose-a-cyclist.png main-window.png critical-power.png \
 	power.zones
 
+
 all: $(HTML)
 .PHONY: all clean install
 
diff --git a/doc/critical-power-plot.png b/doc/critical-power-plot.png
new file mode 100644
index 000000000..abee2b042
Binary files /dev/null and b/doc/critical-power-plot.png differ
diff --git a/doc/histogram-analysis.png b/doc/histogram-analysis.png
new file mode 100644
index 000000000..fb6000200
Binary files /dev/null and b/doc/histogram-analysis.png differ
diff --git a/doc/pf-pv-plot.png b/doc/pf-pv-plot.png
new file mode 100644
index 000000000..1d90f44e4
Binary files /dev/null and b/doc/pf-pv-plot.png differ
diff --git a/doc/ride-plot.png b/doc/ride-plot.png
new file mode 100644
index 000000000..f13cd39d8
Binary files /dev/null and b/doc/ride-plot.png differ
diff --git a/doc/ride-summary.png b/doc/ride-summary.png
new file mode 100644
index 000000000..e23550c89
Binary files /dev/null and b/doc/ride-summary.png differ
diff --git a/doc/screenshot-cpint.png b/doc/screenshot-cpint.png
deleted file mode 100644
index 5b77eaa65..000000000
Binary files a/doc/screenshot-cpint.png and /dev/null differ
diff --git a/doc/screenshot-download.png b/doc/screenshot-download.png
deleted file mode 100644
index 702b16b0e..000000000
Binary files a/doc/screenshot-download.png and /dev/null differ
diff --git a/doc/screenshot-phist.png b/doc/screenshot-phist.png
deleted file mode 100644
index c2fcdb7bd..000000000
Binary files a/doc/screenshot-phist.png and /dev/null differ
diff --git a/doc/screenshot-plot.png b/doc/screenshot-plot.png
deleted file mode 100644
index 2b4654c88..000000000
Binary files a/doc/screenshot-plot.png and /dev/null differ
diff --git a/doc/screenshot-summary.png b/doc/screenshot-summary.png
deleted file mode 100644
index d3bdaf0d4..000000000
Binary files a/doc/screenshot-summary.png and /dev/null differ
diff --git a/doc/screenshot-weekly.png b/doc/screenshot-weekly.png
deleted file mode 100644
index b897dbf19..000000000
Binary files a/doc/screenshot-weekly.png and /dev/null differ
diff --git a/doc/screenshots.content b/doc/screenshots.content
index 4bd9ae18a..145f160da 100644
--- a/doc/screenshots.content
+++ b/doc/screenshots.content
@@ -3,46 +3,47 @@
 <p>
 <center>
 
+<p>
 <big><font face="arial,helvetica,sanserif">
-The Download Dialog
+Ride Summary
 </font></big>
 <p>
-<img src="screenshot-download.png" alt="Download Dialog" align="center">
+<img src="ride-summary.png" alt="Ride Summary Screen" align="center">
 
 <p>
 <big><font face="arial,helvetica,sanserif">
-The Ride Summary
+Plotting Altitude, Cadence, Heart Rate, Power, and Speed
 </font></big>
 <p>
-<img src="screenshot-summary.png" alt="Ride Summary Screen" align="center">
+<img src="ride-plot.png" alt="Power and HR Plot" align="center">
 
 <p>
 <big><font face="arial,helvetica,sanserif">
-The Power, Heart Rate, Speed, and Cadence Plot
+Plotting Critical Power
 </font></big>
 <p>
-<img src="screenshot-plot.png" alt="Power and HR Plot" align="center">
+<img src="critical-power-plot.png" alt="The Critical Power Plot" align="center">
 
 <p>
 <big><font face="arial,helvetica,sanserif">
-The Critical Power Plot
+Histogram Analysis
 </font></big>
 <p>
-<img src="screenshot-cpint.png" alt="The Critical Power Plot" align="center">
+<img src="histogram-analysis.png" alt="The Power Histogram" align="center">
 
 <p>
 <big><font face="arial,helvetica,sanserif">
-The Power Histogram
+Plotting Pedal Force Versus Pedal Velocity
 </font></big>
 <p>
-<img src="screenshot-phist.png" alt="The Power Histogram" align="center">
+<img src="pf-pv-plot.png" alt="The Power Histogram" align="center">
 
 <p>
 <big><font face="arial,helvetica,sanserif">
 The Weekly Summary
 </font></big>
 <p>
-<img src="screenshot-weekly.png" alt="The Weekly Summary" align="center">
+<img src="weekly-summary.png" alt="The Weekly Summary" align="center">
 
 </center>
 
diff --git a/doc/weekly-summary.png b/doc/weekly-summary.png
new file mode 100644
index 000000000..482b6b445
Binary files /dev/null and b/doc/weekly-summary.png differ