diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp
index 93dc40cb39..5c3805fe8e 100644
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@@ -94,7 +94,7 @@ namespace Oxygen
         loadConfiguration( configuration );
 
         // load shadows
-        foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
+        foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
         { ui->readConfig( _configuration ); }
 
         // load exceptions
@@ -115,7 +115,7 @@ namespace Oxygen
 
         // exceptions
         if( _configWidget->isChanged() ) modified = true;
-        else if( exceptionListChanged() ) modified = true;
+        // else if( exceptionListChanged() ) modified = true;
 
         // emit relevant signals
         if( modified ) emit changed();
@@ -143,7 +143,7 @@ namespace Oxygen
         ExceptionList( exceptions ).writeConfig( *_configuration );
 
         // write shadow configuration
-        foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
+        foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
         { ui->writeConfig( _configuration ); }
 
         // sync configuration
@@ -164,7 +164,7 @@ namespace Oxygen
         loadConfiguration( configuration );
 
         // load shadows
-        foreach( ShadowConfigurationUi* ui, _configWidget->shadowConfigurations )
+        foreach( ShadowConfigWidget* ui, _configWidget->shadowConfigurations )
         { ui->readDefaults( _configuration ); }
 
         updateChanged();
diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp
index 05234dda15..c84cf75eac 100644
--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@@ -133,6 +133,8 @@ namespace Oxygen
         _configuration->setUseNarrowButtonSpacing( ui.narrowButtonSpacing->isChecked() );
         _configuration->setCloseWindowFromMenuButton( ui.closeFromMenuButton->isChecked() );
 
+        setChanged( false );
+
         if( _expertMode )
         { _animationConfigWidget->save(); }
 
@@ -229,6 +231,7 @@ namespace Oxygen
         else if( ui.drawSizeGrip->isChecked() != _configuration->drawSizeGrip() ) modified = true;
         else if( ui.titleOutline->isChecked() !=  _configuration->drawTitleOutline() ) modified = true;
         else if( ui.narrowButtonSpacing->isChecked() !=  _configuration->useNarrowButtonSpacing() ) modified = true;
+        else if( ui.closeFromMenuButton->isChecked() != _configuration->closeWindowFromMenuButton() ) modified = true;
 
         // shadow configurations
         else if( shadowConfigurations[0]->isModified() ) modified = true;
diff --git a/clients/oxygen/config/oxygenconfigwidget.h b/clients/oxygen/config/oxygenconfigwidget.h
index e431c46fb5..c7400cc0a6 100644
--- a/clients/oxygen/config/oxygenconfigwidget.h
+++ b/clients/oxygen/config/oxygenconfigwidget.h
@@ -26,7 +26,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "ui_oxygenconfigurationui.h"
-#include "oxygenshadowconfigurationui.h"
+#include "oxygenshadowconfigwidget.h"
 #include "oxygenexceptionlistwidget.h"
 #include "../oxygendecorationdefines.h"
 
@@ -73,7 +73,7 @@ namespace Oxygen
         { return ui.exceptions; }
 
         //! shadow configuration
-        QVector<ShadowConfigurationUi*> shadowConfigurations;
+        QVector<ShadowConfigWidget*> shadowConfigurations;
 
         //! toggle expert mode
         void toggleExpertMode( bool );
diff --git a/clients/oxygen/config/ui/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
index d5bc49a61c..8c5efe3079 100644
--- a/clients/oxygen/config/ui/oxygenconfigurationui.ui
+++ b/clients/oxygen/config/ui/oxygenconfigurationui.ui
@@ -345,7 +345,7 @@
        <item row="0" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_7">
          <item>
-          <widget class="Oxygen::ShadowConfigurationUi" name="inactiveShadowConfiguration">
+          <widget class="Oxygen::ShadowConfigWidget" name="inactiveShadowConfiguration">
            <property name="title">
             <string>Window Drop-Down Shadow</string>
            </property>
@@ -355,7 +355,7 @@
           </widget>
          </item>
          <item>
-          <widget class="Oxygen::ShadowConfigurationUi" name="activeShadowConfiguration">
+          <widget class="Oxygen::ShadowConfigWidget" name="activeShadowConfiguration">
            <property name="title">
             <string>Active Window Glow</string>
            </property>
@@ -431,9 +431,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Oxygen::ShadowConfigurationUi</class>
+   <class>Oxygen::ShadowConfigWidget</class>
    <extends>QGroupBox</extends>
-   <header>oxygenshadowconfigurationui.h</header>
+   <header>oxygenshadowconfigwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>