diff --git a/clients/kde2/config/config.cpp b/clients/kde2/config/config.cpp
index 011d524d0..83ecc0250 100644
--- a/clients/kde2/config/config.cpp
+++ b/clients/kde2/config/config.cpp
@@ -1,149 +1,149 @@
 /*********************************************************************
  
  	KDE2 Default configuration widget
  
  	Copyright (c) 2001
  		Karol Szwed <gallium@kde.org>
  		http://gallium.n3.net/
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "config.h" 
 
 #include <QWhatsThis>
 #include <QPixmap>
 
 #include <kglobal.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kvbox.h>
 
 extern "C"
 {
 	KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
 	{
 		return(new KDE2Config(conf, parent));
 	}
 }
 
 // NOTE:
 // 'conf' is a pointer to the kwindecoration modules open kwin config,
 //		  and is by default set to the "Style" group.
 // 'parent' is the parent of the QObject, which is a VBox inside the
 //		  Configure tab in kwindecoration
 
 KDE2Config::KDE2Config( KConfig* conf, QWidget* parent )
-	: QObject( parent ), c(conf)
+	: QObject( parent )
 {
 	KGlobal::locale()->insertCatalog("kwin_clients");
+	c = new KConfig("kwinKDE2rc");
 	highcolor = QPixmap::defaultDepth() > 8;
 	gb = new KVBox( parent );
 	gb->setSpacing( KDialog::spacingHint() );
 
 	cbShowStipple = new QCheckBox( i18n("Draw titlebar &stipple effect"), gb );
 	cbShowStipple->setWhatsThis(
 		i18n("When selected, active titlebars are drawn "
 		 "with a stipple (dotted) effect; otherwise, they are "
 		 "drawn without the stipple."));
 
 	cbShowGrabBar = new QCheckBox( i18n("Draw g&rab bar below windows"), gb );
 	cbShowGrabBar->setWhatsThis(
 		i18n("When selected, decorations are drawn with a \"grab bar\" "
 		"below windows; otherwise, no grab bar is drawn."));
 
 	// Only show the gradient checkbox for highcolor displays
 	if (highcolor)
 	{
 		cbUseGradients = new QCheckBox( i18n("Draw &gradients"), gb );
 		cbUseGradients->setWhatsThis(
 			i18n("When selected, decorations are drawn with gradients "
 			"for high-color displays; otherwise, no gradients are drawn.") );
 	}
 
-	// Load configuration options
-	c = new KConfig("kwinKDE2rc");
-	KConfigGroup cg(c, "General");
-	load( cg );
-
 	// Ensure we track user changes properly
 	connect( cbShowStipple, SIGNAL(clicked()), 
 			 this, SLOT(slotSelectionChanged()) );
 	connect( cbShowGrabBar, SIGNAL(clicked()), 
 			 this, SLOT(slotSelectionChanged()) );
 	if (highcolor)
 		connect( cbUseGradients, SIGNAL(clicked()), 
 				 this, SLOT(slotSelectionChanged()) );
 
+	// Load configuration options
+	load( KConfigGroup() );
+
 	// Make the widgets visible in kwindecoration
 	gb->show();
 }
 
 
 KDE2Config::~KDE2Config()
 {
 	delete gb;
+	delete c;
 }
 
 
 void KDE2Config::slotSelectionChanged()
 {
 	emit changed();
 }
 
 
 // Loads the configurable options from the kwinrc config file
 // It is passed the open config from kwindecoration to improve efficiency
 void KDE2Config::load( const KConfigGroup&  )
 {
-	KConfigGroup cg(c, "KDE2");
+	KConfigGroup cg(c, "General");
 	bool override = cg.readEntry( "ShowTitleBarStipple", true);
 	cbShowStipple->setChecked( override );
 
 	override = cg.readEntry( "ShowGrabBar", true);
 	cbShowGrabBar->setChecked( override );
 
 	if (highcolor) {
 		override = cg.readEntry( "UseGradients", true);
 		cbUseGradients->setChecked( override );
 	}
 }
 
 
 // Saves the configurable options to the kwinrc config file
 void KDE2Config::save( KConfigGroup&  )
 {
-	KConfigGroup cg(c, "KDE2");
+	KConfigGroup cg(c, "General");
 	cg.writeEntry( "ShowTitleBarStipple", cbShowStipple->isChecked() );
 	cg.writeEntry( "ShowGrabBar", cbShowGrabBar->isChecked() );
 
 	if (highcolor)
 		cg.writeEntry( "UseGradients", cbUseGradients->isChecked() );
 	// No need to conf->sync() - kwindecoration will do it for us
 }
 
 
 // Sets UI widget defaults which must correspond to style defaults
 void KDE2Config::defaults()
 {
 	cbShowStipple->setChecked( true );
 	cbShowGrabBar->setChecked( true );
 
 	if (highcolor)
 		cbUseGradients->setChecked( true );
 }
 
 #include "config.moc"
 // vim: ts=4
 // kate: space-indent off; tab-width 4;