diff --git a/src/AllPlot.cpp b/src/AllPlot.cpp
index f3a0068ef..3ba989c2e 100644
--- a/src/AllPlot.cpp
+++ b/src/AllPlot.cpp
@@ -179,13 +179,7 @@ AllPlot::AllPlot():
     distanceArray(NULL), altArray(NULL), interArray(NULL), smooth(30), bydist(false),
     shade_zones(false)
 {
-    QSettings *settings;
-    QDir home = QDir();
-    if(!home.exists("Library/GoldenCheetah"))
-        settings = new QSettings(GC_SETTINGS_CO, GC_SETTINGS_APP);
-    else
-        settings = new QSettings(home.absolutePath()+"/gc", QSettings::IniFormat);
-    
+    boost::shared_ptr<QSettings> settings = GetApplicationSettings();    
     unit = settings->value(GC_UNIT);
     
     useMetricUnits = (unit.toString() == "Metric");
diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp
index a453d25ed..9481bb989 100644
--- a/src/ConfigDialog.cpp
+++ b/src/ConfigDialog.cpp
@@ -134,20 +134,7 @@ void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previou
 //   ! new mode: change the CP associated with the present mode
 void ConfigDialog::save_Clicked()
 {
-    QDir home = QDir();
-    QSettings *settings;
-    
-    if(!home.exists("Library/GoldenCheetah"))
-    {
-        settings = new QSettings(GC_SETTINGS_CO, GC_SETTINGS_APP);
-        home = QDir::home();
-    }
-    else
-    {
-        settings = new QSettings(home.absolutePath()+"/gc", QSettings::IniFormat);
-        
-    }
-  
+    boost::shared_ptr<QSettings> settings = GetApplicationSettings();  
     settings->setValue(GC_UNIT, configPage->unitCombo->currentText());
     settings->setValue(GC_ALLRIDES_ASCENDING, configPage->allRidesAscending->checkState());
     settings->setValue(GC_CRANKLENGTH, configPage->crankLengthCombo->currentText());
diff --git a/src/DatePickerDialog.cpp b/src/DatePickerDialog.cpp
index 46b74dcaf..4aa06f2cd 100644
--- a/src/DatePickerDialog.cpp
+++ b/src/DatePickerDialog.cpp
@@ -93,12 +93,7 @@ void DatePickerDialog::on_btnOK_clicked()
 void DatePickerDialog::on_btnBrowse_clicked()
 {
     //First check to see if the Library folder exists where the executable is (for USB sticks)
-    QDir home = QDir();
-    QSettings *settings;
-    if(!home.exists("Library/GoldenCheetah"))
-        settings = new QSettings(GC_SETTINGS_CO, GC_SETTINGS_APP);
-    else
-        settings = new QSettings(home.absolutePath()+"/gc", QSettings::IniFormat);
+    boost::shared_ptr<QSettings> settings = GetApplicationSettings();
     
     QVariant lastDirVar = settings->value(GC_SETTINGS_LAST_IMPORT_PATH);
     QString lastDir = (lastDirVar != QVariant()) 
diff --git a/src/MainWindow.h b/src/MainWindow.h
index f8f05d7dd..7f9abf064 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -24,6 +24,7 @@
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include "RideItem.h"
+#include <boost/shared_ptr.hpp>
 
 class AllPlot;
 class CpintPlot;