diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
+++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
@@ -9,8 +9,7 @@
 
 /* constants */
 const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
-const DimSettingsAc = "idle-dim-ac";
-const DimSettingsBattery = "idle-dim-battery";
+const DimSettings = "idle-dim";
 const PowerBusName = 'org.gnome.SettingsDaemon';
 const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
 
@@ -116,10 +115,8 @@
             
             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
             
-            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
-            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
-            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
-            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
+            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
+            this._settingsMenu.menu.addMenuItem(dimSwitch);
                       
             //initial update.
             //We have to wait until dbus calls back to decide whether to display brightness controls.
@@ -145,7 +142,7 @@
                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
                 }
                 
-                this.menu.addSettingsAction(_("Settings"), "screen");
+                this.menu.addSettingsAction(_("Settings"), "screensaver");
 		    }));
         }
         catch (e) {