diff --git a/cm/res/res/values/config.xml b/cm/res/res/values/config.xml
index e655322..376327a 100644
--- a/cm/res/res/values/config.xml
+++ b/cm/res/res/values/config.xml
@@ -55,4 +55,12 @@
     <integer name="config_dayColorTemperature">6500</integer>
     <integer name="config_nightColorTemperature">4500</integer>
     <integer name="config_outdoorAmbientLux">9000</integer>
+
+    <!-- Is the notification LED brightness adjustable ?
+         Used to decide if the user can set LED brightness -->
+    <bool name="config_adjustableNotificationLedBrightness">false</bool>
+
+    <!-- Does the device have multiple LEDs ?
+         Used to decide if the user can change the multiple LEDs settings -->
+    <bool name="config_multipleNotificationLeds">false</bool>
 </resources>
diff --git a/cm/res/res/values/symbols.xml b/cm/res/res/values/symbols.xml
index e8a61a6..cf1336b 100644
--- a/cm/res/res/values/symbols.xml
+++ b/cm/res/res/values/symbols.xml
@@ -69,4 +69,8 @@
     <java-symbol type="integer" name="config_dayColorTemperature" />
     <java-symbol type="integer" name="config_nightColorTemperature" />
     <java-symbol type="integer" name="config_outdoorAmbientLux" />
+
+    <!-- Notification and battery light -->
+    <java-symbol type="bool" name="config_adjustableNotificationLedBrightness" />
+    <java-symbol type="bool" name="config_multipleNotificationLeds" />
 </resources>
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
index b9b0601..c15fa22 100644
--- a/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -62,4 +62,12 @@
 
     <!-- Default for CMSettings.Global.POWER_NOTIFICATIONS_RINGTONE -->
     <string name="def_power_notifications_ringtone" translatable="false">content://settings/system/notification_sound</string>
+
+    <!-- Default value for the notification LEDs brightness
+         on devices equiped with configurable LED controller -->
+    <integer name="def_notification_brightness_level">255</integer>
+
+    <!-- Default value for whether or not to use multiple notification LEDs
+         on devices equiped with more than one LED -->
+    <bool name="def_notification_multiple_leds">false</bool>
 </resources>
\ No newline at end of file
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index 97b9c29..9229c7a 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -240,6 +240,12 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
         loadStringSetting(db, CMTableNames.TABLE_GLOBAL,
                 CMSettings.Global.POWER_NOTIFICATIONS_RINGTONE,
                 R.string.def_power_notifications_ringtone);
+
+        loadIntegerSetting(db, CMTableNames.TABLE_SYSTEM, CMSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
+                R.integer.def_notification_brightness_level);
+
+        loadBooleanSetting(db, CMTableNames.TABLE_SYSTEM, CMSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE,
+                R.bool.def_notification_multiple_leds);
     }
 
     /**