diff --git a/bin/copy-to-website.example b/bin/copy-to-website.example
index 611a0f1..5575a01 100755
--- a/bin/copy-to-website.example
+++ b/bin/copy-to-website.example
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rsync --delete -avP *.png *.html ~/my.www.dir/html/graphs/
+rsync --delete -avP *.png *.svg *.html ~/my.www.dir/html/graphs/
diff --git a/bin/diff-freq-graph b/bin/diff-freq-graph
index d5b7b27..bee8bae 100755
--- a/bin/diff-freq-graph
+++ b/bin/diff-freq-graph
@@ -1,4 +1,5 @@
 #!/bin/bash
+TERMINAL=$1
 
 LINSCALELIMIT=1
 for stat in statistics.*; do
@@ -10,7 +11,7 @@ LINSCALELIMIT=`echo $LINSCALELIMIT | ../bin/mul 1000000`
 # echo $LINSCALELIMIT
 
 (
-../bin/graph-header all-diff-freq.png $LINSCALELIMIT "%1.1f us/s" "all clocks (diff freq)" "set yrange [-3:3]"
+../bin/graph-header all-diff-freq $TERMINAL $LINSCALELIMIT "%1.1f us/s" "all clocks (diff freq)" "set yrange [-3:3]"
 ../bin/foreach-stat "'__FILE__' using 1:(\$6*1000000) title '__TITLE__' with line \\"
 echo 
 ) | gnuplot
diff --git a/bin/graph-header b/bin/graph-header
index f40531b..42be0d0 100755
--- a/bin/graph-header
+++ b/bin/graph-header
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-FILENAME=$1
-LINSCALELIMIT=$2
-FORMAT=$3
-TITLE=$4
-CUSTOM=$5
+BASENAME=$1
+TERMINAL=$2
+LINSCALELIMIT=$3
+FORMAT=$4
+TITLE=$5
+CUSTOM=$6
 
 YTICS=`../bin/linlogytics $LINSCALELIMIT`
 
@@ -12,10 +13,10 @@ YTICS=`../bin/linlogytics $LINSCALELIMIT`
 #echo $YTICS 1>&2
 
 cat <<EOF
-set terminal png size 900,600
+set terminal $TERMINAL size 900,600
 set xdata time
 set timefmt "%s"
-set output "$FILENAME"
+set output "$BASENAME.$TERMINAL"
 set grid
 set xlabel "Time"
 set format x "%d-%H:%M"
