diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp
index 4cd069c35..0b5a041d8 100644
--- a/src/RideSummaryWindow.cpp
+++ b/src/RideSummaryWindow.cpp
@@ -477,6 +477,17 @@ RideSummaryWindow::htmlSummary()
         maximumColumn << "max_tHb";
     }
 
+    // additional metrics for runs & swims
+    if (ridesummary) {
+        if (ride->isRun()) averageColumn << "pace";
+        if (ride->isSwim()) averageColumn << "pace_swim";
+    } else {
+        int nActivities, nRides, nRuns, nSwims;
+        context->athlete->rideCache->getRideTypeCounts(specification,                    nActivities, nRides, nRuns, nSwims);
+        if (nRuns > 0) averageColumn << "pace";
+        if (nSwims > 0) averageColumn << "pace_swim";
+    }
+
     // users determine the metrics to display
     QString s = appsettings->value(this, GC_SETTINGS_SUMMARY_METRICS, GC_SETTINGS_SUMMARY_METRICS_DEFAULT).toString();
     if (s == "") s = GC_SETTINGS_SUMMARY_METRICS_DEFAULT;
diff --git a/src/Settings.h b/src/Settings.h
index ccee653bb..9b4ece6ae 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -44,9 +44,9 @@
 #define GC_RIDE_PLOT_STACK           "ridePlot/Stack"
 #define GC_PERF_MAN_METRIC           "performanceManager/metric"
 #define GC_HIST_BIN_WIDTH            "histogamWindow/binWidth"
-#define GC_SETTINGS_BESTS_METRICS_DEFAULT "5s_critical_power,1m_critical_power,5m_critical_power,20m_critical_power,60m_critical_power"
-#define GC_SETTINGS_SUMMARY_METRICS_DEFAULT "skiba_xpower,skiba_relative_intensity,skiba_bike_score,daniels_points,daniels_equivalent_power,trimp_points,aerobic_decoupling"
-#define GC_SETTINGS_INTERVAL_METRICS_DEFAULT "workout_time,total_distance,total_work,average_power,skiba_xpower,max_power,average_hr,ninety_five_percent_hr,average_cad,average_speed"
+#define GC_SETTINGS_BESTS_METRICS_DEFAULT "5s_critical_power,1m_critical_power,5m_critical_power,20m_critical_power,60m_critical_power,3m_critical_pace,20m_critical_pace,3m_critical_pace_swim,20m_critical_pace_swim"
+#define GC_SETTINGS_SUMMARY_METRICS_DEFAULT "triscore,skiba_xpower,skiba_relative_intensity,xPace,swimscore_xpace,trimp_points,aerobic_decoupling"
+#define GC_SETTINGS_INTERVAL_METRICS_DEFAULT "workout_time,total_distance,total_work,average_power,average_hr,average_cad,average_speed,pace,pace_swim,distance_swim"
 #define GC_DATETIME_FORMAT          "ddd MMM dd, yyyy, hh:mm"
 #define GC_UNIT                     "unit"
 #define GC_PACE                     "pace"