diff --git a/src/libkstapp/applicationsettings.cpp b/src/libkstapp/applicationsettings.cpp
@@ -14,12 +14,12 @@
 
 #include "updatemanager.h"
 #include "defaultlabelpropertiestab.h"
+#include "settings.h"
 
 #include <QCoreApplication>
 #ifndef KST_NO_OPENGL
 #include <QGLPixelBuffer>
 #endif
-#include <QSettings>
 
 #include <QDebug>
 #ifdef Q_WS_X11
@@ -46,28 +46,27 @@ ApplicationSettings *ApplicationSettings::self() {
 }
 
 
-ApplicationSettings::ApplicationSettings() {
+ApplicationSettings::ApplicationSettings() :
+  _settings(createSettings("application"))
+{
+  _transparentDrag = _settings.value("general/transparentdrag", false).toBool();
+  _useOpenGL = _settings.value("general/opengl", false).toBool(); //QVariant(QGLPixelBuffer::hasOpenGLPbuffers())).toBool();
 
-  _settings = new QSettings("kst", "application");
+  _maxUpdate = _settings.value("general/minimumupdateperiod", QVariant(200)).toInt();
 
-  _transparentDrag = _settings->value("general/transparentdrag", false).toBool();
-  _useOpenGL = _settings->value("general/opengl", false).toBool(); //QVariant(QGLPixelBuffer::hasOpenGLPbuffers())).toBool();
+  _showGrid = _settings.value("grid/showgrid", QVariant(false)).toBool();
+  _snapToGrid = _settings.value("grid/snaptogrid", QVariant(false)).toBool();
+  _gridHorSpacing = _settings.value("grid/horizontalspacing", 20.0).toDouble();
+  _gridVerSpacing = _settings.value("grid/verticalspacing", 20.0).toDouble();
+  _antialiasPlots = _settings.value("general/antialiasplots", QVariant(true)).toBool();
 
-  _maxUpdate = _settings->value("general/minimumupdateperiod", QVariant(200)).toInt();
-
-  _showGrid = _settings->value("grid/showgrid", QVariant(false)).toBool();
-  _snapToGrid = _settings->value("grid/snaptogrid", QVariant(false)).toBool();
-  _gridHorSpacing = _settings->value("grid/horizontalspacing", 20.0).toDouble();
-  _gridVerSpacing = _settings->value("grid/verticalspacing", 20.0).toDouble();
-  _antialiasPlots = _settings->value("general/antialiasplots", QVariant(true)).toBool();
-
-  Qt::BrushStyle style = (Qt::BrushStyle)_settings->value("fill/style", "0").toInt();
+  Qt::BrushStyle style = (Qt::BrushStyle)_settings.value("fill/style", "0").toInt();
   if (style < Qt::LinearGradientPattern) {
-    _backgroundBrush.setColor(QColor(_settings->value("fill/color", "white").toString()));
+    _backgroundBrush.setColor(QColor(_settings.value("fill/color", "white").toString()));
     _backgroundBrush.setStyle(style);
   }
 
-  QString stopList = _settings->value("fill/gradient", QString()).toString();
+  QString stopList = _settings.value("fill/gradient", QString()).toString();
   if (!stopList.isEmpty()) {
     QStringList stopInfo = stopList.split(',', QString::SkipEmptyParts);
     QLinearGradient gradient(0.0, 0.0, 0.0, 1.0);
@@ -78,19 +77,18 @@ ApplicationSettings::ApplicationSettings() {
     _backgroundBrush = QBrush(gradient);
   }
 
-  _refViewWidth = _settings->value("fonts/referenceviewwidth", QVariant(A4Width)).toDouble();
-  _refViewHeight = _settings->value("fonts/referenceviewheight", QVariant(A4Height)).toDouble();
-  _minFontSize = _settings->value("fonts/minimumfontsize", QVariant(4.0)).toDouble();
+  _refViewWidth = _settings.value("fonts/referenceviewwidth", QVariant(A4Width)).toDouble();
+  _refViewHeight = _settings.value("fonts/referenceviewheight", QVariant(A4Height)).toDouble();
+  _minFontSize = _settings.value("fonts/minimumfontsize", QVariant(4.0)).toDouble();
 
-  _layoutMargins.setHeight(_settings->value("layout/marginheight", QVariant(3.0)).toDouble());
-  _layoutMargins.setWidth(_settings->value("layout/marginwidth", QVariant(3.0)).toDouble());
-  _layoutSpacing.setHeight(_settings->value("layout/spacingheight", QVariant(0.0)).toDouble());
-  _layoutSpacing.setWidth(_settings->value("layout/spacingwidth", QVariant(0.0)).toDouble());
+  _layoutMargins.setHeight(_settings.value("layout/marginheight", QVariant(3.0)).toDouble());
+  _layoutMargins.setWidth(_settings.value("layout/marginwidth", QVariant(3.0)).toDouble());
+  _layoutSpacing.setHeight(_settings.value("layout/spacingheight", QVariant(0.0)).toDouble());
+  _layoutSpacing.setWidth(_settings.value("layout/spacingwidth", QVariant(0.0)).toDouble());
 }
 
 
 ApplicationSettings::~ApplicationSettings() {
-  delete _settings;
 }
 
 bool ApplicationSettings::transparentDrag() const {
@@ -99,7 +97,7 @@ bool ApplicationSettings::transparentDrag() const {
 
 void ApplicationSettings::setTransparentDrag(bool transparent_drag) {
   _transparentDrag = transparent_drag;
-  _settings->setValue("general/transparentdrag",transparent_drag);
+  _settings.setValue("general/transparentdrag",transparent_drag);
   emit modified();
 }
 
@@ -110,7 +108,7 @@ bool ApplicationSettings::useOpenGL() const {
 
 void ApplicationSettings::setUseOpenGL(bool useOpenGL) {
   _useOpenGL = useOpenGL;
-  _settings->setValue("general/opengl", useOpenGL);
+  _settings.setValue("general/opengl", useOpenGL);
   emit modified();
 }
 
@@ -131,7 +129,7 @@ qreal ApplicationSettings::referenceViewWidthCM() const {
 
 void ApplicationSettings::setReferenceViewWidthCM(const qreal width) {
   _refViewWidth = width;
-  _settings->setValue("general/referenceviewwidth", width);
+  _settings.setValue("general/referenceviewwidth", width);
   emit modified();
 }
 
@@ -152,7 +150,7 @@ qreal ApplicationSettings::referenceViewHeightCM() const {
 
 void ApplicationSettings::setReferenceViewHeightCM(const qreal height) {
   _refViewHeight = height;
-  _settings->setValue("general/referenceviewheight", height);
+  _settings.setValue("general/referenceviewheight", height);
   emit modified();
 }
 
@@ -163,7 +161,7 @@ qreal ApplicationSettings::minimumFontSize() const {
 
 void ApplicationSettings::setMinimumFontSize(qreal points) {
   _minFontSize = points;
-  _settings->setValue("general/minimumfontsize", points);
+  _settings.setValue("general/minimumfontsize", points);
   emit modified();
 }
 
@@ -175,7 +173,7 @@ int ApplicationSettings::minimumUpdatePeriod() const {
 
 void ApplicationSettings::setMinimumUpdatePeriod(const int period) {
   _maxUpdate = period;
-  _settings->setValue("general/minimumupdateperiod", period);
+  _settings.setValue("general/minimumupdateperiod", period);
 
   UpdateManager::self()->setMinimumUpdatePeriod(period);
 }
@@ -188,7 +186,7 @@ bool ApplicationSettings::showGrid() const {
 
 void ApplicationSettings::setShowGrid(bool showGrid) {
   _showGrid = showGrid;
-  _settings->setValue("grid/showgrid", showGrid);
+  _settings.setValue("grid/showgrid", showGrid);
   emit modified();
 }
 
@@ -200,7 +198,7 @@ bool ApplicationSettings::antialiasPlots() const {
 
 void ApplicationSettings::setAntialiasPlots(bool antialias) {
   _antialiasPlots = antialias;
-  _settings->setValue("general/antialiasplots", antialias);
+  _settings.setValue("general/antialiasplots", antialias);
   emit modified();
 }
 
@@ -212,7 +210,7 @@ bool ApplicationSettings::snapToGrid() const {
 
 void ApplicationSettings::setSnapToGrid(bool snapToGrid) {
   _snapToGrid = snapToGrid;
-  _settings->setValue("grid/snaptogrid", snapToGrid);
+  _settings.setValue("grid/snaptogrid", snapToGrid);
   emit modified();
 }
 
@@ -224,7 +222,7 @@ qreal ApplicationSettings::gridHorizontalSpacing() const {
 
 void ApplicationSettings::setGridHorizontalSpacing(qreal spacing) {
   _gridHorSpacing = spacing;
-  _settings->setValue("grid/horizontalspacing", spacing);
+  _settings.setValue("grid/horizontalspacing", spacing);
   emit modified();
 }
 
@@ -236,7 +234,7 @@ qreal ApplicationSettings::gridVerticalSpacing() const {
 
 void ApplicationSettings::setGridVerticalSpacing(qreal spacing) {
   _gridVerSpacing = spacing;
-  _settings->setValue("grid/verticalspacing", spacing);
+  _settings.setValue("grid/verticalspacing", spacing);
   emit modified();
 }
 
@@ -252,8 +250,8 @@ QSizeF ApplicationSettings::layoutMargins() const {
 
 void ApplicationSettings::setLayoutMargins(QSizeF margins) {
   _layoutMargins = margins;
-  _settings->setValue("layout/marginheight", margins.height());
-  _settings->setValue("layout/marginwidth", margins.width());
+  _settings.setValue("layout/marginheight", margins.height());
+  _settings.setValue("layout/marginwidth", margins.width());
   emit modified();
 }
 
@@ -265,8 +263,8 @@ QSizeF ApplicationSettings::layoutSpacing() const {
 
 void ApplicationSettings::setLayoutSpacing(QSizeF spacing) {
   _layoutSpacing = spacing;
-  _settings->setValue("layout/spacingheight", spacing.height());
-  _settings->setValue("layout/spacingwidth", spacing.width());
+  _settings.setValue("layout/spacingheight", spacing.height());
+  _settings.setValue("layout/spacingwidth", spacing.width());
   emit modified();
 }
 

diff --git a/src/libkstapp/applicationsettings.h b/src/libkstapp/applicationsettings.h
@@ -82,7 +82,7 @@ class ApplicationSettings : public QObject
     static void cleanup();
 
   private:
-    QSettings *_settings;
+    QSettings& _settings;
     bool _transparentDrag;
     bool _useOpenGL;
     qreal _refViewWidth;

diff --git a/src/libkstapp/arrowitem.cpp b/src/libkstapp/arrowitem.cpp
@@ -210,13 +210,13 @@ ViewItem* ArrowItemFactory::generateGraphics(QXmlStreamReader& xml, ObjectStore
 }
 
 void ArrowItem::applyDialogDefaultsHeads() {
-  _endArrowHead = _dialogDefaults->value("arrow/hasEndHead",true).toBool();
+  _endArrowHead = dialogDefaults().value("arrow/hasEndHead",true).toBool();
   if (_endArrowHead) {
-    _endArrowScale = _dialogDefaults->value("arrow/endHeadScale",12).toDouble();
+    _endArrowScale = dialogDefaults().value("arrow/endHeadScale",12).toDouble();
   }
-  _startArrowHead = _dialogDefaults->value("arrow/hasStartHead",false).toBool();
+  _startArrowHead = dialogDefaults().value("arrow/hasStartHead",false).toBool();
   if (_startArrowHead) {
-    _startArrowScale = _dialogDefaults->value("arrow/startHeadScale",12).toDouble();
+    _startArrowScale = dialogDefaults().value("arrow/startHeadScale",12).toDouble();
   }
 }
 

diff --git a/src/libkstapp/arrowitemdialog.cpp b/src/libkstapp/arrowitemdialog.cpp
@@ -57,13 +57,13 @@ void ArrowItemDialog::propertiesChanged() {
   _arrowItem->setEndArrowScale(_propertiesTab->endArrowScale());
 
   if (_saveAsDefault->isChecked()) {
-    _dialogDefaults->setValue("arrow/hasEndHead", QVariant(_arrowItem->endArrowHead()).toString());
+    dialogDefaults().setValue("arrow/hasEndHead", QVariant(_arrowItem->endArrowHead()).toString());
     if (_arrowItem->endArrowHead()) {
-      _dialogDefaults->setValue("arrow/endHeadScale", _arrowItem->endArrowScale());
+      dialogDefaults().setValue("arrow/endHeadScale", _arrowItem->endArrowScale());
     }
-    _dialogDefaults->setValue("arrow/hasStartHead", QVariant(_arrowItem->startArrowHead()).toString());
+    dialogDefaults().setValue("arrow/hasStartHead", QVariant(_arrowItem->startArrowHead()).toString());
     if (_arrowItem->startArrowHead()) {
-      _dialogDefaults->setValue("arrow/startHeadScale", _arrowItem->startArrowScale());
+      dialogDefaults().setValue("arrow/startHeadScale", _arrowItem->startArrowScale());
     }
   }
   _arrowItem->update();

diff --git a/src/libkstapp/changedatasampledialog.cpp b/src/libkstapp/changedatasampledialog.cpp
@@ -250,15 +250,15 @@ void ChangeDataSampleDialog::removeAll() {
 
 
 void ChangeDataSampleDialog::initializeEntries() {
-  _dataRange->setCountFromEnd(_dialogDefaults->value("vector/countFromEnd",false).toBool());
-  _dataRange->setStart(_dialogDefaults->value("vector/start", 0).toInt());
-  _dataRange->setReadToEnd(_dialogDefaults->value("vector/readToEnd",true).toBool());
-  _dataRange->setRange(_dialogDefaults->value("vector/range", 1).toInt());
-  _dataRange->setSkip(_dialogDefaults->value("vector/skip", 0).toInt());
-  _dataRange->setDoSkip(_dialogDefaults->value("vector/doSkip", false).toBool());
-  _dataRange->setDoFilter(_dialogDefaults->value("vector/doAve",false).toBool());
-  _dataRange->setStartUnits(_dialogDefaults->value("vector/startUnits",i18n("frames")).toString());
-  _dataRange->setRangeUnits(_dialogDefaults->value("vector/rangeUnits",i18n("frames")).toString());
+  _dataRange->setCountFromEnd(dialogDefaults().value("vector/countFromEnd",false).toBool());
+  _dataRange->setStart(dialogDefaults().value("vector/start", 0).toInt());
+  _dataRange->setReadToEnd(dialogDefaults().value("vector/readToEnd",true).toBool());
+  _dataRange->setRange(dialogDefaults().value("vector/range", 1).toInt());
+  _dataRange->setSkip(dialogDefaults().value("vector/skip", 0).toInt());
+  _dataRange->setDoSkip(dialogDefaults().value("vector/doSkip", false).toBool());
+  _dataRange->setDoFilter(dialogDefaults().value("vector/doAve",false).toBool());
+  _dataRange->setStartUnits(dialogDefaults().value("vector/startUnits",i18n("frames")).toString());
+  _dataRange->setRangeUnits(dialogDefaults().value("vector/rangeUnits",i18n("frames")).toString());
 }
 
 
@@ -385,15 +385,15 @@ void ChangeDataSampleDialog::apply() {
   UpdateManager::self()->doUpdates(true);
   UpdateServer::self()->requestUpdateSignal();
 
-  _dialogDefaults->setValue("vector/range", _dataRange->range());
-  _dialogDefaults->setValue("vector/start", _dataRange->start());
-  _dialogDefaults->setValue("vector/countFromEnd", _dataRange->countFromEnd());
-  _dialogDefaults->setValue("vector/readToEnd", _dataRange->readToEnd());
-  _dialogDefaults->setValue("vector/skip", _dataRange->skip());
-  _dialogDefaults->setValue("vector/doSkip", _dataRange->doSkip());
-  _dialogDefaults->setValue("vector/doAve", _dataRange->doFilter());
-  _dialogDefaults->setValue("vector/startUnits", _dataRange->_startUnits->currentText());
-  _dialogDefaults->setValue("vector/rangeUnits", _dataRange->_rangeUnits->currentText());
+  dialogDefaults().setValue("vector/range", _dataRange->range());
+  dialogDefaults().setValue("vector/start", _dataRange->start());
+  dialogDefaults().setValue("vector/countFromEnd", _dataRange->countFromEnd());
+  dialogDefaults().setValue("vector/readToEnd", _dataRange->readToEnd());
+  dialogDefaults().setValue("vector/skip", _dataRange->skip());
+  dialogDefaults().setValue("vector/doSkip", _dataRange->doSkip());
+  dialogDefaults().setValue("vector/doAve", _dataRange->doFilter());
+  dialogDefaults().setValue("vector/startUnits", _dataRange->_startUnits->currentText());
+  dialogDefaults().setValue("vector/rangeUnits", _dataRange->_rangeUnits->currentText());
 
   updateCurveListDialog();
   kstApp->mainWindow()->document()->setChanged(true);

diff --git a/src/libkstapp/changefiledialog.cpp b/src/libkstapp/changefiledialog.cpp
@@ -74,7 +74,7 @@ ChangeFileDialog::ChangeFileDialog(QWidget *parent)
   connect(_configure, SIGNAL(clicked()), this, SLOT(showConfigWidget()));
   connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(updatePrimitiveList()));
 
-  _dataFile->setFile(_dialogDefaults->value("changedatafile/newFileName",QDir::currentPath()).toString());
+  _dataFile->setFile(dialogDefaults().value("changedatafile/newFileName",QDir::currentPath()).toString());
 
   updateButtons();
 }
@@ -488,7 +488,7 @@ void ChangeFileDialog::apply() {
   kstApp->mainWindow()->document()->setChanged(true);
 
   // store the newly used file as default for the next time the dialog is called
-  _dialogDefaults->setValue("changedatafile/newFileName",_dataFile->file());
+  dialogDefaults().setValue("changedatafile/newFileName",_dataFile->file());
 
 }
 

diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp
@@ -278,7 +278,7 @@ void CommandLineParser::createCurveInPlot(VectorPtr xv, VectorPtr yv, VectorPtr
     curve->setHasPoints(_usePoints);
     curve->setHasLines(_useLines);
     curve->setHasBars(_useBargraph);
-    curve->setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
+    curve->setLineWidth(dialogDefaults().value("curves/lineWidth",0).toInt());
     //curve->setPointType(ptype++ % KSTPOINT_MAXTYPE);
 
     if (ev) {
@@ -411,8 +411,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
 
 #ifndef KST_NO_PRINTER
   // set paper settings to match defaults.
-  _paperSize = QPrinter::PaperSize(_dialogDefaults->value("print/paperSize", QPrinter::Letter).toInt());
-  if (_dialogDefaults->value("print/landscape",true).toBool()) {
+  _paperSize = QPrinter::PaperSize(dialogDefaults().value("print/paperSize", QPrinter::Letter).toInt());
+  if (dialogDefaults().value("print/landscape",true).toBool()) {
     _landscape = true;
   } else {
     _landscape = false;
@@ -724,8 +724,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
 
 #ifndef KST_NO_PRINTER
   // set defaults to match what has been set.
-  _dialogDefaults->setValue("print/landscape", _landscape);
-  _dialogDefaults->setValue("print/paperSize", int(_paperSize));
+  dialogDefaults().setValue("print/landscape", _landscape);
+  dialogDefaults().setValue("print/paperSize", int(_paperSize));
 #endif
 
   if (_plotItem) {

diff --git a/src/libkstapp/datawizard.cpp b/src/libkstapp/datawizard.cpp
@@ -55,7 +55,7 @@ DataWizardPageDataSource::DataWizardPageDataSource(ObjectStore *store, QWidget *
   connect(_configureSource, SIGNAL(clicked()), this, SLOT(configureSource()));
 
   if (default_source.isEmpty()) {
-    _url->setFile(_dialogDefaults->value("vector/datasource", ".").toString());
+    _url->setFile(dialogDefaults().value("vector/datasource", ".").toString());
   } else {
     _url->setFile(default_source);
   }
@@ -481,29 +481,29 @@ PlotItemInterface *DataWizardPagePlot::existingPlot() const {
 
 
 void DataWizardPagePlot::updatePlotBox() {
-  _plotNumber->setValue(_dialogDefaults->value("wizard/plotCount",2).toInt());
+  _plotNumber->setValue(dialogDefaults().value("wizard/plotCount",2).toInt());
 
-  if (_dialogDefaults->value("wizard/legendsAuto",true).toBool()) {
+  if (dialogDefaults().value("wizard/legendsAuto",true).toBool()) {
     _legendsOn->setChecked(true);
-  } else if (_dialogDefaults->value("wizard/legendsOn",false).toBool()) {
+  } else if (dialogDefaults().value("wizard/legendsOn",false).toBool()) {
     _legendsAuto->setChecked(true);
   } else {
     _legendsOff->setChecked(true);
   }
-  _psdLogX->setChecked(_dialogDefaults->value("wizard/logX",false).toBool());
-  _psdLogY->setChecked(_dialogDefaults->value("wizard/logY",false).toBool());
+  _psdLogX->setChecked(dialogDefaults().value("wizard/logX",false).toBool());
+  _psdLogY->setChecked(dialogDefaults().value("wizard/logY",false).toBool());
 
-  _legendsOn->setChecked(_dialogDefaults->value("wizard/legendsOn",false).toBool());
-  _legendsAuto->setChecked(_dialogDefaults->value("wizard/legendsAuto",false).toBool());
-  _legendsVertical->setChecked(_dialogDefaults->value("legend/verticalDisplay",false).toBool());
+  _legendsOn->setChecked(dialogDefaults().value("wizard/legendsOn",false).toBool());
+  _legendsAuto->setChecked(dialogDefaults().value("wizard/legendsAuto",false).toBool());
+  _legendsVertical->setChecked(dialogDefaults().value("legend/verticalDisplay",false).toBool());
 
-  _rescaleFonts->setChecked(_dialogDefaults->value("wizard/rescaleFonts", true).toBool());
-  _shareAxis->setChecked(_dialogDefaults->value("wizard/shareAxis", false).toBool());
+  _rescaleFonts->setChecked(dialogDefaults().value("wizard/rescaleFonts", true).toBool());
+  _shareAxis->setChecked(dialogDefaults().value("wizard/shareAxis", false).toBool());
   _shareAxis->hide(); //FIXME - not done yet.
 
-  if (_dialogDefaults->value("wizard/linesOnly", true).toBool()) {
+  if (dialogDefaults().value("wizard/linesOnly", true).toBool()) {
     _drawLines->setChecked(true);
-  } else if (_dialogDefaults->value("wizard/pointsOnly", true).toBool()) {
+  } else if (dialogDefaults().value("wizard/pointsOnly", true).toBool()) {
     _drawPoints->setChecked(true);
   } else {
     _drawBoth->setChecked(true);
@@ -518,7 +518,7 @@ void DataWizardPagePlot::updatePlotBox() {
   _existingPlotName->setEnabled(havePlots && _existingPlot->isChecked());
   _plotLayoutBox->setEnabled(!_existingPlot->isChecked());
 
-  CurvePlotPlacement placement = static_cast<CurvePlotPlacement>(_dialogDefaults->value("wizard/curvePlacement",MultiplePlots).toInt());
+  CurvePlotPlacement placement = static_cast<CurvePlotPlacement>(dialogDefaults().value("wizard/curvePlacement",MultiplePlots).toInt());
   switch (placement) {
   case OnePlot:
     _onePlot->setChecked(true);
@@ -547,7 +547,7 @@ void DataWizardPagePlot::updatePlotBox() {
     _multiplePlots->setChecked(true);
     break;
   }
-  CurvePlacement::Layout layout = static_cast<CurvePlacement::Layout>(_dialogDefaults->value("wizard/plotLayout", CurvePlacement::Auto).toInt());
+  CurvePlacement::Layout layout = static_cast<CurvePlacement::Layout>(dialogDefaults().value("wizard/plotLayout", CurvePlacement::Auto).toInt());
   switch (layout) {
   case CurvePlacement::Auto:
     _autoLayout->setChecked(true);
@@ -560,7 +560,7 @@ void DataWizardPagePlot::updatePlotBox() {
     break;
   }
 
-  _gridColumns->setValue(_dialogDefaults->value("wizard/gridColumns", CurvePlacement::Auto).toInt());
+  _gridColumns->setValue(dialogDefaults().value("wizard/gridColumns", CurvePlacement::Auto).toInt());
 }
 
 
@@ -574,7 +574,7 @@ DataWizardPageDataPresentation::DataWizardPageDataPresentation(ObjectStore *stor
    setupUi(this);
 
   _xVectorExisting->setObjectStore(store);
-  _xVectorExisting->setToLastX(_dialogDefaults->value("curve/xvectorfield","INDEX").toString());
+  _xVectorExisting->setToLastX(dialogDefaults().value("curve/xvectorfield","INDEX").toString());
   _xAxisUseExisting->setChecked(_xVectorExisting->count()>0);
   dataRange()->loadWidgetDefaults();
   getFFTOptions()->loadWidgetDefaults();
@@ -586,8 +586,8 @@ DataWizardPageDataPresentation::DataWizardPageDataPresentation(ObjectStore *stor
   _FFTOptions->GroupBoxFFTOptions->setCheckable(true);
   _FFTOptions->GroupBoxFFTOptions->setTitle(i18n("Create S&pectra Plots. Set FFT options below:"));
 
-  _FFTOptions->GroupBoxFFTOptions->setChecked(_dialogDefaults->value("wizard/doPSD",false).toBool());
-  _xAxisGroup->setChecked(_dialogDefaults->value("wizard/doXY",true).toBool());
+  _FFTOptions->GroupBoxFFTOptions->setChecked(dialogDefaults().value("wizard/doPSD",false).toBool());
+  _xAxisGroup->setChecked(dialogDefaults().value("wizard/doXY",true).toBool());
 }
 
 
@@ -647,7 +647,7 @@ void DataWizardPageDataPresentation::updateVectors() {
   _xVector->addItems(((DataWizard*)wizard())->dataSourceFieldList());
   _pageValid = validOptions();
 
-  int x_index = _xVector->findText(_dialogDefaults->value("curve/xvectorfield","INDEX").toString());
+  int x_index = _xVector->findText(dialogDefaults().value("curve/xvectorfield","INDEX").toString());
   if (x_index<0) {
     x_index = _xVector->findText("INDEX");
   }
@@ -745,7 +745,7 @@ DataWizard::DataWizard(QWidget *parent, const QString& fileToOpen)
 
 
   // the dialog needs to know that the default has been set....
-  _pageDataSource->sourceChanged(_dialogDefaults->value("vector/datasource",".").toString());
+  _pageDataSource->sourceChanged(dialogDefaults().value("vector/datasource",".").toString());
 
   if (!fileToOpen.isEmpty()) {
     _pageDataSource->sourceChanged(fileToOpen);
@@ -772,24 +772,24 @@ void DataWizard::finished() {
   uint n_curves = 0;
   uint n_steps = 0;
 
-  _dialogDefaults->setValue("wizard/doPSD", _pageDataPresentation->plotPSD());
-  _dialogDefaults->setValue("wizard/doXY", _pageDataPresentation->plotData());
-  _dialogDefaults->setValue("wizard/curvePlacement", _pagePlot->curvePlacement());
-  _dialogDefaults->setValue("wizard/plotCount", _pagePlot->plotCount());
+  dialogDefaults().setValue("wizard/doPSD", _pageDataPresentation->plotPSD());
+  dialogDefaults().setValue("wizard/doXY", _pageDataPresentation->plotData());
+  dialogDefaults().setValue("wizard/curvePlacement", _pagePlot->curvePlacement());
+  dialogDefaults().setValue("wizard/plotCount", _pagePlot->plotCount());
 
-  _dialogDefaults->setValue("wizard/legendsOn", _pagePlot->legendsOn());
-  _dialogDefaults->setValue("wizard/legendsAuto", _pagePlot->legendsAuto());
-  _dialogDefaults->setValue("legend/verticalDisplay", _pagePlot->legendsVertical());
-  _dialogDefaults->setValue("wizard/logX", _pagePlot->PSDLogX());
-  _dialogDefaults->setValue("wizard/logY", _pagePlot->PSDLogY());
+  dialogDefaults().setValue("wizard/legendsOn", _pagePlot->legendsOn());
+  dialogDefaults().setValue("wizard/legendsAuto", _pagePlot->legendsAuto());
+  dialogDefaults().setValue("legend/verticalDisplay", _pagePlot->legendsVertical());
+  dialogDefaults().setValue("wizard/logX", _pagePlot->PSDLogX());
+  dialogDefaults().setValue("wizard/logY", _pagePlot->PSDLogY());
 
-  _dialogDefaults->setValue("wizard/rescaleFonts", _pagePlot->rescaleFonts());
-  _dialogDefaults->setValue("wizard/shareAxis", _pagePlot->shareAxis());
+  dialogDefaults().setValue("wizard/rescaleFonts", _pagePlot->rescaleFonts());
+  dialogDefaults().setValue("wizard/shareAxis", _pagePlot->shareAxis());
 
-  _dialogDefaults->setValue("wizard/linesOnly", _pagePlot->drawLines());
-  _dialogDefaults->setValue("wizard/pointsOnly", _pagePlot->drawPoints());
-  _dialogDefaults->setValue("wizard/plotLayout", _pagePlot->layout());
-  _dialogDefaults->setValue("wizard/gridColumns", _pagePlot->gridColumns());
+  dialogDefaults().setValue("wizard/linesOnly", _pagePlot->drawLines());
+  dialogDefaults().setValue("wizard/pointsOnly", _pagePlot->drawPoints());
+  dialogDefaults().setValue("wizard/plotLayout", _pagePlot->layout());
+  dialogDefaults().setValue("wizard/gridColumns", _pagePlot->gridColumns());
   QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
   DataSourcePtr ds = _pageDataSource->dataSource();
@@ -889,7 +889,7 @@ void DataWizard::finished() {
 
     const QString field = _pageDataPresentation->vectorField();
 
-    _dialogDefaults->setValue("curve/xvectorfield",field);
+    dialogDefaults().setValue("curve/xvectorfield",field);
     Q_ASSERT(_document && _document->objectStore());
 
     DataVectorPtr dxv = _document->objectStore()->createObject<DataVector>();
@@ -1074,8 +1074,8 @@ void DataWizard::finished() {
       curve->setColor(color);
       curve->setHasPoints(_pagePlot->drawLinesAndPoints() || _pagePlot->drawPoints());
       curve->setHasLines(_pagePlot->drawLinesAndPoints() || _pagePlot->drawLines());
-      curve->setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
-      curve->setPointSize(_dialogDefaults->value("curves/pointSize",CURVE_DEFAULT_POINT_SIZE).toDouble());
+      curve->setLineWidth(dialogDefaults().value("curves/lineWidth",0).toInt());
+      curve->setPointSize(dialogDefaults().value("curves/pointSize",CURVE_DEFAULT_POINT_SIZE).toDouble());
       curve->setPointType(ptype++ % KSTPOINT_MAXTYPE);
 
       curve->writeLock();
@@ -1151,8 +1151,8 @@ void DataWizard::finished() {
         curve->setYVector(powerspectrum->vY());
         curve->setHasPoints(_pagePlot->drawLinesAndPoints() || _pagePlot->drawPoints());
         curve->setHasLines(_pagePlot->drawLinesAndPoints() || _pagePlot->drawLines());
-        curve->setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
-        curve->setPointSize(_dialogDefaults->value("curves/pointSize",CURVE_DEFAULT_POINT_SIZE).toDouble());
+        curve->setLineWidth(dialogDefaults().value("curves/lineWidth",0).toInt());
+        curve->setPointSize(dialogDefaults().value("curves/pointSize",CURVE_DEFAULT_POINT_SIZE).toDouble());
         curve->setPointType(ptype++ % KSTPOINT_MAXTYPE);
 
         if (!_pageDataPresentation->plotDataPSD() || colors.count() <= indexColor) {

diff --git a/src/libkstapp/exportgraphicsdialog.cpp b/src/libkstapp/exportgraphicsdialog.cpp
@@ -29,19 +29,19 @@ ExportGraphicsDialog::ExportGraphicsDialog(MainWindow *parent)
   : QDialog(parent) {
   setupUi(this);
 
-  _saveLocation->setFile(_dialogDefaults->value("export/filename",QDir::currentPath()).toString());
+  _saveLocation->setFile(dialogDefaults().value("export/filename",QDir::currentPath()).toString());
 
   _autoSaveTimer = new QTimer(this);
 
-  _listVectorFormats->setChecked(_dialogDefaults->value("export/useVectors",true).toBool());
-  _listBitmapFormats->setChecked(_dialogDefaults->value("export/useBitmaps",true).toBool());
+  _listVectorFormats->setChecked(dialogDefaults().value("export/useVectors",true).toBool());
+  _listBitmapFormats->setChecked(dialogDefaults().value("export/useBitmaps",true).toBool());
 
   updateFormats();
 
-  _xSize->setValue(_dialogDefaults->value("export/xsize","1024").toInt());
-  _ySize->setValue(_dialogDefaults->value("export/ysize","768").toInt());
+  _xSize->setValue(dialogDefaults().value("export/xsize","1024").toInt());
+  _ySize->setValue(dialogDefaults().value("export/ysize","768").toInt());
 
-  _comboBoxSizeOption->setCurrentIndex(_dialogDefaults->value("export/sizeOption","0").toInt());
+  _comboBoxSizeOption->setCurrentIndex(dialogDefaults().value("export/sizeOption","0").toInt());
   enableWidthHeight();
 
   _saveLocationLabel->setBuddy(_saveLocation->_fileEdit);
@@ -81,7 +81,7 @@ void ExportGraphicsDialog::updateFormats() {
   _comboBoxFormats->clear();
   _comboBoxFormats->addItems(formats);
 
-  int index = _comboBoxFormats->findText(_dialogDefaults->value("export/format","png").toString());
+  int index = _comboBoxFormats->findText(dialogDefaults().value("export/format","png").toString());
   if (index<0) {
     if (_listBitmapFormats->isChecked()) {
       index = _comboBoxFormats->findText("png");
@@ -152,13 +152,13 @@ void ExportGraphicsDialog::createFile() {
       filename += '.' + format;
     }
   }
-  _dialogDefaults->setValue("export/filename", default_filename);
-  _dialogDefaults->setValue("export/format", format);
-  _dialogDefaults->setValue("export/xsize", _xSize->value());
-  _dialogDefaults->setValue("export/ysize", _ySize->value());
-  _dialogDefaults->setValue("export/sizeOption", _comboBoxSizeOption->currentIndex());
-  _dialogDefaults->setValue("export/useVectors", _listVectorFormats->isChecked());
-  _dialogDefaults->setValue("export/useBitmaps", _listBitmapFormats->isChecked());
+  dialogDefaults().setValue("export/filename", default_filename);
+  dialogDefaults().setValue("export/format", format);
+  dialogDefaults().setValue("export/xsize", _xSize->value());
+  dialogDefaults().setValue("export/ysize", _ySize->value());
+  dialogDefaults().setValue("export/sizeOption", _comboBoxSizeOption->currentIndex());
+  dialogDefaults().setValue("export/useVectors", _listVectorFormats->isChecked());
+  dialogDefaults().setValue("export/useBitmaps", _listBitmapFormats->isChecked());
   emit exportGraphics(filename, format, _xSize->value(), _ySize->value(), _comboBoxSizeOption->currentIndex());
 }
 

diff --git a/src/libkstapp/exportvectorsdialog.cpp b/src/libkstapp/exportvectorsdialog.cpp
@@ -31,7 +31,7 @@ ExportVectorsDialog::ExportVectorsDialog(QWidget *parent) :
     MainWindow::setWidgetFlags(this);
 
      _saveLocationLabel->setBuddy(_saveLocation->_fileEdit);
-     _saveLocation->setFile(_dialogDefaults->value("vectorexport/filename",QDir::currentPath()).toString());
+     _saveLocation->setFile(dialogDefaults().value("vectorexport/filename",QDir::currentPath()).toString());
 
     if (MainWindow *mw = qobject_cast<MainWindow*>(parent)) {
       _store = mw->document()->objectStore();
@@ -251,7 +251,7 @@ bool ExportVectorsDialog::apply() {
   out.flush();
 
   file.close();
-  _dialogDefaults->setValue("vectorexport/filename", _saveLocation->file());
+  dialogDefaults().setValue("vectorexport/filename", _saveLocation->file());
 
   return(true);
 }

diff --git a/src/libkstapp/histogramdialog.cpp b/src/libkstapp/histogramdialog.cpp
@@ -69,7 +69,7 @@ HistogramTab::HistogramTab(QWidget *parent)
   _curveAppearance->setShowHead(false);
   _curveAppearance->setShowBars(true);
   _curveAppearance->setPointDensity(0);
-  _curveAppearance->setColor(_dialogDefaults->value("plot/strokeBrushColor",QColor(Qt::black)).value<QColor>());
+  _curveAppearance->setColor(dialogDefaults().value("plot/strokeBrushColor",QColor(Qt::black)).value<QColor>());
 
   _vectorLabel->setProperty("si","Data vecto&r:");
   TextLabel1_4_2_2->setProperty("si","Bins from&:");
@@ -326,8 +326,8 @@ void HistogramDialog::editSingleMode() {
 
 void HistogramDialog::configureTab(ObjectPtr object) {
   if (!object) {
-    _histogramTab->setRealTimeAutoBin(_dialogDefaults->value("histogram/realTimeAutoBin", false).toBool());
-    _histogramTab->setNormalizationType(Histogram::NormalizationType(_dialogDefaults->value("histogram/normalizationType",Histogram::Number).toInt()));
+    _histogramTab->setRealTimeAutoBin(dialogDefaults().value("histogram/realTimeAutoBin", false).toBool());
+    _histogramTab->setNormalizationType(Histogram::NormalizationType(dialogDefaults().value("histogram/normalizationType",Histogram::Number).toInt()));
   } else if (HistogramPtr histogram = kst_cast<Histogram>(object)) {
     _histogramTab->setVector(histogram->vector());
     _histogramTab->setMin(histogram->xMin());

diff --git a/src/libkstapp/labelcreator.cpp b/src/libkstapp/labelcreator.cpp
@@ -40,14 +40,14 @@ LabelCreator::LabelCreator(QWidget *parent)
   _labelText->setObjectStore(kstApp->mainWindow()->document()->objectStore());
 
   QFont font;
-  font.fromString(_dialogDefaults->value("label/font",font.toString()).toString());
+  font.fromString(dialogDefaults().value("label/font",font.toString()).toString());
   _family->setCurrentFont(font);
   _bold->setChecked(font.bold());
   _italic->setChecked(font.italic());
 
-  _labelColor->setColor(_dialogDefaults->value("label/color",QColor(Qt::black)).value<QColor>());
-  _labelFontScale->setValue(_dialogDefaults->value("label/fontScale",12).toDouble());
-  if (_dialogDefaults->value("label/fixLeft",true).toBool()) {
+  _labelColor->setColor(dialogDefaults().value("label/color",QColor(Qt::black)).value<QColor>());
+  _labelFontScale->setValue(dialogDefaults().value("label/fontScale",12).toDouble());
+  if (dialogDefaults().value("label/fixLeft",true).toBool()) {
     _left->setChecked(true);
   } else {
     _right->setChecked(true);

diff --git a/src/libkstapp/labelitem.cpp b/src/libkstapp/labelitem.cpp
@@ -61,11 +61,11 @@ bool LabelItem::inputsChanged(qint64 serial) {
 
 void LabelItem::applyDefaults() {
   QFont font;
-  font.fromString(_dialogDefaults->value(defaultsGroupName()+"/font",font.toString()).toString());
+  font.fromString(dialogDefaults().value(defaultsGroupName()+"/font",font.toString()).toString());
   _font  = font;
-  _color = _dialogDefaults->value(defaultsGroupName()+"/color",QColor(Qt::black)).value<QColor>();
-  _scale = _dialogDefaults->value(defaultsGroupName()+"/fontScale",12).toDouble();
-  _fixleft = _dialogDefaults->value(defaultsGroupName()+"/fixLeft",true).toBool();
+  _color = dialogDefaults().value(defaultsGroupName()+"/color",QColor(Qt::black)).value<QColor>();
+  _scale = dialogDefaults().value(defaultsGroupName()+"/fontScale",12).toDouble();
+  _fixleft = dialogDefaults().value(defaultsGroupName()+"/fixLeft",true).toBool();
   applyDialogDefaultsLockPosToData();
 }
 
@@ -76,9 +76,9 @@ void LabelItem::saveAsDialogDefaults() const {
 }
 
 void LabelItem::saveDialogDefaultsFont(const QFont &F, const QColor &C) {
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/font", QVariant(F).toString());
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/color", C.name());
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/fontScale", F.pointSize());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/font", QVariant(F).toString());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/color", C.name());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/fontScale", F.pointSize());
 }
 
 LabelItem::~LabelItem() {
@@ -304,8 +304,8 @@ void CreateLabelCommand::createItem(QString *inText) {
     label->setLockPosToData(dialog.lockPosToData());
     if (dialog.saveAsDefaults()) {
       label->saveAsDialogDefaults();
-      _dialogDefaults->setValue(label->staticDefaultsGroupName()+"/fixLeft",dialog.fixLeft());
-      _dialogDefaults->setValue(label->staticDefaultsGroupName()+"/lockPosToData",dialog.lockPosToData());
+      dialogDefaults().setValue(label->staticDefaultsGroupName()+"/fixLeft",dialog.fixLeft());
+      dialogDefaults().setValue(label->staticDefaultsGroupName()+"/lockPosToData",dialog.lockPosToData());
     }
   }
   _item->view()->scene()->addItem(_item);

diff --git a/src/libkstapp/labelitemdialog.cpp b/src/libkstapp/labelitemdialog.cpp
@@ -140,7 +140,7 @@ void LabelItemDialog::saveDimensions(ViewItem *viewitem) {
   item->updateRelativeSize(true);
 
   if (_saveAsDefault->isChecked()) {
-    _dialogDefaults->setValue(item->staticDefaultsGroupName()+"/fixLeft",_labelDimensionsTab->fixLeft());
+    dialogDefaults().setValue(item->staticDefaultsGroupName()+"/fixLeft",_labelDimensionsTab->fixLeft());
   }
 }
 }

diff --git a/src/libkstapp/legenditem.cpp b/src/libkstapp/legenditem.cpp
@@ -342,16 +342,16 @@ void LegendItem::setLegendColor(const QColor &color) {
 
 
 void LegendItem::applyDefaults() {
-  _auto = _dialogDefaults->value(defaultsGroupName()+"/auto",true).toBool();
+  _auto = dialogDefaults().value(defaultsGroupName()+"/auto",true).toBool();
 
-  _color = _dialogDefaults->value(defaultsGroupName()+"/color",QColor(Qt::black)).value<QColor>();
+  _color = dialogDefaults().value(defaultsGroupName()+"/color",QColor(Qt::black)).value<QColor>();
 
   QFont font;
-  font.fromString(_dialogDefaults->value(defaultsGroupName()+"/font",font.toString()).toString());
+  font.fromString(dialogDefaults().value(defaultsGroupName()+"/font",font.toString()).toString());
   setLegendFont(font);
 
-  setFontScale(_dialogDefaults->value(defaultsGroupName()+"/fontScale", 12.0).toDouble());
-  _verticalDisplay = _dialogDefaults->value(defaultsGroupName()+"/verticalDisplay",true).toBool();
+  setFontScale(dialogDefaults().value(defaultsGroupName()+"/fontScale", 12.0).toDouble());
+  _verticalDisplay = dialogDefaults().value(defaultsGroupName()+"/verticalDisplay",true).toBool();
 }
 
 void LegendItem::setFont(const QFont &f, const QColor &c) {
@@ -361,9 +361,9 @@ void LegendItem::setFont(const QFont &f, const QColor &c) {
 }
 
 void LegendItem::saveAsDialogDefaults() const {
-  _dialogDefaults->setValue(defaultsGroupName()+"/auto",_auto);
-  _dialogDefaults->setValue(defaultsGroupName()+"/title", _title);
-  _dialogDefaults->setValue(defaultsGroupName()+"/verticalDisplay", _verticalDisplay);
+  dialogDefaults().setValue(defaultsGroupName()+"/auto",_auto);
+  dialogDefaults().setValue(defaultsGroupName()+"/title", _title);
+  dialogDefaults().setValue(defaultsGroupName()+"/verticalDisplay", _verticalDisplay);
 
   QFont F = _font;
   F.setPointSize(_fontScale);
@@ -373,9 +373,9 @@ void LegendItem::saveAsDialogDefaults() const {
 }
 
 void LegendItem::saveDialogDefaultsFont(const QFont &F, const QColor &C) {
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/font", QVariant(F).toString());
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/fontScale",F.pointSize());
-  _dialogDefaults->setValue(staticDefaultsGroupName()+"/color", C.name());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/font", QVariant(F).toString());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/fontScale",F.pointSize());
+  dialogDefaults().setValue(staticDefaultsGroupName()+"/color", C.name());
 }
 
 void LegendItem::saveInPlot(QXmlStreamWriter &xml) {

diff --git a/src/libkstapp/logdialog.cpp b/src/libkstapp/logdialog.cpp
@@ -32,21 +32,21 @@ LogDialog::LogDialog(MainWindow *parent)
 
   _formats->addItems(formats);
   _formats->setCurrentIndex(
-        _formats->findText(_dialogDefaults->value("log/format","png").toString()));
+        _formats->findText(dialogDefaults().value("log/format","png").toString()));
 
-  _xSize->setValue(_dialogDefaults->value("log/xsize","1024").toInt());
-  _ySize->setValue(_dialogDefaults->value("log/ysize","768").toInt());
+  _xSize->setValue(dialogDefaults().value("log/xsize","1024").toInt());
+  _ySize->setValue(dialogDefaults().value("log/ysize","768").toInt());
 
-  _sizeOption->setCurrentIndex(_dialogDefaults->value("log/sizeOption","0").toInt());
+  _sizeOption->setCurrentIndex(dialogDefaults().value("log/sizeOption","0").toInt());
   enableWidthHeight();
 
-  _saveLocation->setFile(_dialogDefaults->value("log/logdir",QDir::currentPath()).toString());
+  _saveLocation->setFile(dialogDefaults().value("log/logdir",QDir::currentPath()).toString());
 
-  _script->setText(_dialogDefaults->value("log/script", QString()).toString());
+  _script->setText(dialogDefaults().value("log/script", QString()).toString());
 
   _tab->setCurrentIndex(0);
 
-  _user->setText(_dialogDefaults->value("log/user", QString()).toString());
+  _user->setText(dialogDefaults().value("log/user", QString()).toString());
 
   connect(_message, SIGNAL(textChanged()), this, SLOT(changed()));
   connect(_sizeOption, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()));
@@ -105,13 +105,13 @@ void LogDialog::apply() {
   int y_size = _ySize->value();
   int size_option_index = _sizeOption->currentIndex();
 
-  _dialogDefaults->setValue("log/logdir", _logdir);
-  _dialogDefaults->setValue("log/format", _format);
-  _dialogDefaults->setValue("log/xsize", x_size);
-  _dialogDefaults->setValue("log/ysize", y_size);
-  _dialogDefaults->setValue("log/sizeOption", size_option_index);
-  _dialogDefaults->setValue("log/script", _script->text());
-  _dialogDefaults->setValue("log/user", _username);
+  dialogDefaults().setValue("log/logdir", _logdir);
+  dialogDefaults().setValue("log/format", _format);
+  dialogDefaults().setValue("log/xsize", x_size);
+  dialogDefaults().setValue("log/ysize", y_size);
+  dialogDefaults().setValue("log/sizeOption", size_option_index);
+  dialogDefaults().setValue("log/script", _script->text());
+  dialogDefaults().setValue("log/user", _username);
 
   _logtime = time(NULL);
 

diff --git a/src/libkstapp/mainwindow.cpp b/src/libkstapp/mainwindow.cpp
@@ -56,6 +56,7 @@
 #include "datavector.h"
 #include "commandlineparser.h"
 #include "dialogdefaults.h"
+#include "settings.h"
 
 #include "dialoglauncher.h"
 #include "scriptserver.h"
@@ -79,6 +80,7 @@
 namespace Kst {
 
 MainWindow::MainWindow() :
+    _settings(createSettings("application")),
     _dataManager(0),
     _exportGraphics(0),
     _exportVectors(0),
@@ -96,7 +98,7 @@ MainWindow::MainWindow() :
     _statusBarTimeout(0)
 #if defined(__QNX__)
   , _qnxToolbarsVisible(true)
-#endif 
+#endif
 {
   _doc = new Document(this);
   _scriptServer = new ScriptServer(_doc->objectStore());
@@ -173,7 +175,7 @@ void MainWindow::setLayoutMode(bool layoutMode) {
     _highlightPointAct->setEnabled(false);
     _tiedZoomAct->setEnabled(false);
   } else {
-    v->setViewMode(View::Data);    
+    v->setViewMode(View::Data);
     _highlightPointAct->setEnabled(true);
     _tiedZoomAct->setEnabled(true);
   }
@@ -309,17 +311,16 @@ void MainWindow::open() {
   if (!promptSaveDone()) {
     return;
   }
-  QSettings settings("Kst2");
-  const QString lastKey = "lastOpenedKstFile";
-  QString fn = settings.value(lastKey).toString();
+  const QString key = "lastOpenedKstFile";
+  QString fn = _settings.value(key).toString();
   if (fn.isEmpty()) {
       fn = _doc->fileName();
   }
   fn = QFileDialog::getOpenFileName(this, tr("Kst: Open File"), fn, tr("Kst Sessions (*.kst)"));
   if (fn.isEmpty()) {
     return;
   }
-  settings.setValue(lastKey, fn);
+  _settings.setValue(key, fn);
   openFile(fn);
 }
 
@@ -340,20 +341,20 @@ QAction* MainWindow::createRecentFileAction(const QString& filename, int idx, co
 
 void MainWindow::updateRecentKstFiles(const QString& filename)
 {
-  updateRecentFiles("recentKstFileList", _fileMenu, _bottomRecentKstActions, _recentKstFilesMenu, filename, SLOT(openRecentKstFile()));
+  updateRecentFiles(_fileMenu, _bottomRecentKstActions, _recentKstFilesMenu, filename, SLOT(openRecentKstFile()));
 }
 
 
 void MainWindow::updateRecentDataFiles(const QString& filename)
 {
-  updateRecentFiles("recentDataFileList", _toolsMenu, _bottomRecentDataActions, _recentDataFilesMenu, filename, SLOT(openRecentDataFile()));
+  updateRecentFiles(_toolsMenu, _bottomRecentDataActions, _recentDataFilesMenu, filename, SLOT(openRecentDataFile()));
   if (!filename.isEmpty()) {
-    _dialogDefaults->setValue("vector/datasource", filename);
+    dialogDefaults().setValue("vector/datasource", filename);
   }
 }
 
 
-void MainWindow::updateRecentFiles(const QString& key, QMenu* menu, QList<QAction*>& actions, QMenu* submenu, const QString& newfilename, const char* openslot)
+void MainWindow::updateRecentFiles(QMenu* menu, QList<QAction*>& actions, QMenu* submenu, const QString& newfilename, const char* openslot)
 {
   // Always add absolute paths to the recent file lists, otherwise they are not very reusable
   QString absoluteFilePath = newfilename;
@@ -364,19 +365,19 @@ void MainWindow::updateRecentFiles(const QString& key, QMenu* menu, QList<QActio
     menu->removeAction(it);
     delete it;
   }
+  const QString key = "recentDataFileList";
   actions.clear();
-  QSettings settings("Kst2");
-  QStringList recentFiles = settings.value(key).toStringList();
+  QStringList recentFiles = _settings.value(key).toStringList();
   if (recentFiles.removeDuplicates() > 0) {
-    settings.setValue(key, recentFiles);
+    _settings.setValue(key, recentFiles);
   }
   if (!absoluteFilePath.isEmpty()) {
     recentFiles.removeOne(absoluteFilePath);
     recentFiles.push_front(absoluteFilePath);
     recentFiles = recentFiles.mid(0, 30);
-    settings.setValue(key, recentFiles);
+    _settings.setValue(key, recentFiles);
   }
-  
+
   submenu->clear();
   QAction* check = new QAction(this);
   check->setText("&Cleanup Non-Existent Files");
@@ -412,15 +413,14 @@ void MainWindow::checkRecentFilesOnExistence()
 {
   QAction *action = qobject_cast<QAction *>(sender());
   if (action) {
-    QSettings settings("Kst2");
-    QStringList recentFiles = settings.value(action->data().toString()).toStringList();
+    QStringList recentFiles = _settings.value(action->data().toString()).toStringList();
     recentFiles.removeDuplicates();
     foreach(const QString& it, recentFiles) {
       if (!QFileInfo(it).exists()) {
         recentFiles.removeOne(it);
       }
     }
-    settings.setValue(action->data().toString(), recentFiles);
+    _settings.setValue(action->data().toString(), recentFiles);
     updateRecentKstFiles();
     updateRecentDataFiles();
   }
@@ -681,16 +681,16 @@ void MainWindow::printFromCommandLine(const QString &printFileName) {
 }
 
 void MainWindow::setPrinterDefaults(QPrinter *printer) {
-  if (_dialogDefaults->value("print/landscape",true).toBool()) {
+  if (dialogDefaults().value("print/landscape",true).toBool()) {
     printer->setOrientation(QPrinter::Landscape);
   } else {
     printer->setOrientation(QPrinter::Portrait);
   }
 
-  printer->setPaperSize(QPrinter::PaperSize(_dialogDefaults->value("print/paperSize", QPrinter::Letter).toInt()));
+  printer->setPaperSize(QPrinter::PaperSize(dialogDefaults().value("print/paperSize", QPrinter::Letter).toInt()));
 
-  QPointF topLeft =_dialogDefaults->value("print/topLeftMargin", QPointF(15.0,15.0)).toPointF();
-  QPointF bottomRight =_dialogDefaults->value("print/bottomRightMargin", QPointF(15.0,15.0)).toPointF();
+  QPointF topLeft =dialogDefaults().value("print/topLeftMargin", QPointF(15.0,15.0)).toPointF();
+  QPointF bottomRight =dialogDefaults().value("print/bottomRightMargin", QPointF(15.0,15.0)).toPointF();
 
   printer->setPageMargins(topLeft.x(), topLeft.y(), bottomRight.x(), bottomRight.y(), QPrinter::Millimeter);
   // Apparent Qt bug: setting the page margins here doesn't set the correspoding values in the print
@@ -699,13 +699,13 @@ void MainWindow::setPrinterDefaults(QPrinter *printer) {
 }
 
 void MainWindow::savePrinterDefaults(QPrinter *printer) {
-  _dialogDefaults->setValue("print/landscape", printer->orientation() == QPrinter::Landscape);
-  _dialogDefaults->setValue("print/paperSize", int(printer->paperSize()));
+  dialogDefaults().setValue("print/landscape", printer->orientation() == QPrinter::Landscape);
+  dialogDefaults().setValue("print/paperSize", int(printer->paperSize()));
 
   qreal left, top, right, bottom;
   printer->getPageMargins(&left, &top, &right, &bottom, QPrinter::Millimeter);
-  _dialogDefaults->setValue("print/topLeftMargin", QPointF(left, top));
-  _dialogDefaults->setValue("print/bottomRightMargin", QPointF(right, bottom));
+  dialogDefaults().setValue("print/topLeftMargin", QPointF(left, top));
+  dialogDefaults().setValue("print/bottomRightMargin", QPointF(right, bottom));
 
 }
 
@@ -717,7 +717,7 @@ void MainWindow::print() {
 
 #ifndef Q_OS_WIN
   // QPrintDialog: Cannot be used on non-native printers
-  printer.setOutputFileName(_dialogDefaults->value("print/path", "./print.pdf").toString());
+  printer.setOutputFileName(dialogDefaults().value("print/path", "./print.pdf").toString());
 #endif
   QPointer<QPrintDialog> pd = new QPrintDialog(&printer, this);
 #if QT_VERSION >= 0x040500
@@ -732,7 +732,7 @@ void MainWindow::print() {
     QApplication::restoreOverrideCursor();
     savePrinterDefaults(&printer);
   }
-  _dialogDefaults->setValue("print/path", printer.outputFileName());
+  dialogDefaults().setValue("print/path", printer.outputFileName());
   delete pd;
 }
 #endif
@@ -993,7 +993,7 @@ void MainWindow::createActions() {
 #ifdef KST_NO_PRINTER
   _printAct->setEnabled(false);
 #endif
-  
+
   _exportGraphicsAct = new QAction(tr("&Export as Image(s)..."), this);
   _exportGraphicsAct->setStatusTip(tr("Export graphics to disk"));
   _exportGraphicsAct->setIcon(QPixmap(":image-x-generic.png"));
@@ -1205,13 +1205,13 @@ void MainWindow::createActions() {
   _tabTiedAct->setCheckable(true);
   //connect(_tiedZoomAct, SIGNAL(triggered()), this, SLOT(toggleTiedZoom()));
 
-  
+
   _highlightPointAct = new QAction(tr("&Highlight Data Points"), this);
   _highlightPointAct->setStatusTip(tr("Highlight closest data point"));
   _highlightPointAct->setIcon(QPixmap(":kst_datamode.png"));
   _highlightPointAct->setCheckable(true);
   connect(_highlightPointAct, SIGNAL(toggled(bool)), this, SLOT(setHighlightPoint(bool)));
-  
+
 
   // Then, exclusive interaction modes
   QActionGroup* _interactionModeGroup = new QActionGroup(this);
@@ -1329,7 +1329,7 @@ void MainWindow::createMenus() {
   _fileMenu->addAction(_newTabAct);
   _fileMenu->addAction(_closeTabAct);
   _fileMenu->addSeparator();
-  // exit  
+  // exit
   _fileMenu->addAction(_exitAct);
   // recent files
   _fileMenu->addSeparator();
@@ -1588,9 +1588,9 @@ void MainWindow::readFromEnd() {
     v->unlock();
   }
   UpdateManager::self()->doUpdates(true);
-  _dialogDefaults->setValue("vector/range", nf);
-  _dialogDefaults->setValue("vector/countFromEnd", true);
-  _dialogDefaults->setValue("vector/readToEnd", false);
+  dialogDefaults().setValue("vector/range", nf);
+  dialogDefaults().setValue("vector/countFromEnd", true);
+  dialogDefaults().setValue("vector/readToEnd", false);
 }
 
 void MainWindow::readToEnd() {
@@ -1614,9 +1614,9 @@ void MainWindow::readToEnd() {
     v->registerChange();
     v->unlock();
   }
-  _dialogDefaults->setValue("vector/start", f0);
-  _dialogDefaults->setValue("vector/countFromEnd", false);
-  _dialogDefaults->setValue("vector/readToEnd", true);
+  dialogDefaults().setValue("vector/start", f0);
+  dialogDefaults().setValue("vector/countFromEnd", false);
+  dialogDefaults().setValue("vector/readToEnd", true);
   UpdateManager::self()->doUpdates(true);
 }
 
@@ -1667,10 +1667,10 @@ void MainWindow::forward() {
       v->unlock();
     }
   }
-  _dialogDefaults->setValue("vector/range", nf);
-  _dialogDefaults->setValue("vector/start", f0);
-  _dialogDefaults->setValue("vector/countFromEnd", false);
-  _dialogDefaults->setValue("vector/readToEnd", false);
+  dialogDefaults().setValue("vector/range", nf);
+  dialogDefaults().setValue("vector/start", f0);
+  dialogDefaults().setValue("vector/countFromEnd", false);
+  dialogDefaults().setValue("vector/readToEnd", false);
 
   UpdateManager::self()->doUpdates(true);
 }
@@ -1718,10 +1718,10 @@ void MainWindow::back() {
       v->unlock();
     }
   }
-  _dialogDefaults->setValue("vector/range", nf);
-  _dialogDefaults->setValue("vector/start", f0);
-  _dialogDefaults->setValue("vector/countFromEnd", false);
-  _dialogDefaults->setValue("vector/readToEnd", false);
+  dialogDefaults().setValue("vector/range", nf);
+  dialogDefaults().setValue("vector/start", f0);
+  dialogDefaults().setValue("vector/countFromEnd", false);
+  dialogDefaults().setValue("vector/readToEnd", false);
   UpdateManager::self()->doUpdates(true);
 }
 
@@ -1969,28 +1969,27 @@ bool MainWindow::isTiedTabs() {
 }
 
 void MainWindow::readSettings() {
-  QSettings settings("Kst2");
 #if defined(__QNX__) || defined(__ANDROID__)
   // There is only one size we want on mobile platforms - full screen!
   setWindowState(Qt::WindowFullScreen);
 #else
-  QByteArray geo = settings.value("geometry").toByteArray();
+  QByteArray geo = _settings.value("geometry").toByteArray();
   if (!geo.isEmpty()) {
       restoreGeometry(geo);
   } else {
       setGeometry(50, 50, 800, 600);
   }
 #endif // defined(__QNX__) || defined(__ANDROID__)
-  restoreState(settings.value("toolbarState").toByteArray());
-  _tabTiedAct->setChecked(settings.value("tieTabs").toBool());
+
+  restoreState(_settings.value("toolbarState").toByteArray());
+  _tabTiedAct->setChecked(_settings.value("tieTabs").toBool());
 }
 
 
 void MainWindow::writeSettings() {
-  QSettings settings("Kst2");
-  settings.setValue("geometry", saveGeometry());
-  settings.setValue("toolbarState", saveState());
-  settings.setValue("tieTabs", _tabTiedAct->isChecked());
+  _settings.setValue("geometry", saveGeometry());
+  _settings.setValue("toolbarState", saveState());
+  _settings.setValue("tieTabs", _tabTiedAct->isChecked());
 }
 
 void MainWindow::setWidgetFlags(QWidget* widget)

diff --git a/src/libkstapp/mainwindow.h b/src/libkstapp/mainwindow.h
@@ -26,6 +26,7 @@ class QAction;
 class QProgressBar;
 class QUndoGroup;
 class QPrinter;
+class QSettings;
 
 namespace Kst {
 
@@ -182,8 +183,8 @@ class MainWindow : public QMainWindow
     bool promptSaveDone();
 
     QAction* createRecentFileAction(const QString& filename, int idx, const QString& text, const char* openslot);
-    void updateRecentFiles(const QString& key, QMenu *menu, QList<QAction*>& actions, QMenu* submenu, const QString& newfilename, const char* openslot);
-    
+    void updateRecentFiles(QMenu *menu, QList<QAction*>& actions, QMenu* submenu, const QString& newfilename, const char* openslot);
+
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
 #if defined(__QNX__)
@@ -197,6 +198,7 @@ class MainWindow : public QMainWindow
     TabWidget *_tabWidget;
     QUndoGroup *_undoGroup;
     ScriptServer* _scriptServer;
+    QSettings& _settings;
 
     DataManager *_dataManager;
     DebugDialog *_debugDialog;
@@ -256,14 +258,14 @@ class MainWindow : public QMainWindow
 #endif
     QAction *_createSharedAxisBoxAct;
 
-    QAction *_aboutAct;    
+    QAction *_aboutAct;
     QAction *_dataManagerAct;
     QAction *_debugDialogAct;
     QAction *_exitAct;
     QAction *_exportGraphicsAct;
     QAction *_exportVectorsAct;
     QAction *_logAct;
-    QAction *_openAct;    
+    QAction *_openAct;
     QAction *_saveAct;
     QAction *_saveAsAct;
     QAction *_closeAct;

diff --git a/src/libkstapp/matrixdialog.cpp b/src/libkstapp/matrixdialog.cpp
@@ -641,17 +641,17 @@ MatrixDialog::~MatrixDialog() {
 void MatrixDialog::configureTab(ObjectPtr matrix) {
   if (!matrix) {
     _matrixTab->setMatrixMode(MatrixTab::DataMatrix);
-    _matrixTab->setFile(_dialogDefaults->value("matrix/datasource",_matrixTab->file()).toString());
+    _matrixTab->setFile(dialogDefaults().value("matrix/datasource",_matrixTab->file()).toString());
 
-    _matrixTab->setXStartCountFromEnd(_dialogDefaults->value("matrix/xCountFromEnd",false).toBool());
-    _matrixTab->setYStartCountFromEnd(_dialogDefaults->value("matrix/yCountFromEnd",false).toBool());
-    _matrixTab->setXReadToEnd(_dialogDefaults->value("matrix/xReadToEnd",false).toBool());
-    _matrixTab->setYReadToEnd(_dialogDefaults->value("matrix/yReadToEnd",false).toBool());
+    _matrixTab->setXStartCountFromEnd(dialogDefaults().value("matrix/xCountFromEnd",false).toBool());
+    _matrixTab->setYStartCountFromEnd(dialogDefaults().value("matrix/yCountFromEnd",false).toBool());
+    _matrixTab->setXReadToEnd(dialogDefaults().value("matrix/xReadToEnd",false).toBool());
+    _matrixTab->setYReadToEnd(dialogDefaults().value("matrix/yReadToEnd",false).toBool());
 
-    _matrixTab->setXNumSteps(_dialogDefaults->value("matrix/xNumSteps",1000).toInt());
-    _matrixTab->setYNumSteps(_dialogDefaults->value("matrix/yNumSteps",1000).toInt());
-    _matrixTab->setXStart(_dialogDefaults->value("matrix/reqXStart",0).toInt());
-    _matrixTab->setYStart(_dialogDefaults->value("matrix/reqYStart",0).toInt());
+    _matrixTab->setXNumSteps(dialogDefaults().value("matrix/xNumSteps",1000).toInt());
+    _matrixTab->setYNumSteps(dialogDefaults().value("matrix/yNumSteps",1000).toInt());
+    _matrixTab->setXStart(dialogDefaults().value("matrix/reqXStart",0).toInt());
+    _matrixTab->setYStart(dialogDefaults().value("matrix/reqYStart",0).toInt());
 
 #ifdef NO_GENERATED_OPTIONS
     _matrixTab->hideGeneratedOptions();

diff --git a/src/libkstapp/pictureitem.cpp b/src/libkstapp/pictureitem.cpp
@@ -71,7 +71,7 @@ void PictureItem::paint(QPainter *painter) {
 
 
 void CreatePictureCommand::createItem() {
-  QString start_dir = _dialogDefaults->value("picture/startdir", ".").toString();
+  QString start_dir = dialogDefaults().value("picture/startdir", ".").toString();
   QString filter = "Images (";
   QList<QByteArray> formats = QImageReader::supportedImageFormats ();
   for (int i=0; i<formats.size(); i++) {
@@ -81,7 +81,7 @@ void CreatePictureCommand::createItem() {
   QString file = QFileDialog::getOpenFileName(_view, tr("Kst: Open Image"), start_dir, filter);
   if (file.isEmpty())
     return;
-  _dialogDefaults->setValue("picture/startdir", QFileInfo(file).path());
+  dialogDefaults().setValue("picture/startdir", QFileInfo(file).path());
   _item = new PictureItem(_view, QImage(file));
   _view->setCursor(Qt::CrossCursor);
 

diff --git a/src/libkstapp/plotaxis.cpp b/src/libkstapp/plotaxis.cpp
@@ -1170,33 +1170,33 @@ void PlotAxis::copyProperties(PlotAxis *source) {
 }
 
 void PlotAxis::saveAsDialogDefaults(const QString &group) const {
-  _dialogDefaults->setValue(group+"Visible", QVariant(isAxisVisible()).toString());
-  _dialogDefaults->setValue(group+"Log", QVariant(axisLog()).toString());
-  _dialogDefaults->setValue(group+"Reversed", QVariant(axisReversed()).toString());
-  _dialogDefaults->setValue(group+"AutoBaseOffset", QVariant(axisAutoBaseOffset()).toString());
-  _dialogDefaults->setValue(group+"BaseOffset", QVariant(axisBaseOffset()).toString());
-  _dialogDefaults->setValue(group+"ForceOffsetMin", QVariant(axisForceOffsetMin()).toString());
-  _dialogDefaults->setValue(group+"Interpret", QVariant(axisInterpret()).toString());
-  _dialogDefaults->setValue(group+"Interpretation", QVariant(axisInterpretation()).toString());
-  _dialogDefaults->setValue(group+"Display", QVariant(axisDisplay()).toString());
-  _dialogDefaults->setValue(group+"DisplayFormatString", QVariant(axisDisplayFormatString()).toString());
-  _dialogDefaults->setValue(group+"Timezone", QVariant(timezoneName()));
-  _dialogDefaults->setValue(group+"MajorTickMode", QVariant(axisMajorTickMode()).toString());
-  _dialogDefaults->setValue(group+"MinorTickCount", QVariant(axisMinorTickCount()).toString());
-  _dialogDefaults->setValue(group+"AutoMinorTickCount", QVariant(axisAutoMinorTicks()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorTicks", QVariant(drawAxisMajorTicks()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorTicks", QVariant(drawAxisMajorTicks()).toString());
-  _dialogDefaults->setValue(group+"DrawMinorTicks", QVariant(drawAxisMinorTicks()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorGridLines", QVariant(drawAxisMajorGridLines()).toString());
-  _dialogDefaults->setValue(group+"DrawMinorGridLines", QVariant(drawAxisMinorGridLines()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorGridLinecolor", QVariant(axisMajorGridLineColor()).toString());
-  _dialogDefaults->setValue(group+"DrawMinorGridLinecolor", QVariant(axisMinorGridLineColor()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorGridLinestyle", QVariant((int)axisMajorGridLineStyle()).toString());
-  _dialogDefaults->setValue(group+"DrawMinorGridLinestyle", QVariant((int)axisMinorGridLineStyle()).toString());
-  _dialogDefaults->setValue(group+"DrawMajorGridLinewidth", QVariant(axisMajorGridLineWidth()).toString());
-  _dialogDefaults->setValue(group+"DrawMinorGridLinewidth", QVariant(axisMinorGridLineWidth()).toString());
-  _dialogDefaults->setValue(group+"SignificantDigits", QVariant(axisSignificantDigits()).toString());
-  _dialogDefaults->setValue(group+"Rotation", QVariant(axisLabelRotation()).toString());
+  dialogDefaults().setValue(group+"Visible", QVariant(isAxisVisible()).toString());
+  dialogDefaults().setValue(group+"Log", QVariant(axisLog()).toString());
+  dialogDefaults().setValue(group+"Reversed", QVariant(axisReversed()).toString());
+  dialogDefaults().setValue(group+"AutoBaseOffset", QVariant(axisAutoBaseOffset()).toString());
+  dialogDefaults().setValue(group+"BaseOffset", QVariant(axisBaseOffset()).toString());
+  dialogDefaults().setValue(group+"ForceOffsetMin", QVariant(axisForceOffsetMin()).toString());
+  dialogDefaults().setValue(group+"Interpret", QVariant(axisInterpret()).toString());
+  dialogDefaults().setValue(group+"Interpretation", QVariant(axisInterpretation()).toString());
+  dialogDefaults().setValue(group+"Display", QVariant(axisDisplay()).toString());
+  dialogDefaults().setValue(group+"DisplayFormatString", QVariant(axisDisplayFormatString()).toString());
+  dialogDefaults().setValue(group+"Timezone", QVariant(timezoneName()));
+  dialogDefaults().setValue(group+"MajorTickMode", QVariant(axisMajorTickMode()).toString());
+  dialogDefaults().setValue(group+"MinorTickCount", QVariant(axisMinorTickCount()).toString());
+  dialogDefaults().setValue(group+"AutoMinorTickCount", QVariant(axisAutoMinorTicks()).toString());
+  dialogDefaults().setValue(group+"DrawMajorTicks", QVariant(drawAxisMajorTicks()).toString());
+  dialogDefaults().setValue(group+"DrawMajorTicks", QVariant(drawAxisMajorTicks()).toString());
+  dialogDefaults().setValue(group+"DrawMinorTicks", QVariant(drawAxisMinorTicks()).toString());
+  dialogDefaults().setValue(group+"DrawMajorGridLines", QVariant(drawAxisMajorGridLines()).toString());
+  dialogDefaults().setValue(group+"DrawMinorGridLines", QVariant(drawAxisMinorGridLines()).toString());
+  dialogDefaults().setValue(group+"DrawMajorGridLinecolor", QVariant(axisMajorGridLineColor()).toString());
+  dialogDefaults().setValue(group+"DrawMinorGridLinecolor", QVariant(axisMinorGridLineColor()).toString());
+  dialogDefaults().setValue(group+"DrawMajorGridLinestyle", QVariant((int)axisMajorGridLineStyle()).toString());
+  dialogDefaults().setValue(group+"DrawMinorGridLinestyle", QVariant((int)axisMinorGridLineStyle()).toString());
+  dialogDefaults().setValue(group+"DrawMajorGridLinewidth", QVariant(axisMajorGridLineWidth()).toString());
+  dialogDefaults().setValue(group+"DrawMinorGridLinewidth", QVariant(axisMinorGridLineWidth()).toString());
+  dialogDefaults().setValue(group+"SignificantDigits", QVariant(axisSignificantDigits()).toString());
+  dialogDefaults().setValue(group+"Rotation", QVariant(axisLabelRotation()).toString());
 }
 
 void PlotAxis::saveInPlot(QXmlStreamWriter &xml, QString axisId) {

diff --git a/src/libkstapp/plotitem.cpp b/src/libkstapp/plotitem.cpp
diff --git a/src/libkstapp/scalardialog.cpp b/src/libkstapp/scalardialog.cpp
@@ -276,7 +276,7 @@ void ScalarDialog::configureTab(ObjectPtr object) {
     _scalarTab->hideDataOptions();
     _scalarTab->setValue(QString::number(scalar->value()));
   } else { // new scalar
-    _scalarTab->setFile(_dialogDefaults->value("vector/datasource",_scalarTab->file()).toString());
+    _scalarTab->setFile(dialogDefaults().value("vector/datasource",_scalarTab->file()).toString());
   }
 }
 

diff --git a/src/libkstapp/stringdialog.cpp b/src/libkstapp/stringdialog.cpp
@@ -233,7 +233,7 @@ void StringDialog::configureTab(ObjectPtr object) {
     _stringTab->hideDataOptions();
     _stringTab->setValue(string->value());
   } else { // new string
-    _stringTab->setFile(_dialogDefaults->value("String/datasource",_stringTab->file()).toString());
+    _stringTab->setFile(dialogDefaults().value("String/datasource",_stringTab->file()).toString());
   }
 }
 

diff --git a/src/libkstapp/svgitem.cpp b/src/libkstapp/svgitem.cpp
@@ -85,14 +85,14 @@ void SvgItem::setSvgData(const QByteArray &svgData) {
 }
 
 void CreateSvgCommand::createItem() {
-  QString start_dir = _dialogDefaults->value("svg/startdir", ".").toString();
+  QString start_dir = dialogDefaults().value("svg/startdir", ".").toString();
   QString filter = "SVG Images (*.svg *.SVG)";
   QString file = QFileDialog::getOpenFileName(_view, tr("Kst: Open SVG Image"), start_dir, filter);
 
   if (file.isEmpty())
     return;
 
-  _dialogDefaults->setValue("svg/startdir", QFileInfo(file).path());
+  dialogDefaults().setValue("svg/startdir", QFileInfo(file).path());
   _item = new SvgItem(_view, file);
   _view->setCursor(Qt::CrossCursor);
 

diff --git a/src/libkstapp/themedialog.cpp b/src/libkstapp/themedialog.cpp
@@ -158,15 +158,15 @@ void ThemeDialog::setStrokeTab() {
 
 void ThemeDialog::setFontTab() {
   QFont font;
-  font.fromString(_dialogDefaults->value(PlotItem::staticDefaultsGroupName()+"/globalFontFamily",font.toString()).toString());
+  font.fromString(dialogDefaults().value(PlotItem::staticDefaultsGroupName()+"/globalFontFamily",font.toString()).toString());
   QColor color;
-  color = _dialogDefaults->value(PlotItem::staticDefaultsGroupName()+"/globalFontColor", QColor(Qt::black)).value<QColor>();
+  color = dialogDefaults().value(PlotItem::staticDefaultsGroupName()+"/globalFontColor", QColor(Qt::black)).value<QColor>();
 
   _family->setCurrentFont(font);
   _bold->setChecked(font.bold());
   _italic->setChecked(font.italic());
   _labelColor->setColor(color);
-  _labelFontScale->setValue(_dialogDefaults->value(PlotItem::staticDefaultsGroupName()+"/globalFontScale", 13).toDouble());
+  _labelFontScale->setValue(dialogDefaults().value(PlotItem::staticDefaultsGroupName()+"/globalFontScale", 13).toDouble());
 }
 
 void ThemeDialog::buttonClicked(QAbstractButton *button) {

diff --git a/src/libkstapp/vectordialog.cpp b/src/libkstapp/vectordialog.cpp
@@ -360,10 +360,10 @@ void VectorDialog::updateButtons() {
 void VectorDialog::configureTab(ObjectPtr vector) {
   if (!vector) {
     _vectorTab->dataRange()->loadWidgetDefaults();
-    _vectorTab->setFile(_dialogDefaults->value("vector/datasource",_vectorTab->file()).toString());
-    _vectorTab->setFrom(_dialogDefaults->value("genVector/min",-10).toInt());
-    _vectorTab->setTo(_dialogDefaults->value("genVector/max",10).toInt());
-    _vectorTab->setNumberOfSamples(_dialogDefaults->value("genVector/length",1000).toInt());
+    _vectorTab->setFile(dialogDefaults().value("vector/datasource",_vectorTab->file()).toString());
+    _vectorTab->setFrom(dialogDefaults().value("genVector/min",-10).toInt());
+    _vectorTab->setTo(dialogDefaults().value("genVector/max",10).toInt());
+    _vectorTab->setNumberOfSamples(dialogDefaults().value("genVector/length",1000).toInt());
   } else if (DataVectorPtr dataVector = kst_cast<DataVector>(vector)) {
     _vectorTab->setVectorMode(VectorTab::DataVector);
     _vectorTab->setFile(dataVector->dataSource()->fileName());

diff --git a/src/libkstapp/view.cpp b/src/libkstapp/view.cpp
@@ -624,7 +624,7 @@ double View::resetPlotFontSizes(PlotItem* plot) {
 double View::resetPlotFontSizes(QList<PlotItem*> new_plots) {
   QList<PlotItem*> plots(new_plots);
   plots.append(PlotItemManager::self()->plotsForView(this));
-  qreal pointSize = _dialogDefaults->value("plot/globalFontScale",16.0).toDouble();
+  qreal pointSize = dialogDefaults().value("plot/globalFontScale",16.0).toDouble();
 
   // the 6 in the line below is a magic number that impedes scaling until you
   // have more than a couple of rows/columns.  A 1 would make it scale more

diff --git a/src/libkstmath/dataobject.cpp b/src/libkstmath/dataobject.cpp
@@ -25,6 +25,7 @@
 #include "relation.h"
 #include "sharedptr.h"
 #include "primitive.h"
+#include "settings.h"
 
 #include <QApplication>
 #include <QDir>
@@ -39,9 +40,15 @@
 
 //#define LOCKTRACE
 
-namespace Kst {
+using namespace Kst;
+
+
+QSettings& DataObject::settingsObject()
+{
+  static QSettings& settingsObject = createSettings("data");
+  return settingsObject;
+}
 
-QSettings DataObject::settingsObject("kst", "data");
 QMap<QString,QString> DataObject::url_map;
 
 
@@ -316,7 +323,7 @@ DataObjectConfigWidget* DataObject::pluginWidget(const QString& name) {
   for (DataObjectPluginList::ConstIterator it = _pluginList.begin(); it != _pluginList.end(); ++it) {
     if ((*it)->pluginName() == name) {
       if ((*it)->hasConfigWidget()) {
-        return (*it)->configWidget(&settingsObject);
+        return (*it)->configWidget(&settingsObject());
       }
       break;
     }
@@ -877,6 +884,4 @@ QByteArray DataObject::scriptInterface(QList<QByteArray> &c) {
   return "No such command...";
 }
 
-
-}
 // vim: ts=2 sw=2 et
diff --git a/src/libkstmath/dataobject.h b/src/libkstmath/dataobject.h
@@ -42,7 +42,7 @@ typedef SharedPtr<DataObject> DataObjectPtr;
 typedef ObjectList<DataObject> DataObjectList;
 typedef QMap<DataObjectPtr, DataObjectPtr> DataObjectDataObjectMap;
 
-class KSTMATH_EXPORT DataObject : public Object 
+class KSTMATH_EXPORT DataObject : public Object
 {
     Q_OBJECT
 
@@ -173,21 +173,21 @@ class KSTMATH_EXPORT DataObject : public Object
     virtual qint64 minInputSerial() const;
     virtual qint64 maxInputSerialOfLastChange() const;
 
-  private:    
+  private:
     QString _name;
     QString _author;
     QString _description;
     QString _version;
     QString _library;
 
   private:
-    static QSettings settingsObject;
+    static QSettings& settingsObject();
     static QMap<QString,QString> url_map;
     static void scanPlugins();
 };
 
 
-class KSTMATH_EXPORT DataObjectConfigWidget : public QWidget 
+class KSTMATH_EXPORT DataObjectConfigWidget : public QWidget
 {
     Q_OBJECT
 

diff --git a/src/widgets/curveappearance.cpp b/src/widgets/curveappearance.cpp
@@ -526,16 +526,16 @@ void CurveAppearance::setWidgetDefaults(bool nextColor) {
   if (nextColor) {
     ColorSequence::self().next();
   }
-  _dialogDefaults->setValue("curves/showPoints",showPoints());
-  _dialogDefaults->setValue("curves/showLines", showLines());
-  _dialogDefaults->setValue("curves/showBars",showBars());
-  _dialogDefaults->setValue("curves/lineWidth",lineWidth());
-  _dialogDefaults->setValue("curves/pointSize",pointSize());
-  _dialogDefaults->setValue("curves/lineStyle",lineStyle());
-  _dialogDefaults->setValue("curves/pointType", pointType());
-  _dialogDefaults->setValue("curves/headType", headType());
-  _dialogDefaults->setValue("curves/pointDensity", pointDensity());
-  _dialogDefaults->setValue("curves/showHead", showHead());
+  dialogDefaults().setValue("curves/showPoints",showPoints());
+  dialogDefaults().setValue("curves/showLines", showLines());
+  dialogDefaults().setValue("curves/showBars",showBars());
+  dialogDefaults().setValue("curves/lineWidth",lineWidth());
+  dialogDefaults().setValue("curves/pointSize",pointSize());
+  dialogDefaults().setValue("curves/lineStyle",lineStyle());
+  dialogDefaults().setValue("curves/pointType", pointType());
+  dialogDefaults().setValue("curves/headType", headType());
+  dialogDefaults().setValue("curves/pointDensity", pointDensity());
+  dialogDefaults().setValue("curves/showHead", showHead());
 }
 
 // set the widget to the stored default values
@@ -546,16 +546,16 @@ void CurveAppearance::loadWidgetDefaults() {
   ColorSequence::self().next();
   setBarFillColor(ColorSequence::self().current());
 
-  setShowPoints(_dialogDefaults->value("curves/showPoints",false).toBool());
-  setShowLines(_dialogDefaults->value("curves/showLines",true).toBool());
-  setShowBars(_dialogDefaults->value("curves/showBars",false).toBool());
-  setShowHead(_dialogDefaults->value("curves/showHead",false).toBool());
-  setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
-  setPointSize(_dialogDefaults->value("curves/pointSize",0).toInt());
-  setLineStyle(_dialogDefaults->value("curves/lineStyle",0).toInt());
-  setPointType(_dialogDefaults->value("curves/pointType",0).toInt());
-  setHeadType(_dialogDefaults->value("curves/headType",0).toInt());
-  setPointDensity(_dialogDefaults->value("curves/pointDensity",0).toInt());
+  setShowPoints(dialogDefaults().value("curves/showPoints",false).toBool());
+  setShowLines(dialogDefaults().value("curves/showLines",true).toBool());
+  setShowBars(dialogDefaults().value("curves/showBars",false).toBool());
+  setShowHead(dialogDefaults().value("curves/showHead",false).toBool());
+  setLineWidth(dialogDefaults().value("curves/lineWidth",0).toInt());
+  setPointSize(dialogDefaults().value("curves/pointSize",0).toInt());
+  setLineStyle(dialogDefaults().value("curves/lineStyle",0).toInt());
+  setPointType(dialogDefaults().value("curves/pointType",0).toInt());
+  setHeadType(dialogDefaults().value("curves/headType",0).toInt());
+  setPointDensity(dialogDefaults().value("curves/pointDensity",0).toInt());
 }
 
 }

diff --git a/src/widgets/datarange.cpp b/src/widgets/datarange.cpp
@@ -240,27 +240,27 @@ void DataRange::doSkipChanged() {
 
 void DataRange::setWidgetDefaults() {
   //FIXME Do we need a V->readLock() here?
-  _dialogDefaults->setValue("vector/range", range());
-  _dialogDefaults->setValue("vector/start", start());
-  _dialogDefaults->setValue("vector/countFromEnd", countFromEnd());
-  _dialogDefaults->setValue("vector/readToEnd", readToEnd());
-  _dialogDefaults->setValue("vector/skip", skip());
-  _dialogDefaults->setValue("vector/doSkip", doSkip());
-  _dialogDefaults->setValue("vector/doAve", doFilter());
-  _dialogDefaults->setValue("vector/rangeUnits", rangeUnits());
-  _dialogDefaults->setValue("vector/startUnits", rangeUnits());
+  dialogDefaults().setValue("vector/range", range());
+  dialogDefaults().setValue("vector/start", start());
+  dialogDefaults().setValue("vector/countFromEnd", countFromEnd());
+  dialogDefaults().setValue("vector/readToEnd", readToEnd());
+  dialogDefaults().setValue("vector/skip", skip());
+  dialogDefaults().setValue("vector/doSkip", doSkip());
+  dialogDefaults().setValue("vector/doAve", doFilter());
+  dialogDefaults().setValue("vector/rangeUnits", rangeUnits());
+  dialogDefaults().setValue("vector/startUnits", rangeUnits());
 }
 
 void DataRange::loadWidgetDefaults() {
-  setRange(_dialogDefaults->value("vector/range", 1).toInt());
-  setStart(_dialogDefaults->value("vector/start", 0).toInt());
-  setCountFromEnd(_dialogDefaults->value("vector/countFromEnd",false).toBool());
-  setReadToEnd(_dialogDefaults->value("vector/readToEnd",true).toBool());
-  setSkip(_dialogDefaults->value("vector/skip", 0).toInt());
-  setDoSkip(_dialogDefaults->value("vector/doSkip", false).toBool());
-  setDoFilter(_dialogDefaults->value("vector/doAve",false).toBool());
-  setRangeUnits(_dialogDefaults->value("vector/rangeUnits",tr("frames")).toString());
-  setStartUnits(_dialogDefaults->value("vector/startUnits",tr("frames")).toString());
+  setRange(dialogDefaults().value("vector/range", 1).toInt());
+  setStart(dialogDefaults().value("vector/start", 0).toInt());
+  setCountFromEnd(dialogDefaults().value("vector/countFromEnd",false).toBool());
+  setReadToEnd(dialogDefaults().value("vector/readToEnd",true).toBool());
+  setSkip(dialogDefaults().value("vector/skip", 0).toInt());
+  setDoSkip(dialogDefaults().value("vector/doSkip", false).toBool());
+  setDoFilter(dialogDefaults().value("vector/doAve",false).toBool());
+  setRangeUnits(dialogDefaults().value("vector/rangeUnits",tr("frames")).toString());
+  setStartUnits(dialogDefaults().value("vector/startUnits",tr("frames")).toString());
 }
 
 }

diff --git a/src/widgets/dialogdefaults.cpp b/src/widgets/dialogdefaults.cpp
@@ -12,55 +12,62 @@
 
 #include "dialogdefaults.h"
 #include "datasource.h"
+#include "settings.h"
 
 #include <QPen>
 
 
 namespace Kst {
-  QSettings *_dialogDefaults;
+
+QSettings& dialogDefaults()
+{
+  static QSettings& settingsObject = createSettings("dialog");
+  return settingsObject;
+}
+
 
 void setDataVectorDefaults(DataVectorPtr V) {
-  _dialogDefaults->setValue("vector/datasource", V->filename());
+  dialogDefaults().setValue("vector/datasource", V->filename());
 }
 
 void setGenVectorDefaults(GeneratedVectorPtr V) {
-  _dialogDefaults->setValue("genVector/min", V->min());
-  _dialogDefaults->setValue("genVector/max", V->max()); 
-  _dialogDefaults->setValue("genVector/length", V->length());
+  dialogDefaults().setValue("genVector/min", V->min());
+  dialogDefaults().setValue("genVector/max", V->max());
+  dialogDefaults().setValue("genVector/length", V->length());
 }
 
 void setDataMatrixDefaults(DataMatrixPtr M) {
   //qDebug() << "M...filename: " << M->dataSource()->fileName();
 
   // FIXME: data source filename isn't valid...
-  _dialogDefaults->setValue("matrix/datasource",M->dataSource()->fileName());
+  dialogDefaults().setValue("matrix/datasource",M->dataSource()->fileName());
 
-  _dialogDefaults->setValue("matrix/xCountFromEnd",M->xCountFromEnd());
-  _dialogDefaults->setValue("matrix/yCountFromEnd",M->yCountFromEnd());
-  _dialogDefaults->setValue("matrix/xReadToEnd",M->xReadToEnd());
-  _dialogDefaults->setValue("matrix/yReadToEnd",M->yReadToEnd());
+  dialogDefaults().setValue("matrix/xCountFromEnd",M->xCountFromEnd());
+  dialogDefaults().setValue("matrix/yCountFromEnd",M->yCountFromEnd());
+  dialogDefaults().setValue("matrix/xReadToEnd",M->xReadToEnd());
+  dialogDefaults().setValue("matrix/yReadToEnd",M->yReadToEnd());
 
-  _dialogDefaults->setValue("matrix/xNumSteps",M->xNumSteps());
-  _dialogDefaults->setValue("matrix/yNumSteps",M->yNumSteps());
-  _dialogDefaults->setValue("matrix/reqXStart",M->reqXStart());
-  _dialogDefaults->setValue("matrix/reqYStart",M->reqYStart());
+  dialogDefaults().setValue("matrix/xNumSteps",M->xNumSteps());
+  dialogDefaults().setValue("matrix/yNumSteps",M->yNumSteps());
+  dialogDefaults().setValue("matrix/reqXStart",M->reqXStart());
+  dialogDefaults().setValue("matrix/reqYStart",M->reqYStart());
 }
 
-void setHistogramDefaults(HistogramPtr H) {  
-  _dialogDefaults->setValue("histogram/realTimeAutoBin", H->realTimeAutoBin());
-  _dialogDefaults->setValue("histogram/normalizationType",H->normalizationType());
+void setHistogramDefaults(HistogramPtr H) {
+  dialogDefaults().setValue("histogram/realTimeAutoBin", H->realTimeAutoBin());
+  dialogDefaults().setValue("histogram/normalizationType",H->normalizationType());
 }
 
 void saveDialogDefaultsLockPosToData(const QString &group_name, const bool lockPosToData) {
-  _dialogDefaults->setValue(group_name+"/lockPosToData", QVariant(lockPosToData).toString());
+  dialogDefaults().setValue(group_name+"/lockPosToData", QVariant(lockPosToData).toString());
 }
 
 
 void saveDialogDefaultsBrush(const QString &group_name, const QBrush &b) {
   // Save the brush
-  _dialogDefaults->setValue(group_name+"/fillBrushColor", QVariant(b.color()).toString());
-  _dialogDefaults->setValue(group_name+"/fillBrushStyle", QVariant((int)b.style()).toString());
-  _dialogDefaults->setValue(group_name+"/fillBrushUseGradient", QVariant(bool(b.gradient())).toString());
+  dialogDefaults().setValue(group_name+"/fillBrushColor", QVariant(b.color()).toString());
+  dialogDefaults().setValue(group_name+"/fillBrushStyle", QVariant((int)b.style()).toString());
+  dialogDefaults().setValue(group_name+"/fillBrushUseGradient", QVariant(bool(b.gradient())).toString());
   if (b.gradient()) {
     QString stopList;
     foreach(const QGradientStop &stop, b.gradient()->stops()) {
@@ -72,31 +79,31 @@ void saveDialogDefaultsBrush(const QString &group_name, const QBrush &b) {
       stopList += color.name();
       stopList += ',';
     }
-     _dialogDefaults->setValue(group_name+"/fillBrushGradient", stopList);
+     dialogDefaults().setValue(group_name+"/fillBrushGradient", stopList);
    }
 }
 
 void saveDialogDefaultsPen(const QString &group_name, const QPen &p) {
   // Save stroke...
   QBrush b = p.brush();
 
-  _dialogDefaults->setValue(group_name+"/strokeStyle", QVariant((int)p.style()).toString());
-  _dialogDefaults->setValue(group_name+"/strokeWidth", p.widthF());
-  _dialogDefaults->setValue(group_name+"/strokeJoinStyle", QVariant(p.joinStyle()).toString());
-  _dialogDefaults->setValue(group_name+"/strokeCapStyle", QVariant(p.capStyle()).toString());
-  _dialogDefaults->setValue(group_name+"/strokeBrushColor", QVariant(b.color()).toString());
-  _dialogDefaults->setValue(group_name+"/strokeBrushStyle", QVariant((int)b.style()).toString());
+  dialogDefaults().setValue(group_name+"/strokeStyle", QVariant((int)p.style()).toString());
+  dialogDefaults().setValue(group_name+"/strokeWidth", p.widthF());
+  dialogDefaults().setValue(group_name+"/strokeJoinStyle", QVariant(p.joinStyle()).toString());
+  dialogDefaults().setValue(group_name+"/strokeCapStyle", QVariant(p.capStyle()).toString());
+  dialogDefaults().setValue(group_name+"/strokeBrushColor", QVariant(b.color()).toString());
+  dialogDefaults().setValue(group_name+"/strokeBrushStyle", QVariant((int)b.style()).toString());
 
 }
 
 
 QBrush dialogDefaultsBrush(const QString &group_name) {
   //set the brush
   QBrush brush;
-  bool useGradient = _dialogDefaults->value(group_name +"/fillBrushUseGradient", false).toBool();
+  bool useGradient = dialogDefaults().value(group_name +"/fillBrushUseGradient", false).toBool();
   if (useGradient) {
     QStringList stopInfo =
-        _dialogDefaults->value(group_name +"/fillBrushGradient", "0,#000000,1,#ffffff,").
+        dialogDefaults().value(group_name +"/fillBrushGradient", "0,#000000,1,#ffffff,").
         toString().split(',', QString::SkipEmptyParts);
     QLinearGradient gradient(1,0,0,0);
     gradient.setCoordinateMode(QGradient::ObjectBoundingMode);
@@ -105,9 +112,9 @@ QBrush dialogDefaultsBrush(const QString &group_name) {
     }
     brush = QBrush(gradient);
   } else {
-    QColor color = _dialogDefaults->value(group_name +"/fillBrushColor",QColor(Qt::white)).value<QColor>();
+    QColor color = dialogDefaults().value(group_name +"/fillBrushColor",QColor(Qt::white)).value<QColor>();
     brush.setColor(color);
-    brush.setStyle((Qt::BrushStyle)_dialogDefaults->value(group_name +"/fillBrushStyle",1).toInt());
+    brush.setStyle((Qt::BrushStyle)dialogDefaults().value(group_name +"/fillBrushStyle",1).toInt());
   }
 
   return brush;
@@ -117,19 +124,19 @@ QPen dialogDefaultsPen(const QString &group_name) {
   QPen pen;
   QColor color;
   QBrush brush;
-  pen.setStyle((Qt::PenStyle)_dialogDefaults->value(group_name +"/strokeStyle", 1).toInt());
-  pen.setWidthF(_dialogDefaults->value(group_name +"/strokeWidth",0).toDouble());
-  pen.setJoinStyle((Qt::PenJoinStyle)_dialogDefaults->value(group_name +"/strokeJoinStyle",64).toInt());
-  pen.setCapStyle((Qt::PenCapStyle)_dialogDefaults->value(group_name +"/strokeCapStyle",16).toInt());
-  color = _dialogDefaults->value(group_name +"/strokeBrushColor",QColor(Qt::black)).value<QColor>();
+  pen.setStyle((Qt::PenStyle)dialogDefaults().value(group_name +"/strokeStyle", 1).toInt());
+  pen.setWidthF(dialogDefaults().value(group_name +"/strokeWidth",0).toDouble());
+  pen.setJoinStyle((Qt::PenJoinStyle)dialogDefaults().value(group_name +"/strokeJoinStyle",64).toInt());
+  pen.setCapStyle((Qt::PenCapStyle)dialogDefaults().value(group_name +"/strokeCapStyle",16).toInt());
+  color = dialogDefaults().value(group_name +"/strokeBrushColor",QColor(Qt::black)).value<QColor>();
   brush.setColor(color);
-  brush.setStyle((Qt::BrushStyle)_dialogDefaults->value(group_name +"/strokeBrushStyle",1).toInt());
+  brush.setStyle((Qt::BrushStyle)dialogDefaults().value(group_name +"/strokeBrushStyle",1).toInt());
   pen.setBrush(brush);
 
   return pen;
 }
 
 bool dialogDefaultsLockPosToData(const QString &group_name) {
-  return _dialogDefaults->value(group_name+"/lockPosToData",false).toBool();
+  return dialogDefaults().value(group_name+"/lockPosToData",false).toBool();
 }
 }
diff --git a/src/widgets/dialogdefaults.h b/src/widgets/dialogdefaults.h
@@ -28,7 +28,7 @@
 class QSettings;
 
 namespace Kst {
-  KSTWIDGETS_EXPORT extern QSettings *_dialogDefaults;
+  KSTWIDGETS_EXPORT QSettings& dialogDefaults();
 
   KSTWIDGETS_EXPORT void setDataVectorDefaults(DataVectorPtr);
   KSTWIDGETS_EXPORT void setGenVectorDefaults(GeneratedVectorPtr V);

diff --git a/src/widgets/fftoptions.cpp b/src/widgets/fftoptions.cpp
@@ -290,32 +290,32 @@ bool FFTOptions::checkGivenValues(double sampleRate, int FFTLength) {
 
 // store the current state of the widget as the default
 void FFTOptions::setWidgetDefaults() {
-  _dialogDefaults->setValue("spectrum/freq", sampleRate());
-  _dialogDefaults->setValue("spectrum/average", interleavedAverage());
-  _dialogDefaults->setValue("spectrum/len", FFTLength());
-  _dialogDefaults->setValue("spectrum/apodize", apodize());
-  _dialogDefaults->setValue("spectrum/removeMean", removeMean());
-  _dialogDefaults->setValue("spectrum/vUnits", vectorUnits());
-  _dialogDefaults->setValue("spectrum/rUnits", rateUnits());
-  _dialogDefaults->setValue("spectrum/apodizeFxn", apodizeFunction());
-  _dialogDefaults->setValue("spectrum/gaussianSigma", sigma());
-  _dialogDefaults->setValue("spectrum/output", output());
-  _dialogDefaults->setValue("spectrum/interpolateHoles", interpolateOverHoles());
+  dialogDefaults().setValue("spectrum/freq", sampleRate());
+  dialogDefaults().setValue("spectrum/average", interleavedAverage());
+  dialogDefaults().setValue("spectrum/len", FFTLength());
+  dialogDefaults().setValue("spectrum/apodize", apodize());
+  dialogDefaults().setValue("spectrum/removeMean", removeMean());
+  dialogDefaults().setValue("spectrum/vUnits", vectorUnits());
+  dialogDefaults().setValue("spectrum/rUnits", rateUnits());
+  dialogDefaults().setValue("spectrum/apodizeFxn", apodizeFunction());
+  dialogDefaults().setValue("spectrum/gaussianSigma", sigma());
+  dialogDefaults().setValue("spectrum/output", output());
+  dialogDefaults().setValue("spectrum/interpolateHoles", interpolateOverHoles());
 }
 
 // set the widget to the stored default values
 void FFTOptions::loadWidgetDefaults() {
-  setSampleRate(_dialogDefaults->value("spectrum/freq",100.0).toDouble());
-  setInterleavedAverage(_dialogDefaults->value("spectrum/average",true).toBool());
-  setFFTLength(_dialogDefaults->value("spectrum/len",12).toInt());
-  setApodize(_dialogDefaults->value("spectrum/apodize",true).toBool());
-  setRemoveMean(_dialogDefaults->value("spectrum/removeMean",true).toBool());
-  setVectorUnits(_dialogDefaults->value("spectrum/vUnits","V").toString());
-  setRateUnits(_dialogDefaults->value("spectrum/rUnits","Hz").toString());
-  setApodizeFunction(ApodizeFunction(_dialogDefaults->value("spectrum/apodizeFxn",WindowOriginal).toInt()));
-  setSigma(_dialogDefaults->value("spectrum/gaussianSigma",1.0).toDouble());
-  setOutput(PSDType(_dialogDefaults->value("spectrum/output",PSDPowerSpectralDensity).toInt()));
-  setInterpolateOverHoles(_dialogDefaults->value("spectrum/interpolateHoles",true).toInt());
+  setSampleRate(dialogDefaults().value("spectrum/freq",100.0).toDouble());
+  setInterleavedAverage(dialogDefaults().value("spectrum/average",true).toBool());
+  setFFTLength(dialogDefaults().value("spectrum/len",12).toInt());
+  setApodize(dialogDefaults().value("spectrum/apodize",true).toBool());
+  setRemoveMean(dialogDefaults().value("spectrum/removeMean",true).toBool());
+  setVectorUnits(dialogDefaults().value("spectrum/vUnits","V").toString());
+  setRateUnits(dialogDefaults().value("spectrum/rUnits","Hz").toString());
+  setApodizeFunction(ApodizeFunction(dialogDefaults().value("spectrum/apodizeFxn",WindowOriginal).toInt()));
+  setSigma(dialogDefaults().value("spectrum/gaussianSigma",1.0).toDouble());
+  setOutput(PSDType(dialogDefaults().value("spectrum/output",PSDPowerSpectralDensity).toInt()));
+  setInterpolateOverHoles(dialogDefaults().value("spectrum/interpolateHoles",true).toInt());
 }
 
 }

diff --git a/src/widgets/vectorselector.cpp b/src/widgets/vectorselector.cpp
@@ -141,7 +141,7 @@ void VectorSelector::setAllowEmptySelection(bool allowEmptySelection) {
 void VectorSelector::newVector() {
   QString newName;
   if (_isX) {
-    newName = _dialogDefaults->value("curve/xvectorfield","INDEX").toString();
+    newName = dialogDefaults().value("curve/xvectorfield","INDEX").toString();
   }
   DialogLauncher::self()->showVectorDialog(newName, 0, true);
   fillVectors();