diff --git a/bin/index b/bin/index
index ce5d53e..906a33b 100755
--- a/bin/index
+++ b/bin/index
@@ -40,6 +40,10 @@ my $ALL_REMOTES = "";
 my $ALL_REMOTES_WITH_LINK = "";
 foreach my $r (@remotes) {
   my $remote = $r;
+  my $link = $r;
+  if ($ENV["GNUPLOT_TERMINALS"] == "png svg") {
+    $link =~ s/png$/svg/;
+  }
   $remote =~ s/^remote-statistics\.//;
   $remote =~ s/\.(svg|png)$//;
   my $key = $remote;
@@ -47,7 +51,7 @@ foreach my $r (@remotes) {
   my $desc = $titles{"statistics.$key"} || $key;
   my $img = "<img src=\"$r\" alt=\"Remote clock: $desc\" />";
   $ALL_REMOTES .= "$img<br />\n";
-  $ALL_REMOTES_WITH_LINK .= "<a href=\"$remote\">$img</a><br />\n";
+  $ALL_REMOTES_WITH_LINK .= "<a href=\"$link\">$img</a><br />\n";
 }
 
 open(TMPL,"<","index.html.tmpl");
diff --git a/bin/local-clock-graph b/bin/local-clock-graph
index 017cc24..b8fb88d 100755
--- a/bin/local-clock-graph
+++ b/bin/local-clock-graph
@@ -1,4 +1,5 @@
 #!/bin/bash
+TERMINAL=$1
 
 LINSCALELIMIT=`../bin/linscalelimit 1 5 tracking.log | ../bin/mul 1000000`
 
@@ -7,10 +8,10 @@ LINSCALELIMIT=`../bin/linscalelimit 1 5 tracking.log | ../bin/mul 1000000`
 YTICS=`../bin/linlogytics $LINSCALELIMIT`
 
 gnuplot <<EOF
-set terminal png size 900,600
+set terminal $TERMINAL size 900,600
 set xdata time
 set timefmt "%s"
-set output "local-clock.png"
+set output "local-clock.$TERMINAL"
 set grid
 set xlabel "Time"
 set format x "%d-%H:%M"
@@ -38,10 +39,10 @@ ONE=`../bin/percentile 8 1 tracking.log | ../bin/mul 1000000`
 NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
 NN_M_O=`echo $NINETYNINE - $ONE | bc`
 gnuplot <<EOF
-set terminal png size 900,600
+set terminal $TERMINAL size 900,600
 set xdata time
 set timefmt "%s"
-set output "local-clock-stddev.png"
+set output "local-clock-stddev.$TERMINAL"
 set grid
 set xlabel "Time"
 set format x "%d-%H:%M"
@@ -73,10 +74,10 @@ ONE=`../bin/percentile 4 1 tracking.log`
 NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
 NN_M_O=`echo $NINETYNINE - $ONE | bc`
 gnuplot <<EOF
-set terminal png size 900,600
+set terminal $TERMINAL size 900,600
 set xdata time
 set timefmt "%s"
-set output "local-clock-skew.png"
+set output "local-clock-skew.$TERMINAL"
 set grid
 set xlabel "Time"
 set format x "%d-%H:%M"
diff --git a/bin/offset-graph b/bin/offset-graph
index 0c8e344..5e1d8e4 100755
--- a/bin/offset-graph
+++ b/bin/offset-graph
@@ -1,4 +1,5 @@
 #!/bin/bash
+TERMINAL=$1
 
 LINSCALELIMIT=1
 for stat in statistics.*; do
@@ -8,7 +9,7 @@ done
 LINSCALELIMIT=`echo $LINSCALELIMIT | ../bin/mul 1000000`
 
 (
-../bin/graph-header all-offset.png $LINSCALELIMIT "%1.0f us" "all clocks (offset)" ""
+../bin/graph-header all-offset $TERMINAL $LINSCALELIMIT "%1.0f us" "all clocks (offset)" ""
 ../bin/foreach-stat "'__FILE__' using 1:(\$4*1000000) title '__TITLE__' with line \\"
 echo 
 ) | gnuplot
@@ -24,7 +25,7 @@ else
 fi
 
 #(
-#  ../bin/graph-header remote-strat1.png 1 "%1.0f us" "offset of remote strat1s" ""
+#  ../bin/graph-header remote-strat1 $TERMINAL "%1.0f µs" "Offset Of Remote Stratum-1s" ""
 #  i=0
 #  echo "$titles" | while read file title; do
 #    if [ $i != 0 ]; then
@@ -37,7 +38,7 @@ fi
 #) | gnuplot
 #
 #(
-#  ../bin/graph-header remote-strat1-downstream.png 1 "%1.0f us" "offset-rtt/2 of remote strat1s" ""
+#  ../bin/graph-header remote-strat1-downstream $TERMINAL "%1.0f µs" "Offset-RTT/2 Of Remote Stratum-1s" ""
 #  i=0
 #  echo "$titles" | while read file title; do
 #    measurements_file=`echo $file | sed 's/^statistics/measurements/'`
@@ -57,13 +58,13 @@ echo "$titles" | while read file title; do
   imagename=`echo $file | sed 's/:/_/g'`
   measurements_file=`echo $file | sed 's/^statistics/measurements/'`
   # Run only (1) for existing files and (2) once, so `titles.*` can be a sub-/superset
-  if [ -f "$file" -a ! -f "remote-${imagename}.png" -a ! -f "remote-${imagename}.svg" ]; then
+  if [ -f "$file" -a ! -f "remote-${imagename}.$TERMINAL" ]; then
     (
       if [ -f $measurements_file ]; then
         FIFTY=`../bin/percentile 10 50 $measurements_file | ../bin/mul 1000000`
         CUSTOM="set label 1 gprintf('50%% = $FIFTY us',50) at graph 0.01,0.05 left front"
         LINSCALELIMIT=`../bin/linscalelimit 1 10 $measurements_file | ../bin/mul 1000000`
-        ../bin/graph-header remote-${imagename}.png $LINSCALELIMIT "%1.0f us" "offset of $title" "$CUSTOM"
+        ../bin/graph-header remote-${imagename} $TERMINAL $LINSCALELIMIT "%1.0f us" "offset of $title" "$CUSTOM"
         echo "'$measurements_file' using 1:(\$11*1000000) title 'offset' with line, \\"
         echo "'$measurements_file' using 1:((\$11+\$12/2)*1000000) title 'offset+rtt/2' with line, \\"
         echo "'$measurements_file' using 1:((\$11-\$12/2)*1000000) title 'offset-rtt/2' with line, \\"
@@ -72,7 +73,7 @@ echo "$titles" | while read file title; do
         FIFTY=`../bin/percentile 3 50 $file | ../bin/mul 1000000`
         CUSTOM="set label 1 gprintf('50%% = $FIFTY us',50) at graph 0.01,0.05 left front"
         LINSCALELIMIT=`../bin/linscalelimit 1 3 $file | ../bin/mul 1000000`
-        ../bin/graph-header remote-${imagename}.png $LINSCALELIMIT "%1.0f us" "offset of $title" "$CUSTOM"
+        ../bin/graph-header remote-${imagename} $TERMINAL $LINSCALELIMIT "%1.0f us" "offset of $title" "$CUSTOM"
         echo "'$file' using 1:(\$4*1000000) title 'offset' with line, \\"
         echo "$FIFTY title '50th percentile'"
       fi
diff --git a/bin/plot b/bin/plot
index 638b1dc..8a06384 100755
--- a/bin/plot
+++ b/bin/plot
@@ -3,165 +3,165 @@
 export GDFONTPATH=/usr/share/fonts/liberation
 export GNUPLOT_DEFAULT_GDFONT=LiberationSans-Regular
 
-../bin/local-clock-graph
-../bin/offset-graph
-../bin/diff-freq-graph
-../bin/skew-graph
+rm remote-statistics.*.{png,svg} 2>/dev/null
 
-NINETYFIVE=`../bin/percentile 3 95 tracking.log`
-NINETYNINE=`../bin/percentile 3 99 tracking.log`
-FIVE=`../bin/percentile 3 5 tracking.log`
-ONE=`../bin/percentile 3 1 tracking.log`
-NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
-NN_M_O=`echo $NINETYNINE - $ONE | bc`
-gnuplot <<EOF
-set terminal png size 900,600
-set xdata time
-set timefmt "%s"
-set output "percentiles.png"
-set grid
-set xlabel "Time"
-set format x "%d-%H:%M"
-set xtic rotate by -45 scale 0
-set ytics format "%1.3f ppm" nomirror
-set title "Local Clock range"
-set key bottom right box
-set label 1 gprintf("99%% = $NINETYNINE ppm",99) at graph 0.01,0.3 left front
-set label 2 gprintf("95%% = $NINETYFIVE ppm",95) at graph 0.01,0.25 left front
-set label 3 gprintf(" 5%% = $FIVE ppm",5) at graph 0.01,0.2 left front
-set label 4 gprintf(" 1%% = $ONE ppm",1) at graph 0.01,0.15 left front
-set label 5 gprintf("95%% - 5%% = $NF_M_F ppm",90) at graph 0.01,0.1 left front
-set label 6 gprintf("99%% - 1%% = $NN_M_O ppm",98) at graph 0.01,0.05 left front
-set lmargin 12
-set rmargin 12
-plot \
- "tracking.log" using 1:4 title "local clock error" with linespoints, \
- $NINETYNINE title "99th percentile", \
- $NINETYFIVE title "95th percentile", \
- $FIVE title "5th percentile", \
- $ONE title "1st percentile"
+for TERMINAL in $GNUPLOT_TERMINALS
+do
+  NINETYFIVE=`../bin/percentile 3 95 tracking.log`
+  NINETYNINE=`../bin/percentile 3 99 tracking.log`
+  FIVE=`../bin/percentile 3 5 tracking.log`
+  ONE=`../bin/percentile 3 1 tracking.log`
+  NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
+  NN_M_O=`echo $NINETYNINE - $ONE | bc`
+  gnuplot <<EOF
+  set terminal $TERMINAL size 900,600
+  set xdata time
+  set timefmt "%s"
+  set output "percentiles.$TERMINAL"
+  set grid
+  set xlabel "Time"
+  set format x "%d-%H:%M"
+  set xtic rotate by -45 scale 0
+  set ytics format "%1.3f ppm" nomirror
+  set title "Local Clock range"
+  set key bottom right box
+  set label 1 gprintf("99%% = $NINETYNINE ppm",99) at graph 0.01,0.3 left front
+  set label 2 gprintf("95%% = $NINETYFIVE ppm",95) at graph 0.01,0.25 left front
+  set label 3 gprintf(" 5%% = $FIVE ppm",5) at graph 0.01,0.2 left front
+  set label 4 gprintf(" 1%% = $ONE ppm",1) at graph 0.01,0.15 left front
+  set label 5 gprintf("95%% - 5%% = $NF_M_F ppm",90) at graph 0.01,0.1 left front
+  set label 6 gprintf("99%% - 1%% = $NN_M_O ppm",98) at graph 0.01,0.05 left front
+  set lmargin 12
+  set rmargin 12
+  plot \
+  "tracking.log" using 1:4 title "local clock error" with linespoints, \
+  $NINETYNINE title "99th percentile", \
+  $NINETYFIVE title "95th percentile", \
+  $FIVE title "5th percentile", \
+  $ONE title "1st percentile"
 EOF
 
-NINETYFIVE=`../bin/percentile 5 95 tracking.log | ../bin/mul 1000000`
-NINETYNINE=`../bin/percentile 5 99 tracking.log | ../bin/mul 1000000`
-FIVE=`../bin/percentile 5 5 tracking.log | ../bin/mul 1000000`
-ONE=`../bin/percentile 5 1 tracking.log | ../bin/mul 1000000`
-NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
-NN_M_O=`echo $NINETYNINE - $ONE | bc`
-LINSCALELIMIT=`../bin/linscalelimit 1 5 tracking.log | ../bin/mul 1000000`
-YTICS=`../bin/linlogytics $LINSCALELIMIT`
-gnuplot <<EOF
-set terminal png size 900,600
-set xdata time
-set timefmt "%s"
-set output "percentiles-offset.png"
-set grid
-set xlabel "Time"
-set format x "%d-%H:%M"
-flogy(y) = ((log(abs(y))-log($LINSCALELIMIT))/log(10)+2)*$LINSCALELIMIT*0.5
-glogy(y) = exp((log(10)*(abs(y)/($LINSCALELIMIT)-1)/0.5)+log($LINSCALELIMIT))
-f(y) = (abs(y) < $LINSCALELIMIT) ? y : sgn(y)*flogy(y)
-g(y) = (abs(y) < $LINSCALELIMIT) ? y : sgn(y)*glogy(y)
-set nonlinear y via f(y) inverse g(y)
-set xtic rotate by -45 scale 0
-set ytics format "%1.2f us" nomirror ($YTICS)
-set title "Local Clock Offsets over time"
-set key bottom right box
-set label 1 gprintf("99%% = %1.2f us",$NINETYNINE) at graph 0.01,0.3 left front
-set label 2 gprintf("95%% = %1.2f us",$NINETYFIVE) at graph 0.01,0.25 left front
-set label 3 gprintf(" 5%% = %1.2f us",$FIVE) at graph 0.01,0.2 left front
-set label 4 gprintf(" 1%% = %1.2f us",$ONE) at graph 0.01,0.15 left front
-set label 5 gprintf("95%% - 5%% = %1.2f us", $NF_M_F) at graph 0.01,0.1 left front
-set label 6 gprintf("99%% - 1%% = %1.2f us", $NN_M_O) at graph 0.01,0.05 left front
-set lmargin 12
-set rmargin 12
-plot \
- "tracking.log" using 1:(\$6 * 1000000) title "local clock offset" with linespoints, \
- $NINETYNINE title "99th percentile", \
- $NINETYFIVE title "95th percentile", \
- $FIVE title "5th percentile", \
- $ONE title "1st percentile"
+  NINETYFIVE=`../bin/percentile 5 95 tracking.log | ../bin/mul 1000000`
+  NINETYNINE=`../bin/percentile 5 99 tracking.log | ../bin/mul 1000000`
+  FIVE=`../bin/percentile 5 5 tracking.log | ../bin/mul 1000000`
+  ONE=`../bin/percentile 5 1 tracking.log | ../bin/mul 1000000`
+  NF_M_F=`echo $NINETYFIVE - $FIVE | bc`
+  NN_M_O=`echo $NINETYNINE - $ONE | bc`
+  LINSCALELIMIT=`../bin/linscalelimit 1 5 tracking.log | ../bin/mul 1000000`
+  YTICS=`../bin/linlogytics $LINSCALELIMIT`
+  gnuplot <<EOF
+  set terminal $TERMINAL size 900,600
+  set xdata time
+  set timefmt "%s"
+  set output "percentiles-offset.$TERMINAL"
+  set grid
+  set xlabel "Time"
+  set format x "%d-%H:%M"
+  flogy(y) = ((log(abs(y))-log($LINSCALELIMIT))/log(10)+2)*$LINSCALELIMIT*0.5
+  glogy(y) = exp((log(10)*(abs(y)/($LINSCALELIMIT)-1)/0.5)+log($LINSCALELIMIT))
+  f(y) = (abs(y) < $LINSCALELIMIT) ? y : sgn(y)*flogy(y)
+  g(y) = (abs(y) < $LINSCALELIMIT) ? y : sgn(y)*glogy(y)
+  set nonlinear y via f(y) inverse g(y)
+  set xtic rotate by -45 scale 0
+  set ytics format "%1.2f us" nomirror ($YTICS)
+  set title "Local Clock Offsets over time"
+  set key bottom right box
+  set label 1 gprintf("99%% = %1.2f us",$NINETYNINE) at graph 0.01,0.3 left front
+  set label 2 gprintf("95%% = %1.2f us",$NINETYFIVE) at graph 0.01,0.25 left front
+  set label 3 gprintf(" 5%% = %1.2f us",$FIVE) at graph 0.01,0.2 left front
+  set label 4 gprintf(" 1%% = %1.2f us",$ONE) at graph 0.01,0.15 left front
+  set label 5 gprintf("95%% - 5%% = %1.2f us", $NF_M_F) at graph 0.01,0.1 left front
+  set label 6 gprintf("99%% - 1%% = %1.2f us", $NN_M_O) at graph 0.01,0.05 left front
+  set lmargin 12
+  set rmargin 12
+  plot \
+  "tracking.log" using 1:(\$6 * 1000000) title "local clock offset" with linespoints, \
+  $NINETYNINE title "99th percentile", \
+  $NINETYFIVE title "95th percentile", \
+  $FIVE title "5th percentile", \
+  $ONE title "1st percentile"
 EOF
 
-# for nanosecond level:
-#../bin/histogram 5 1000000000 <tracking.log >tracking.log.history
-../bin/histogram 5 1000000 <tracking.log >tracking.log.history
-SEVENTYFIVE=`../bin/percentile 5 75 tracking.log | ../bin/mul 1000000`
-TWENTYFIVE=`../bin/percentile 5 25 tracking.log | ../bin/mul 1000000`
+  # for nanosecond level:
+  #../bin/histogram 5 1000000000 <tracking.log >tracking.log.history
+  ../bin/histogram 5 1000000 <tracking.log >tracking.log.history
+  SEVENTYFIVE=`../bin/percentile 5 75 tracking.log | ../bin/mul 1000000`
+  TWENTYFIVE=`../bin/percentile 5 25 tracking.log | ../bin/mul 1000000`
 
-gnuplot <<EOF
-set terminal png size 900,600
-set output "offset-histogram.png"
-set grid
-set xtic rotate by -45 scale 0
-set title "Local Clock Offsets - Histogram"
-set xtics format "%1.1f us" nomirror
-set label 1 gprintf("99%% = %1.2f us",$NINETYNINE) at $NINETYNINE, graph 0.91 left front offset 1,-1
-set style arrow 1 nohead 
-set arrow from $NINETYNINE,0 to $NINETYNINE,graph 0.91 as 1
-set label 2 gprintf(" 1%% = %1.2f us",$ONE) at $ONE, graph 0.91 right front offset -1,-1
-set style arrow 2 nohead
-set arrow from $ONE,0 to $ONE,graph 0.91 as 2
-set label 3 gprintf("25%% = %1.2f us",$TWENTYFIVE) at $TWENTYFIVE, graph 0.7 right front offset -1,-1
-set style arrow 3 nohead
-set arrow from $TWENTYFIVE,0 to $TWENTYFIVE,graph 0.7 as 3
-set label 4 gprintf("75%% = %1.2f us",$SEVENTYFIVE) at $SEVENTYFIVE, graph 0.7 left front offset 1,-1
-set style arrow 4 nohead
-set arrow from $SEVENTYFIVE,0 to $SEVENTYFIVE,graph 0.7 as 4
-set xrange [-500:500]
-set key off
-set lmargin 12
-set rmargin 12
-plot \
- "tracking.log.history" using 1:2 title "histogram" with boxes
+  gnuplot <<EOF
+  set terminal $TERMINAL size 900,600
+  set output "offset-histogram.$TERMINAL"
+  set grid
+  set xtic rotate by -45 scale 0
+  set title "Local Clock Offsets - Histogram"
+  set xtics format "%1.1f us" nomirror
+  set label 1 gprintf("99%% = %1.2f us",$NINETYNINE) at $NINETYNINE, graph 0.91 left front offset 1,-1
+  set style arrow 1 nohead 
+  set arrow from $NINETYNINE,0 to $NINETYNINE,graph 0.91 as 1
+  set label 2 gprintf(" 1%% = %1.2f us",$ONE) at $ONE, graph 0.91 right front offset -1,-1
+  set style arrow 2 nohead
+  set arrow from $ONE,0 to $ONE,graph 0.91 as 2
+  set label 3 gprintf("25%% = %1.2f us",$TWENTYFIVE) at $TWENTYFIVE, graph 0.7 right front offset -1,-1
+  set style arrow 3 nohead
+  set arrow from $TWENTYFIVE,0 to $TWENTYFIVE,graph 0.7 as 3
+  set label 4 gprintf("75%% = %1.2f us",$SEVENTYFIVE) at $SEVENTYFIVE, graph 0.7 left front offset 1,-1
+  set style arrow 4 nohead
+  set arrow from $SEVENTYFIVE,0 to $SEVENTYFIVE,graph 0.7 as 4
+  set xrange [-500:500]
+  set key off
+  set lmargin 12
+  set rmargin 12
+  plot \
+  "tracking.log.history" using 1:2 title "histogram" with boxes
 EOF
 
-# optional GPS tracking
-#gnuplot <<EOF
-#set terminal png size 900,600
-#set xdata time
-#set timefmt "%s"
-#set output "gps-lock.png"
-#set grid
-#set xlabel "Time"
-#set format x "%d-%H:%M"
-#set xtic rotate by -45 scale 0
-#set ytics format "%1.0f seconds/hr with lock" nomirror
-#set title "Seconds per hour spent in GPS lock"
-#set key bottom right box
-#plot \
-# "gps-lock" using 1:2 title "second" with lines
-#EOF
-#
-#../bin/histogram-snr <snr-history >snr-history.history
-#gnuplot <<EOF
-#set terminal png size 900,600
-#set output "gps-snr-histogram.png"
-#set grid
-#set xtic rotate by -45 scale 0
-#set title "GPS SNR histogram"
-#set xtics format "%1.1fdB snr" nomirror
-#set key off
-#plot \
-# "snr-history.history" using 1:2 title "histogram" with boxes
-#EOF
-#
-#../bin/snr-hourly snr-history >snr-history.hourly
-#gnuplot <<EOF
-#set terminal png size 900,600
-#set xdata time
-#set timefmt "%s"
-#set output "gps-snr-hourly.png"
-#set grid
-#set xlabel "Time"
-#set format x "%d-%H:%M"
-#set xtic rotate by -45 scale 0
-#set ytics format "%1.0f %% of time" nomirror
-#set title "Percent of time satellites spent at 0 snr"
-#set key bottom right box
-#plot \
-# "snr-history.hourly" using 1:(\$2 / (\$2 + \$3) * 100) title "signal" with lines
-#EOF
+  # optional GPS tracking
+  #gnuplot <<EOF
+  #set terminal $TERMINAL size 900,600
+  #set xdata time
+  #set timefmt "%s"
+  #set output "gps-lock.$TERMINAL"
+  #set grid
+  #set xlabel "Time"
+  #set format x "%d-%H:%M"
+  #set xtic rotate by -45 scale 0
+  #set ytics format "%1.0f seconds/hr with lock" nomirror
+  #set title "Seconds per hour spent in GPS lock"
+  #set key bottom right box
+  #plot \
+  # "gps-lock" using 1:2 title "second" with lines
+  #EOF
+  #
+  #../bin/histogram-snr <snr-history >snr-history.history
+  #gnuplot <<EOF
+  #set terminal $TERMINAL size 900,600
+  #set output "gps-snr-histogram.$TERMINAL"
+  #set grid
+  #set xtic rotate by -45 scale 0
+  #set title "GPS SNR histogram"
+  #set xtics format "%1.1fdB snr" nomirror
+  #set key off
+  #plot \
+  # "snr-history.history" using 1:2 title "histogram" with boxes
+  #EOF
+  #
+  #../bin/snr-hourly snr-history >snr-history.hourly
+  #gnuplot <<EOF
+  #set terminal $TERMINAL size 900,600
+  #set xdata time
+  #set timefmt "%s"
+  #set output "gps-snr-hourly.$TERMINAL"
+  #set grid
+  #set xlabel "Time"
+  #set format x "%d-%H:%M"
+  #set xtic rotate by -45 scale 0
+  #set ytics format "%1.0f %% of time" nomirror
+  #set title "Percent of time satellites spent at 0 snr"
+  #set key bottom right box
+  #plot \
+  # "snr-history.hourly" using 1:(\$2 / (\$2 + \$3) * 100) title "signal" with lines
+  #EOF
+done
 
 if [ -x custom-plot ]; then
   ./custom-plot
diff --git a/bin/run b/bin/run
index a0b7940..98488e4 100755
--- a/bin/run
+++ b/bin/run
@@ -1,4 +1,11 @@
 #!/bin/bash
+if [ "x$1" = "x--plus-svg" ]; then
+  export GNUPLOT_TERMINALS="png svg"
+  shift
+else
+  export GNUPLOT_TERMINALS="${GNUPLOT_TERMINALS:-png}"
+fi
+
 
 if [ -x startime ]; then
   STARTIME=`./startime`
diff --git a/bin/skew-graph b/bin/skew-graph
index b8eeefc..1742851 100755
--- a/bin/skew-graph
+++ b/bin/skew-graph
@@ -1,4 +1,5 @@
 #!/bin/bash
+TERMINAL=$1
 
 LINSCALELIMIT=1
 for stat in statistics.*; do
@@ -8,7 +9,7 @@ done
 LINSCALELIMIT=`echo $LINSCALELIMIT | ../bin/mul 1000000`
 
 (
-../bin/graph-header all-skew.png $LINSCALELIMIT "%1.1f us/s" "all clocks (skew)" "set yrange [-10:10]"
+../bin/graph-header all-skew $TERMINAL $LINSCALELIMIT "%1.1f us/s" "all clocks (skew)" "set yrange [-10:10]"
 ../bin/foreach-stat "'__FILE__' using 1:(\$6*1000000) title '__TITLE__' with line \\"
 echo 
 ) | gnuplot