diff --git a/src/AllPlot.cpp b/src/AllPlot.cpp
index 736893bef..d7e398626 100644
--- a/src/AllPlot.cpp
+++ b/src/AllPlot.cpp
@@ -861,10 +861,10 @@ AllPlot::refreshCalibrationMarkers()
             mrk->attach(this);
             mrk->setLineStyle(QwtPlotMarker::VLine);
             mrk->setLabelAlignment(Qt::AlignRight | Qt::AlignTop);
-            mrk->setLinePen(QPen(GColor(CCALIBRATIONMARKER), 0, Qt::DashDotLine));
+            mrk->setLinePen(QPen(GColor(CPLOTMARKER), 0, Qt::DashDotLine));
             QwtText text("\n\n"+calibration.name);
             text.setFont(QFont("Helvetica", 9, QFont::Bold));
-            text.setColor(GColor(CCALIBRATIONMARKER));
+            text.setColor(GColor(CPLOTMARKER));
             if (!bydist)
                 mrk->setValue(calibration.start / 60.0, 0.0);
             else
diff --git a/src/Colors.cpp b/src/Colors.cpp
index 94b9cfcdf..697079502 100644
--- a/src/Colors.cpp
+++ b/src/Colors.cpp
@@ -110,7 +110,6 @@ void GCColor::setupColors()
         { tr("Alternate Power"), "CALTPOWER", Qt::magenta },
         { tr("Left Balance"), "CBALANCELEFT", QColor(178,0,0) },
         { tr("Right Balance"), "CBALANCERIGHT", QColor(128,0,50) },
-        { tr("Plot Markers"), "COLORCALIBRATIONMARKER", QColor(40,40,40) },
         { "", "", QColor(0,0,0) },
     };
 
diff --git a/src/Colors.h b/src/Colors.h
index 85fc8891b..4e85b0ceb 100644
--- a/src/Colors.h
+++ b/src/Colors.h
@@ -99,7 +99,7 @@ class ColorEngine : public QObject
 #define GColor(x) GCColor::getColor(x)
 
 // Define how many cconfigurable metric colors are available
-#define CNUMOFCFGCOLORS       71
+#define CNUMOFCFGCOLORS       70
 
 #define CPLOTBACKGROUND       0
 #define CRIDEPLOTBACKGROUND   1
@@ -171,6 +171,5 @@ class ColorEngine : public QObject
 #define CALTPOWER             67
 #define CBALANCELEFT          68
 #define CBALANCERIGHT         69
-#define CCALIBRATIONMARKER    70
 
 #endif
diff --git a/test/rides/20130716_202738.fit b/test/rides/20130716_202738.fit
new file mode 100644
index 000000000..93593a097
Binary files /dev/null and b/test/rides/20130716_202738.fit differ
diff --git a/test/rides/20130717_143733.fit b/test/rides/20130717_143733.fit
new file mode 100644
index 000000000..a9172e5ed
Binary files /dev/null and b/test/rides/20130717_143733.fit differ
diff --git a/test/rides/descriptions.txt b/test/rides/descriptions.txt
index cb8c24b4a..dd4544f08 100644
--- a/test/rides/descriptions.txt
+++ b/test/rides/descriptions.txt
@@ -70,3 +70,7 @@ lgulseth...pwx
    A very short ride (12 seconds) to test array processing and general
    bounds checking in the GC codebase.
 
+20130716_202738.fit
+20130717_143733.fit
+   Two rides that contain the calibration messages collected from 
+   an osync headunit.