diff --git a/res/layout-land/dialog_battery_settings.xml b/res/layout-land/dialog_battery_settings.xml
new file mode 100644
index 000000000..330a7d887
--- /dev/null
+++ b/res/layout-land/dialog_battery_settings.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Daniel Nilsson
+     Copyright (C) 2012 THe CyanogenMod Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+    <org.omnirom.omnigears.ui.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:layout_marginStart="10dp" />
+    <LinearLayout
+        android:id="@+id/color_panel_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:orientation="vertical" >
+        <EditText
+            android:id="@+id/hex_color_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:digits="0123456789ABCDEFabcdef"
+            android:inputType="textNoSuggestions"
+            android:maxLength="6" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_panel"
+            android:layout_width="match_parent"
+            android:layout_height="40dp" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/color_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal" >
+        <Spinner
+            android:id="@+id/color_list_spinner"
+            android:layout_width="0px"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0.5" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_list_panel"
+            android:layout_width="0px"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_weight="0.5" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-land/dialog_color_picker.xml b/res/layout-land/dialog_color_picker.xml
new file mode 100644
index 000000000..334f76f6d
--- /dev/null
+++ b/res/layout-land/dialog_color_picker.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Daniel Nilsson
+     Copyright (C) 2012 THe CyanogenMod Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+    <org.omnirom.omnigears.ui.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:layout_marginStart="10dp" />
+    <LinearLayout
+        android:id="@+id/color_panel_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:orientation="vertical" >
+        <EditText
+            android:id="@+id/hex_color_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:digits="0123456789ABCDEFabcdef"
+            android:inputType="textNoSuggestions"
+            android:maxLength="6" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_panel"
+            android:layout_width="match_parent"
+            android:layout_height="40dp" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-land/dialog_light_settings.xml b/res/layout-land/dialog_light_settings.xml
new file mode 100644
index 000000000..e4ec129c3
--- /dev/null
+++ b/res/layout-land/dialog_light_settings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Daniel Nilsson
+     Copyright (C) 2012 THe CyanogenMod Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+    <org.omnirom.omnigears.ui.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:layout_marginStart="10dp" />
+    <LinearLayout
+        android:id="@+id/color_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_weight="0.5"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" >
+        <Spinner
+            android:id="@+id/color_list_spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_list_panel"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_weight="0.5" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_weight="0.5"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" >
+        <LinearLayout
+            android:id="@+id/color_panel_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+            <EditText
+                android:id="@+id/hex_color_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:digits="0123456789ABCDEFabcdef"
+                android:inputType="textNoSuggestions"
+                android:maxLength="6" />
+            <org.omnirom.omnigears.ui.ColorPanelView
+                android:id="@+id/color_panel"
+                android:layout_width="match_parent"
+                android:layout_height="40dp" />
+        </LinearLayout>
+        <Spinner
+            android:id="@+id/on_spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        <Spinner
+            android:id="@+id/off_spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
new file mode 100644
index 000000000..9d116a4d9
--- /dev/null
+++ b/res/layout/app_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_marginEnd="8dip"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:id="@+id/app_name"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
+
+</LinearLayout>
diff --git a/res/layout/dialog_battery_settings.xml b/res/layout/dialog_battery_settings.xml
index cea2c90a9..0792d54d9 100644
--- a/res/layout/dialog_battery_settings.xml
+++ b/res/layout/dialog_battery_settings.xml
@@ -12,85 +12,63 @@
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
-     limitations under the License. -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
     <org.omnirom.omnigears.ui.ColorPickerView
         android:id="@+id/color_picker_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp" />
-
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp" />
     <LinearLayout
         android:id="@+id/color_panel_view"
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_alignStart="@id/color_picker_view"
-        android:layout_alignEnd="@id/color_picker_view"
-        android:layout_below="@id/color_picker_view"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
         android:orientation="horizontal" >
-
         <EditText
             android:id="@+id/hex_color_input"
             android:layout_width="0px"
-            android:maxLength="6"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5"
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5" />
-
+            android:maxLength="6" />
         <org.omnirom.omnigears.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="0px"
             android:layout_height="match_parent"
+            android:layout_marginStart="10dp"
             android:layout_weight="0.5" />
     </LinearLayout>
-
     <LinearLayout
         android:id="@+id/color_list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/color_panel_view"
-        android:layout_marginStart="10dp"
+        android:layout_marginBottom="5dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginTop="4dp"
-        android:orientation="vertical" >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/color_list_title"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal" >
+        <Spinner
+            android:id="@+id/color_list_spinner"
+            android:layout_width="0px"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="4dip" >
-
-             <Spinner
-                android:id="@+id/color_list_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-             <View
-                android:layout_width="8dip"
-                android:layout_height="match_parent" />
-
-             <org.omnirom.omnigears.ui.ColorPanelView
-                android:id="@+id/color_list_panel"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-        </LinearLayout>
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0.5" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_list_panel"
+            android:layout_width="0px"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_weight="0.5" />
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/dialog_color_picker.xml b/res/layout/dialog_color_picker.xml
new file mode 100644
index 000000000..e6113826b
--- /dev/null
+++ b/res/layout/dialog_color_picker.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Daniel Nilsson
+     Copyright (C) 2012 THe CyanogenMod Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+    <org.omnirom.omnigears.ui.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp" />
+    <LinearLayout
+        android:id="@+id/color_panel_view"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal" >
+        <EditText
+            android:id="@+id/hex_color_input"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5"
+            android:digits="0123456789ABCDEFabcdef"
+            android:inputType="textNoSuggestions"
+            android:maxLength="6" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_panel"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_marginStart="10dp"
+            android:layout_weight="0.5" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/dialog_light_settings.xml b/res/layout/dialog_light_settings.xml
index e619ceb71..d185ceea6 100644
--- a/res/layout/dialog_light_settings.xml
+++ b/res/layout/dialog_light_settings.xml
@@ -12,131 +12,100 @@
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
-     limitations under the License. -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
     <org.omnirom.omnigears.ui.ColorPickerView
         android:id="@+id/color_picker_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp" />
-
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp" />
     <LinearLayout
         android:id="@+id/color_panel_view"
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_alignStart="@id/color_picker_view"
-        android:layout_alignEnd="@id/color_picker_view"
-        android:layout_below="@id/color_picker_view"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
         android:orientation="horizontal" >
-
         <EditText
             android:id="@+id/hex_color_input"
             android:layout_width="0px"
-            android:maxLength="6"
+            android:layout_height="match_parent"
+            android:layout_weight="0.5"
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5" />
-
+            android:maxLength="6" />
         <org.omnirom.omnigears.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="0px"
             android:layout_height="match_parent"
+            android:layout_marginStart="10dp"
             android:layout_weight="0.5" />
     </LinearLayout>
-
     <LinearLayout
         android:id="@+id/color_list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/color_panel_view"
-        android:layout_marginStart="10dp"
+        android:layout_marginBottom="5dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginTop="4dp"
-        android:orientation="vertical" >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/color_list_title"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal" >
+        <Spinner
+            android:id="@+id/color_list_spinner"
+            android:layout_width="0px"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="4dip" >
-
-             <Spinner
-                android:id="@+id/color_list_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-             <View
-                android:layout_width="8dip"
-                android:layout_height="match_parent" />
-
-             <org.omnirom.omnigears.ui.ColorPanelView
-                android:id="@+id/color_list_panel"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-        </LinearLayout>
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0.5" />
+        <org.omnirom.omnigears.ui.ColorPanelView
+            android:id="@+id/color_list_panel"
+            android:layout_width="0px"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_weight="0.5" />
     </LinearLayout>
-
     <LinearLayout
         android:id="@+id/speed_title_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/color_list_view"
-        android:layout_marginStart="10dp"
+        android:layout_marginBottom="5dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="5dp"
         android:orientation="vertical" >
-
         <View
             android:layout_width="match_parent"
             android:layout_height="2dp"
             android:background="@android:drawable/divider_horizontal_dark" />
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:text="@string/pulse_speed_title"
             android:textAppearance="?android:attr/textAppearanceSmall" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingBottom="4dip" >
-
+            android:paddingBottom="5dip" >
             <Spinner
                 android:id="@+id/on_spinner"
-                android:layout_width="match_parent"
+                android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
-
-            <View
-                android:layout_width="8dip"
-                android:layout_height="match_parent" />
-
             <Spinner
                 android:id="@+id/off_spinner"
-                android:layout_width="match_parent"
+                android:layout_width="0px"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
                 android:layout_weight="1" />
         </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/preference_application_light.xml b/res/layout/preference_application_light.xml
index 72b8e1b8c..152bacd57 100644
--- a/res/layout/preference_application_light.xml
+++ b/res/layout/preference_application_light.xml
@@ -5,7 +5,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingStart="5dp"
-    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingEnd="@dimen/color_preference_end"
     android:background="?android:attr/selectableItemBackground" >
 
     <ImageView
@@ -45,6 +45,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingEnd="10dp"
         android:orientation="vertical" >
 
         <TextView
@@ -64,8 +65,8 @@
 
     <ImageView
         android:id="@+id/light_color"
-        android:layout_width="32dip"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/color_preference_width"
+        android:layout_height="@dimen/color_preference_height_large"
         android:layout_gravity="center" />
 
 </LinearLayout>
diff --git a/res/layout/preference_battery_light.xml b/res/layout/preference_battery_light.xml
index a1d77c843..99d3583e3 100644
--- a/res/layout/preference_battery_light.xml
+++ b/res/layout/preference_battery_light.xml
@@ -5,7 +5,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingStart="5dp"
-    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingEnd="@dimen/color_preference_end"
     android:background="?android:attr/selectableItemBackground" >
 
     <RelativeLayout
@@ -34,8 +34,8 @@
 
     <ImageView
         android:id="@+id/light_color"
-        android:layout_width="32dip"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/color_preference_width"
+        android:layout_height="@dimen/color_preference_height"
         android:layout_gravity="center" />
 
 </LinearLayout>
diff --git a/res/layout/preference_color_picker.xml b/res/layout/preference_color_picker.xml
new file mode 100644
index 000000000..99d3583e3
--- /dev/null
+++ b/res/layout/preference_color_picker.xml
@@ -0,0 +1,41 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_light_pref"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="5dp"
+    android:paddingEnd="@dimen/color_preference_end"
+    android:background="?android:attr/selectableItemBackground" >
+
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="1" />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/light_color"
+        android:layout_width="@dimen/color_preference_width"
+        android:layout_height="@dimen/color_preference_height"
+        android:layout_gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/preference_number_picker_dialog.xml b/res/layout/preference_number_picker_dialog.xml
new file mode 100644
index 000000000..6dac6dc93
--- /dev/null
+++ b/res/layout/preference_number_picker_dialog.xml
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <NumberPicker
+        android:id="@+id/number_picker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dip"
+        android:layout_marginTop="6dip" />
+
+</LinearLayout>
diff --git a/res/values-ca/custom_strings.xml b/res/values-ca/custom_strings.xml
new file mode 100644
index 000000000..9cca110e3
--- /dev/null
+++ b/res/values-ca/custom_strings.xml
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2013 The OmniROM Project
+
+  Parts Copyright (C) 2012-2013 The CyanogenMod Project
+
+  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 3 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/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="ok">OK</string>
+    <string name="reset">reinicialitzar</string>
+
+    <string name="bars_and_menus_settings">Barres i menús</string>
+    <string name="active_display_settings">Pantalla activa</string>
+    <string name="bars_and_menus_category_status_bar_title">Barra d\'estat</string>
+    <string name="bars_and_menus_category_navigation_bar_title">Barra de navegació</string>
+    <string name="status_bar_battery_title">Estil de la bateria</string>
+    <string name="status_bar_toggle_brightness">Control de brillantor</string>
+    <string name="status_bar_toggle_brightness_summary">Ajust de la brillantor lliscant a través de la barra d\'estat</string>
+    <string name="status_bar_toggle_info">Brillantor automàtica està activada</string>
+    <string name="status_bar_signal_text_title">Estil de l\'estat del senyal</string>
+    <string name="status_bar_style_icon">Icona</string>
+    <string name="status_bar_style_hidden">Ocult</string>
+    <string name="status_bar_signal_text_show_text">Texte</string>
+    <string name="status_bar_battery_status_percentage">Percentatge</string>
+    <string name="status_bar_battery_status_circle">Cercle</string>
+    <string name="status_bar_battery_status_circle_percentage">Cercle amb percentatge</string>
+    <string name="status_bar_notif_count_title">Recompte de notificacions</string>
+    <string name="status_bar_notif_count_summary">Mostra el número de notificacions pendents</string>
+
+    <!-- String for IconPicker -->
+    <string name="icon_picker_title">Triar font de la icona</string>
+    <string name="icon_picker_system_icons_title">Icones del sistema</string>
+    <string name="icon_picker_gallery_title">Galeria</string>
+    <string name="icon_picker_pack_title">Pack d\'icones</string>
+
+    <string name="profile_applist_title">Aplicacions</string>
+    <string name="profile_choose_app">Trieu aplicació</string>
+    <string name="profiles_add">Afegir</string>
+
+    <!-- Notification light dialogs -->
+    <string name="edit_light_settings">Edita la configuració de llum</string>
+    <string name="pulse_speed_title">Durada de l\'impuls i la velocitat</string>
+    <string name="color_list_title">Color</string>
+    <string name="default_time">Normal</string>
+    <string name="custom_time">Personalitzat</string>
+    <string name="dialog_test">Prova</string>
+    <string name="dialog_delete_title">Esborrar</string>
+    <string name="dialog_delete_message">¿Eliminar l\'element seleccionat?</string>
+    <string name="dialog_test_message">Apagar la pantalla per veure la notificació seleccionada en l\'acció o descartar aquesta caixa de diàleg per aturar la prova</string>
+    <string name="dialog_test_button">Descartar</string>
+
+    <!-- Lights settings screen, notification light settings -->
+    <string name="notification_light_enable">Habilitar</string>
+    <string name="notification_light_general_title">General</string>
+    <string name="notification_light_applist_title">Aplicacions</string>
+    <string name="notification_light_phonelist_title">Telèfon</string>
+    <string name="notification_light_use_custom">Utilitza valors personalitzats</string>
+    <string name="notification_light_enabled">Habilitat</string>
+    <string name="notification_light_disabled">Deshabilitat</string>
+    <string name="notification_light_default_value">Per defecte</string>
+    <string name="notification_light_missed_call_title">Trucada perduda</string>
+    <string name="notification_light_voicemail_title">Correu de veu</string>
+    <string name="notification_light_screen_on_title">Mostra quan la pantalla està activa</string>
+
+    <!-- Values for the notification light pulse spinners -->
+    <string name="pulse_length_always_on">Sempre actiu</string>
+    <string name="pulse_length_very_short">Molt curt</string>
+    <string name="pulse_length_short">Curt</string>
+    <string name="pulse_length_normal">Normal</string>
+    <string name="pulse_length_long">Llarg</string>
+    <string name="pulse_length_very_long">Molt llarg</string>
+    <string name="pulse_speed_very_fast">Molt ràpid</string>
+    <string name="pulse_speed_fast">Ràpid</string>
+    <string name="pulse_speed_normal">Normal</string>
+    <string name="pulse_speed_slow">Lent</string>
+    <string name="pulse_speed_very_slow">Molt lent</string>
+
+    <string name="led_color_green">Verd</string>
+    <string name="led_color_red">Vermell</string>
+
+    <!-- Battery light settings  -->
+    <string name="battery_light_enable">Habilitat</string>
+    <string name="battery_low_pulse_title">Pols si la bateria baixa</string>
+    <string name="battery_light_list_title">Colors</string>
+    <string name="battery_light_low_color_title">Bateria baixa</string>
+    <string name="battery_light_medium_color_title">Carregant</string>
+    <string name="battery_light_full_color_title">Carregat (90%)</string>
+    <string name="battery_light_really_full_color_title">Carregat (100%)</string>
+    <string name="edit_battery_settings">Edita la configuració de la bateria</string>
+
+    <!-- brightness settings -->
+    <string name="brightness_settings_title">Configuració de la lluminositat</string>
+    <string name="screen_current_value">Valor actual de la pantalla: <xliff:g id="screen_level">%d</xliff:g></string>
+    <string name="button_current_value">Valor actual del botó: <xliff:g id="button_level">%d</xliff:g></string>
+
+    <string name="auto_brightness_sensitivity_title">Ajust de sensibilitat</string>
+    <string name="auto_brightness_sensitivity_summary">Mitjà</string>
+    <string name="auto_brightness_sensitivity_verylow">Molt baix</string>
+    <string name="auto_brightness_sensitivity_low">Baix</string>
+    <string name="auto_brightness_sensitivity_medium">Mitjà</string>
+    <string name="auto_brightness_sensitivity_high">Alt</string>
+    <string name="auto_brightness_sensitivity_veryhigh">Molt alt</string>
+
+    <string name="screen_brightness_category">Pantalla</string>
+    <string name="screen_auto_brightness">Nivells automàtics</string>
+    <string name="screen_auto_brighness_summary">Nivells de brillantor de la pantalla per la manera automàtica</string>
+    <string name="button_auto_brightness">Nivells automàtics</string>
+    <string name="button_auto_brighness_summary">Nivells de brillantor del botó en mode automàtic</string>
+    <string name="button_no_brightness">Mode fosc</string>
+    <string name="button_no_brightness_summary">No ajustar la brillantor botó</string>
+    <string name="button_link_brightness">Enllaç a la pantalla</string>
+    <string name="button_link_brightness_summary">Utilitza el mateix valor que la pantalla per la brillantor dels botons</string>
+    <string name="button_manual_brightness">Nivell manual</string>
+    <string name="button_manual_brightness_summary">Nivell de brillantor del botó per a la manera manual</string>
+    <string name="dialog_manual_brightness_title">Brillantor del botó en manual</string>
+    <!-- Automatic brightness customization -->
+    <string name="auto_brightness_setup_title">Brillantor automàtica</string>
+    <string name="light_sensor_current_value">Valor actual del sensor de llum: <xliff:g id="light_level">%d</xliff:g> lux</string>
+    <string name="auto_brightness_dialog_title">Nivells de brillantor automàtica</string>
+    <string name="auto_brightness_level_format"><xliff:g id="level">%1$d</xliff:g></string>
+    <string name="auto_brightness_last_level_format"><xliff:g id="level">%1$d</xliff:g>+</string>
+    <string name="auto_brightness_adjust_button">Ajustar</string>
+    <string name="auto_brightness_close_button">Tancar</string>
+    <string name="auto_brightness_reset_button">Reiniciar</string>
+    <string name="auto_brightness_split_dialog_title">Dividir nivell de brillantor</string>
+    <string name="auto_brightness_level_dialog_title">Nivell de brillantor</string>
+    <string name="auto_brightness_lux">Lluminositat ambiental (lux)</string>
+    <string name="auto_brightness_backlight">Brillo</string>
+    <string name="auto_brightness_reset_dialog_title">¿Reiniciar nivells?</string>
+    <string name="auto_brightness_reset_confirmation">Tots els nivells de brillantor es restabliran als valors per defecte.</string>
+    <string name="auto_brightness_split_lux_format">Dividir posició (entre <xliff:g id="min">%1$d</xliff:g> i <xliff:g id="max">%2$d</xliff:g> lux)</string>
+    <string name="auto_brightness_level_options">Opcions de nivell de llum</string>
+    <string name="auto_brightness_menu_edit">Edita</string>
+    <string name="auto_brightness_menu_split">Dividir</string>
+    <string name="auto_brightness_menu_remove">Eliminar</string>
+    <string name="sensor_category">Sensor</string>
+    <string name="button_timeout_title">Temps d\'espera</string>
+    <string name="button_timeout_summary">Desactivat en el valor 0</string>
+    <string name="button_brightness_title">Botó de brillantor</string>
+    <string name="button_brightness_summary">Botó ajustos de brillantor</string>
+
+    <!-- button settings -->
+    <string name="button_volume_keys_title">Volum</string>
+    <string name="button_volume_wake_title">Botó activar</string>
+    <string name="button_volume_wake_summary">Al prende un botó de volum despertarà el dispositiu</string>
+    <string name="button_volume_music_control_title">Control de la música</string>
+    <string name="button_volume_music_control_summary">Pulsació llarga per canviar entre cançons amb la pantalla apagada</string>
+    <string name="button_headsethook_title">Auriculars</string>
+    <string name="button_headsethook_launch_voice_title">Auriculars llança veu</string>
+    <string name="button_headsethook_launch_voice_summary">En prémer el botó de l\'auricular llançarà controls de veu</string>
+
+    <!-- Network traffic -->
+    <string name="network_traffic_title">Trànsit de xarxa</string>
+    <string name="show_network_traffic_state">Monitor de trànsit a barra d\'estat</string>
+    <string name="show_network_traffic_unit">Unitats</string>
+    <string name="show_network_traffic_frequency">Interval d\'actualització</string>
+    <string name="show_network_traffic_disable">Desactivat</string>
+    <string name="show_network_traffic_up">Sortint</string>
+    <string name="show_network_traffic_down">Entrant</string>
+    <string name="show_network_traffic_all">Sortint y entrant</string>
+    <string name="show_network_traffic_bit">Bits per segon</string>
+    <string name="show_network_traffic_byte">Bytes per segon</string>
+    <string name="show_network_traffic_500">500 ms</string>
+    <string name="show_network_traffic_1000">1000 ms</string>
+    <string name="show_network_traffic_1500">1500 ms</string>
+    <string name="show_network_traffic_2000">2000 ms</string>
+
+    <!-- Status Bar Activity Indicators -->
+    <string name="show_activity_indicators_on_status_bar_title">Indicadors d\'activitat</string>
+    <string name="show_activity_indicators_on_status_bar_summary">Mostra indicadors en barres de senyal</string>
+
+    <!-- Hardware keys -->
+    <string name="button_keys_title">Botons</string>
+    <string name="keys_bindings_title">Accions dels botons</string>
+    <string name="button_keys_back_title" >Botó enrere</string>
+    <string name="button_keys_home_title" >Botó inici</string>
+    <string name="button_keys_menu_title" >Botó menú</string>
+    <string name="button_keys_assist_title" >Botó cercar</string>
+    <string name="button_keys_appSwitch_title" >Botó canvi d\'aplicació</string>
+    <string name="keys_enable_custom_title">Accions personalitzades</string>
+    <string name="keys_back_press_title">Botó enrere</string>
+    <string name="keys_back_long_press_title">Botó enrere (pulsació llarga)</string>
+    <string name="keys_home_press_title">Botó inici</string>
+    <string name="keys_home_long_press_title">Botó inici (pulsació llarga)</string>
+    <string name="keys_home_double_tap_title">Botó inici (doble pulsació)</string>
+    <string name="keys_menu_press_title">Botó menú</string>
+    <string name="keys_menu_long_press_title">Botó menú (pulsació llarga)</string>
+    <string name="keys_assist_press_title">Botó recerca</string>
+    <string name="keys_assist_long_press_title">Botó recerca (pulsació llarga)</string>
+    <string name="keys_app_switch_press_title">Botó canvi d\'aplicació</string>
+    <string name="keys_app_switch_long_press_title">Botó canvi d\'aplicació (pulsació llarga)</string>
+    <string name="keys_action_nothing">Cap acció</string>
+    <string name="keys_action_menu">Menú obrir/tancar</string>
+    <string name="keys_action_app_switch">Aplicacions recents</string>
+    <string name="keys_action_search">Assistent de recerca</string>
+    <string name="keys_action_voice_search">Cerca per veu</string>
+    <string name="keys_action_in_app_search">Cerca dins de l\'aplicació</string>
+    <string name="keys_action_home">Botó inici</string>
+    <string name="keys_action_back">Botó enrere</string>
+    <string name="keys_action_last_app">Canviar a l\'última aplicació</string>
+    <string name="keys_action_kill_app">Matar aplicació</string>
+    <string name="keys_action_sleep">Anar a dormir</string>
+    <string name="keys_action_normal">Pulsació normal</string>
+    <string name="keys_action_long">Pulsació llarga</string>
+    <string name="keys_action_double">Doble pulsació</string>
+    <string name="dialog_no_home_key_title">Sense acció</string>
+    <string name="no_home_key">Vostè no té assignada una acció al botó de \"Inici\"! Això pot fer que el dispositiu sigui inservible!</string>
+    <string name="virtual_key_haptic_feedback_title">Vibra en tocar</string>
+    <string name="virtual_key_haptic_feedback_summary">Depèn de \"Vibra en tocar\" en la configuració de so</string>
+    <string name="navigation_bar_show_title">Mostra la barra de navegació</string>
+    <string name="navigation_bar_show_summary">Forçar activar barra de navegació</string>
+    <string name="hardware_keys_disable_title">Desactivar tecles</string>
+    <string name="hardware_keys_disable_summary">Forçar desactivar tecles</string>
+
+    <!-- Power Menu Options-->
+    <string name="bars_and_menus_category_power_menu_title">Menú d\'encesa</string>
+    <string name="power_menu_toggle_screenshot_title">Captura de pantalla</string>
+    <string name="power_menu_toggle_screenshot_summary">Mostra opció per capturar la pantalla en menú d\'encesa</string>
+    <string name="power_menu_toggle_screenrecord_title">Gravar la pantalla</string>
+    <string name="power_menu_toggle_screenrecord_summary">Mostra opció per gravar la pantalla a través de menús d\'encesa</string>
+    <string name="power_menu_toggle_mobile_data_title">Dades mòbils</string>
+    <string name="power_menu_toggle_mobile_data_summary">Mostra opció de dades mòbils al menú d\'encesa</string>
+    <string name="power_menu_toggle_airplane_mode_title">Mode avió</string>
+    <string name="power_menu_toggle_airplane_mode_summary">Mostra opció de mode avió al menú d\'encesa</string>
+    <string name="power_menu_toggle_sound_toggles_title">Commutar so</string>
+    <string name="power_menu_toggle_sound_toggles_summary">Mostra opció de mode avió al menú d\'encesa</string>
+
+    <!-- Active Display Notifications -->
+    <string name="ad_settings_title">Pantalla activa</string>
+    <string name="ad_settings_summary">Canviar la configuració de pantalla activa</string>
+    <string name="ad_enable_title">Habilitar</string>
+    <string name="ad_enable_summary_on">Pantalla activa habilitada</string>
+    <string name="ad_enable_summary_off">Pantalla activa deshabilitada</string>
+    <string name="ad_bypass_title">Mode drecera</string>
+    <string name="ad_bypass_summary">Mode butxaca llançarà la pantalla de bloqueig quan no hi ha notificacions i està habilitada la seguretat</string>
+    <string name="ad_text_title">Text de la notificació</string>
+    <string name="ad_text_summary">Mostra el text de la notificació entorn a l\'anell</string>
+    <string name="ad_content_title">Vista de notificació personalitzada</string>
+    <string name="ad_content_summary">Utilitza l\'estil de pantalla activa per als detalls de notificació</string>
+    <string name="ad_annoying_title">Notificacions menys freqüents</string>
+    <string name="ad_annoying_summary">Limita el nombre de notificacions a una vegada per període de temps</string>
+    <string name="ad_double_tap_title">Doble pulsació per dormir</string>
+    <string name="ad_double_tap_summary">Apaga la pantalla amb doble pulsació</string>
+    <string name="ad_shake_event_settings_title">Ajustos de \"Shake\"</string>
+    <string name="ad_shake_event_title">Agitar per tornar a mostrar</string>
+    <string name="ad_shake_event_summary">Agitar el dispositiu per tornar a mostrar les notificacions</string>
+    <string name="ad_shake_force_title">Esdeveniment predeterminat</string>
+    <string name="ad_shake_force_summary">Després de rebre la notificació no s\'executarà la pantalla activa fins que l\'usuari agiti el dispositiu</string>
+    <string name="ad_shake_threshold_title">Intensitat</string>
+    <string name="ad_shake_threshold_summary">Intensitat de la sacsejada necessària per mostrar notificacions</string>
+    <string name="ad_shake_timeout_title">Temps d\'espera</string>
+    <string name="ad_shake_timeout_summary">Segons que \"Shake\" està actiu després de rebre una notificació, 0 significa sempre actiu.</string>
+    <string name="ad_shake_quiet_hours_title">Ignorar \"Quiet Hours\"</string>
+    <string name="ad_shake_quiet_hours_summary">Permet agitar durant hores en silenci</string>
+    <string name="ad_shake_long_threshold_title">Interval</string>
+    <string name="ad_shake_long_threshold_summary">Temps mínim entre moviments consecutius</string>
+    <string name="ad_all_notifications_title">Mostra en curs</string>
+    <string name="ad_all_notifications_summary">Mostra notificacions no eliminables</string>
+    <string name="ad_hide_low_priority_title">Amagar baixa prioritat</string>
+    <string name="ad_hide_low_priority_summary">Amagar notificacions marcades com de baixa prioritat</string>
+    <string name="ad_pocket_mode_title">Mode butxaca</string>
+    <string name="ad_pocket_mode_summary">Mostra notificacions pendents després de treure l\'aparell de la seva butxaca</string>
+    <string name="ad_redisplay_title">Tornar a visualitzar notificacions</string>
+    <string name="ad_timeout_title">Temps d\'espera per tornar a visualitzar</string>
+    <string name="ad_threshold_title">Temps d\'espera per al llindar de proximitat</string>
+    <string name="ad_threshold_summary">Temps que el sensor de proximitat ha d\'estar cobert abans d\'activar la pantalla</string>
+    <string name="ad_brightness_title">Brillantor de la pantalla</string>
+    <string name="ad_customizations_title">Configuració avançada</string>
+    <string name="ad_excluded_apps_title">Aplicacions excloses</string>
+    <string name="ad_excluded_apps_summary">Cap notificació seran mostrades per aquestes aplicacions</string>
+    <string name="ad_privacy_apps_title">Mode de privacitat</string>
+    <string name="ad_privacy_apps_summary">Mostra els detalls per a les notificacions d\'aquestes aplicacions</string>
+    <string name="ad_show_date_title">Mostra data</string>
+    <string name="ad_show_ampm_title">Mostra AM/PM</string>
+    <string name="ad_sunlight_mode_title">Mode de llum del sol</string>
+    <string name="ad_brightness_summary">S\'utilitza en el control de brillantor manual</string>
+    <string name="ad_show_date_summary">Mostrar la data sobre el rellotge</string>
+    <string name="ad_show_ampm_summary">Mostra l\'indicador AM / PM quan s\'utilitza el format de 12 hores</string>
+    <string name="ad_sunlight_mode_summary">Invertir colors en ambient lluminós</string>
+    <string name="ad_turnoff_mode_title">Apagat automàtic</string>
+    <string name="ad_turnoff_mode_summary">Apagar després de encendre en mode butxaca i tornar a la butxaca</string>
+    <string name="ad_redisplay_never">Mai</string>
+    <string name="ad_redisplay_1m">1 minut</string>
+    <string name="ad_redisplay_5m">5 minuts</string>
+    <string name="ad_redisplay_15m">15 minuts</string>
+    <string name="ad_redisplay_30m">30 minuts</string>
+    <string name="ad_redisplay_1h">1 hora</string>
+    <string name="ad_redisplay_2h">2 hores</string>
+    <string name="ad_redisplay_5h">5 hores</string>
+    <string name="ad_timeout_3s">3 segons</string>
+    <string name="ad_timeout_5s">5 segons</string>
+    <string name="ad_timeout_8s">8 segons</string>
+    <string name="ad_timeout_10s">10 segons</string>
+    <string name="ad_timeout_15s">15 segons</string>
+    <string name="ad_timeout_25s">25 segons</string>
+    <string name="ad_threshold_0s">Immediat</string>
+    <string name="ad_threshold_1s">1 segon</string>
+    <string name="ad_threshold_2s">2 segons</string>
+    <string name="ad_threshold_3s">3 segons</string>
+    <string name="ad_threshold_4s">4 segons</string>
+    <string name="ad_threshold_5s">5 segons</string>
+    <string name="ad_pocket_mode_off">Apagat</string>
+    <string name="ad_pocket_mode_notifications">Notificacions només</string>
+    <string name="ad_pocket_mode_always">Sempre</string>
+
+    <string name="bars_and_menus_category_recent_panel_title">Vista recents</string>
+
+    <!-- Recents clear all -->
+    <string name="show_recent_clear_all_button_title">Botó per esborrar tot</string>
+    <string name="show_recent_clear_all_button_summary">Mostra un botó per esborrar tot a la vista d\'aplicacions recents</string>
+    <string name="recent_clear_all_button_location_title">Posició del botó per esborrar tot</string>
+    <string name="recent_clear_all_button_location_summary">Trieu la posició del botó</string>
+    <string name="recent_clear_all_button_location_top_left">Dalt a l\'esquerra</string>
+    <string name="recent_clear_all_button_location_top_right">Dalt a la dreta</string>
+    <string name="recent_clear_all_button_location_bottom_left">Baix a l\'esquerra</string>
+    <string name="recent_clear_all_button_location_bottom_right">Baix a la dreta</string>
+
+    <!-- Memory Indicator -->
+    <string name="show_recents_memory_indicator_title">Indicador de memòria</string>
+    <string name="show_recents_memory_indicator_summary">Mostra un indicador de memòria a la vista d\'aplicacions recents</string>
+    <string name="recents_memory_indicator_location_title">Posició de l\'indicador de memòria</string>
+    <string name="recents_memory_indicator_location_summary">Trieu la posició de l\'indicador de memòria</string>
+
+    <!-- Contextual Notification Panel Header -->
+    <string name="notification_drawer_category_title">Tauler de notificacions</string>
+    <string name="custom_statusbar_header_title">Capçalera contextual</string>
+    <string name="custom_statusbar_header_summary">Estableix una imatge de fons basada en la data i hora actuals</string>
+
+    <!-- Volume default -->
+    <string name="button_volume_default_none">Cap</string>
+    <string name="button_volume_default_ringer">Trucada</string>
+    <string name="button_volume_default_media">Multimèdia</string>
+    <string name="button_volume_default_title">Volum per defecte</string>
+    <string name="button_volume_default_summary">Trieu quin volum es canvia per defecte</string>
+
+    <!-- Navigation Bar customization-->
+    <string name="navigation_bar_title">Botons i disseny</string>
+    <string name="navigation_bar_summary">Configurar botons de la barra de navegació</string>
+    <string name="navigation_bar_help_text">1 - Per iniciar l\'edició, toc a la icona de bloqueig \n\n2 - Premeu qualsevol botó per assignar o canviar la funcionalitat \n\n3 - Premeu qualsevol botó per canviar l\'ordre \n\n4 - Per guardar, premeu el icona de bloqueig de nou \n\n5 - per restaurar els valors per defecte del sistema, premeu el botó de reinici \n\n</string>
+    <string name="navigation_bar_tips">\u2022 Les accions només es poden assignar a un botó a la vegada\n\n\u2022 El botó d\'inici no pot ser reassignat\n\n\u2022 Botons laterals no poden ser reorganitzats</string>
+    <string name="navigation_bar_tips_title">Consells ràpids</string>
+    <string name="navigation_bar_reset_message">¿Esborrar els paràmetres actuals i restaurar els valors predeterminats?</string>
+    <string name="navigation_bar_save_message">Configuració de la barra de navegació guardada</string>
+    <string name="navigation_bar_reset_toast">Restablerts valors de la barra de navegació</string>
+    <string name="navigation_bar_menu_editable">Editable</string>
+    <string name="navigation_bar_menu_locked">Bloquejat</string>
+
+    <!-- Navigation ring shortcuts -->
+    <string name="navigation_ring_title">Dreceres d\'inici ràpid</string>
+    <string name="navigation_ring_summary">Configura dreceres de la barra de navegació personalitzada</string>
+    <string name="navring_target_reset_message">¿Eliminar tots els accessos directes de la barra de navegació creats per l\'usuari i restaurar els valors predeterminats?</string>
+    <string name="navring_target_reset">Restablir valors predeterminats dels accessos directes de la barra de navegació</string>
+    <string name="navring_action_open_ime_switcher">Obrir canvi d\'IME</string>
+    <string name="navring_action_kill_app">Matar aplicació</string>
+    <string name="navring_action_none">Cap</string>
+    <string name="navring_action_take_screenshot">Capturar pantalla</string>
+    <string name="navring_action_ring_vibrate">Trucada/Vibració</string>
+    <string name="navring_action_ring_silent">Trucada/Silenci</string>
+    <string name="navring_action_ring_vibrate_silent">Trucada/Vibració/Silenci</string>
+    <string name="navring_action_screen_off">Apagar pantalla</string>
+    <string name="navring_action_torch">Conmuntar torxa</string>
+    <string name="navring_action_google_now">Google Now</string>
+    <string name="navring_choose_action_title">Trieu l\'acció</string>
+    <string name="navring_action_last_app">Canviar a l\'última aplicació</string>
+
+    <!-- Lock Screen Shortcuts -->
+    <string name="lockscreen_target_info">Arrossegueu el control lliscant per assignar accessos directes</string>
+    <string name="lockscreen_target_title">Dreceres del control lliscant</string>
+    <string name="lockscreen_target_summary">Veure o canviar els accessos directes personalitzats de la pantalla de bloqueig</string>
+    <string name="lockscreen_target_reset">Restablir valors predeterminats de les dreceres a la pantalla de bloqueig</string>
+    <string name="lockscreen_target_reset_title">Reinicialitzar</string>
+    <string name="lockscreen_target_reset_message">¿Eliminar tots els accessos directes de la pantalla de bloqueig creats per l\'usuari i restaurar els valors predeterminats?</string>
+    <string name="lockscreen_target_empty">Buit</string>
+    <string name="lockscreen_target_edit_title">Edita accés directe i la icona</string>
+    <string name="lockscreen_target_edit_msg">Seleccionar o canviar l\'aplicació o activitat desitjada i la icona associada</string>
+
+    <!-- Lock screen shortcuts -->
+    <string name="picker_activities">Activitats</string>
+    <string name="select_custom_app_title">Selecciona aplicació personalitzada</string>
+    <string name="select_custom_activity_title">Selecciona activitat personalitzada</string>
+    <string name="icon_picker_choose_icon_title">Seleccioneu la icona</string>
+    <string name="icon_picker_alarm">Alarma</string>
+    <string name="icon_picker_browser">Navegador</string>
+    <string name="icon_picker_calendar">Calendari</string>
+    <string name="icon_picker_camera">Càmera</string>
+    <string name="icon_picker_chrome">Chrome</string>
+    <string name="icon_picker_contacts">Contactes</string>
+    <string name="icon_picker_email">Email</string>
+    <string name="icon_picker_email2">Email Holo</string>
+    <string name="icon_picker_facebook">Facebook</string>
+    <string name="icon_picker_gallery">Galleria</string>
+    <string name="icon_picker_gmail">Gmail</string>
+    <string name="icon_picker_google_small">Google (petit)</string>
+    <string name="icon_picker_googleplus">Google Plus</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
+    <string name="icon_picker_maps">Maps</string>
+    <string name="icon_picker_movie">Pel·lícula</string>
+    <string name="icon_picker_music">Música</string>
+    <string name="icon_picker_nav_normal">Navegació</string>
+    <string name="icon_picker_phone">Telèfon</string>
+    <string name="icon_picker_podcast">Podcast</string>
+    <string name="icon_picker_rss">Rss</string>
+    <string name="icon_picker_search">Cerca</string>
+    <string name="icon_picker_snapchat">Snapchat</string>
+    <string name="icon_picker_sms">SMS</string>
+    <string name="icon_picker_twitter">Twitter</string>
+
+    <string name="quick_settings_category_title">Ajustos ràpids</string>
+
+    <!-- QuickSettings: Dynamic Row -->
+    <string name="qs_configurable_title">Ajustaments ràpids configurables</string>
+    <string name="qs_configurable_summary">Activar/desactivar canvis dinàmics</string>
+
+    <!-- QuickSettings: Quick Pulldown -->
+    <string name="title_quick_pulldown">Accés ràpid</string>
+    <string name="summary_quick_pulldown">Ajustaments ràpids desplegables amb un dit</string>
+    <string name="quick_pulldown_off">Desactivat</string>
+    <string name="quick_pulldown_centre">Centre</string>
+    <string name="quick_pulldown_left">Esquerra</string>
+    <string name="quick_pulldown_right">Dreta</string>
+
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">Accés intel·ligent</string>
+    <string name="smart_pulldown_summary">Obriu els ajustaments ràpids quan no hi ha notificacions presents</string>
+    <string name="smart_pulldown_off">Desactivat</string>
+    <string name="smart_pulldown_dismissable">Si no hi ha notificacions eliminables</string>
+    <string name="smart_pulldown_persistent">Si no hi ha notificacions</string>
+
+    <!-- Cursor control -->
+    <string name="volume_key_cursor_control_title">Control del cursor</string>
+    <string name="volume_key_cursor_control_on">Esquerra/dreta</string>
+    <string name="volume_key_cursor_control_on_reverse">Dreta/esquerra</string>
+
+    <!-- Quick Swipe -->
+    <string name="quick_swipe_title">Lliscat ràpid</string>
+    <string name="quick_swipe_summary">Lliscar per canviar ràpidament entre els ajustaments ràpids i tauler de notificacions</string>
+
+    <!-- navigation bar -->
+    <string name="soft_back_kill_app_title">Pulsació llarga per matar aplicació</string>
+    <string name="soft_back_kill_app_summary">Pulsació llarga matarà aplicació en primer pla</string>
+
+    <!-- Sound themes -->
+    <string name="sound_packages_title">Paquets de so</string>
+    <string name="install_sound_pack_title">Instal·lar paquets de so</string>
+    <string name="install_sound_pack_summary">Instal·lar nous paquets de so afegits a la carpeta Soundpacks en la memòria interna</string>
+    <string name="select_sound_pack_title">Seleccioneu el paquet de so</string>
+    <string name="select_sound_pack_summary">Seleccioneu el paquet de so actiu</string>
+    <string name="default_sound_pack">Per defecte (Sistema)</string>
+    <string name="error_pack_install">Error instal·lant paquet de so</string>
+
+    <string name="omniswitch_category">OmniSwitch</string>
+    <string name="recents_use_omniswitch_title">Ús per recents</string>
+    <string name="recents_use_omniswitch_summary">Utilitza OmniSwitch en lloc de la vista per defecte</string>
+    <string name="omniswitch_start_settings_title">Configuració</string>
+    <string name="omniswitch_start_settings_summary">Obre la configuració de OmniSwitch</string>
+    <string name="omniswitch_not_installed_title">Avís</string>
+    <string name="omniswitch_not_installed_summary">OmniSwitch no està instal·lat</string>
+    <string name="omniswitch_not_installed_message">OmniSwitch no està instal·lat</string>
+    <string name="omniswitch_first_time_title">Informació</string>
+    <string name="omniswitch_first_time_message">Assegureu-vos que ha habilitat OmniSwitch. Vostè pot fer això mitjançant l\'ús de \"Configuració\".</string>
+
+    <string name="emulate_menu_key_title">Emular la tecla de menú de hardware</string>
+    <string name="emulate_menu_key_summary">Força l\'ocultació del menú de tres punts en les aplicacions. Requereix reinici de l\'aplicació</string>
+
+    <string name="force_show_overflow_menu_title">Mostra el menú de tres punts</string>
+    <string name="force_show_overflow_menu_summary">Força la visualització del menú de tres punts en les aplicacions. Requereix reinici de l\'aplicació</string>
+
+    <!-- Clock -->
+    <string name="status_bar_clock">Rellotge i data</string>
+    <string name="status_bar_clock_title">Estil del rellotge i data</string>
+    <string name="clock_title_enable">Alineació</string>
+    <string name="clock_enabled">Activat</string>
+    <string name="clock_disabled">Desactivat</string>
+    <string name="clock_color_title">Color</string>
+    <string name="status_bar_clock_style_reset">Restaurar color</string>
+    <string name="status_bar_show_clock_title">Mostra rellotge i data</string>
+    <string name="status_bar_am_pm_title">AM/PM</string>
+    <string name="status_bar_am_pm_info">Rellotge de 24 hores està habilitat</string>
+    <string name="enable_clock_weekday">Dia de la setmana</string>
+    <string name="enable_clock_weekday_summary">Dia abreujat de la setmana abans de l\'hora</string>
+    <string name="right_clock">Rellotge a la dreta</string>
+    <string name="center_clock">Rellotge centrat</string>
+    <string name="dont_show">No mostrar</string>
+    <string name="clock_date_display">Data</string>
+    <string name="clock_date_display_summary">Veure dates personalitzat abans que el rellotge</string>
+    <string name="clock_date_style">Estil de la data</string>
+    <string name="clock_date_format">Format de la data</string>
+    <string name="am_pm_clock_normal">Mida normal de la font</string>
+    <string name="am_pm_clock_small">Mida petita de la font</string>
+    <string name="am_pm_clock_none">No mostrar</string>
+    <string name="clock_date_display_none">No mostrar</string>
+    <string name="clock_date_display_small">Mida petita de la font</string>
+    <string name="clock_date_display_normal">Mida normal de la font</string>
+    <string name="clock_date_style_normal">Normal</string>
+    <string name="clock_date_style_lowercase">Minúscules</string>
+    <string name="clock_date_style_uppercase">Mayúscules</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Indicar bateria en l\'anell de desbloqueig</string>
+
+    <!-- Lockscreen -->
+    <string name="category_widgets_title">Widgets</string>
+    <string name="category_privacy_title">Privacitat</string>
+    <string name="category_background_title">Fons</string>
+    <string name="more_settings_title">Més</string>
+
+    <!-- Widgets-->
+    <string name="maximize_widgets_title">Maximitzar</string>
+    <string name="enable_camera_title">Càmera</string>
+    <string name="enable_camera_summary">Activar widget de la càmera</string>
+
+    <!-- Privacy -->
+    <string name="enable_power_menu_title">Menú d\'encesa</string>
+    <string name="enable_power_menu_summary">Activar menú d\'encesa</string>
+
+    <!-- Background -->
+    <string name="see_through_title">Veure a través</string>
+    <string name="see_through_summary">Les seves dades poden ser visibles per als que l\'envolten</string>
+    <string name="blur_radius_title">Difuminar contingut</string>
+    <string name="blur_radius_summary">Intensitat de l\'efecte de difuminat</string>
+    <string name="lockscreen_wallpaper">Wallpaper</string>
+    <string name="lockscreen_wallpaper_disabled">L\'efecte \'veure a través\' ha de ser desactivat</string>
+
+    <!-- Navigation bar height/width -->
+    <string name="navbar_dimen_title">Dimensions</string>
+    <string name="navbar_dimen_summary">Configurar l\'ample i l\'altura de la barra de navegació</string>
+    <string name="navbar_dimensions_reset_message">¿Restablir totes les entrades a les dimensions per defecte?</string>
+    <string name="navigation_bar_height_title">Alçada de la barra de navegació</string>
+    <string name="navigation_bar_height_summary">Alçada de la barra de navegació en la manera retrat.</string>
+    <string name="navigation_bar_height_landscape_title">Alçada de la barra de navegació en la manera paisatge</string>
+    <string name="navigation_bar_height_landscape_summary">Alçada de la barra de navegació en la manera paisatge.</string>
+    <string name="navigation_bar_width_title">Ample de la barra de navegació</string>
+    <string name="navigation_bar_width_summary">Alçada de la barra de navegació si la barra està al llarg d\'un costat</string>
+    <string name="navigation_bar_size_42_dp_default">42 dp (predeterminat)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (predeterminat)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (apagat)</string>
+
+    <!-- Notification Panel Shortcuts -->
+    <string name="notification_bar_shortcuts">Dreceres de capçalera</string>
+    <string name="clock_shortcut_title">Tiemps</string>
+    <string name="calendar_shortcut_title">Data</string>
+    <string name="default_shortcut">Predeterminat</string>
+
+    <string name="color_picker_dialog_title">Color</string>
+
+    <!-- Swap volume buttons when the screen is rotated -->
+    <string name="swap_volume_buttons_title">Voltejar botons de volum</string>
+    <string name="swap_volume_buttons_summary">Voltejar botons de volum segons la posició del terminal</string>
+    <string name="swap_volume_advanced_settings_title">Configuració de rotació avançades</string>
+    <string name="swap_volume_advanced_settings_close">Tancar</string>
+    <string name="swap_volume_disabled_90_title">Deshabilitar a 90 graus</string>
+    <string name="swap_volume_disabled_270_title">Deshabilitar a 270 graus</string>
+
+   <!-- Lockscreen immersive mode -->
+   <string name="category_immersive_mode_title">Mode inmersiu</string>
+   <string name="lockscreen_immersive_mode_title">Desactivar mode inmersiu</string>
+</resources>
diff --git a/res/values-cs/custom_strings.xml b/res/values-cs/custom_strings.xml
index c334a099c..6df15dba0 100644
--- a/res/values-cs/custom_strings.xml
+++ b/res/values-cs/custom_strings.xml
@@ -117,7 +117,7 @@
     <string name="screen_auto_brighness_summary">Úrovně jasu obrazovky automatického režimu</string>
     <string name="button_auto_brightness">Automatické úrovně</string>
     <string name="button_auto_brighness_summary">Úrovně jasu tlačítka automatického režimu</string>
-    <string name="button_brightness_category">Tlačítka</string>
+    <string name="button_brightness_title">Tlačítka</string>
     <string name="button_no_brightness">Tmavý režim</string>
     <string name="button_no_brightness_summary">Nenastavovat jas tlačítka</string>
     <string name="button_link_brightness">Odkaz na obrazovce</string>
@@ -395,4 +395,15 @@
     <string name="soft_back_kill_app_title">Dlouhým stiskem tlačítka zpět vynutit ukončení aplikace</string>
     <string name="soft_back_kill_app_summary">Dlouhým stiskem tlačítka zpět vynutíte ukončení aplikace v popředí</string>
 
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Baterie kolem odemykacího kruhu</string>
+
+    <!-- Enable camera -->
+    <string name="lockscreen_enable_camera_title">Widget fotoaparátu</string>
+    <string name="lockscreen_enable_camera_summary">Zobrazit widget fotoaparátu vpravo od obrazovky odmeknutí</string>
+
+    <!-- Enable power menu -->
+    <string name="lockscreen_enable_power_menu_title">Povolit nabídku Vypnout</string>
+    <string name="lockscreen_enable_power_menu_summary">Zobrazit nabídku Vypnout při zamčené obrazovce</string>
+
 </resources>
diff --git a/res/values-de/custom_strings.xml b/res/values-de/custom_strings.xml
index 602a244a5..833ecaf3b 100644
--- a/res/values-de/custom_strings.xml
+++ b/res/values-de/custom_strings.xml
@@ -118,7 +118,7 @@
     <string name="screen_auto_brighness_summary">Helligkeitsstufen für Automodus</string>
     <string name="button_auto_brightness">Automatische Stufen</string>
     <string name="button_auto_brighness_summary">Tastenhelligkeit im Automodus</string>
-    <string name="button_brightness_category">Tasten</string>
+    <string name="button_brightness_title">Tasten</string>
     <string name="button_no_brightness">Dunkler Modus</string>
     <string name="button_no_brightness_summary">Tastenhelligkeit nicht einstellen</string>
     <string name="button_link_brightness">Mit Bildschirm verknüpfen</string>
@@ -385,6 +385,23 @@
     <string name="icon_picker_sms">Nachrichten</string>
     <string name="icon_picker_twitter">Twitter</string>
 
+    <!-- Tinted statusbar -->
+    <string name="tinted_statusbar_title">Farben</string>
+    <string name="title_tinted_statusbar">Dynamischer Farbwechsel</string>
+    <string name="title_tinted_statusbar_option">Farbe ändern an</string>
+    <string name="tinted_statusbar_off">Deaktiviert</string>
+    <string name="tinted_statusbar_actionbar">Aktionsleistenfarbe</string>
+    <string name="tinted_statusbar_system">Bildschirmfarbe</string>
+    <string name="tinted_statusbar_statusbar">Statusleiste</string>
+    <string name="tinted_statusbar_navbar">Navigationsleiste</string>
+    <string name="tinted_statusbar_all">Beide</string>
+    <string name="tinted_statusbar_filter_title">Farben umkehren</string>
+    <string name="tinted_statusbar_filter_summary">Umkehren der Farben einschalten</string>
+    <string name="tinted_statusbar_full_mode_title">Farbe der Navigationsleiste</string>
+    <string name="tinted_statusbar_full_mode_summary">Aktuelle Farbe zur Navigationsleiste hinzufügen</string>
+    <string name="tinted_statusbar_transparent_title">Deckkraft der Statusleiste</string>
+    <string name="tinted_navbar_transparent_title">Deckkraft der Navigationsleiste</string>
+
     <!-- QuickSettings: Dynamic Row -->
     <string name="qs_configurable_title">Schnelleinstellungen konfigurierbar</string>
     <string name="qs_configurable_summary">Aktivieren/Deaktivieren dynamischer Zeilenänderungen</string>
@@ -470,4 +487,21 @@
     <string name="clock_date_style_normal">Normal</string>
     <string name="clock_date_style_lowercase">Kleinbuchstaben</string>
     <string name="clock_date_style_uppercase">Großbuchstaben</string>
+
+    <string name="security_maximize_widgets_title">Sperrbildschirm Widgets maximieren</string>
+
+    <!-- Enable camera -->
+    <string name="lockscreen_enable_camera_title">Kamera-Widget</string>
+    <string name="lockscreen_enable_camera_summary">Nach rechts wischen, um Kamera-Widget zu zeigen</string>
+
+    <!-- Enable power menu -->
+    <string name="lockscreen_enable_power_menu_title">Ausschalt-Menü aktivieren</string>
+    <string name="lockscreen_enable_power_menu_summary">Ausschalt-Menü anzeigen, wenn der Bildschirm gesperrt ist</string>
+
+    <!-- Lockscreen see through -->
+    <string name="lockscreen_see_through_title">Durchsichtig</string>
+    <string name="lockscreen_see_through_summary">Zeigt den Inhalt hinter dem Sperrbildschirm. Daten könnten für umstehende sichtbar sein.</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Batteriestatus um Entsperrsysmbol</string>
 </resources>
diff --git a/res/values-el/custom_strings.xml b/res/values-el/custom_strings.xml
new file mode 100644
index 000000000..dcfafdf90
--- /dev/null
+++ b/res/values-el/custom_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Μπαταρία γύρω από δακτύλιο ξεκλειδώματος</string>
+
+</resources>
diff --git a/res/values-es/custom_strings.xml b/res/values-es/custom_strings.xml
new file mode 100644
index 000000000..f83cbabc4
--- /dev/null
+++ b/res/values-es/custom_strings.xml
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2013 The OmniROM Project
+
+  Parts Copyright (C) 2012-2013 The CyanogenMod Project
+
+  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 3 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/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="ok">OK</string>
+    <string name="reset">Reinicializar</string>
+
+    <string name="bars_and_menus_settings">Barras y menús</string>
+    <string name="active_display_settings">Pantalla activa</string>
+    <string name="bars_and_menus_category_status_bar_title">Barra de estado</string>
+    <string name="bars_and_menus_category_navigation_bar_title">Barra de navegación</string>
+    <string name="status_bar_battery_title">Estilo de la batería</string>
+    <string name="status_bar_toggle_brightness">Control de brillo</string>
+    <string name="status_bar_toggle_brightness_summary">Ajuste el brillo deslizando a través de la barra de estado</string>
+    <string name="status_bar_toggle_info">Brillo automático está activado</string>
+    <string name="status_bar_signal_text_title">Estilo del estado de la señal</string>
+    <string name="status_bar_style_icon">Icono</string>
+    <string name="status_bar_style_hidden">Oculto</string>
+    <string name="status_bar_signal_text_show_text">Texto</string>
+    <string name="status_bar_battery_status_percentage">Porcentaje</string>
+    <string name="status_bar_battery_status_circle">Círculo</string>
+    <string name="status_bar_battery_status_circle_percentage">Círculo con porcentaje</string>
+    <string name="status_bar_notif_count_title">Recuento de notificaciones</string>
+    <string name="status_bar_notif_count_summary">Muestra el número de notificaciones pendientes</string>
+
+    <!-- String for IconPicker -->
+    <string name="icon_picker_title">Elegir fuente del icono</string>
+    <string name="icon_picker_system_icons_title">Iconos del sistema</string>
+    <string name="icon_picker_gallery_title">Galería</string>
+    <string name="icon_picker_pack_title">Pack de iconos</string>
+
+    <string name="profile_applist_title">Aplicaciones</string>
+    <string name="profile_choose_app">Elija aplicación</string>
+    <string name="profiles_add">Añadir</string>
+
+    <!-- Notification light dialogs -->
+    <string name="edit_light_settings">Editar la configuración de luz</string>
+    <string name="pulse_speed_title">Duración del impulso y la velocidad</string>
+    <string name="color_list_title">Color</string>
+    <string name="default_time">Normal</string>
+    <string name="custom_time">Personalizado</string>
+    <string name="dialog_test">Prueba</string>
+    <string name="dialog_delete_title">Borrar</string>
+    <string name="dialog_delete_message">¿Eliminar el elemento seleccionado?</string>
+    <string name="dialog_test_message">Apagar la pantalla para ver la notificación seleccionada en la acción o descartar este cuadro de diálogo para detener la prueba</string>
+    <string name="dialog_test_button">Descartar</string>
+
+    <!-- Lights settings screen, notification light settings -->
+    <string name="notification_light_enable">Habilitar</string>
+    <string name="notification_light_general_title">General</string>
+    <string name="notification_light_applist_title">Aplicaciones</string>
+    <string name="notification_light_phonelist_title">Teléfono</string>
+    <string name="notification_light_use_custom">Usar valores personalizados</string>
+    <string name="notification_light_enabled">Habilitado</string>
+    <string name="notification_light_disabled">Deshabilitado</string>
+    <string name="notification_light_default_value">Predeterminado</string>
+    <string name="notification_light_missed_call_title">LLamada perdida</string>
+    <string name="notification_light_voicemail_title">Correo de voz</string>
+    <string name="notification_light_screen_on_title">Mostrar cuando la pantalla está activa</string>
+
+    <!-- Values for the notification light pulse spinners -->
+    <string name="pulse_length_always_on">Siempre activo</string>
+    <string name="pulse_length_very_short">Muy corto</string>
+    <string name="pulse_length_short">Corto</string>
+    <string name="pulse_length_normal">Normal</string>
+    <string name="pulse_length_long">Largo</string>
+    <string name="pulse_length_very_long">Muy largo</string>
+    <string name="pulse_speed_very_fast">Muy rápido</string>
+    <string name="pulse_speed_fast">Rapido</string>
+    <string name="pulse_speed_normal">Normal</string>
+    <string name="pulse_speed_slow">Lento</string>
+    <string name="pulse_speed_very_slow">Muy lento</string>
+
+    <string name="led_color_green">Verde</string>
+    <string name="led_color_red">Rojo</string>
+
+    <!-- Battery light settings  -->
+    <string name="battery_light_enable">Habilitado</string>
+    <string name="battery_low_pulse_title">Pulso si la batería baja</string>
+    <string name="battery_light_list_title">Colores</string>
+    <string name="battery_light_low_color_title">Batería baja</string>
+    <string name="battery_light_medium_color_title">Cargando</string>
+    <string name="battery_light_full_color_title">Cargado (90%)</string>
+    <string name="battery_light_really_full_color_title">Cargado (100%)</string>
+    <string name="edit_battery_settings">Editar la configuración de la batería</string>
+
+    <!-- brightness settings -->
+    <string name="brightness_settings_title">Configuración de la luminosidad</string>
+    <string name="screen_current_value">Valor actual de la pantalla: <xliff:g id="screen_level">%d</xliff:g></string>
+    <string name="button_current_value">Valor actual del botón: <xliff:g id="button_level">%d</xliff:g></string>
+
+    <string name="auto_brightness_sensitivity_title">Ajuste de sensibilidad</string>
+    <string name="auto_brightness_sensitivity_summary">Medio</string>
+    <string name="auto_brightness_sensitivity_verylow">Muy bajo</string>
+    <string name="auto_brightness_sensitivity_low">Bajo</string>
+    <string name="auto_brightness_sensitivity_medium">Medio</string>
+    <string name="auto_brightness_sensitivity_high">Alto</string>
+    <string name="auto_brightness_sensitivity_veryhigh">Muy alto</string>
+
+    <string name="screen_brightness_category">Pantalla</string>
+    <string name="screen_auto_brightness">Niveles automáticos</string>
+    <string name="screen_auto_brighness_summary">Niveles de brillo de la pantalla para el modo automático</string>
+    <string name="button_auto_brightness">Niveles automáticos</string>
+    <string name="button_auto_brighness_summary">Niveles de brillo del botón en modo automático</string>
+    <string name="button_no_brightness">Modo oscuro</string>
+    <string name="button_no_brightness_summary">No ajustar el brillo del botón</string>
+    <string name="button_link_brightness">Enlace a la pantalla</string>
+    <string name="button_link_brightness_summary">Usar el mismo valor que la pantalla para el brillo de los botones</string>
+    <string name="button_manual_brightness">Nivel manual</string>
+    <string name="button_manual_brightness_summary">Nivel de brillo del botón para el modo manual</string>
+    <string name="dialog_manual_brightness_title">Brillo del botón en manual</string>
+    <!-- Automatic brightness customization -->
+    <string name="auto_brightness_setup_title">Brillo automático</string>
+    <string name="light_sensor_current_value">Valor actual del sensor de luz: <xliff:g id="light_level">%d</xliff:g> lux</string>
+    <string name="auto_brightness_dialog_title">Niveles de brillo automático</string>
+    <string name="auto_brightness_level_format"><xliff:g id="level">%1$d</xliff:g></string>
+    <string name="auto_brightness_last_level_format"><xliff:g id="level">%1$d</xliff:g>+</string>
+    <string name="auto_brightness_adjust_button">Ajustar</string>
+    <string name="auto_brightness_close_button">Cerrar</string>
+    <string name="auto_brightness_reset_button">Reiniciar</string>
+    <string name="auto_brightness_split_dialog_title">Dividir nivel de brillo</string>
+    <string name="auto_brightness_level_dialog_title">Nivel de brillo</string>
+    <string name="auto_brightness_lux">Luminosidad ambiental (lux)</string>
+    <string name="auto_brightness_backlight">Brillo</string>
+    <string name="auto_brightness_reset_dialog_title">¿Reiniciar niveles?</string>
+    <string name="auto_brightness_reset_confirmation">Todos los niveles de brillo se restablecerán a sus valores predeterminados.</string>
+    <string name="auto_brightness_split_lux_format">Dividir posicion (entre <xliff:g id="min">%1$d</xliff:g> y <xliff:g id="max">%2$d</xliff:g> lux)</string>
+    <string name="auto_brightness_level_options">Opciones de nivel de luz</string>
+    <string name="auto_brightness_menu_edit">Editar</string>
+    <string name="auto_brightness_menu_split">Dividir</string>
+    <string name="auto_brightness_menu_remove">Eliminar</string>
+    <string name="sensor_category">Sensor</string>
+    <string name="button_timeout_title">Tiempo de espera</string>
+    <string name="button_timeout_summary">Deshabilitado en el valor 0</string>
+    <string name="button_brightness_title">Botón de brillo</string>
+    <string name="button_brightness_summary">Botón ajustes de brillo</string>
+
+    <!-- button settings -->
+    <string name="button_volume_keys_title">Volumen</string>
+    <string name="button_volume_wake_title">Botón activar</string>
+    <string name="button_volume_wake_summary">Al pulsar un botón de volumen despertará el dispositivo</string>
+    <string name="button_volume_music_control_title">Control de la música</string>
+    <string name="button_volume_music_control_summary">Pulsación larga para cambiar entre canciones con la pantalla apagada</string>
+    <string name="button_headsethook_title">Auriculares</string>
+    <string name="button_headsethook_launch_voice_title">Auriculares lanza voz</string>
+    <string name="button_headsethook_launch_voice_summary">Al pulsar el botón del auricular lanzará controles de voz</string>
+
+    <!-- Network traffic -->
+    <string name="network_traffic_title">Tráfico de red</string>
+    <string name="show_network_traffic_state">Monitor de tráfico en barra de estado</string>
+    <string name="show_network_traffic_unit">Unidades</string>
+    <string name="show_network_traffic_frequency">Intervalo de actualización</string>
+    <string name="show_network_traffic_disable">Desactivado</string>
+    <string name="show_network_traffic_up">Saliente</string>
+    <string name="show_network_traffic_down">Entrante</string>
+    <string name="show_network_traffic_all">Saliente y entrante</string>
+    <string name="show_network_traffic_bit">Bits por segundo</string>
+    <string name="show_network_traffic_byte">Bytes por segundo</string>
+    <string name="show_network_traffic_500">500 ms</string>
+    <string name="show_network_traffic_1000">1000 ms</string>
+    <string name="show_network_traffic_1500">1500 ms</string>
+    <string name="show_network_traffic_2000">2000 ms</string>
+
+    <!-- Status Bar Activity Indicators -->
+    <string name="show_activity_indicators_on_status_bar_title">Indicadores de actividad</string>
+    <string name="show_activity_indicators_on_status_bar_summary">Mostrar indicadores en barras de señal</string>
+
+    <!-- Hardware keys -->
+    <string name="button_keys_title">Botones</string>
+    <string name="keys_bindings_title">Acciones de los botones</string>
+    <string name="button_keys_back_title" >Botón atrás</string>
+    <string name="button_keys_home_title" >Botón inicio</string>
+    <string name="button_keys_menu_title" >Botón menú</string>
+    <string name="button_keys_assist_title" >Botón buscar</string>
+    <string name="button_keys_appSwitch_title" >Botón cambio de aplicación</string>
+    <string name="keys_enable_custom_title">Acciones personalizadas</string>
+    <string name="keys_back_press_title">Botón atrás</string>
+    <string name="keys_back_long_press_title">Botón atrás (pulsación larga)</string>
+    <string name="keys_home_press_title">Botón inicio</string>
+    <string name="keys_home_long_press_title">Botón inicio (pulsación larga)</string>
+    <string name="keys_home_double_tap_title">Botón inicio (doble pulsación)</string>
+    <string name="keys_menu_press_title">Botón menú</string>
+    <string name="keys_menu_long_press_title">Botón menú (pulsación larga)</string>
+    <string name="keys_assist_press_title">Botón búsqueda</string>
+    <string name="keys_assist_long_press_title">Botón búsqueda (pulsación larga)</string>
+    <string name="keys_app_switch_press_title">Botón cambio de aplicación</string>
+    <string name="keys_app_switch_long_press_title">Botón cambio de aplicación (pulsación larga)</string>
+    <string name="keys_action_nothing">Ninguna acción</string>
+    <string name="keys_action_menu">Menú abrir/cerrar</string>
+    <string name="keys_action_app_switch">Aplicaciones recientes</string>
+    <string name="keys_action_search">Asistente de búsqueda</string>
+    <string name="keys_action_voice_search">Búsqueda por voz</string>
+    <string name="keys_action_in_app_search">Búsqueda dentro de la aplicación</string>
+    <string name="keys_action_home">Botón inicio</string>
+    <string name="keys_action_back">Botón atrás</string>
+    <string name="keys_action_last_app">Cambiar a la última aplicación</string>
+    <string name="keys_action_kill_app">Matar aplicación</string>
+    <string name="keys_action_sleep">Ir a dormir</string>
+    <string name="keys_action_normal">Pulsación normal</string>
+    <string name="keys_action_long">Pulsación larga</string>
+    <string name="keys_action_double">Doble pulsación</string>
+    <string name="dialog_no_home_key_title">Sin acción</string>
+    <string name="no_home_key">Usted no tiene asignada una acción al botón de \"Inicio\"! Esto puede hacer que el dispositivo sea inservible!</string>
+    <string name="virtual_key_haptic_feedback_title">Vibrar al tocar</string>
+    <string name="virtual_key_haptic_feedback_summary">Depende de \"Vibrar al tocar\" en la configuración de sonido</string>
+    <string name="navigation_bar_show_title">Mostrar barra de navegación</string>
+    <string name="navigation_bar_show_summary">Forzar activar barra de navegación</string>
+    <string name="hardware_keys_disable_title">Desactivar teclas</string>
+    <string name="hardware_keys_disable_summary">Forzar desactivar teclas</string>
+
+    <!-- Power Menu Options-->
+    <string name="bars_and_menus_category_power_menu_title">Menú de encendido</string>
+    <string name="power_menu_toggle_screenshot_title">Captura de pantalla</string>
+    <string name="power_menu_toggle_screenshot_summary">Mostrar opción para capturar la pantalla en menú de encendido</string>
+    <string name="power_menu_toggle_screenrecord_title">Grabar la pantalla</string>
+    <string name="power_menu_toggle_screenrecord_summary">Mostrar opción para grabar la pantalla en menú de encendido</string>
+    <string name="power_menu_toggle_mobile_data_title">Datos móviles</string>
+    <string name="power_menu_toggle_mobile_data_summary">Mostrar opción de datos móviles en el menú de encendido</string>
+    <string name="power_menu_toggle_airplane_mode_title">Modo avión</string>
+    <string name="power_menu_toggle_airplane_mode_summary">Mostrar opción de modo avión en el menú de encendido</string>
+    <string name="power_menu_toggle_sound_toggles_title">Conmutar sonido</string>
+    <string name="power_menu_toggle_sound_toggles_summary">Mostrar opción de modo avión en el menú de encendido</string>
+
+    <!-- Active Display Notifications -->
+    <string name="ad_settings_title">Pantalla activa</string>
+    <string name="ad_settings_summary">Cambiar la configuración de pantalla activa</string>
+    <string name="ad_enable_title">Habilitar</string>
+    <string name="ad_enable_summary_on">Pantalla activa habilitada</string>
+    <string name="ad_enable_summary_off">Pantalla activa deshabilitada</string>
+    <string name="ad_bypass_title">Modo atajo</string>
+    <string name="ad_bypass_summary">Modo bolsillo lanzará la pantalla de bloqueo cuando no existen notificaciones y está habilitada la seguridad</string>
+    <string name="ad_text_title">Texto de la notificación</string>
+    <string name="ad_text_summary">Mostrar el texto de la notificación entorno al anillo</string>
+    <string name="ad_content_title">Vista de notificación personalizada</string>
+    <string name="ad_content_summary">Usar el estilo de pantalla activa para los detalles de notificación</string>
+    <string name="ad_annoying_title">Notificaciones menos frecuentes</string>
+    <string name="ad_annoying_summary">Limita el número de notificaciones a una vez por período de tiempo</string>
+    <string name="ad_double_tap_title">Doble pulsación para dormir</string>
+    <string name="ad_double_tap_summary">Apaga la pantalla con doble pulsación</string>
+    <string name="ad_shake_event_settings_title">Ajustes de \"Shake\"</string>
+    <string name="ad_shake_event_title">Agitar para volver a mostrar</string>
+    <string name="ad_shake_event_summary">Agitar el dispositivo para volver a mostrar las notificaciones</string>
+    <string name="ad_shake_force_title">Evento predeterminado</string>
+    <string name="ad_shake_force_summary">Después de recibir la notificación no se ejecutará la pantalla activa hasta que el usuario agite el dispositivo</string>
+    <string name="ad_shake_threshold_title">Intensidad</string>
+    <string name="ad_shake_threshold_summary">Intensidad de la sacudida necesaria para mostrar notificaciones</string>
+    <string name="ad_shake_timeout_title">Tiempo de espera</string>
+    <string name="ad_shake_timeout_summary">Segundos que \"Shake\" está activo después de recibir una notificación, 0 significa siempre activo.</string>
+    <string name="ad_shake_quiet_hours_title">Ignorar \"Quiet Hours\"</string>
+    <string name="ad_shake_quiet_hours_summary">Permite agitar durante horas en silencio</string>
+    <string name="ad_shake_long_threshold_title">Intérvalo</string>
+    <string name="ad_shake_long_threshold_summary">Tiempo mínimo entre movimientos consecutivos</string>
+    <string name="ad_all_notifications_title">Mostrar en curso</string>
+    <string name="ad_all_notifications_summary">Mostrar notificaciones no eliminables</string>
+    <string name="ad_hide_low_priority_title">Ocultar baja prioridad</string>
+    <string name="ad_hide_low_priority_summary">Ocultar notificaciones marcadas como de baja prioridad</string>
+    <string name="ad_pocket_mode_title">Modo bolsillo</string>
+    <string name="ad_pocket_mode_summary">Mostrar notificaciones pendientes después de sacar el aparato de su bolsillo</string>
+    <string name="ad_redisplay_title">Volver a visualizar notificaciones</string>
+    <string name="ad_timeout_title">Tiempo de espera para volver a visualizar</string>
+    <string name="ad_threshold_title">Tiempo de espera para umbral de proximidad</string>
+    <string name="ad_threshold_summary">Tiempo que el sensor de proximidad debe estar cubierto antes de activar la pantalla</string>
+    <string name="ad_brightness_title">Brillo de la pantalla</string>
+    <string name="ad_customizations_title">Ajustes avanzados</string>
+    <string name="ad_excluded_apps_title">Aplicaciones excluidas</string>
+    <string name="ad_excluded_apps_summary">Ninguna notificación será mostrada para estas aplicaciones</string>
+    <string name="ad_privacy_apps_title">Modo de privacidad</string>
+    <string name="ad_privacy_apps_summary">No mostrar detalles para las notificaciones de estas aplicaciones</string>
+    <string name="ad_show_date_title">Mostrar fecha</string>
+    <string name="ad_show_ampm_title">Mostrar AM/PM</string>
+    <string name="ad_sunlight_mode_title">Modo de luz del sol</string>
+    <string name="ad_brightness_summary">Se utiliza en el control de brillo manual</string>
+    <string name="ad_show_date_summary">Mostrar la fecha sobre el reloj</string>
+    <string name="ad_show_ampm_summary">Mostrar indicador AM / PM cuando se utiliza el formato de 12 horas</string>
+    <string name="ad_sunlight_mode_summary">Invertir colores en ambiente luminoso</string>
+    <string name="ad_turnoff_mode_title">Apagado automático</string>
+    <string name="ad_turnoff_mode_summary">Apagar después de encenderse en modo bolsillo y volver al bolsillo</string>
+    <string name="ad_redisplay_never">Nunca</string>
+    <string name="ad_redisplay_1m">1 minuto</string>
+    <string name="ad_redisplay_5m">5 minutos</string>
+    <string name="ad_redisplay_15m">15 minutos</string>
+    <string name="ad_redisplay_30m">30 minutos</string>
+    <string name="ad_redisplay_1h">1 hora</string>
+    <string name="ad_redisplay_2h">2 horas</string>
+    <string name="ad_redisplay_5h">5 horas</string>
+    <string name="ad_timeout_3s">3 segundos</string>
+    <string name="ad_timeout_5s">5 segundos</string>
+    <string name="ad_timeout_8s">8 segundos</string>
+    <string name="ad_timeout_10s">10 segundos</string>
+    <string name="ad_timeout_15s">15 segundos</string>
+    <string name="ad_timeout_25s">25 segundos</string>
+    <string name="ad_threshold_0s">Inmediato</string>
+    <string name="ad_threshold_1s">1 segundo</string>
+    <string name="ad_threshold_2s">2 segundos</string>
+    <string name="ad_threshold_3s">3 segundos</string>
+    <string name="ad_threshold_4s">4 segundos</string>
+    <string name="ad_threshold_5s">5 segundos</string>
+    <string name="ad_pocket_mode_off">Apagado</string>
+    <string name="ad_pocket_mode_notifications">Notificaciones sólo</string>
+    <string name="ad_pocket_mode_always">Siempre</string>
+
+    <string name="bars_and_menus_category_recent_panel_title">Vista recientes</string>
+
+    <!-- Recents clear all -->
+    <string name="show_recent_clear_all_button_title">Botón para borrar todo</string>
+    <string name="show_recent_clear_all_button_summary">Muestra un botón para borrar todo en la vista de aplicaciones recientes</string>
+    <string name="recent_clear_all_button_location_title">Posición del boton para borrar todo</string>
+    <string name="recent_clear_all_button_location_summary">Elija la posición del botón</string>
+    <string name="recent_clear_all_button_location_top_left">Arriba a la izquierda</string>
+    <string name="recent_clear_all_button_location_top_right">Arriba a la derecha</string>
+    <string name="recent_clear_all_button_location_bottom_left">Abajo a la izquierda</string>
+    <string name="recent_clear_all_button_location_bottom_right">Abajo a la derecha</string>
+
+    <!-- Memory Indicator -->
+    <string name="show_recents_memory_indicator_title">Indicador de memoria</string>
+    <string name="show_recents_memory_indicator_summary">Muestra un indicador de memoria en la vista de aplicaciones recientes</string>
+    <string name="recents_memory_indicator_location_title">Posición del indicador de memoria</string>
+    <string name="recents_memory_indicator_location_summary">Elija la posición del indicador de memoria</string>
+
+    <!-- Contextual Notification Panel Header -->
+    <string name="notification_drawer_category_title">Panel de notificaciones</string>
+    <string name="custom_statusbar_header_title">Encabezado contextual</string>
+    <string name="custom_statusbar_header_summary">Establece una imagen de fondo basada en la fecha y hora actuales</string>
+
+    <!-- Volume default -->
+    <string name="button_volume_default_none">Ninguno</string>
+    <string name="button_volume_default_ringer">LLamada</string>
+    <string name="button_volume_default_media">Multimedia</string>
+    <string name="button_volume_default_title">Volumen por defecto</string>
+    <string name="button_volume_default_summary">Elija qué volumen se cambia de forma predeterminada</string>
+
+    <!-- Navigation Bar customization-->
+    <string name="navigation_bar_title">Botones y diseño</string>
+    <string name="navigation_bar_summary">Configurar botones de la barra de navegación</string>
+    <string name="navigation_bar_help_text">1 - Para iniciar la edición, toque en el icono de bloqueo\n\n2 - Pulse cualquier botón para asignar o cambiar la funcionalidad\n\n3 - Mantenga pulsado cualquier botón para cambiar el orden\n\n4 - Para guardar, pulse el icono de bloqueo de nuevo\n\n5 - Para restaurar los valores por defecto del sistema, pulse el botón de reinicio\n\n</string>
+    <string name="navigation_bar_tips">\u2022 Las acciones sólo se pueden asignar a un botón a la vez\n\n\u2022 El botón de inicio no puede ser reasignado\n\n\u2022 Botones laterales no pueden ser reorganizados</string>
+    <string name="navigation_bar_tips_title">Consejos rápidos</string>
+    <string name="navigation_bar_reset_message">¿Borrar los ajustes actuales y restaurar a los valores predeterminados?</string>
+    <string name="navigation_bar_save_message">Configuración de la barra de navegación guardada</string>
+    <string name="navigation_bar_reset_toast">Restablecidos valores de la barra de navegación</string>
+    <string name="navigation_bar_menu_editable">Editable</string>
+    <string name="navigation_bar_menu_locked">Bloqueado</string>
+
+    <!-- Navigation ring shortcuts -->
+    <string name="navigation_ring_title">Atajos de inicio rápido</string>
+    <string name="navigation_ring_summary">Configurar accesos directos de la barra de navegación personalizada</string>
+    <string name="navring_target_reset_message">¿Eliminar todos los accesos directos de la barra de navegación creados por el usuario y restaurar a los valores predeterminados?</string>
+    <string name="navring_target_reset">Restablecer valores predeterminados de los accesos directos de la barra de navegación</string>
+    <string name="navring_action_open_ime_switcher">Abrir cambio de IME</string>
+    <string name="navring_action_kill_app">Matar aplicación</string>
+    <string name="navring_action_none">Ninguno</string>
+    <string name="navring_action_take_screenshot">Capturar pantalla</string>
+    <string name="navring_action_ring_vibrate">LLamada/Vibración</string>
+    <string name="navring_action_ring_silent">LLamada/Silencio</string>
+    <string name="navring_action_ring_vibrate_silent">LLamada/Vibración/Silencio</string>
+    <string name="navring_action_screen_off">Apagar pantalla</string>
+    <string name="navring_action_torch">Conmuntar antorcha</string>
+    <string name="navring_action_google_now">Google Now</string>
+    <string name="navring_choose_action_title">Elija la acción</string>
+    <string name="navring_action_last_app">Cambiar a la última aplicación</string>
+
+    <!-- Lock Screen Shortcuts -->
+    <string name="lockscreen_target_info">Arrastre el control deslizante para asignar accesos directos</string>
+    <string name="lockscreen_target_title">Atajos del control deslizante</string>
+    <string name="lockscreen_target_summary">Ver o cambiar los accesos directos personalizados de la pantalla de bloqueo</string>
+    <string name="lockscreen_target_reset">Restablecer valores predeterminados de los atajos en la pantalla de bloqueo</string>
+    <string name="lockscreen_target_reset_title">Reinicializar</string>
+    <string name="lockscreen_target_reset_message">¿Eliminar todos los accesos directos de la pantalla de bloqueo creados por el usuario y restaurar a los valores predeterminados?</string>
+    <string name="lockscreen_target_empty">Vacio</string>
+    <string name="lockscreen_target_edit_title">Editar acceso directo y el icono</string>
+    <string name="lockscreen_target_edit_msg">Seleccionar o cambiar la aplicación o actividad deseada y el icono asociado</string>
+
+    <!-- Lock screen shortcuts -->
+    <string name="picker_activities">Actividades</string>
+    <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+    <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
+    <string name="icon_picker_choose_icon_title">Seleccione el icono</string>
+    <string name="icon_picker_alarm">Alarma</string>
+    <string name="icon_picker_browser">Navegador</string>
+    <string name="icon_picker_calendar">Calendario</string>
+    <string name="icon_picker_camera">Cámara</string>
+    <string name="icon_picker_chrome">Chrome</string>
+    <string name="icon_picker_contacts">Contactos</string>
+    <string name="icon_picker_email">Email</string>
+    <string name="icon_picker_email2">Email Holo</string>
+    <string name="icon_picker_facebook">Facebook</string>
+    <string name="icon_picker_gallery">Gallería</string>
+    <string name="icon_picker_gmail">Gmail</string>
+    <string name="icon_picker_google_small">Google (pequeño)</string>
+    <string name="icon_picker_googleplus">Google Plus</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
+    <string name="icon_picker_maps">Maps</string>
+    <string name="icon_picker_movie">Película</string>
+    <string name="icon_picker_music">Música</string>
+    <string name="icon_picker_nav_normal">Navegación</string>
+    <string name="icon_picker_phone">Teléfono</string>
+    <string name="icon_picker_podcast">Podcast</string>
+    <string name="icon_picker_rss">Rss</string>
+    <string name="icon_picker_search">Búsqueda</string>
+    <string name="icon_picker_snapchat">Snapchat</string>
+    <string name="icon_picker_sms">SMS</string>
+    <string name="icon_picker_twitter">Twitter</string>
+
+    <string name="quick_settings_category_title">Ajustes rápidos</string>
+
+    <!-- QuickSettings: Dynamic Row -->
+    <string name="qs_configurable_title">Ajustes rápidos configurables</string>
+    <string name="qs_configurable_summary">Activar/desactivar cambios dinámicos</string>
+
+    <!-- QuickSettings: Quick Pulldown -->
+    <string name="title_quick_pulldown">Acceso rápido</string>
+    <string name="summary_quick_pulldown">Ajustes rápidos desplegables con un dedo</string>
+    <string name="quick_pulldown_off">Deshabilitado</string>
+    <string name="quick_pulldown_centre">Centro</string>
+    <string name="quick_pulldown_left">Izquierda</string>
+    <string name="quick_pulldown_right">Derecha</string>
+
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">Acceso inteligente</string>
+    <string name="smart_pulldown_summary">Abra los ajustes rápidos cuando no hay notificaciones presentes</string>
+    <string name="smart_pulldown_off">Deshabilitado</string>
+    <string name="smart_pulldown_dismissable">Si no hay notificaciones eliminables</string>
+    <string name="smart_pulldown_persistent">Si no hay notificaciones</string>
+
+    <!-- Cursor control -->
+    <string name="volume_key_cursor_control_title">Control del cursor</string>
+    <string name="volume_key_cursor_control_on">Izquierda/derecha</string>
+    <string name="volume_key_cursor_control_on_reverse">Derecha/izquierda</string>
+
+    <!-- Quick Swipe -->
+    <string name="quick_swipe_title">Deslizado rápido</string>
+    <string name="quick_swipe_summary">Deslizar para cambiar rápidamente entre los ajustes rápidos y panel de notificaciones</string>
+
+    <!-- navigation bar -->
+    <string name="soft_back_kill_app_title">Pulsación larga para matar aplicación</string>
+    <string name="soft_back_kill_app_summary">Pulsación larga matará aplicación en primer plano</string>
+
+    <!-- Sound themes -->
+    <string name="sound_packages_title">Paquetes de sonido</string>
+    <string name="install_sound_pack_title">Instalar paquetes de sonido</string>
+    <string name="install_sound_pack_summary">Instalar nuevos paquetes de sonido añadidos en la carpeta Soundpacks en la memoria interna</string>
+    <string name="select_sound_pack_title">Seleccione el paquete de sonido</string>
+    <string name="select_sound_pack_summary">Seleccione el paquete de sonido activo</string>
+    <string name="default_sound_pack">Predeterminado (Sistema)</string>
+    <string name="error_pack_install">Error instalando paquete de sonido</string>
+
+    <string name="omniswitch_category">OmniSwitch</string>
+    <string name="recents_use_omniswitch_title">Uso para recientes</string>
+    <string name="recents_use_omniswitch_summary">Usar OmniSwitch en lugar de la vista por defecto</string>
+    <string name="omniswitch_start_settings_title">Configuración</string>
+    <string name="omniswitch_start_settings_summary">Abre la configuración de OmniSwitch</string>
+    <string name="omniswitch_not_installed_title">Advertencia</string>
+    <string name="omniswitch_not_installed_summary">OmniSwitch no esta instalado</string>
+    <string name="omniswitch_not_installed_message">OmniSwitch no esta instalado</string>
+    <string name="omniswitch_first_time_title">Información</string>
+    <string name="omniswitch_first_time_message">Asegúrese de que ha habilitado OmniSwitch. Usted puede hacer esto mediante el uso de \"Configuración\".</string>
+
+    <string name="emulate_menu_key_title">Emular la tecla de menú de hardware</string>
+    <string name="emulate_menu_key_summary">Fuerza la ocultación del menú de tres puntos en las aplicaciones. Requiere reinicio de la aplicación</string>
+
+    <string name="force_show_overflow_menu_title">Mostrar menú de tres puntos</string>
+    <string name="force_show_overflow_menu_summary">Fuerza la visualización del menú de tres puntos en las aplicaciones. Requiere reinicio de la aplicación</string>
+
+    <!-- Clock -->
+    <string name="status_bar_clock">Reloj y fecha</string>
+    <string name="status_bar_clock_title">Estilo del reloj y fecha</string>
+    <string name="clock_title_enable">Alineación</string>
+    <string name="clock_enabled">Activado</string>
+    <string name="clock_disabled">Desactivado</string>
+    <string name="clock_color_title">Color</string>
+    <string name="status_bar_clock_style_reset">Restaurar color</string>
+    <string name="status_bar_show_clock_title">Mostrar reloj y fecha</string>
+    <string name="status_bar_am_pm_title">AM/PM</string>
+    <string name="status_bar_am_pm_info">Reloj de 24 horas está habilitado</string>
+    <string name="enable_clock_weekday">Día de la semana</string>
+    <string name="enable_clock_weekday_summary">Día abreviado de la semana antes de la hora</string>
+    <string name="right_clock">Reloj a la derecha</string>
+    <string name="center_clock">Reloj centrado</string>
+    <string name="dont_show">No mostrar</string>
+    <string name="clock_date_display">Fecha</string>
+    <string name="clock_date_display_summary">Ver fechas personalizado antes que el reloj</string>
+    <string name="clock_date_style">Estilo de la fecha</string>
+    <string name="clock_date_format">Formato de la fecha</string>
+    <string name="am_pm_clock_normal">Tamaño normal de la fuente</string>
+    <string name="am_pm_clock_small">Tamaño pequeño de la fuente</string>
+    <string name="am_pm_clock_none">No mostrar</string>
+    <string name="clock_date_display_none">No mostrar</string>
+    <string name="clock_date_display_small">Tamaño pequeño de la fuente</string>
+    <string name="clock_date_display_normal">Tamaño normal de la fuente</string>
+    <string name="clock_date_style_normal">Normal</string>
+    <string name="clock_date_style_lowercase">Minúsculas</string>
+    <string name="clock_date_style_uppercase">Mayúsculas</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Indicar batería en el anillo de desbloqueo</string>
+
+    <!-- Lockscreen -->
+    <string name="category_widgets_title">Widgets</string>
+    <string name="category_privacy_title">Privacidad</string>
+    <string name="category_background_title">Fondo</string>
+    <string name="more_settings_title">Más</string>
+
+    <!-- Widgets-->
+    <string name="maximize_widgets_title">Maximizar</string>
+    <string name="enable_camera_title">Cámara</string>
+    <string name="enable_camera_summary">Activar widget de la cámara</string>
+
+    <!-- Privacy -->
+    <string name="enable_power_menu_title">Menú de encendido</string>
+    <string name="enable_power_menu_summary">Activar menú de encendido</string>
+
+    <!-- Background -->
+    <string name="see_through_title">Ver a través</string>
+    <string name="see_through_summary">Sus datos pueden ser visibles para los que le rodean</string>
+    <string name="blur_radius_title">Difuminar contenido</string>
+    <string name="blur_radius_summary">Intensidad del efecto de difuminado</string>
+    <string name="lockscreen_wallpaper">Wallpaper</string>
+    <string name="lockscreen_wallpaper_disabled">El efecto \'ver a través\' debe ser desactivado</string>
+
+    <!-- Navigation bar height/width -->
+    <string name="navbar_dimen_title">Dimensiones</string>
+    <string name="navbar_dimen_summary">Configurar el ancho y la altura de la barra de navegación</string>
+    <string name="navbar_dimensions_reset_message">¿Restablecer todas las entradas a las dimensiones por defecto?</string>
+    <string name="navigation_bar_height_title">Altura de la barra de navegación</string>
+    <string name="navigation_bar_height_summary">Altura de la barra de navegación en el modo retrato.</string>
+    <string name="navigation_bar_height_landscape_title">Altura de la barra de navegación en el modo paisaje</string>
+    <string name="navigation_bar_height_landscape_summary">Altura de la barra de navegación en el modo paisaje.</string>
+    <string name="navigation_bar_width_title">Ancho de la barra de navegación</string>
+    <string name="navigation_bar_width_summary">Altura de la barra de navegación si la barra está a lo largo de un lado</string>
+    <string name="navigation_bar_size_42_dp_default">42 dp (predeterminado)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (predeterminado)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (apagado)</string>
+
+    <!-- Notification Panel Shortcuts -->
+    <string name="notification_bar_shortcuts">Atajos de cabecera</string>
+    <string name="clock_shortcut_title">Tiempo</string>
+    <string name="calendar_shortcut_title">Fecha</string>
+    <string name="default_shortcut">Predeterminado</string>
+
+    <string name="color_picker_dialog_title">Color</string>
+
+    <!-- Swap volume buttons when the screen is rotated -->
+    <string name="swap_volume_buttons_title">Voltear botones de volumen</string>
+    <string name="swap_volume_buttons_summary">Voltear botones de volumen según la posición del terminal</string>
+    <string name="swap_volume_advanced_settings_title">Configuración avanzada de rotación</string>
+    <string name="swap_volume_advanced_settings_close">Cerrar</string>
+    <string name="swap_volume_disabled_90_title">Deshabilitar a 90 grados</string>
+    <string name="swap_volume_disabled_270_title">Deshabilitar a 270 grados</string>
+
+   <!-- Lockscreen immersive mode -->
+   <string name="category_immersive_mode_title">Modo inmersivo</string>
+   <string name="lockscreen_immersive_mode_title">Desactivar modo inmersivo</string>
+</resources>
diff --git a/res/values-fr/custom_strings.xml b/res/values-fr/custom_strings.xml
index 404baa920..1c8d2ebd2 100644
--- a/res/values-fr/custom_strings.xml
+++ b/res/values-fr/custom_strings.xml
@@ -60,6 +60,7 @@
     <string name="notification_light_default_value">Défaut</string>
     <string name="notification_light_missed_call_title">Appel manqué</string>
     <string name="notification_light_voicemail_title">Messagerie vocale</string>
+    <string name="notification_light_screen_on_title">Afficher lorsque l\'écran est actif</string>
     <string name="pulse_length_always_on">Toujours activé</string>
     <string name="pulse_length_very_short">Très court</string>
     <string name="pulse_length_short">Court</string>
@@ -96,7 +97,8 @@
     <string name="screen_auto_brighness_summary">Niveaux de luminosité de l\'écran pour le mode automatique</string>
     <string name="button_auto_brightness">Niveaux automatique</string>
     <string name="button_auto_brighness_summary">Niveaux de luminosité des boutons pour le mode automatique</string>
-    <string name="button_brightness_category">Boutons</string>
+    <string name="button_brightness_title">Boutons</string>
+    <string name="button_brightness_summary">Paramètres de luminosité des boutons</string>
     <string name="button_no_brightness">Mode sombre</string>
     <string name="button_no_brightness_summary">Ne pas définir la luminosité du bouton</string>
     <string name="button_link_brightness">Lier à l\'écran</string>
@@ -187,6 +189,10 @@
     <string name="no_home_key">Vous n\'avez pas assigné de bouton à l\'action \"Accueil\"\u00A0! Cela peut rendre votre appareil inutilisable\u00A0!</string>
     <string name="virtual_key_haptic_feedback_title">Vibrer au toucher</string>
     <string name="virtual_key_haptic_feedback_summary">Cette option dépend de l\'option \"Vibrer au toucher\" des paramètres du son</string>
+    <string name="navigation_bar_show_title">Afficher la barre de navigation</string>
+    <string name="navigation_bar_show_summary">Forcer l\'activation de la barre de navigation</string>
+    <string name="hardware_keys_disable_title">Désactiver les touches</string>
+    <string name="hardware_keys_disable_summary">Forcer la désactivation des touches</string>
     <string name="bars_and_menus_category_power_menu_title">Menu marche/arrêt</string>
     <string name="power_menu_toggle_screenshot_title">Capture d\'écran</string>
     <string name="power_menu_toggle_screenshot_summary">Afficher les options de capture d\'écran dans le menu marche/arrêt</string>
@@ -203,22 +209,39 @@
     <string name="ad_enable_title">Activer</string>
     <string name="ad_enable_summary_on">ActiveDisplay activé</string>
     <string name="ad_enable_summary_off">ActiveDisplay désactivé</string>
-    <string name="ad_bypass_title">Outrepasser Active Display</string>
-    <string name="ad_bypass_summary">Lors qu\'aucune notification ne sera présente, le mode de poche verrouillera votre appareil</string>
+    <string name="ad_bypass_title">Outrepasser ActiveDisplay</string>
+    <string name="ad_bypass_summary">Lorsqu\'aucune notification ne sera présente, le mode de poche verrouillera votre appareil</string>
     <string name="ad_text_title">Texte des notifications</string>
     <string name="ad_text_summary">Afficher le texte des notifications autour du cercle</string>
     <string name="ad_content_title">Utiliser les notifications personnalisées</string>
-    <string name="ad_content_summary">Utiliser le style d\'affichage d\'Active Display pour afficher les détails des notifications au lieu du style du système</string>
+    <string name="ad_content_summary">Utiliser le style d\'affichage d\'ActiveDisplay pour afficher les détails des notifications au lieu du style du système</string>
+    <string name="ad_annoying_title">Notification moins fréquente</string>
+    <string name="ad_annoying_summary">Limiter la notification à une par période</string>
+    <string name="ad_double_tap_title">Veille avec double appui</string>
+    <string name="ad_double_tap_summary">Éteindre l\'écran avec un double appui</string>
+    <string name="ad_shake_event_settings_title">Paramètres lorsque secoué</string>
+    <string name="ad_shake_event_title">Secouer pour réafficher</string>
+    <string name="ad_shake_event_summary">Secouer votre appareil pour réafficher les notifications</string>
+    <string name="ad_shake_force_title">Événement par défaut</string>
+    <string name="ad_shake_force_summary">Après avoir reçu une notification ne pas activer ActiveDisplay jusqu\'à la prochain secousse de l\'utilisateur</string>
+    <string name="ad_shake_threshold_title">Intensité</string>
+    <string name="ad_shake_threshold_summary">Intensité nécessaire des secousses pour afficher les notifications</string>
+    <string name="ad_shake_timeout_title">Délai</string>
+    <string name="ad_shake_timeout_summary">Temps en seconde pendant lequel les notifications restent actives après une secousse, 0 signifie toujours actif</string>
+    <string name="ad_shake_quiet_hours_title">Outrepasser les heures silencieuses</string>
+    <string name="ad_shake_quiet_hours_summary">Autoriser les secousses pendant les heures silencieuses</string>
+    <string name="ad_shake_long_threshold_title">Intervalle</string>
+    <string name="ad_shake_long_threshold_summary">Temps minimum entre deux secousses consécutifs</string>
     <string name="ad_all_notifications_title">Toutes les notifications</string>
     <string name="ad_all_notifications_summary">Afficher toutes les notifications, y compris les notifications non-effaçables</string>
     <string name="ad_hide_low_priority_title">Masquer les faibles priorités</string>
-    <string name="ad_hide_low_priority_summary">Cachez les notifications de faible priorité, comme celle de Google Now</string>
+    <string name="ad_hide_low_priority_summary">Masquer les notifications de faible priorité, comme celle de Google Now</string>
     <string name="ad_pocket_mode_title">Mode de poche</string>
     <string name="ad_pocket_mode_summary">Afficher ActiveDisplay lorsque vous sortez l\'appareil de votre poche</string>
     <string name="ad_redisplay_title">Ré-afficher les notifications</string>
     <string name="ad_timeout_title">Durée d\'affichage</string>
     <string name="ad_threshold_title">Seuil de proximité</string>
-    <string name="ad_threshold_summary">Définir le délai pendant lequel le capteur doit être recouvert avant qu\'Active Display soit affiché</string>
+    <string name="ad_threshold_summary">Définir le délai pendant lequel le capteur doit être recouvert avant qu\'ActiveDisplay soit affiché</string>
     <string name="ad_brightness_title">Luminosité des notifications</string>
     <string name="ad_customizations_title">Personnalisation</string>
     <string name="ad_excluded_apps_title">Applications exclues</string>
@@ -279,6 +302,7 @@
     <string name="button_volume_default_title">Volume par défaut</string>
     <string name="button_volume_default_summary">Définir quel volume modifier par défaut</string>
     <string name="navigation_bar_title">Boutons et agencement</string>
+    <string name="navigation_bar_summary">Configurer les boutons de la barre de navigation</string>
     <string name="navigation_bar_help_text">1 - Pour commencer l\'édition, appuyer sur le cadenas\n\n2 - Appuyer sur un des boutons pour assigner ou changer une fonctionnalité\n\n3 - Exercer une pression longue pour modifier l\'ordre\n\n4 - Pour enregistrer, appuyer à nouveau sur le cadenas\n\n5 - Pour remettre à zéro, appuyer sur le bouton \"Réinitialiser\"\n\n</string>
     <string name="navigation_bar_tips">\u2022 Les actions ne peuvent être assignées qu\'une seule fois\n\n\u2022 Le bouton Accueil ne peut pas être réassigné\n\n\u2022 Les boutons sur le bord ne peuvent être déplacés</string>
     <string name="navigation_bar_tips_title">Conseils pratiques</string>
@@ -288,6 +312,7 @@
     <string name="navigation_bar_menu_editable">Éditable</string>
     <string name="navigation_bar_menu_locked">Verrouillé</string>
     <string name="navigation_ring_title">Raccourcis de lancement rapide</string>
+    <string name="navigation_ring_summary">Configurer les raccourcis de la barre de navigation personnalisée</string>
     <string name="navring_target_reset_message">Supprimer tous les raccourcis de la barre de navigation et revenir à la configuration d\'origine\u00A0?</string>
     <string name="navring_target_reset">Raccourcis de la barre de navigation réinitialisés</string>
     <string name="navring_action_open_ime_switcher">Changer la méthode de saisie</string>
@@ -329,6 +354,7 @@
     <string name="icon_picker_email2">Email Holo</string>
     <string name="icon_picker_facebook">Facebook</string>
     <string name="icon_picker_gallery">Galerie</string>
+    <string name="icon_picker_gmail">Gmail</string>
     <string name="icon_picker_google_small">Google (petit)</string>
     <string name="icon_picker_googleplus">Google+</string>
     <string name="icon_picker_googletalk">Hangouts</string>
@@ -340,6 +366,7 @@
     <string name="icon_picker_podcast">Podcast</string>
     <string name="icon_picker_rss">RSS</string>
     <string name="icon_picker_search">Recherche</string>
+    <string name="icon_picker_snapchat">Snapchat</string>
     <string name="icon_picker_sms">Messages</string>
     <string name="icon_picker_twitter">Twitter</string>
     <string name="quick_settings_category_title">Volet des paramètres</string>
@@ -395,7 +422,7 @@
     <string name="status_bar_am_pm_title">AM/PM</string>
     <string name="status_bar_am_pm_info">L\'heure sur 24 heures est activée</string>
     <string name="enable_clock_weekday">Jour de la semaine</string>
-    <string name="enable_clock_weekday_summary">Jour abrégée de la semaine avant l\'heure</string>
+    <string name="enable_clock_weekday_summary">Jour abrégé de la semaine avant l\'heure</string>
     <string name="right_clock">À droite</string>
     <string name="center_clock">Au centre</string>
     <string name="dont_show">Ne pas afficher</string>
@@ -412,4 +439,51 @@
     <string name="clock_date_style_normal">Normale</string>
     <string name="clock_date_style_lowercase">Minuscule</string>
     <string name="clock_date_style_uppercase">Majuscule</string>
+    <string name="battery_around_lockscreen_ring">Niveau de batterie autour de l\'anneau de déverrouillage</string>
+    <string name="category_widgets_title">Widgets</string>
+    <string name="category_privacy_title">Privé</string>
+    <string name="category_background_title">Arrière plan</string>
+    <string name="more_settings_title">Plus</string>
+    <string name="maximize_widgets_title">Maximisé</string>
+    <string name="enable_camera_title">Appareil photo</string>
+    <string name="enable_camera_summary">Activer le widget appareil photo</string>
+    <string name="enable_power_menu_title">Menu Marche/Arrêt</string>
+    <string name="enable_power_menu_summary">Activer le menu Marche/Arrêt</string>
+    <string name="see_through_title">Affichage transparent</string>
+    <string name="see_through_summary">Vos données peuvent être visibles à ceux autour de vous</string>
+    <string name="blur_radius_title">Effet de flou</string>
+    <string name="blur_radius_summary">Intensité de l\'effet de flou</string>
+    <string name="lockscreen_wallpaper">Fond d\'écran</string>
+    <string name="lockscreen_wallpaper_disabled">L\'effet de flou doit être désactivé</string>
+    <string name="navbar_dimen_title">Dimensions</string>
+    <string name="navbar_dimen_summary">Configurer la hauteur et la largeur de la barre de navigation</string>
+    <string name="navbar_dimensions_reset_message">Réinitialiser toutes les dimensions\u00A0?</string>
+    <string name="navigation_bar_height_title">Hauteur de la barre de navigation</string>
+    <string name="navigation_bar_height_summary">Hauteur de la barre de navigation en mode portrait</string>
+    <string name="navigation_bar_height_landscape_title">Hauteur de la barre de navigation paysage</string>
+    <string name="navigation_bar_height_landscape_summary">Hauteur de la barre de navigation en mode paysage</string>
+    <string name="navigation_bar_width_title">Largeur de la barre de navigation</string>
+    <string name="navigation_bar_width_summary">Largeur de la barre de navigation lors qu\'elle est placée sur un coté</string>
+    <string name="navigation_bar_size_42_dp_default">42 dp (défaut)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (défaut)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (désactivé)</string>
+    <string name="notification_bar_shortcuts">Raccourcis d\'en-tête</string>
+    <string name="clock_shortcut_title">Heure</string>
+    <string name="calendar_shortcut_title">Date</string>
+    <string name="default_shortcut">Défaut</string>
+    <string name="color_picker_dialog_title">Couleur</string>
+    <string name="swap_volume_buttons_title">Rotation des boutons</string>
+    <string name="swap_volume_buttons_summary">Ajuster l\'action des boutons de volume en fonction de l\'orientation</string>
+    <string name="swap_volume_advanced_settings_title">Paramètres avancés de rotation</string>
+    <string name="swap_volume_advanced_settings_close">Fermer</string>
+    <string name="swap_volume_disabled_90_title">Désactivé à 90 degrés</string>
+    <string name="swap_volume_disabled_270_title">Désactivé à 270 degrés</string>
+    <string name="category_immersive_mode_title">Mode immersif</string>
+    <string name="lockscreen_immersive_mode_title">Désactiver le mode immersif</string>
 </resources>
diff --git a/res/values-it/custom_strings.xml b/res/values-it/custom_strings.xml
index 4f9511550..e0160d8c4 100644
--- a/res/values-it/custom_strings.xml
+++ b/res/values-it/custom_strings.xml
@@ -116,7 +116,7 @@
     <string name="screen_auto_brighness_summary">I livelli di luminosità dello schermo sono in modalità automatica</string>
     <string name="button_auto_brightness">Livelli automatici</string>
     <string name="button_auto_brighness_summary">I livelli dei pusalti sono in modalità automatica</string>
-    <string name="button_brightness_category">Pulsanti</string>
+    <string name="button_brightness_title">Pulsanti</string>
     <string name="button_no_brightness">Modalità buia</string>
     <string name="button_no_brightness_summary">Non impostare la luminosità pulsanti</string>
     <string name="button_link_brightness">Passa a schermo</string>
@@ -388,4 +388,9 @@
     <!-- navigation bar -->
     <string name="soft_back_kill_app_title">Tasto indietro per chiudere le applicazioni</string>
     <string name="soft_back_kill_app_summary">Tieni premuto il tasto indietro per chiudere le applicazioni recenti</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Batteria anello di sblocco</string>
+
+    <string name="security_maximize_widgets_title">Massimizza widget lockscreen</string>
 </resources>
diff --git a/res/values-nl/custom_strings.xml b/res/values-nl/custom_strings.xml
index e5526e0f5..9b25f1dc5 100644
--- a/res/values-nl/custom_strings.xml
+++ b/res/values-nl/custom_strings.xml
@@ -117,7 +117,7 @@
     <string name="screen_auto_brighness_summary">Schermhelderheid automatisch bepalen</string>
     <string name="button_auto_brightness">Automatische waardes</string>
     <string name="button_auto_brighness_summary">Knoppenhelderheid automatisch bepalen</string>
-    <string name="button_brightness_category">Knoppen</string>
+    <string name="button_brightness_title">Knoppen</string>
     <string name="button_no_brightness">Donkere modus</string>
     <string name="button_no_brightness_summary">Geen knoppenhelderheid</string>
     <string name="button_link_brightness">Link naar scherm</string>
@@ -405,4 +405,7 @@
     <!-- navigation bar -->
     <string name="soft_back_kill_app_title">Lang drukken op terug sluit app</string>
     <string name="soft_back_kill_app_summary">Door lang op de terug knop te drukken sluit de app op de voorgrond</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Batterij-niveau om ontgrendelingsring</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-pl/custom_strings.xml b/res/values-pl/custom_strings.xml
index e049fe08e..a15ab8c7c 100644
--- a/res/values-pl/custom_strings.xml
+++ b/res/values-pl/custom_strings.xml
@@ -115,7 +115,7 @@
     <string name="screen_auto_brighness_summary">Poziomy jasności ekranu dla trybu automatycznego</string>
     <string name="button_auto_brightness">Automatyczne poziomy</string>
     <string name="button_auto_brighness_summary">Poziomy jasności przycisku dla trybu automatycznego</string>
-    <string name="button_brightness_category">Przyciski</string>
+    <string name="button_brightness_title">Przyciski</string>
     <string name="button_no_brightness">Tryb ciemny</string>
     <string name="button_no_brightness_summary">Nie ustawiaj jasnośći przycisków</string>
     <string name="button_link_brightness">Powiąż z ekranem</string>
@@ -377,4 +377,6 @@
     <string name="volume_key_cursor_control_on">Lewo/prawo</string>
     <string name="volume_key_cursor_control_on_reverse">Prawo/lewo</string>
 
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Stan baterii wokół pierścienia odblokowania</string>
 </resources>
diff --git a/res/values-pt/custom_strings.xml b/res/values-pt/custom_strings.xml
index 13768820f..82adb3921 100644
--- a/res/values-pt/custom_strings.xml
+++ b/res/values-pt/custom_strings.xml
@@ -112,7 +112,7 @@
     <string name="screen_auto_brighness_summary">Níveis de brilho da tela para modo automático</string>
     <string name="button_auto_brightness">Níveis automáticos</string>
     <string name="button_auto_brighness_summary">Níveis ade brilho do botão para modo automático</string>
-    <string name="button_brightness_category">Botões</string>
+    <string name="button_brightness_title">Botões</string>
     <string name="button_no_brightness">Modo escuro</string>
     <string name="button_no_brightness_summary">"Não definir brilho do botão"</string>
     <string name="button_link_brightness">Link com a tela</string>
@@ -389,4 +389,6 @@
     <string name="volume_key_cursor_control_on">Esquerda/direita</string>
     <string name="volume_key_cursor_control_on_reverse">Direita/esquerda</string>
 
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Bateria ao redor do anel de desbloqueio</string>
 </resources>
diff --git a/res/values-ru/custom_strings.xml b/res/values-ru/custom_strings.xml
new file mode 100644
index 000000000..df26670b4
--- /dev/null
+++ b/res/values-ru/custom_strings.xml
@@ -0,0 +1,571 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2013 The OmniROM Project
+
+  Parts Copyright (C) 2012-2013 The CyanogenMod Project
+
+  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 3 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/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="ok">ОК</string>
+    <string name="reset">Сброс</string>
+
+    <string name="bars_and_menus_settings">Панели и меню</string>
+    <string name="active_display_settings">Активные уведомления</string>
+    <string name="bars_and_menus_category_status_bar_title">Строка состояния</string>
+    <string name="bars_and_menus_category_navigation_bar_title">Панель навигации</string>
+    <string name="status_bar_battery_title">Стиль индикатора батареи</string>
+    <string name="status_bar_toggle_brightness">Управление яркостью</string>
+    <string name="status_bar_toggle_brightness_summary">Регулировать яркость экрана движением пальца по строке состояния</string>
+    <string name="status_bar_toggle_info">Включена автоматическая регулировка яркости</string>
+    <string name="status_bar_signal_text_title">Стиль индикатора сигнала</string>
+    <string name="status_bar_style_icon">Значок</string>
+    <string name="status_bar_style_hidden">Не показывать индикатор</string>
+    <string name="status_bar_signal_text_show_text">Текст</string>
+    <string name="status_bar_battery_status_percentage">Проценты</string>
+    <string name="status_bar_battery_status_circle">Круг</string>
+    <string name="status_bar_battery_status_circle_percentage">Круг с процентами</string>
+    <string name="status_bar_notif_count_title">Счётчик уведомлений</string>
+    <string name="status_bar_notif_count_summary">Показывать количество новых уведомлений в строке состояния</string>
+
+    <!-- String for IconPicker -->
+    <string name="icon_picker_title">Выберите источник иконки</string>
+    <string name="icon_picker_system_icons_title">Системные иконки</string>
+    <string name="icon_picker_gallery_title">Галерея</string>
+    <string name="icon_picker_pack_title">Набор иконок</string>
+
+    <string name="profile_applist_title">Приложения</string>
+    <string name="profile_choose_app">Выберите приложение</string>
+    <string name="profiles_add">Добавить</string>
+
+    <!-- Notification light dialogs -->
+    <string name="edit_light_settings">Изменить настройки индикатора</string>
+    <string name="pulse_speed_title">Длительность и скорость мигания</string>
+    <string name="color_list_title">Цвет</string>
+    <string name="default_time">Нормально</string>
+    <string name="custom_time">Пользовательский</string>
+    <string name="dialog_test">Тест</string>
+    <string name="dialog_delete_title">Удалить</string>
+    <string name="dialog_delete_message">Удалить выбранные элементы?</string>
+    <string name="dialog_test_message">Выключите экран, чтобы увидеть выбранные настройки индикатора в действии или закройте этот диалог для остановки теста</string>
+    <string name="dialog_test_button">Отклонить</string>
+
+    <!-- Lights settings screen, notification light settings -->
+    <string name="notification_light_enable">Включить</string>
+    <string name="notification_light_general_title">Основные</string>
+    <string name="notification_light_applist_title">Приложения</string>
+    <string name="notification_light_phonelist_title">Телефон</string>
+    <string name="notification_light_use_custom">Собственные значения</string>
+    <string name="notification_light_enabled">Включен</string>
+    <string name="notification_light_disabled">Отключен</string>
+    <string name="notification_light_default_value">По умолчанию</string>
+    <string name="notification_light_missed_call_title">Пропущенный вызов</string>
+    <string name="notification_light_voicemail_title">Голосовая почта</string>
+    <string name="notification_light_screen_on_title">Показывать, когда экран включен</string>
+
+    <!-- Values for the notification light pulse spinners -->
+    <string name="pulse_length_always_on">Всегда вкл.</string>
+    <string name="pulse_length_very_short">Очень коротко</string>
+    <string name="pulse_length_short">Коротко</string>
+    <string name="pulse_length_normal">Нормально</string>
+    <string name="pulse_length_long">Долго</string>
+    <string name="pulse_length_very_long">Очень долго</string>
+    <string name="pulse_speed_very_fast">Очень быстро</string>
+    <string name="pulse_speed_fast">Быстро</string>
+    <string name="pulse_speed_normal">Нормально</string>
+    <string name="pulse_speed_slow">Долго</string>
+    <string name="pulse_speed_very_slow">Очень долго</string>
+
+    <string name="led_color_green">Зелёный</string>
+    <string name="led_color_red">Красный</string>
+
+    <!-- Battery light settings  -->
+    <string name="battery_light_enable">Включен</string>
+    <string name="battery_low_pulse_title">Индикация разрядки батареи</string>
+    <string name="battery_light_list_title">Цвета</string>
+    <string name="battery_light_low_color_title">Батарея разряжена</string>
+    <string name="battery_light_medium_color_title">Заряжается</string>
+    <string name="battery_light_full_color_title">Заряжена на (90%)</string>
+    <string name="battery_light_really_full_color_title">Полностью заряжена</string>
+    <string name="edit_battery_settings">Изменить настройки батареи</string>
+
+    <!-- brightness settings -->
+    <string name="brightness_settings_title">Настройка яркости</string>
+    <string name="screen_current_value">Текущее значение экрана: <xliff:g id="screen_level">%d</xliff:g></string>
+    <string name="button_current_value">Текущее значение кнопок: <xliff:g id="button_level">%d</xliff:g></string>
+
+    <string name="auto_brightness_sensitivity_title">Настройка чувствительности</string>
+    <string name="auto_brightness_sensitivity_summary">Средняя</string>
+    <string name="auto_brightness_sensitivity_verylow">Очень низкая</string>
+    <string name="auto_brightness_sensitivity_low">Низкая</string>
+    <string name="auto_brightness_sensitivity_medium">Средняя</string>
+    <string name="auto_brightness_sensitivity_high">Высокая</string>
+    <string name="auto_brightness_sensitivity_veryhigh">Очень высокая</string>
+
+    <string name="screen_brightness_category">Экран</string>
+    <string name="screen_auto_brightness">Автоматическая яркость</string>
+    <string name="screen_auto_brighness_summary">Яркость экрана в автоматическом режиме</string>
+    <string name="button_auto_brightness">Автоматическая яркость подсветки</string>
+    <string name="button_auto_brighness_summary">Яркость подсветки кнопок в автоматическом режиме</string>
+    <string name="button_brightness_title">Кнопки</string>
+    <string name="button_no_brightness">Отключить подсветку</string>
+    <string name="button_no_brightness_summary">Подсветка кнопок отключена</string>
+    <string name="button_link_brightness">Ссылаться на яркость экрана</string>
+    <string name="button_link_brightness_summary">Яркость кнопок будет та же, что и у экрана</string>
+    <string name="button_manual_brightness">Ручная настройка</string>
+    <string name="button_manual_brightness_summary">Ручная настройка яркости подсветки кнопок</string>
+    <string name="dialog_manual_brightness_title">Ручная настройка яркости</string>
+    <!-- Automatic brightness customization -->
+    <string name="auto_brightness_setup_title">Автоматическая яркость</string>
+    <string name="light_sensor_current_value">Текущее значение датчика: <xliff:g id="light_level">%d</xliff:g> lux</string>
+    <string name="auto_brightness_dialog_title">Автоматические уровни яркости</string>
+    <string name="auto_brightness_level_format"><xliff:g id="уровень">%1$d</xliff:g></string>
+    <string name="auto_brightness_last_level_format"><xliff:g id="уровень">%1$d</xliff:g>+</string>
+    <string name="auto_brightness_adjust_button">Регулировать</string>
+    <string name="auto_brightness_close_button">Закрыть</string>
+    <string name="auto_brightness_reset_button">Сбросить</string>
+    <string name="auto_brightness_split_dialog_title">Разделенный уровень яркости</string>
+    <string name="auto_brightness_level_dialog_title">Уровень яркости</string>
+    <string name="auto_brightness_lux">Яркость Окружающей среды (lux)</string>
+    <string name="auto_brightness_backlight">Яркость</string>
+    <string name="auto_brightness_reset_dialog_title">Сбросить уровни яркости ?</string>
+    <string name="auto_brightness_reset_confirmation">Все уровни яркости будут сброшены к значениям по умолчанию.</string>
+    <string name="auto_brightness_split_lux_format">Разделенная позиция (между<xliff:g id="min">%1$d</xliff:g> и <xliff:g id="max">%2$d</xliff:g> lux)</string>
+    <string name="auto_brightness_level_options">Настройки уровня света</string>
+    <string name="auto_brightness_menu_edit">Редактировать</string>
+    <string name="auto_brightness_menu_split">Разделить</string>
+    <string name="auto_brightness_menu_remove">Удалить</string>
+    <string name="sensor_category">Датчик</string>
+    <string name="button_timeout_title">Тайм-аут</string>
+    <string name="button_timeout_summary">Отключается при нулевом значении</string>
+    <string name="button_brightness_title">Яркость кнопок</string>
+    <string name="button_brightness_summary">Настройки яркости кнопок</string>
+
+    <!-- button settings -->
+    <string name="button_volume_keys_title">Кнопки громкости</string>
+    <string name="button_volume_wake_title">Пробуждение кнопками громкости</string>
+    <string name="button_volume_wake_summary">Нажатие на кнопки громкости пробуждает устройство.</string>
+    <string name="button_volume_music_control_title">Управление музыкой кнопками громкости</string>
+    <string name="button_volume_music_control_summary">Когда экран выключен, долгое нажатие кнопок громкости переключает музыкальные треки</string>
+    <string name="button_headsethook_title">Гарнитура</string>
+    <string name="button_headsethook_launch_voice_title">Кнопки гарнитуры запускают голосовое управление</string>
+    <string name="button_headsethook_launch_voice_summary">Нажатие кнопок гарнитуры запускает голосовое управление</string>
+
+    <!-- Network traffic -->
+    <string name="network_traffic_title">Индикатор сетевого трафика</string>
+    <string name="show_network_traffic_state">Показывать скорость передачи данных</string>
+    <string name="show_network_traffic_unit">Единицы измерения</string>
+    <string name="show_network_traffic_frequency">Частота обновления</string>
+    <string name="show_network_traffic_disable">Отключен</string>
+    <string name="show_network_traffic_up">Исходящий</string>
+    <string name="show_network_traffic_down">Входящий</string>
+    <string name="show_network_traffic_all">Исходящий и входящий</string>
+    <string name="show_network_traffic_bit">Бит в секунду</string>
+    <string name="show_network_traffic_byte">Байт в секунду</string>
+    <string name="show_network_traffic_500">500 мс</string>
+    <string name="show_network_traffic_1000">1000 мс</string>
+    <string name="show_network_traffic_1500">1500 мс</string>
+    <string name="show_network_traffic_2000">2000 мс</string>
+
+    <!-- Status Bar Activity Indicators -->
+    <string name="show_activity_indicators_on_status_bar_title">Индикатор сетевой активности</string>
+    <string name="show_activity_indicators_on_status_bar_summary">Показывать индикатор сетевой активности в строке сосояния на значках сети или WiFi</string>
+
+    <!-- Hardware keys -->
+    <string name="button_keys_title">Кнопки</string>
+    <string name="keys_bindings_title">Назначения кнопок</string>
+    <string name="button_keys_back_title" >Назад</string>
+    <string name="button_keys_home_title" >Домой</string>
+    <string name="button_keys_menu_title" >Меню</string>
+    <string name="button_keys_assist_title" >Поиск</string>
+    <string name="button_keys_appSwitch_title" >Переключение приложений</string>
+    <string name="keys_enable_custom_title">Включить свои назначения</string>
+    <string name="keys_back_press_title">Кнопка \"Назад\"</string>
+    <string name="keys_back_long_press_title">Кнопка \"Назад\" (долгое нажатие)</string>
+    <string name="keys_home_press_title">Кнопка \"Домой\"</string>
+    <string name="keys_home_long_press_title">Кнопка \"Домой\" (долгое нажатие)</string>
+    <string name="keys_home_double_tap_title">Кнопка \"Домой\" (двойное нажатие)</string>
+    <string name="keys_menu_press_title">Кнопка \"Меню\"</string>
+    <string name="keys_menu_long_press_title">Кнопка \"Меню\" (долгое нажатие)</string>
+    <string name="keys_assist_press_title">Кнопка \"Поиск\"</string>
+    <string name="keys_assist_long_press_title">Кнопка \"Поиск\" (долгое нажатие)</string>
+    <string name="keys_app_switch_press_title">Кнопка переключения приложений</string>
+    <string name="keys_app_switch_long_press_title">Кнопка переключения приложений (долгое нажатие)</string>
+    <string name="keys_action_nothing">Нет действия</string>
+    <string name="keys_action_menu">Открыть/закрыть меню</string>
+    <string name="keys_action_app_switch">Недавние приложения</string>
+    <string name="keys_action_search">Запустить поиск</string>
+    <string name="keys_action_voice_search">Запустить голосовой поиск</string>
+    <string name="keys_action_in_app_search">In-app search</string>
+    <string name="keys_action_home">Эмулировать кнопку Меню</string>
+    <string name="keys_action_back">Эмулировать кнопку Назад</string>
+    <string name="keys_action_last_app">Переключиться на последнее приложение</string>
+    <string name="keys_action_kill_app">Закрыть приложение</string>
+    <string name="keys_action_sleep">Выключить экран</string>
+    <string name="keys_action_normal">Обычное нажатие</string>
+    <string name="keys_action_long">Долгое нажатие</string>
+    <string name="keys_action_double">Двойное нажатие</string>
+    <string name="dialog_no_home_key_title">Нет кнопки Домой</string>
+    <string name="no_home_key">Вы не назначили кнопку \"Домой\"! Это может сделать устройство непригодным для использования!</string>
+    <string name="virtual_key_haptic_feedback_title">Вибрировать при нажатии</string>
+    <string name="virtual_key_haptic_feedback_summary">Зависит от параметра \"Виброотклик\" в настройках звука</string>
+    <string name="navigation_bar_show_title">Включить панель навигации</string>
+    <string name="navigation_bar_show_summary">Принудительно включить панель навигации</string>
+    <string name="hardware_keys_disable_title">Отключить кнопки</string>
+    <string name="hardware_keys_disable_summary">Принудительно отключить аппаратные кнопки</string>
+
+    <!-- Power Menu Options-->
+    <string name="bars_and_menus_category_power_menu_title">Меню кнопки питания</string>
+    <string name="power_menu_toggle_screenshot_title">Снимок экрана</string>
+    <string name="power_menu_toggle_screenshot_summary">Отображать \"Снимок экрана\" в меню кнопки питания</string>
+    <string name="power_menu_toggle_screenrecord_title">Запись с экрана</string>
+    <string name="power_menu_toggle_screenrecord_summary">Отображать \"Запись с экрана\" в меню кнопки питания</string>
+    <string name="power_menu_toggle_mobile_data_title">Передача данных</string>
+    <string name="power_menu_toggle_mobile_data_summary">Отображать \"Передачу данных\" в меню кнопки питания</string>
+    <string name="power_menu_toggle_airplane_mode_title">Режим полёта</string>
+    <string name="power_menu_toggle_airplane_mode_summary">Отображать \"Режим полёта\" в меню кнопки питания</string>
+    <string name="power_menu_toggle_sound_toggles_title">Звуковая панель</string>
+    <string name="power_menu_toggle_sound_toggles_summary">Отображать \"Звуковую панель\" в меню кнопки питания</string>
+
+    <!-- Active Display Notifications -->
+    <string name="ad_settings_title">Активные Уведомления</string>
+    <string name="ad_settings_summary">Сменить настройки Активных Уведомлений </string>
+    <string name="ad_enable_title">Включить</string>
+    <string name="ad_enable_summary_on">Активные Уведомления включены</string>
+    <string name="ad_enable_summary_off">Активные Уведомления выключены</string>
+    <string name="ad_bypass_title">Игнорировать \"Активные Уведомления\"</string>
+    <string name="ad_bypass_summary">Режим \"В кармане\" запустит экран блокировки, когда нет уведомлений</string>
+    <string name="ad_text_title">Текст уведомлений</string>
+    <string name="ad_text_summary">Показывать текст уведомления вокруг кольца</string>
+    <string name="ad_content_title">Расширенный вид уведомления</string>
+    <string name="ad_content_summary">Отображать детали уведомлений</string>
+    <string name="ad_annoying_title">Уменьшить частоту уведомлений</string>
+    <string name="ad_annoying_summary">Огриничить количество уведомлений за промежуток времени</string>
+    <string name="ad_double_tap_title">Блокировка двойным нажатием</string>
+    <string name="ad_double_tap_summary">Двойное нажатие выключит экран</string>
+    <string name="ad_shake_event_settings_title">Настройки встряхивания</string>
+    <string name="ad_shake_event_title">Встряхнуть для отображения</string>
+    <string name="ad_shake_event_summary">Встряхните устройство для повторного отображения уведомления</string>
+    <string name="ad_shake_force_title">Для всех событий</string>
+    <string name="ad_shake_force_summary">При получении нового уведомления \"Активные Уведомления\" не будут работать, пока пользователь не встряхнёт устройство</string>
+    <string name="ad_shake_threshold_title">Интенсивность</string>
+    <string name="ad_shake_threshold_summary">Интенсивность встряхивания, необходимая для отображения уведомлений</string>
+    <string name="ad_shake_timeout_title">Время ожидания</string>
+    <string name="ad_shake_timeout_summary">Время, которое \"Встряхивание\" активно после получения уведомления, 0 означает всегда активно.</string>
+    <string name="ad_shake_quiet_hours_title">Игнорировать \"Тихие часы\"</string>
+    <string name="ad_shake_quiet_hours_summary">Разрешить \"Встряхивание\" во время \"Тихих часов\"</string>
+    <string name="ad_shake_long_threshold_title">Интервал</string>
+    <string name="ad_shake_long_threshold_summary">Минимальное время между встряхиваниями</string>
+    <string name="ad_all_notifications_title">Показывать неудаляемые уведомления</string>
+    <string name="ad_all_notifications_summary">Показывать уведомления, которые нельзя удалить</string>
+    <string name="ad_hide_low_priority_title">Скрыть низкий приоритет</string>
+    <string name="ad_hide_low_priority_summary">Скрыть уведомления более низкого приоритета</string>
+    <string name="ad_pocket_mode_title">Режим \"В кармане\"</string>
+    <string name="ad_pocket_mode_summary">Включает экран и отображает все уведомления, когда устройство достали из кармана. Отключает экран, когда устройство кладут обратно в карман.</string>
+    <string name="ad_redisplay_title">Повторное отображение уведомлений</string>
+    <string name="ad_timeout_title">Время до отключения экрана</string>
+    <string name="ad_threshold_title">Порог активации датчика</string>
+    <string name="ad_threshold_summary">Время, которое датчик должен быть прикрыт, чтобы появились \"Активные Уведомления\"</string>
+    <string name="ad_brightness_title">Яркость экрана</string>
+    <string name="ad_customizations_title">Расширенные настройки</string>
+    <string name="ad_excluded_apps_title">Исключения</string>
+    <string name="ad_excluded_apps_summary">Уведомления от этих приложений не будут показываться</string>
+    <string name="ad_privacy_apps_title">Режим \"Конфиденциальности\"</string>
+    <string name="ad_privacy_apps_summary">Детали уведомлений от этих приложений не будут показаны</string>
+    <string name="ad_show_date_title">Показывать дату</string>
+    <string name="ad_show_ampm_title">Показывать AM/PM</string>
+    <string name="ad_sunlight_mode_title">Режим \"Дневного света\"</string>
+    <string name="ad_brightness_summary">Использовать ручную настройку яркости</string>
+    <string name="ad_show_date_summary">Отображать дату над часами</string>
+    <string name="ad_show_ampm_summary">Отображать AM/PM при использовании 12-часового формата времени</string>
+    <string name="ad_sunlight_mode_summary">Инвертировать цвета в условиях яркого освещения</string>
+    <string name="ad_turnoff_mode_title">Авто-блокировка</string>
+    <string name="ad_turnoff_mode_summary">Блокировать устройство при возвращении его в карман</string>
+    <string name="ad_redisplay_never">Никогда</string>
+    <string name="ad_redisplay_1m">1 минута</string>
+    <string name="ad_redisplay_5m">5 минут</string>
+    <string name="ad_redisplay_15m">15 минут</string>
+    <string name="ad_redisplay_30m">30 минут</string>
+    <string name="ad_redisplay_1h">1 час</string>
+    <string name="ad_redisplay_2h">2 часа</string>
+    <string name="ad_redisplay_5h">5 часов</string>
+    <string name="ad_timeout_3s">3 секунды</string>
+    <string name="ad_timeout_5s">5 секунд</string>
+    <string name="ad_timeout_8s">8 секунд</string>
+    <string name="ad_timeout_10s">10 секунд</string>
+    <string name="ad_timeout_15s">15 секунд</string>
+    <string name="ad_timeout_25s">25 секунд</string>
+    <string name="ad_threshold_0s">Мгновенно</string>
+    <string name="ad_threshold_1s">1 секунда</string>
+    <string name="ad_threshold_2s">2 секунды</string>
+    <string name="ad_threshold_3s">3 секунды</string>
+    <string name="ad_threshold_4s">4 секунды</string>
+    <string name="ad_threshold_5s">5 секунд</string>
+    <string name="ad_pocket_mode_off">Выкл.</string>
+    <string name="ad_pocket_mode_notifications">Только уведомления</string>
+    <string name="ad_pocket_mode_always">Всегда</string>
+
+    <string name="bars_and_menus_category_recent_panel_title">Вид \"Недавних приложений\"</string>
+
+    <!-- Recents clear all -->
+    <string name="show_recent_clear_all_button_title">Кнопка \"Очистить всё\"</string>
+    <string name="show_recent_clear_all_button_summary">Показывать кнопку \"Очистить всё\"</string>
+    <string name="recent_clear_all_button_location_title">Расположение кнопки \"Очистить всё\"</string>
+    <string name="recent_clear_all_button_location_summary">Выберите, где будет располагаться кнопка \"Очистить всё\"</string>
+    <string name="recent_clear_all_button_location_top_left">Вверху слева</string>
+    <string name="recent_clear_all_button_location_top_right">Вверху справа</string>
+    <string name="recent_clear_all_button_location_bottom_left">Внизу слева</string>
+    <string name="recent_clear_all_button_location_bottom_right">Внизу справа</string>
+
+    <!-- Memory Indicator -->
+    <string name="show_recents_memory_indicator_title">Индикатор использования ОЗУ</string>
+    <string name="show_recents_memory_indicator_summary">Отображать Индикатор использования ОЗУ в недавних приложениях</string>
+    <string name="recents_memory_indicator_location_title">Позиция индикатора использования ОЗУ</string>
+    <string name="recents_memory_indicator_location_summary">Выберите позицию индикатора использования ОЗУ</string>
+
+    <!-- Contextual Notification Panel Header -->
+    <string name="notification_drawer_category_title">Панель уведомлений</string>
+    <string name="custom_statusbar_header_title">Заголовок панели уведомлений</string>
+    <string name="custom_statusbar_header_summary">Устанавить случайное фоновое изображение в заголовке панели уведомлений, там, где располагается текущая дата и время</string>
+
+    <!-- Volume default -->
+    <string name="button_volume_default_none">Не изменять</string>
+    <string name="button_volume_default_ringer">Звонка</string>
+    <string name="button_volume_default_media">Мультимедиа</string>
+    <string name="button_volume_default_title">По умолчанию</string>
+    <string name="button_volume_default_summary">Выберите, громкость чего изменяется по умолчанию</string>
+
+    <!-- Navigation Bar customization-->
+    <string name="navigation_bar_title">Кнопки и их расположение</string>
+    <string name="navigation_bar_summary">Настройки кнопок панели навигации</string>
+    <string name="navigation_bar_help_text">1 - Для редактирования нажмите значок замка\n\n2 - Нажмите кнопку для изменения её функциональности\n\n3 - Долгим нажатием по кнопке можно перенести её влево или вправо\n\n4 - Для сохранения снова нажмите на значок замка\n\n5 - Для восстановления настроек нажмите кнопку Сброс\n\n</string>
+    <string name="navigation_bar_tips">\u2022 Одно действие может быть назначено только на одну кнопку\n\n\u2022  Нельзя изменить назначение кнопки Домой\n\n\u2022 Нельзя перемещать боковые кнопки</string>
+    <string name="navigation_bar_tips_title">Ограничения</string>
+    <string name="navigation_bar_reset_message">Удалить текущие настройки и восстановить значения по умолчанию?</string>
+    <string name="navigation_bar_save_message">Настройки панели навигации сохранены</string>
+    <string name="navigation_bar_reset_toast">Настройки панели навигации сброшены по умолчанию</string>
+    <string name="navigation_bar_menu_editable">Режим правки</string>
+    <string name="navigation_bar_menu_locked">Заблокировано</string>
+
+    <!-- Navigation ring shortcuts -->
+    <string name="navigation_ring_title">Ярлыки быстрого запуска</string>
+    <string name="navigation_ring_summary">Настроить ярлыки быстрого запуска</string>
+    <string name="navring_target_reset_message">Удалить пользовательские настройки ярлыков быстрого запуска?</string>
+    <string name="navring_target_reset">Ярлыки быстрого запуска были сброшены к значениям по умолчанию</string>
+    <string name="navring_action_open_ime_switcher">Выбор способа ввода</string>
+    <string name="navring_action_kill_app">Закрыть приложение</string>
+    <string name="navring_action_none">Действия нет</string>
+    <string name="navring_action_take_screenshot">Снимок экрана</string>
+    <string name="navring_action_ring_vibrate">Звук/Вибрация</string>
+    <string name="navring_action_ring_silent">Звук/Беззвучный</string>
+    <string name="navring_action_ring_vibrate_silent">Звук/Вибрация/Беззвучный</string>
+    <string name="navring_action_screen_off">Выключить экран</string>
+    <string name="navring_action_torch">Фонарь</string>
+    <string name="navring_action_google_now">Google Now</string>
+    <string name="navring_choose_action_title">Выбор действия</string>
+    <string name="navring_action_last_app">Перейти к последнему открытому приложению</string>
+
+    <!-- Lock Screen Shortcuts -->
+    <string name="lockscreen_target_info">Потяните ползунок к цели, чтобы назначить ярлык</string>
+    <string name="lockscreen_target_title">Ярлыки кольца блокировки</string>
+    <string name="lockscreen_target_summary">Установка или настройка ярлыков кольца блокировки</string>
+    <string name="lockscreen_target_reset">Ярлыки кольца блокировки сброшены по умолчанию</string>
+    <string name="lockscreen_target_reset_title">Сброс</string>
+    <string name="lockscreen_target_reset_message">Удалить все созданные ярлыки кольца блокировки и восстановить значения по умолчанию?</string>
+    <string name="lockscreen_target_empty">Пусто</string>
+    <string name="lockscreen_target_edit_title">Изменить ярлык и значок</string>
+    <string name="lockscreen_target_edit_msg">Выберите или измените нужные приложения или действие и значок</string>
+
+    <!-- Lock screen shortcuts -->
+    <string name="picker_activities">Действия</string>
+    <string name="select_custom_app_title">Выбрать собственное приложение</string>
+    <string name="select_custom_activity_title">Выбрать собственное действие</string>
+    <string name="icon_picker_choose_icon_title">Выбрать значок</string>
+    <string name="icon_picker_alarm">Часы</string>
+    <string name="icon_picker_browser">Браузер</string>
+    <string name="icon_picker_calendar">Календарь</string>
+    <string name="icon_picker_camera">Камера</string>
+    <string name="icon_picker_chrome">Chrome</string>
+    <string name="icon_picker_contacts">Contacts</string>
+    <string name="icon_picker_email">Email</string>
+    <string name="icon_picker_email2">Email Holo</string>
+    <string name="icon_picker_facebook">Facebook</string>
+    <string name="icon_picker_gmail">Gmail</string>
+    <string name="icon_picker_gallery">Галерея</string>
+    <string name="icon_picker_google_small">Google (малый)</string>
+    <string name="icon_picker_googleplus">Google Plus</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
+    <string name="icon_picker_maps">Карты</string>
+    <string name="icon_picker_movie">Видео</string>
+    <string name="icon_picker_music">Музыка</string>
+    <string name="icon_picker_nav_normal">Навигация</string>
+    <string name="icon_picker_phone">Телефон</string>
+    <string name="icon_picker_podcast">Подкасты</string>
+    <string name="icon_picker_rss">Rss</string>
+    <string name="icon_picker_search">Поиск</string>
+    <string name="icon_picker_sms">Сообщения</string>
+    <string name="icon_picker_twitter">Twitter</string>
+
+    <string name="quick_settings_category_title">Панель быстрых настроек</string>
+
+    <!-- QuickSettings: Dynamic Row -->
+    <string name="qs_configurable_title">Настраиваемая сетка</string>
+    <string name="qs_configurable_summary">Включить/выключить динамическое изменение сетки</string>
+
+    <!-- QuickSettings: Quick Pulldown -->
+    <string name="title_quick_pulldown">Быстрый доступ</string>
+    <string name="summary_quick_pulldown">Край строки уведомлений при опускании вниз открывает панель быстрых настроек</string>
+    <string name="quick_pulldown_off">Выкл.</string>
+    <string name="quick_pulldown_centre">По центру</string>
+    <string name="quick_pulldown_left">Левый</string>
+    <string name="quick_pulldown_right">Правый</string>
+
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">\"Умная\" панель уведомлений</string>
+    <string name="smart_pulldown_summary">Открывать быстрые настройки, если нет уведомлений</string>
+    <string name="smart_pulldown_off">Выкл.</string>
+    <string name="smart_pulldown_dismissable">Без удаляемых</string>
+    <string name="smart_pulldown_persistent">Без постоянных</string>
+
+    <!-- Cursor control -->
+    <string name="volume_key_cursor_control_title">Перемещение курсора кнопками громкости</string>
+    <string name="volume_key_cursor_control_on">Кнопка \&quot;+\&quot; двигает курсор влево, \&quot;-\&quot;-вправо</string>
+    <string name="volume_key_cursor_control_on_reverse">Кнопка \&quot;+\&quot; двигает курсор вправо, \&quot;-\&quot;-влево</string>
+
+    <!-- Quick Swipe -->
+    <string name="quick_swipe_title">Быстрое переключение</string>
+    <string name="quick_swipe_summary">Переключение свайпом между панелью уведомлений и быстрыми настройками</string>
+
+    <!-- navigation bar -->
+    <string name="soft_back_kill_app_title">Закрывать удержанием кнопки \"Назад\"</string>
+    <string name="soft_back_kill_app_summary">Долгое нажатие кнопки \"Назад\" закроет текущее приложение</string>
+
+    <!-- Sound themes -->
+    <string name="sound_packages_title">Звуковые пакеты</string>
+    <string name="install_sound_pack_title">Установить звуковой пакет</string>
+    <string name="install_sound_pack_summary">Новые установленные звуковые пакеты добавляются в папку \"SoundPacks\" во внутренней памяти устройства</string>
+    <string name="select_sound_pack_title">Выбрать звуковой пакет</string>
+    <string name="select_sound_pack_summary">Выберите активный звуковой пакет для использования</string>
+    <string name="default_sound_pack">По умолчанию (системный)</string>
+    <string name="error_pack_install">Ошибка при установке звукового пакета</string>
+
+    <string name="omniswitch_category">OmniSwitch</string>
+    <string name="recents_use_omniswitch_title">Использовать для \"Недавних приложений\"</string>
+    <string name="recents_use_omniswitch_summary">Использовать OmniSwitch по умолчанию в качестве \"Недавних приложений\"</string>
+    <string name="omniswitch_start_settings_title">Настройки</string>
+    <string name="omniswitch_start_settings_summary">Открыть настройки OmniSwitch</string>
+    <string name="omniswitch_not_installed_title">Внимание</string>
+    <string name="omniswitch_not_installed_summary">OmniSwitch не установлен</string>
+    <string name="omniswitch_not_installed_message">OmniSwitch не установлен</string>
+    <string name="omniswitch_first_time_title">Примечание</string>
+    <string name="omniswitch_first_time_message">Убедитесь, что вы включили OmniSwitch. Вы можете это сделать с помощью \"Настроек\" ниже</string>
+
+    <string name="emulate_menu_key_title">Скрывать кнопку Меню (три точки)</string>
+    <string name="emulate_menu_key_summary">Принудительно скрывать кнопку Меню (три точки). Требуется перезапуск приложения</string>
+
+    <string name="force_show_overflow_menu_title">Показывать кнопку Меню (три точки)</string>
+    <string name="force_show_overflow_menu_summary">Всегда показывать кнопку Меню (три точки). Требуется перезапуск приложения</string>
+
+    <!-- Clock -->
+    <string name="status_bar_clock">Время и дата</string>
+    <string name="status_bar_clock_title">Стиль времени и даты</string>
+    <string name="clock_title_enable">Выравнивание часов</string>
+    <string name="clock_enabled">Включены</string>
+    <string name="clock_disabled">Выключены</string>
+    <string name="clock_color_title">Цвет часов</string>
+    <string name="status_bar_clock_style_reset">Сбросить цвет</string>
+    <string name="status_bar_show_clock_title">Показывать часы и дату</string>
+    <string name="status_bar_am_pm_title">Показывать AM/PM</string>
+    <string name="status_bar_am_pm_info">24-часовой формат часов</string>
+    <string name="enable_clock_weekday">День недели</string>
+    <string name="enable_clock_weekday_summary">День недели перед часами коротко</string>
+    <string name="right_clock">Часы справа</string>
+    <string name="center_clock">Часы по центру</string>
+    <string name="dont_show">Не показывать</string>
+    <string name="clock_date_display">Дата</string>
+    <string name="clock_date_display_summary">Отображать дату перед часами</string>
+    <string name="clock_date_style">Стиль даты</string>
+    <string name="clock_date_format">Формат даты</string>
+    <string name="am_pm_clock_normal">Обычный размер шрифта</string>
+    <string name="am_pm_clock_small">Малый размер шрифта</string>
+    <string name="am_pm_clock_none">Не показывать</string>
+    <string name="clock_date_display_none">Не показывать</string>
+    <string name="clock_date_display_small">Малый размер шрифта</string>
+    <string name="clock_date_display_normal">Обычный размер шрифта</string>
+    <string name="clock_date_style_normal">Обычный</string>
+    <string name="clock_date_style_lowercase">Строчные</string>
+    <string name="clock_date_style_uppercase">ПРОПИСНЫЕ</string>
+
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Индикатор батареи вокруг кольца разблокировки</string>
+
+    <!-- Lockscreen -->
+    <string name="category_widgets_title">Виджеты</string>
+    <string name="category_privacy_title">Безопасность</string>
+    <string name="category_background_title">Фон</string>
+    <string name="more_settings_title">Ещё...</string>
+
+    <!-- Widgets-->
+    <string name="maximize_widgets_title">Развёрнутые виджеты</string>
+    <string name="enable_camera_title">Камера</string>
+    <string name="enable_camera_summary">Включить виджет камеры</string>
+
+    <!-- Privacy -->
+    <string name="enable_power_menu_title">Меню кнопки питания</string>
+    <string name="enable_power_menu_summary">Активировать Меню кнопки питания</string>
+
+    <!-- Background -->
+    <string name="see_through_title">Вид \"насквозь\"</string>
+    <string name="see_through_summary">Показывает содержимое позади экрана блокировки, ваши данные могут быть видны для окружающих</string>
+    <string name="blur_radius_title">Радиус размытия</string>
+    <string name="blur_radius_summary">Интенсивность эффекта размытия</string>
+    <string name="lockscreen_wallpaper">Обои экрана блокировки</string>
+    <string name="lockscreen_wallpaper_disabled">Вид \"насквозь\" должен быть отключен.</string>
+
+    <!-- Navigation bar height/width -->
+    <string name="navbar_dimen_title">Размеры</string>
+    <string name="navbar_dimen_summary">Настроить ширину и высоту панели навигации</string>
+    <string name="navbar_dimensions_reset_message">Сбросить все стили и размеры на значения по умолчанию?</string>
+    <string name="navigation_bar_height_title">Высота панели навигации</string>
+    <string name="navigation_bar_height_summary">Высота панели навигации в портретном режиме.</string>
+    <string name="navigation_bar_height_landscape_title">Высота панели навигации в ландшафте</string>
+    <string name="navigation_bar_height_landscape_summary">Высота панели навигации в ландшафтном режиме.</string>
+    <string name="navigation_bar_width_title">Ширина панели навигации</string>
+    <string name="navigation_bar_width_summary">Или высота, если панель находится сбоку.</string>
+    <string name="navigation_bar_size_42_dp_default">42 dp (по умолчанию)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (по умолчанию)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (выкл)</string>
+
+    <!-- Notification Panel Shortcuts -->
+    <string name="notification_bar_shortcuts">Элементы заголовка</string>
+    <string name="clock_shortcut_title">Время</string>
+    <string name="calendar_shortcut_title">Дата</string>
+    <string name="default_shortcut">По умолчанию</string>
+
+    <string name="color_picker_dialog_title">Цвет</string>
+
+    <!-- Swap volume buttons when the screen is rotated -->
+    <string name="swap_volume_buttons_title">Поворот кнопок громкости</string>
+    <string name="swap_volume_buttons_summary">Менять назначение кнопок регулировки громкости согласно ориентации экрана</string>
+    <string name="swap_volume_advanced_settings_title">Расширенные настройки поворота</string>
+    <string name="swap_volume_advanced_settings_close">Закрыть</string>
+    <string name="swap_volume_disabled_90_title">Отключать под углом 90 градусов</string>
+    <string name="swap_volume_disabled_270_title">Отключать под углом 270 градусов</string>
+</resources>
diff --git a/res/values-sv/custom_strings.xml b/res/values-sv/custom_strings.xml
index 9624d3cd5..340bee62b 100644
--- a/res/values-sv/custom_strings.xml
+++ b/res/values-sv/custom_strings.xml
@@ -96,7 +96,7 @@
     <string name="screen_auto_brighness_summary">Skärmljusnivåer för automatiskt läge</string>
     <string name="button_auto_brightness">Automatiska nivåer</string>
     <string name="button_auto_brighness_summary">Knappljusnivåer för automatiskt läge</string>
-    <string name="button_brightness_category">Knappar</string>
+    <string name="button_brightness_title">Knappar</string>
     <string name="button_no_brightness">Mörkt läge</string>
     <string name="button_no_brightness_summary">Ställ inte in knappljusstyrka</string>
     <string name="button_link_brightness">Sammanlänka med skärm</string>
@@ -317,4 +317,5 @@
     <string name="volume_key_cursor_control_title">Pekarkontroll</string>
     <string name="volume_key_cursor_control_on">Vänster/höger</string>
     <string name="volume_key_cursor_control_on_reverse">Höger/vänster</string>
+    <string name="battery_around_lockscreen_ring">Batteri runt upplåsningsring</string>
 </resources>
diff --git a/res/values-zh-rCN/custom_strings.xml b/res/values-zh-rCN/custom_strings.xml
index 5e37101fd..7289bf553 100644
--- a/res/values-zh-rCN/custom_strings.xml
+++ b/res/values-zh-rCN/custom_strings.xml
@@ -117,7 +117,7 @@
     <string name="screen_auto_brighness_summary">自动模式下的屏幕亮度等级</string>
     <string name="button_auto_brightness">自动等级</string>
     <string name="button_auto_brighness_summary">自动模式下的按钮亮度等级</string>
-    <string name="button_brightness_category">按钮</string>
+    <string name="button_brightness_title">按钮</string>
     <string name="button_no_brightness">全黑模式</string>
     <string name="button_no_brightness_summary">不要设置按钮亮度</string>
     <string name="button_link_brightness">与屏幕同步</string>
@@ -384,4 +384,18 @@
     <string name="volume_key_cursor_control_on">左/右</string>
     <string name="volume_key_cursor_control_on_reverse">右/左</string>
 
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">在解锁环周围显示电量圈</string>
+
+    <!-- Enable camera -->
+    <string name="lockscreen_enable_camera_title">相机小部件</string>
+    <string name="lockscreen_enable_camera_summary">向左滑动以启动相机</string>
+
+    <!-- Enable power menu -->
+    <string name="lockscreen_enable_power_menu_title">启用电源菜单</string>
+    <string name="lockscreen_enable_power_menu_summary">屏幕锁定时显示电源菜单</string>
+
+    <!-- Lockscreen see through -->
+    <string name="lockscreen_see_through_title">透明锁屏</string>
+    <string name="lockscreen_see_through_summary">显示锁屏后的内容。您的个人信息可被您周围的人看见</string>
  </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 07f9d3f3b..e89dca19d 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -30,4 +30,7 @@
     <!-- Whether device has hardware buttons -->
     <bool name="config_has_hardware_buttons">false</bool>
 
+    <!-- does the device supports different notification led configs
+    e.g. color and pulse frequency or just a single -->
+    <bool name="config_notificationLedConfig">true</bool>
 </resources>
diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index 116801186..d5906e705 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -65,7 +65,7 @@
         <item>250</item>
         <item>500</item>
         <item>1000</item>
-        <item>2500</item>
+        <item>2000</item>
         <item>5000</item>
     </string-array>
 
@@ -233,6 +233,7 @@
         <item>@string/icon_picker_email2</item>
         <item>@string/icon_picker_facebook</item>
         <item>@string/icon_picker_gallery</item>
+        <item>@string/icon_picker_gmail</item>
         <item>@string/icon_picker_google_small</item>
         <item>@string/icon_picker_googleplus</item>
         <item>@string/icon_picker_googletalk</item>
@@ -245,6 +246,7 @@
         <item>@string/icon_picker_podcast</item>
         <item>@string/icon_picker_rss</item>
         <item>@string/icon_picker_search</item>
+        <item>@string/icon_picker_snapchat</item>
         <item>@string/icon_picker_twitter</item>
     </string-array>
 
@@ -259,6 +261,7 @@
         <item>ic_lockscreen_email2_normal</item>
         <item>ic_lockscreen_facebook_normal</item>
         <item>ic_lockscreen_gallery_normal</item>
+        <item>ic_lockscreen_gmail_normal</item>
         <item>ic_lockscreen_google_small_normal</item>
         <item>ic_lockscreen_gplus_normal</item>
         <item>ic_lockscreen_gtalk_normal</item>
@@ -271,9 +274,29 @@
         <item>ic_lockscreen_podcast_normal</item>
         <item>ic_lockscreen_rss_normal</item>
         <item>ic_lockscreen_google_normal</item>
+        <item>ic_lockscreen_snapchat_normal</item>
         <item>ic_lockscreen_twitter_normal</item>
     </string-array>
 
+    <!-- tinted statusbar -->
+    <string-array name="tinted_statusbar_entries" translatable="false">
+        <item>@string/tinted_statusbar_off</item>
+        <item>@string/tinted_statusbar_actionbar</item>
+        <item>@string/tinted_statusbar_system</item>
+    </string-array>
+
+    <string-array name="tinted_statusbar_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="tinted_statusbar_option_entries" translatable="false">
+        <item>@string/tinted_statusbar_statusbar</item>
+        <item>@string/tinted_statusbar_navbar</item>
+        <item>@string/tinted_statusbar_all</item>
+    </string-array>
+
     <!-- Quick pulldown -->
     <string-array name="quick_pulldown_entries" translatable="false">
         <item>@string/quick_pulldown_off</item>
@@ -424,4 +447,66 @@
         <item>2000</item>
     </string-array>
 
+    <!-- Navigation bar custom dimensions -->
+    <string-array name="navigation_bar_width_entries" translatable="false">
+        <item>@string/navigation_bar_size_42_dp_default</item>
+        <item>@string/navigation_bar_size_40_dp</item>
+        <item>@string/navigation_bar_size_36_dp</item>
+        <item>@string/navigation_bar_size_30_dp</item>
+        <item>@string/navigation_bar_size_24_dp</item>
+        <item>@string/navigation_bar_size_0_dp</item>
+    </string-array>
+
+    <string-array name="navigation_bar_width" translatable="false">
+        <item>42</item>
+        <item>40</item>
+        <item>36</item>
+        <item>30</item>
+        <item>24</item>
+        <item>0</item>
+    </string-array>
+
+    <string-array name="navigation_bar_height_entries" translatable="false">
+        <item>@string/navigation_bar_size_48_dp_default</item>
+        <item>@string/navigation_bar_size_44_dp</item>
+        <item>@string/navigation_bar_size_42_dp</item>
+        <item>@string/navigation_bar_size_40_dp</item>
+        <item>@string/navigation_bar_size_36_dp</item>
+        <item>@string/navigation_bar_size_30_dp</item>
+        <item>@string/navigation_bar_size_24_dp</item>
+        <item>@string/navigation_bar_size_0_dp</item>
+    </string-array>
+
+    <string-array name="navigation_bar_height" translatable="false">
+        <item>48</item>
+        <item>44</item>
+        <item>42</item>
+        <item>40</item>
+        <item>36</item>
+        <item>30</item>
+        <item>24</item>
+        <item>0</item>
+    </string-array>
+
+    <string-array name="navigation_bar_height_entries_landscape" translatable="false">
+        <item>@string/navigation_bar_size_48_dp_default</item>
+        <item>@string/navigation_bar_size_44_dp</item>
+        <item>@string/navigation_bar_size_42_dp</item>
+        <item>@string/navigation_bar_size_40_dp</item>
+        <item>@string/navigation_bar_size_36_dp</item>
+        <item>@string/navigation_bar_size_30_dp</item>
+        <item>@string/navigation_bar_size_24_dp</item>
+        <item>@string/navigation_bar_size_0_dp</item>
+    </string-array>
+
+    <string-array name="navigation_bar_height_landscape" translatable="false">
+        <item>48</item>
+        <item>44</item>
+        <item>42</item>
+        <item>40</item>
+        <item>36</item>
+        <item>30</item>
+        <item>24</item>
+        <item>0</item>
+    </string-array>
 </resources>
diff --git a/res/values/custom_attrs.xml b/res/values/custom_attrs.xml
index 83648286c..05861838a 100644
--- a/res/values/custom_attrs.xml
+++ b/res/values/custom_attrs.xml
@@ -25,4 +25,9 @@
         <attr name="unitsRight" format="string|reference" />
     </declare-styleable>
 
-</resources>
\ No newline at end of file
+    <declare-styleable name="AppSelectListPreference">
+        <attr name="neutralButtonText" format="string|reference" />
+        <attr name="neutralButtonValue" format="string|reference" />
+        <attr name="positiveButtonValue" format="string|reference" />
+    </declare-styleable>
+</resources>
diff --git a/res/values/custom_dimens.xml b/res/values/custom_dimens.xml
new file mode 100755
index 000000000..8e62137c7
--- /dev/null
+++ b/res/values/custom_dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014 The OmniROM Project
+
+  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 3 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/>.
+ -->
+
+<resources>
+    <dimen name="color_preference_width">16dip</dimen>
+    <dimen name="color_preference_height">16dip</dimen>
+    <dimen name="color_preference_height_large">32dip</dimen>
+    <dimen name="color_preference_end">20dip</dimen>
+</resources>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index b773338f3..ac2fddf43 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -22,7 +22,7 @@
     <string name="reset">Reset</string>
 
     <string name="bars_and_menus_settings">Bars and menus</string>
-    <string name="active_display_settings">ActiveDisplay</string>
+    <string name="active_display_settings">Active display</string>
     <string name="bars_and_menus_category_status_bar_title">Status bar</string>
     <string name="bars_and_menus_category_navigation_bar_title">Navigation bar</string>
     <string name="status_bar_battery_title">Battery style</string>
@@ -118,7 +118,6 @@
     <string name="screen_auto_brighness_summary">Screen brightness levels for automatic mode</string>
     <string name="button_auto_brightness">Automatic levels</string>
     <string name="button_auto_brighness_summary">Button brightness levels for automatic mode</string>
-    <string name="button_brightness_category">Buttons</string>
     <string name="button_no_brightness">Dark mode</string>
     <string name="button_no_brightness_summary">Don\'t set button brightness</string>
     <string name="button_link_brightness">Link to screen</string>
@@ -149,6 +148,8 @@
     <string name="sensor_category">Sensor</string>
     <string name="button_timeout_title">Timeout</string>
     <string name="button_timeout_summary">Disabled on value 0</string>
+    <string name="button_brightness_title">Button brightness</string>
+    <string name="button_brightness_summary">Button brightness settings</string>
 
     <!-- button settings -->
     <string name="button_volume_keys_title">Volume</string>
@@ -218,6 +219,10 @@
     <string name="no_home_key">You have no button assigned to the \"Home\" action! This can make your device unusable!</string>
     <string name="virtual_key_haptic_feedback_title">Vibrate on touch</string>
     <string name="virtual_key_haptic_feedback_summary">Enable depends on \"Vibrate on touch\" in sound settings</string>
+    <string name="navigation_bar_show_title">Show navigation bar</string>
+    <string name="navigation_bar_show_summary">Force enable navigation bar</string>
+    <string name="hardware_keys_disable_title">Disable hardware keys</string>
+    <string name="hardware_keys_disable_summary">Force disable hardware keys</string>
 
     <!-- Power Menu Options-->
     <string name="bars_and_menus_category_power_menu_title">Power menu</string>
@@ -238,14 +243,31 @@
     <string name="ad_enable_title">Enable</string>
     <string name="ad_enable_summary_on">Active display enabled</string>
     <string name="ad_enable_summary_off">Active display disabled</string>
-    <string name="ad_bypass_title">Bypass active display</string>
-    <string name="ad_bypass_summary">When no notifications exist, pocket mode will launch the lockscreen</string>
+    <string name="ad_bypass_title">Bypass mode</string>
+    <string name="ad_bypass_summary">Pocket mode will launch the lockscreen when no notifications exist and lockscreen secure enabled</string>
     <string name="ad_text_title">Notification text</string>
     <string name="ad_text_summary">Show the notification text around the ring</string>
-    <string name="ad_content_title">Use custom notification view</string>
-    <string name="ad_content_summary">Use Active display style for showing notification details, rather than system style</string>
-    <string name="ad_all_notifications_title">Ongoing notifications</string>
-    <string name="ad_all_notifications_summary">Show ongoing, non-clearable notifications</string>
+    <string name="ad_content_title">Custom notification view</string>
+    <string name="ad_content_summary">Use active display style for notification details</string>
+    <string name="ad_annoying_title">Less frequent notification</string>
+    <string name="ad_annoying_summary">Limit the notification to once per time period</string>
+    <string name="ad_double_tap_title">Double tap to sleep</string>
+    <string name="ad_double_tap_summary">Turn screen off with double tap</string>
+    <string name="ad_shake_event_settings_title">Shake settings</string>
+    <string name="ad_shake_event_title">Shake to redisplay</string>
+    <string name="ad_shake_event_summary">Shake device to redisplay notifications</string>
+    <string name="ad_shake_force_title">Default event</string>
+    <string name="ad_shake_force_summary">After receive a notification won\'t run active display until user shakes</string>
+    <string name="ad_shake_threshold_title">Intensity</string>
+    <string name="ad_shake_threshold_summary">Intensity of shake needed to display notifications</string>
+    <string name="ad_shake_timeout_title">Timeout</string>
+    <string name="ad_shake_timeout_summary">Seconds that shake is active after receiving a notification, 0 means always active.</string>
+    <string name="ad_shake_quiet_hours_title">Bypass Quiet Hours</string>
+    <string name="ad_shake_quiet_hours_summary">Allow shake during Quiet Hours</string>
+    <string name="ad_shake_long_threshold_title">Interval</string>
+    <string name="ad_shake_long_threshold_summary">Minimum time between consecutive shakes</string>
+    <string name="ad_all_notifications_title">Show ongoing</string>
+    <string name="ad_all_notifications_summary">Show non-clearable notifications</string>
     <string name="ad_hide_low_priority_title">Hide low priority</string>
     <string name="ad_hide_low_priority_summary">Hide notifications marked as low priority</string>
     <string name="ad_pocket_mode_title">Pocket mode</string>
@@ -253,22 +275,22 @@
     <string name="ad_redisplay_title">Re-display notifications</string>
     <string name="ad_timeout_title">Display timeout</string>
     <string name="ad_threshold_title">Proximity time threshold</string>
-    <string name="ad_threshold_summary">Duration the proximity sensor must be covered before Active display is shown</string>
-    <string name="ad_brightness_title">Notification brightness</string>
+    <string name="ad_threshold_summary">Time the proximity sensor must be covered before active display is shown</string>
+    <string name="ad_brightness_title">Display brightness</string>
     <string name="ad_customizations_title">Advanced settings</string>
     <string name="ad_excluded_apps_title">Excluded apps</string>
     <string name="ad_excluded_apps_summary">No notifications will be shown for these apps</string>
     <string name="ad_privacy_apps_title">Privacy mode</string>
-    <string name="ad_privacy_apps_summary">No details will be shown for notifications belonging to these apps</string>
+    <string name="ad_privacy_apps_summary">No details will be shown for notifications from these apps</string>
     <string name="ad_show_date_title">Show date</string>
     <string name="ad_show_ampm_title">Show AM/PM</string>
     <string name="ad_sunlight_mode_title">Sunlight mode</string>
-    <string name="ad_brightness_summary">Active display brightness (Only applies when automatic brightness is disabled)</string>
+    <string name="ad_brightness_summary">Used on manual brightness control</string>
     <string name="ad_show_date_summary">Show the date above the clock</string>
     <string name="ad_show_ampm_summary">Show AM/PM indicator when using the 12-hour time format</string>
-    <string name="ad_sunlight_mode_summary">Invert colors when in bright areas such as under direct sunlight</string>
-    <string name="ad_turnoff_mode_title">Auto-sleep display</string>
-    <string name="ad_turnoff_mode_summary">Put device to sleep again if it was woken by Pocket mode, and is returned to the pocket</string>
+    <string name="ad_sunlight_mode_summary">Invert colors in bright environment</string>
+    <string name="ad_turnoff_mode_title">Auto-sleep</string>
+    <string name="ad_turnoff_mode_summary">Put to sleep after woken by pocket mode and returned to the pocket</string>
     <string name="ad_redisplay_never">Never</string>
     <string name="ad_redisplay_1m">1 minute</string>
     <string name="ad_redisplay_5m">5 minutes</string>
@@ -313,8 +335,8 @@
 
     <!-- Contextual Notification Panel Header -->
     <string name="notification_drawer_category_title">Notification drawer</string>
-    <string name="custom_statusbar_header_title">Contextual notification panel header</string>
-    <string name="custom_statusbar_header_summary">Sets the background of the notification panel header to an image based on the current date and time</string>
+    <string name="custom_statusbar_header_title">Contextual header</string>
+    <string name="custom_statusbar_header_summary">Sets the background of the header to an image based on the current date and time</string>
 
     <!-- Volume default -->
     <string name="button_volume_default_none">None</string>
@@ -325,6 +347,7 @@
 
     <!-- Navigation Bar customization-->
     <string name="navigation_bar_title">Buttons and layout</string>
+    <string name="navigation_bar_summary">Configure navigation bar buttons</string>
     <string name="navigation_bar_help_text">1 - To begin editing, tap the lock icon\n\n2 - Tap any button to assign or change functionality\n\n3 - Long press any button to rearrange the order\n\n4 - To save, tap the lock icon again\n\n5 - To restore system default, tap the reset button\n\n</string>
     <string name="navigation_bar_tips">\u2022 Actions can only be assigned to one button at a time\n\n\u2022 The home button cannot be re-assigned\n\n\u2022 Side buttons cannot be rearranged</string>
     <string name="navigation_bar_tips_title">Quick tips</string>
@@ -336,6 +359,7 @@
 
     <!-- Navigation ring shortcuts -->
     <string name="navigation_ring_title">Quick launch shortcuts</string>
+    <string name="navigation_ring_summary">Configure custom navigation bar shortcuts</string>
     <string name="navring_target_reset_message">Delete all user created navigation bar shortcuts and restore to default?</string>
     <string name="navring_target_reset">Navigation bar shortcuts reset to default</string>
     <string name="navring_action_open_ime_switcher">Open IME Switcher</string>
@@ -377,6 +401,7 @@
     <string name="icon_picker_email2">Email Holo</string>
     <string name="icon_picker_facebook">Facebook</string>
     <string name="icon_picker_gallery">Gallery</string>
+    <string name="icon_picker_gmail">Gmail</string>
     <string name="icon_picker_google_small">Google (small)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
     <string name="icon_picker_googletalk">Hangouts</string>
@@ -388,9 +413,27 @@
     <string name="icon_picker_podcast">Podcast</string>
     <string name="icon_picker_rss">Rss</string>
     <string name="icon_picker_search">Search</string>
+    <string name="icon_picker_snapchat">Snapchat</string>
     <string name="icon_picker_sms">Messaging</string>
     <string name="icon_picker_twitter">Twitter</string>
 
+    <!-- Tinted statusbar -->
+    <string name="tinted_statusbar_title">Colors</string>
+    <string name="title_tinted_statusbar">Dynamic color change</string>
+    <string name="title_tinted_statusbar_option">Apply color to</string>
+    <string name="tinted_statusbar_off">Disabled</string>
+    <string name="tinted_statusbar_actionbar">Action bar color</string>
+    <string name="tinted_statusbar_system">Screen color</string>
+    <string name="tinted_statusbar_statusbar">Status bar</string>
+    <string name="tinted_statusbar_navbar">Navigation bar</string>
+    <string name="tinted_statusbar_all">Both</string>
+    <string name="tinted_statusbar_filter_title">Reverse color</string>
+    <string name="tinted_statusbar_filter_summary">Enable using reverse color</string>
+    <string name="tinted_statusbar_full_mode_title">Notification drawer color</string>
+    <string name="tinted_statusbar_full_mode_summary">Apply current color to notification drawer</string>
+    <string name="tinted_statusbar_transparent_title">Status bar opacity</string>
+    <string name="tinted_navbar_transparent_title">Navigation bar opacity</string>
+
     <string name="quick_settings_category_title">Quick settings</string>
 
     <!-- QuickSettings: Dynamic Row -->
@@ -409,7 +452,7 @@
     <string name="smart_pulldown_title">Smart pulldown</string>
     <string name="smart_pulldown_summary">Open quick settings when there are no notifications present</string>
     <string name="smart_pulldown_off">Disabled</string>
-    <string name="smart_pulldown_dismissable">If no cleareable notifications</string>
+    <string name="smart_pulldown_dismissable">If no clearable notifications</string>
     <string name="smart_pulldown_persistent">If no notifications</string>
 
     <!-- Cursor control -->
@@ -460,6 +503,7 @@
     <string name="clock_color_title">Color</string>
     <string name="status_bar_clock_style_reset">Reset color</string>
     <string name="status_bar_show_clock_title">Show clock and date</string>
+    <string name="status_bar_force_clock_lockscreen">Always show on lockscreen</string>
     <string name="status_bar_am_pm_title">AM/PM</string>
     <string name="status_bar_am_pm_info">24-hour clock is enabled</string>
     <string name="enable_clock_weekday">Day of the week</string>
@@ -481,4 +525,65 @@
     <string name="clock_date_style_lowercase">Lowercase</string>
     <string name="clock_date_style_uppercase">Uppercase</string>
 
+    <!-- Lockscreen battery ring -->
+    <string name="battery_around_lockscreen_ring">Battery around unlock ring</string>
+
+    <!-- Lockscreen -->
+    <string name="category_widgets_title">Widgets</string>
+    <string name="category_privacy_title">Privacy</string>
+    <string name="category_background_title">Background</string>
+    <string name="more_settings_title">More</string>
+
+    <!-- Widgets-->
+    <string name="maximize_widgets_title">Maximize</string>
+    <string name="enable_camera_title">Camera</string>
+    <string name="enable_camera_summary">Enable camera widget</string>
+
+    <!-- Privacy -->
+    <string name="enable_power_menu_title">Power menu</string>
+    <string name="enable_power_menu_summary">Enable power menu</string>
+
+    <!-- Background -->
+    <string name="see_through_title">See through</string>
+    <string name="see_through_summary">Your data may be visible to those around you</string>
+    <string name="blur_radius_title">Blur content</string>
+    <string name="blur_radius_summary">Intensity for the blur effect</string>
+    <string name="lockscreen_wallpaper">Wallpaper</string>
+    <string name="lockscreen_wallpaper_disabled">See through needs to be disabled</string>
+
+    <!-- Navigation bar height/width -->
+    <string name="navbar_dimen_title">Dimensions</string>
+    <string name="navbar_dimen_summary">Configure width and height of navigation bar</string>
+    <string name="navbar_dimensions_reset_message">Reset all dimensions entries to default?</string>
+    <string name="navigation_bar_height_title">Navigation bar height</string>
+    <string name="navigation_bar_height_summary">Navigation bar height while in portrait.</string>
+    <string name="navigation_bar_height_landscape_title">Navigation bar height landscape</string>
+    <string name="navigation_bar_height_landscape_summary">Navigation bar height while in landscape.</string>
+    <string name="navigation_bar_width_title">Navigation bar width</string>
+    <string name="navigation_bar_width_summary">Navigation bar height if the bar is along a side</string>
+    <string name="navigation_bar_size_42_dp_default">42 dp (default)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (default)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (off)</string>
+
+    <!-- Notification Panel Shortcuts -->
+    <string name="notification_bar_shortcuts">Header shortcuts</string>
+    <string name="clock_shortcut_title">Time</string>
+    <string name="calendar_shortcut_title">Date</string>
+    <string name="default_shortcut">Default</string>
+
+    <string name="color_picker_dialog_title">Color</string>
+
+    <!-- Swap volume buttons when the screen is rotated -->
+    <string name="swap_volume_buttons_title">Match rotation</string>
+    <string name="swap_volume_buttons_summary">Adjust volume buttons action based on current rotation</string>
+
+    <!-- Lockscreen immersive mode -->
+    <string name="category_immersive_mode_title">Immersive mode</string>
+    <string name="lockscreen_immersive_mode_title">Disable immersive mode</string>
 </resources>
diff --git a/res/xml/active_display_settings.xml b/res/xml/active_display_settings.xml
index b7f396d00..9a0f588ac 100644
--- a/res/xml/active_display_settings.xml
+++ b/res/xml/active_display_settings.xml
@@ -24,9 +24,9 @@
         android:summaryOff="@string/ad_enable_summary_off"
         android:summaryOn="@string/ad_enable_summary_on" />
 
-    <CheckBoxPreference
-        android:key="ad_content"
-        android:persistent="false"
+    <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+        android:key="active_display_content"
+        android:defaultValue="true"
         android:title="@string/ad_content_title"
         android:summary="@string/ad_content_summary"
         android:dependency="ad_enable"/>
@@ -38,23 +38,20 @@
         android:summary="@string/ad_bypass_summary"
         android:dependency="ad_enable"/>
 
-    <CheckBoxPreference
-        android:key="ad_text"
-        android:persistent="false"
+    <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+        android:key="active_display_text"
         android:title="@string/ad_text_title"
         android:summary="@string/ad_text_summary"
         android:dependency="ad_enable"/>
 
-    <CheckBoxPreference
-        android:key="ad_all_notifications"
-        android:persistent="false"
+    <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+        android:key="active_display_all_notifications"
         android:title="@string/ad_all_notifications_title"
         android:summary="@string/ad_all_notifications_summary"
         android:dependency="ad_enable"/>
 
-    <CheckBoxPreference
-        android:key="ad_hide_low_priority"
-        android:persistent="false"
+    <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+        android:key="active_display_hide_low_priority_notifications"
         android:title="@string/ad_hide_low_priority_title"
         android:summary="@string/ad_hide_low_priority_summary"
         android:dependency="ad_enable"/>
@@ -84,27 +81,89 @@
         android:entryValues="@array/ad_redisplay_values"
         android:dependency="ad_enable"/>
 
+    <org.omnirom.omnigears.chameleonos.SeekBarPreference
+        android:key="ad_annoying"
+        android:persistent="false"
+        android:title="@string/ad_annoying_title"
+        android:summary="@string/ad_annoying_summary"
+        android:max="60"
+        settings:min="0"
+        settings:interval="1"
+        settings:unitsLeft=""
+        settings:unitsRight="s"
+        android:dependency="ad_enable" />
+
     <PreferenceCategory
-        android:key="ad_customizations"
-        android:title="@string/ad_customizations_title" />
+        android:key="ad_shake_event"
+        android:title="@string/ad_shake_event_settings_title" />
 
-        <org.omnirom.omnigears.chameleonos.AppMultiSelectListPreference
-            android:key="ad_excluded_apps"
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="active_display_shake_event"
+            android:title="@string/ad_shake_event_title"
+            android:summary="@string/ad_shake_event_summary"
+            android:dependency="ad_enable"/>
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="active_display_shake_force"
+            android:title="@string/ad_shake_force_title"
+            android:summary="@string/ad_shake_force_summary"
+            android:dependency="active_display_shake_event"/>
+
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+            android:key="ad_shake_threshold"
             android:persistent="false"
-            android:title="@string/ad_excluded_apps_title"
-            android:summary="@string/ad_excluded_apps_summary"
-            android:dependency="ad_enable" />
+            android:title="@string/ad_shake_threshold_title"
+            android:summary="@string/ad_shake_threshold_summary"
+            android:max="20"
+            settings:min="5"
+            settings:interval="1"
+            settings:unitsLeft=""
+            settings:unitsRight=""
+            android:dependency="active_display_shake_event" />
 
-        <org.omnirom.omnigears.chameleonos.AppMultiSelectListPreference
-            android:key="ad_privacy_apps"
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+            android:key="ad_shake_long_threshold"
             android:persistent="false"
-            android:title="@string/ad_privacy_apps_title"
-            android:summary="@string/ad_privacy_apps_summary"
-            android:dependency="ad_enable" />
+            android:title="@string/ad_shake_long_threshold_title"
+            android:summary="@string/ad_shake_long_threshold_summary"
+            android:max="5"
+            settings:min="1"
+            settings:interval="1"
+            settings:unitsLeft=""
+            settings:unitsRight="s"
+            android:dependency="active_display_shake_event" />
 
-        <CheckBoxPreference
-            android:key="ad_show_date"
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+            android:key="ad_shake_timeout"
             android:persistent="false"
+            android:title="@string/ad_shake_timeout_title"
+            android:summary="@string/ad_shake_timeout_summary"
+            android:max="120"
+            settings:min="0"
+            settings:interval="1"
+            settings:unitsLeft=""
+            settings:unitsRight="s"
+            android:dependency="active_display_shake_event" />
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="active_display_shake_quiet_hours"
+            android:title="@string/ad_shake_quiet_hours_title"
+            android:summary="@string/ad_shake_quiet_hours_summary"
+            android:dependency="active_display_shake_event"/>
+
+    <PreferenceCategory
+        android:key="ad_customizations"
+        android:title="@string/ad_customizations_title" />
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="active_display_double_tap"
+            android:title="@string/ad_double_tap_title"
+            android:summary="@string/ad_double_tap_summary"
+            android:dependency="ad_enable"/>
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="active_display_show_date"
+            android:defaultValue="true"
             android:title="@string/ad_show_date_title"
             android:summary="@string/ad_show_date_summary"
             android:dependency="ad_enable"/>
@@ -116,6 +175,20 @@
             android:summary="@string/ad_show_ampm_summary"
             android:dependency="ad_enable"/>
 
+        <org.omnirom.omnigears.chameleonos.AppMultiSelectListPreference
+            android:key="ad_excluded_apps"
+            android:persistent="false"
+            android:title="@string/ad_excluded_apps_title"
+            android:summary="@string/ad_excluded_apps_summary"
+            android:dependency="ad_enable" />
+
+        <org.omnirom.omnigears.chameleonos.AppMultiSelectListPreference
+            android:key="ad_privacy_apps"
+            android:persistent="false"
+            android:title="@string/ad_privacy_apps_title"
+            android:summary="@string/ad_privacy_apps_summary"
+            android:dependency="ad_enable" />
+
         <CheckBoxPreference
             android:key="ad_turnoff_mode"
             android:persistent="true"
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index f99a5f2a8..84b57e234 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -20,6 +20,57 @@
         android:title="@string/interface_bars_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <!-- Tinted statusbar -->
+    <PreferenceCategory
+            android:key="category_tinted_statusbar"
+            android:title="@string/tinted_statusbar_title">
+
+        <ListPreference
+                android:key="tinted_statusbar"
+                android:title="@string/title_tinted_statusbar"
+                android:entries="@array/tinted_statusbar_entries"
+                android:entryValues="@array/tinted_statusbar_values"
+                android:persistent="false" />
+
+        <ListPreference
+                android:key="tinted_statusbar_option"
+                android:title="@string/title_tinted_statusbar_option"
+                android:entries="@array/tinted_statusbar_option_entries"
+                android:entryValues="@array/tinted_statusbar_values"
+                android:persistent="false" />
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="status_bar_tinted_filter"
+            android:title="@string/tinted_statusbar_filter_title"
+            android:summary="@string/tinted_statusbar_filter_summary" />
+
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+            android:key="tinted_statusbar_transparent"
+            android:persistent="false"
+            android:title="@string/tinted_statusbar_transparent_title"
+            android:max="100"
+            settings:min="0"
+            settings:interval="10"
+            settings:unitsLeft=""
+            settings:unitsRight="%" />
+
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+            android:key="tinted_navbar_transparent"
+            android:persistent="false"
+            android:title="@string/tinted_navbar_transparent_title"
+            android:max="100"
+            settings:min="0"
+            settings:interval="10"
+            settings:unitsLeft=""
+            settings:unitsRight="%" />
+
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="status_bar_tinted_full_mode"
+            android:title="@string/tinted_statusbar_full_mode_title"
+            android:summary="@string/tinted_statusbar_full_mode_summary" />
+
+    </PreferenceCategory>
+
     <!-- Status bar -->
     <PreferenceCategory
             android:key="category_status_bar"
@@ -114,10 +165,19 @@
         <PreferenceScreen
             android:key="navigation_bar"
             android:fragment="org.omnirom.omnigears.interfacesettings.NavBar"
+            android:summary="@string/navigation_bar_summary"
             android:title="@string/navigation_bar_title" />
+
+        <PreferenceScreen
+            android:key="navigation_bar_dimen"
+            android:fragment="org.omnirom.omnigears.interfacesettings.NavBarDimen"
+            android:summary="@string/navbar_dimen_summary"
+            android:title="@string/navbar_dimen_title" />
+
         <PreferenceScreen
             android:key="navigation_ring"
             android:fragment="org.omnirom.omnigears.interfacesettings.NavRing"
+            android:summary="@string/navigation_ring_summary"
             android:title="@string/navigation_ring_title" />
 
         <CheckBoxPreference
diff --git a/res/xml/brightness_settings.xml b/res/xml/brightness_settings.xml
index 6c8d0a7c7..6a02d708b 100644
--- a/res/xml/brightness_settings.xml
+++ b/res/xml/brightness_settings.xml
@@ -17,7 +17,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/brightness"
-        android:key="backlight_settings"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
         <PreferenceCategory
@@ -28,45 +27,12 @@
                         android:title="@string/brightness"
                         android:persistent="false"/>
 
-                <Preference
+                <PreferenceScreen
                         android:key="screen_auto_brightness"
                         android:title="@string/screen_auto_brightness"
                         android:summary="@string/screen_auto_brighness_summary"/>
         </PreferenceCategory>
 
-        <PreferenceCategory
-                android:key="button_brightness_category"
-                android:title="@string/button_brightness_category">
-
-                <Preference
-                        android:key="button_auto_brightness"
-                        android:title="@string/button_auto_brightness"
-                        android:summary="@string/button_auto_brighness_summary"/>
-                <Preference
-                        android:key="button_manual_brightness"
-                        android:title="@string/button_manual_brightness"
-                        android:summary="@string/button_manual_brightness_summary"/>
-                <CheckBoxPreference
-                        android:key="button_no_brightness"
-                        android:title="@string/button_no_brightness"
-                        android:summary="@string/button_no_brightness_summary"
-                        android:persistent="false"/>
-                <CheckBoxPreference
-                        android:key="button_link_brightness"
-                        android:title="@string/button_link_brightness"
-                        android:summary="@string/button_link_brightness_summary"
-                        android:persistent="false"/>
-                <org.omnirom.omnigears.chameleonos.SeekBarPreference
-                        android:key="button_timeout"
-                        android:title="@string/button_timeout_title"
-                        android:summary="@string/button_timeout_summary"
-                        android:max="30"
-                        settings:min="0"
-                        settings:unitsLeft=""
-                        settings:unitsRight="@string/unit_sec"
-                        android:persistent="false" />
-        </PreferenceCategory>
-
         <PreferenceCategory
                 android:key="sensor_category"
                 android:title="@string/sensor_category">
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
new file mode 100644
index 000000000..60d0095d8
--- /dev/null
+++ b/res/xml/button_brightness_settings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014 The OmniROM Project
+
+  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/>.
+ -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/button_brightness_title"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+        <Preference
+                android:key="button_auto_brightness"
+                android:title="@string/button_auto_brightness"
+                android:summary="@string/button_auto_brighness_summary"/>
+        <Preference
+                android:key="button_manual_brightness"
+                android:title="@string/button_manual_brightness"
+                android:summary="@string/button_manual_brightness_summary"/>
+        <CheckBoxPreference
+                android:key="button_no_brightness"
+                android:title="@string/button_no_brightness"
+                android:summary="@string/button_no_brightness_summary"
+                android:persistent="false"/>
+        <CheckBoxPreference
+                android:key="button_link_brightness"
+                android:title="@string/button_link_brightness"
+                android:summary="@string/button_link_brightness_summary"
+                android:persistent="false"/>
+        <org.omnirom.omnigears.chameleonos.SeekBarPreference
+                android:key="button_timeout"
+                android:title="@string/button_timeout_title"
+                android:summary="@string/button_timeout_summary"
+                android:max="30"
+                settings:min="0"
+                settings:unitsLeft=""
+                settings:unitsRight="@string/unit_sec"
+                android:persistent="false" />
+</PreferenceScreen>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 8e3b7812c..635be164c 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -63,12 +63,28 @@
             android:entries="@array/volume_key_cursor_control_entries"
             android:entryValues="@array/volume_key_cursor_control_values" />
 
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="swap_volume_buttons"
+            android:title="@string/swap_volume_buttons_title"
+            android:summary="@string/swap_volume_buttons_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="button_keys"
         android:title="@string/button_keys_title" >
 
+        <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+            android:key="navigation_bar_show"
+            android:title="@string/navigation_bar_show_title"
+            android:summary="@string/navigation_bar_show_summary" />
+
+        <CheckBoxPreference
+            android:key="hardware_keys_disable"
+            android:title="@string/hardware_keys_disable_title"
+            android:summary="@string/hardware_keys_disable_summary"
+            android:persistent="false"/>
+
         <CheckBoxPreference
             android:key="virtual_key_haptic_feedback"
             android:title="@string/virtual_key_haptic_feedback_title"
@@ -81,6 +97,12 @@
             android:summary="@string/force_show_overflow_menu_summary"
             android:persistent="false"/>
 
+        <PreferenceScreen
+            android:key="button_brightness"
+            android:title="@string/brightness"
+            android:summary="@string/button_brightness_summary"
+            android:fragment="org.omnirom.omnigears.brightness.ButtonBrightnessSettings" />
+
         <SwitchPreference
             android:key="keys_enable_custom"
             android:title="@string/keys_enable_custom_title"
diff --git a/res/xml/lockscreen_settings.xml b/res/xml/lockscreen_settings.xml
new file mode 100644
index 000000000..927351c96
--- /dev/null
+++ b/res/xml/lockscreen_settings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2013 The OmniROM Project
+
+  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/>.
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="lockscreen_settings"
+        android:title="@string/lockscreen_settings_title"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <PreferenceCategory
+            android:key="category_widgets"
+            android:title="@string/category_widgets_title"/>
+
+            <CheckBoxPreference
+                    android:key="maximize_widgets"
+                    android:title="@string/maximize_widgets_title"
+                    android:persistent="false"/>
+
+            <CheckBoxPreference
+                    android:key="enable_camera"
+                    android:title="@string/enable_camera_title"
+                    android:summary="@string/enable_camera_summary"
+                    android:persistent="false"/>
+
+    <PreferenceCategory
+            android:key="category_privacy"
+            android:title="@string/category_privacy_title"/>
+
+            <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+                    android:key="lockscreen_enable_power_menu"
+                    android:title="@string/enable_power_menu_title"
+                    android:summary="@string/enable_power_menu_summary"
+                    android:defaultValue="true" />
+
+    <PreferenceCategory
+            android:key="category_background"
+            android:title="@string/category_background_title"/>
+
+            <Preference
+                    android:key="lockscreen_custom_wallpaper"
+                    android:title="@string/lockscreen_wallpaper"
+                    android:persistent="false">
+                    <intent
+                            android:targetPackage="com.android.wallpapercropper"
+                            android:targetClass="com.android.wallpapercropper.LockscreenWallpaper"/>
+            </Preference>
+
+            <CheckBoxPreference
+                    android:key="lockscreen_blur"
+                    android:title="@string/see_through_title"
+                    android:summary="@string/see_through_summary"
+                    android:persistent="false" />
+
+            <org.omnirom.omnigears.chameleonos.SeekBarPreference
+                    android:key="lockscreen_blur_radius"
+                    android:title="@string/blur_radius_title"
+                    android:summary="@string/blur_radius_summary"
+                    android:max="25"
+                    settings:min="0"
+                    settings:unitsLeft=""
+                    settings:unitsRight=""
+                    android:dependency="lockscreen_blur"
+                    android:persistent="false" />
+
+    <PreferenceCategory
+            android:key="category_immersive_mode"
+            android:title="@string/category_immersive_mode_title"/>
+
+            <org.omnirom.omnigears.preference.SystemCheckBoxPreference
+                    android:key="lockscreen_immersive_mode"
+                    android:title="@string/lockscreen_immersive_mode_title"
+                    android:defaultValue="false" />
+</PreferenceScreen>
diff --git a/res/xml/more_interface_settings.xml b/res/xml/more_interface_settings.xml
index 5f82d68dc..f0c1a0c95 100644
--- a/res/xml/more_interface_settings.xml
+++ b/res/xml/more_interface_settings.xml
@@ -23,54 +23,55 @@
     <!-- Recents panel -->
     <PreferenceCategory
             android:key="category_recent_panel"
-            android:title="@string/bars_and_menus_category_recent_panel_title"/>
+            android:title="@string/bars_and_menus_category_recent_panel_title" >
 
-    <CheckBoxPreference
-            android:key="recent_menu_clear_all"
-            android:title="@string/show_recent_clear_all_button_title"
-            android:summary="@string/show_recent_clear_all_button_summary"
-            android:persistent="false" />
+        <CheckBoxPreference
+                android:key="recent_menu_clear_all"
+                android:title="@string/show_recent_clear_all_button_title"
+                android:summary="@string/show_recent_clear_all_button_summary"
+                android:persistent="false" />
 
-    <ListPreference
-            android:key="recent_menu_clear_all_location"
-            android:title="@string/recent_clear_all_button_location_title"
-            android:summary="@string/recent_clear_all_button_location_summary"
-            android:entries="@array/recent_clear_all_button_location_entries"
-            android:entryValues="@array/recent_clear_all_button_location_values"
-            android:defaultValue="2"
-            android:dependency="recent_menu_clear_all" 
-            android:persistent="false"/>
+        <ListPreference
+                android:key="recent_menu_clear_all_location"
+                android:title="@string/recent_clear_all_button_location_title"
+                android:summary="@string/recent_clear_all_button_location_summary"
+                android:entries="@array/recent_clear_all_button_location_entries"
+                android:entryValues="@array/recent_clear_all_button_location_values"
+                android:defaultValue="2"
+                android:dependency="recent_menu_clear_all"
+                android:persistent="false"/>
 
-    <CheckBoxPreference
-            android:key="show_recents_memory_indicator"
-            android:title="@string/show_recents_memory_indicator_title"
-            android:summary="@string/show_recents_memory_indicator_summary"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="recents_memory_indicator_location"
-            android:title="@string/recents_memory_indicator_location_title"
-            android:summary="@string/recents_memory_indicator_location_summary"
-            android:entries="@array/recent_clear_all_button_location_entries"
-            android:entryValues="@array/recent_clear_all_button_location_values"
-            android:defaultValue="2"
-            android:dependency="show_recents_memory_indicator" 
-            android:persistent="false" />
+        <CheckBoxPreference
+                android:key="show_recents_memory_indicator"
+                android:title="@string/show_recents_memory_indicator_title"
+                android:summary="@string/show_recents_memory_indicator_summary"
+                android:persistent="false" />
 
+        <ListPreference
+                android:key="recents_memory_indicator_location"
+                android:title="@string/recents_memory_indicator_location_title"
+                android:summary="@string/recents_memory_indicator_location_summary"
+                android:entries="@array/recent_clear_all_button_location_entries"
+                android:entryValues="@array/recent_clear_all_button_location_values"
+                android:defaultValue="2"
+                android:dependency="show_recents_memory_indicator"
+                android:persistent="false" />
+    </PreferenceCategory>
     <PreferenceCategory
             android:key="category_omniswitch"
-            android:title="@string/omniswitch_category"/>
+            android:title="@string/omniswitch_category">
 
-    <CheckBoxPreference
-            android:key="recents_use_omniswitch"
-            android:title="@string/recents_use_omniswitch_title"
-            android:summary="@string/recents_use_omniswitch_summary"
-            android:persistent="false" />
+        <CheckBoxPreference
+                android:key="recents_use_omniswitch"
+                android:title="@string/recents_use_omniswitch_title"
+                android:summary="@string/recents_use_omniswitch_summary"
+                android:persistent="false" />
 
-    <Preference
-            android:key="omniswitch_start_settings"
-            android:title="@string/omniswitch_start_settings_title"
-            android:summary="@string/omniswitch_start_settings_summary"
-            android:persistent="false" />
+        <Preference
+                android:key="omniswitch_start_settings"
+                android:title="@string/omniswitch_start_settings_title"
+                android:summary="@string/omniswitch_start_settings_summary"
+                android:persistent="false" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/navbar_dimen_settings.xml b/res/xml/navbar_dimen_settings.xml
new file mode 100644
index 000000000..d28e6dea5
--- /dev/null
+++ b/res/xml/navbar_dimen_settings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListPreference
+        android:entries="@array/navigation_bar_height_entries"
+        android:entryValues="@array/navigation_bar_height"
+        android:key="navigation_bar_height"
+        android:title="@string/navigation_bar_height_title"
+        android:summary="@string/navigation_bar_height_summary"
+        android:persistent="false" />
+
+    <ListPreference
+        android:entries="@array/navigation_bar_height_entries_landscape"
+        android:entryValues="@array/navigation_bar_height_landscape"
+        android:key="navigation_bar_height_landscape"
+        android:title="@string/navigation_bar_height_landscape_title"
+        android:summary="@string/navigation_bar_height_landscape_summary"
+        android:persistent="false" />
+
+    <ListPreference
+        android:entries="@array/navigation_bar_width_entries"
+        android:entryValues="@array/navigation_bar_width"
+        android:key="navigation_bar_width"
+        android:title="@string/navigation_bar_width_title"
+        android:summary="@string/navigation_bar_width_summary"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/notification_light_settings.xml b/res/xml/notification_light_settings.xml
index f38f4f091..4ffebf7c5 100644
--- a/res/xml/notification_light_settings.xml
+++ b/res/xml/notification_light_settings.xml
@@ -29,7 +29,8 @@
         <CheckBoxPreference
             android:key="notification_light_screen_on"
             android:title="@string/notification_light_screen_on_title"
-            android:persistent="false" />
+            android:persistent="false"
+            android:dependency="notification_light_pulse" />
 
         <org.omnirom.omnigears.notificationlight.ApplicationLightPreference
             android:key="default"
diff --git a/res/xml/notification_panel_settings.xml b/res/xml/notification_panel_settings.xml
index 1dbf60aa4..de2647935 100644
--- a/res/xml/notification_panel_settings.xml
+++ b/res/xml/notification_panel_settings.xml
@@ -32,4 +32,22 @@
             android:summary="@string/quick_swipe_summary"
             android:persistent="false"/>
 
+    <PreferenceCategory
+            android:key="shortcuts"
+            android:title="@string/notification_bar_shortcuts">
+
+        <org.omnirom.omnigears.preference.AppSelectListPreference
+                android:key="clock_shortcut"
+                android:title="@string/clock_shortcut_title"
+                android:positiveButtonText="@string/default_shortcut"
+                android:persistent="false"/>
+
+        <org.omnirom.omnigears.preference.AppSelectListPreference
+                android:key="calendar_shortcut"
+                android:title="@string/calendar_shortcut_title"
+                android:positiveButtonText="@string/default_shortcut"
+                android:persistent="false"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/og_security_settings_chooser.xml b/res/xml/og_security_settings_chooser.xml
new file mode 100644
index 000000000..662f7e2df
--- /dev/null
+++ b/res/xml/og_security_settings_chooser.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="og_security_category"
+        android:title="@string/more_settings_title">
+
+        <CheckBoxPreference
+            android:key="battery_around_lockscreen_ring"
+            android:title="@string/battery_around_lockscreen_ring"
+            android:persistent="false"/>
+
+        <Preference
+            android:fragment="org.omnirom.omnigears.interfacesettings.LockscreenTargets"
+            android:key="lockscreen_targets"
+            android:summary="@string/lockscreen_target_summary"
+            android:title="@string/lockscreen_target_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/status_bar_clock_style.xml b/res/xml/status_bar_clock_style.xml
index 28f90624b..6701997bc 100644
--- a/res/xml/status_bar_clock_style.xml
+++ b/res/xml/status_bar_clock_style.xml
@@ -18,12 +18,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/status_bar_clock_title">
 
-       <CheckBoxPreference
+        <CheckBoxPreference
             android:key="status_bar_show_clock"
             android:title="@string/status_bar_show_clock_title"
             android:defaultValue="true"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="status_bar_force_clock_lockscreen"
+            android:title="@string/status_bar_force_clock_lockscreen"
+            android:defaultValue="false"
+            android:dependency="status_bar_show_clock"
+            android:persistent="false"/>
+
         <ListPreference
             android:key="clock_style"
             android:entries="@array/clock_style_entries"
diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index 3fd001a6b..dae3a87d4 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -60,6 +60,7 @@
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import org.omnirom.omnigears.preference.SystemCheckBoxPreference;
 
 public class ButtonSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
 
@@ -75,6 +76,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements OnPref
     private static final String BUTTON_VOLUME_DEFAULT = "button_volume_default_screen";
     private static final String BUTTON_VOLUME_MUSIC_CONTROL = "button_volume_music_control";
     private static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";
+    private static final String SWAP_VOLUME_BUTTONS = "swap_volume_buttons";
     private static final String CATEGORY_HEADSETHOOK = "button_headsethook";
     private static final String BUTTON_HEADSETHOOK_LAUNCH_VOICE = "button_headsethook_launch_voice";
 
@@ -93,6 +95,9 @@ public class ButtonSettings extends SettingsPreferenceFragment implements OnPref
     private static final String KEYS_APP_SWITCH_LONG_PRESS = "keys_app_switch_long_press";
     private static final String VIRTUAL_KEY_HAPTIC_FEEDBACK = "virtual_key_haptic_feedback";
     private static final String FORCE_SHOW_OVERFLOW_MENU = "force_show_overflow_menu";
+    private static final String KEYS_BRIGHTNESS_KEY = "button_brightness";
+    private static final String KEYS_SHOW_NAVBAR_KEY = "navigation_bar_show";
+    private static final String KEYS_DISABLE_HW_KEY = "hardware_keys_disable";
 
     // Available custom actions to perform on a key press.
     private static final int ACTION_NOTHING = 0;
@@ -117,6 +122,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements OnPref
 
     private CheckBoxPreference mVolumeWake;
     private CheckBoxPreference mVolumeMusicControl;
+    private CheckBoxPreference mSwapVolumeButtons;
     private ListPreference mVolumeKeyCursorControl;
     private SwitchPreference mEnableCustomBindings;
     private ListPreference mBackPressAction;
@@ -135,6 +141,15 @@ public class ButtonSettings extends SettingsPreferenceFragment implements OnPref
     private CheckBoxPreference mHeadsetHookLaunchVoice;
     private CheckBoxPreference mVirtualKeyHapticFeedback;
     private CheckBoxPreference mForceShowOverflowMenu;
+    private boolean mButtonBrightnessSupport;
+    private CheckBoxPreference mEnableNavBar;
+    private CheckBoxPreference mDisabkeHWKeys;
+    private PreferenceScreen mButtonBrightness;
+    private PreferenceCategory mKeysBackCategory;
+    private PreferenceCategory mKeysHomeCategory;
+    private PreferenceCategory mKeysMenuCategory;
+    private PreferenceCategory mKeysAppSwitchCategory;
+    private PreferenceCategory mKeysAssistCategory;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -149,11 +164,13 @@ public void onCreate(Bundle savedInstanceState) {
         final PreferenceCategory volumeCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_VOLUME);
 
+        mButtonBrightnessSupport = getResources().getBoolean(com.android.internal.R.bool.config_button_brightness_support);
+
         if (hasVolumeRocker()) {
             mVolumeWake = (CheckBoxPreference) findPreference(BUTTON_VOLUME_WAKE);
             mVolumeDefault = (ListPreference) findPreference(BUTTON_VOLUME_DEFAULT);
             if (!res.getBoolean(R.bool.config_show_volumeRockerWake)) {
-                prefScreen.removePreference(mVolumeWake);
+                volumeCategory.removePreference(mVolumeWake);
             } else {
                 mVolumeWake.setChecked(Settings.System.getInt(resolver,
                     Settings.System.VOLUME_WAKE_SCREEN, 0) != 0);
@@ -172,6 +189,10 @@ public void onCreate(Bundle savedInstanceState) {
             mVolumeMusicControl.setChecked(Settings.System.getInt(resolver,
                     Settings.System.VOLUME_MUSIC_CONTROL, 0) != 0);
 
+            mSwapVolumeButtons = (SystemCheckBoxPreference) findPreference(SWAP_VOLUME_BUTTONS);
+            mSwapVolumeButtons.setChecked(Settings.System.getInt(resolver,
+                    Settings.System.SWAP_VOLUME_BUTTONS, 0) != 0);
+
             mVolumeKeyCursorControl = (ListPreference) findPreference(VOLUME_KEY_CURSOR_CONTROL);
             if(mVolumeKeyCursorControl != null) {
                 mVolumeKeyCursorControl.setValue(Integer.toString(Settings.System.getInt(
@@ -194,24 +215,24 @@ public void onCreate(Bundle savedInstanceState) {
 
         final PreferenceCategory keysCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_KEYS);
-        final PreferenceCategory keysBackCategory =
+        mKeysBackCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_BACK);
-        final PreferenceCategory keysHomeCategory =
+        mKeysHomeCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_HOME);
-        final PreferenceCategory keysMenuCategory =
+        mKeysMenuCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_MENU);
-        final PreferenceCategory keysAssistCategory =
+        mKeysAssistCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_ASSIST);
-        final PreferenceCategory keysAppSwitchCategory =
+        mKeysAppSwitchCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_APPSWITCH);
 
         if (!res.getBoolean(R.bool.config_has_hardware_buttons)) {
             prefScreen.removePreference(keysCategory);
-            prefScreen.removePreference(keysBackCategory);
-            prefScreen.removePreference(keysHomeCategory);
-            prefScreen.removePreference(keysMenuCategory);
-            prefScreen.removePreference(keysAssistCategory);
-            prefScreen.removePreference(keysAppSwitchCategory);
+            prefScreen.removePreference(mKeysBackCategory);
+            prefScreen.removePreference(mKeysHomeCategory);
+            prefScreen.removePreference(mKeysMenuCategory);
+            prefScreen.removePreference(mKeysAssistCategory);
+            prefScreen.removePreference(mKeysAppSwitchCategory);
         } else {
             mEnableCustomBindings = (SwitchPreference) prefScreen.findPreference(
                     KEYS_ENABLE_CUSTOM);
@@ -241,6 +262,12 @@ public void onCreate(Bundle savedInstanceState) {
                     VIRTUAL_KEY_HAPTIC_FEEDBACK);
             mForceShowOverflowMenu = (CheckBoxPreference) prefScreen.findPreference(
                     FORCE_SHOW_OVERFLOW_MENU);
+            mEnableNavBar = (CheckBoxPreference) prefScreen.findPreference(
+                    KEYS_SHOW_NAVBAR_KEY);
+            mDisabkeHWKeys = (CheckBoxPreference) prefScreen.findPreference(
+                    KEYS_DISABLE_HW_KEY);
+            mButtonBrightness = (PreferenceScreen) prefScreen.findPreference(
+                    KEYS_BRIGHTNESS_KEY);
 
             if (hasBackKey) {
                 int backPressAction = Settings.System.getInt(resolver,
@@ -258,10 +285,10 @@ public void onCreate(Bundle savedInstanceState) {
                 mBackLongPressAction.setValue(Integer.toString(backLongPressAction));
                 mBackLongPressAction.setSummary(mBackLongPressAction.getEntry());
                 mBackLongPressAction.setOnPreferenceChangeListener(this);
-                
+
                 mKeySettings.put(Settings.System.KEY_BACK_LONG_PRESS_ACTION, backLongPressAction);
             } else {
-                prefScreen.removePreference(keysBackCategory);
+                prefScreen.removePreference(mKeysBackCategory);
             }
 
             if (hasHomeKey) {
@@ -313,7 +340,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                 mKeySettings.put(Settings.System.KEY_HOME_DOUBLE_TAP_ACTION, homeDoubleTapAction);
             } else {
-                prefScreen.removePreference(keysHomeCategory);
+                prefScreen.removePreference(mKeysHomeCategory);
             }
 
             if (hasMenuKey) {
@@ -324,7 +351,7 @@ public void onCreate(Bundle savedInstanceState) {
                 mMenuPressAction.setOnPreferenceChangeListener(this);
 
                 mKeySettings.put(Settings.System.KEY_MENU_ACTION, menuPressAction);
-        
+
                 int menuLongPressAction = ACTION_NOTHING;
                 if (!hasAssistKey) {
                     menuLongPressAction = ACTION_SEARCH;
@@ -339,7 +366,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                 mKeySettings.put(Settings.System.KEY_MENU_LONG_PRESS_ACTION, menuLongPressAction);
             } else {
-                prefScreen.removePreference(keysMenuCategory);
+                prefScreen.removePreference(mKeysMenuCategory);
             }
 
             if (hasAssistKey) {
@@ -359,7 +386,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                 mKeySettings.put(Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, assistLongPressAction);
             } else {
-                prefScreen.removePreference(keysAssistCategory);
+                prefScreen.removePreference(mKeysAssistCategory);
             }
 
             if (hasAppSwitchKey) {
@@ -379,7 +406,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                 mKeySettings.put(Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, appSwitchLongPressAction);
             } else {
-                prefScreen.removePreference(keysAppSwitchCategory);
+                prefScreen.removePreference(mKeysAppSwitchCategory);
             }
 
             mEnableCustomBindings.setChecked((Settings.System.getInt(resolver,
@@ -395,9 +422,18 @@ public void onCreate(Bundle savedInstanceState) {
             }
 
             boolean hasNavBar = getResources().getBoolean(
-                com.android.internal.R.bool.config_showNavigationBar);
+                    com.android.internal.R.bool.config_showNavigationBar);
             mForceShowOverflowMenu.setChecked(Settings.System.getInt(resolver,
-                        Settings.System.FORCE_SHOW_OVERFLOW_MENU, (!hasNavBar && hasMenuKey) ? 0 : 1) == 1);
+                    Settings.System.FORCE_SHOW_OVERFLOW_MENU, (!hasNavBar && hasMenuKey) ? 0 : 1) == 1);
+
+            boolean harwareKeysDisable = Settings.System.getInt(resolver,
+                        Settings.System.HARDWARE_KEYS_DISABLE, 0) == 1;
+            mDisabkeHWKeys.setChecked(harwareKeysDisable);
+
+            if (!mButtonBrightnessSupport){
+                keysCategory.removePreference(mButtonBrightness);
+            }
+            updateDisableHWKeyEnablement(harwareKeysDisable);
         }
 
         final PreferenceCategory headsethookCategory =
@@ -437,6 +473,16 @@ else if (preference == mHeadsetHookLaunchVoice) {
             Settings.System.putInt(getContentResolver(),
                     Settings.System.FORCE_SHOW_OVERFLOW_MENU, checked ? 1:0);
             return true;
+        } else if (preference == mDisabkeHWKeys){
+            boolean checked = ((CheckBoxPreference)preference).isChecked();
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.HARDWARE_KEYS_DISABLE, checked ? 1:0);
+            updateDisableHWKeyEnablement(checked);
+        } else if (preference == mSwapVolumeButtons){
+            boolean checked = ((CheckBoxPreference)preference).isChecked();
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.SWAP_VOLUME_BUTTONS, checked ? 1:0);
+            return true;
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -447,6 +493,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             boolean value = (Boolean) newValue;
             Settings.System.putInt(getContentResolver(), Settings.System.HARDWARE_KEY_REBINDING,
                     value ? 1 : 0);
+            boolean harwareKeysDisable = Settings.System.getInt(getContentResolver(),
+                    Settings.System.HARDWARE_KEYS_DISABLE, 0) == 1;
+            updateDisableHWKeyEnablement(harwareKeysDisable);
             return true;
         } else if (preference == mVolumeKeyCursorControl) {
             String volumeKeyCursorControl = (String) newValue;
@@ -577,7 +626,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
     private boolean hasVolumeRocker() {
         return getActivity().getResources().getBoolean(R.bool.config_has_volume_rocker);
     }
-    
+
     private boolean hasHomeKey() {
         Iterator<Integer> nextAction = mKeySettings.values().iterator();
         while (nextAction.hasNext()){
@@ -621,4 +670,18 @@ public void removeListEntry(ListPreference list, String valuetoRemove) {
         list.setEntries(entries.toArray(new CharSequence[entries.size()]));
         list.setEntryValues(values.toArray(new CharSequence[values.size()]));
     }
+
+    private void updateDisableHWKeyEnablement(boolean harwareKeysDisable) {
+        boolean enableHWKeyRebinding = Settings.System.getInt(getContentResolver(),
+                    Settings.System.HARDWARE_KEY_REBINDING, 0) == 1;
+
+        mVirtualKeyHapticFeedback.setEnabled(!harwareKeysDisable);
+        mForceShowOverflowMenu.setEnabled(!harwareKeysDisable);
+        mButtonBrightness.setEnabled(!harwareKeysDisable);
+        mKeysHomeCategory.setEnabled(!harwareKeysDisable && enableHWKeyRebinding);
+        mKeysBackCategory.setEnabled(!harwareKeysDisable && enableHWKeyRebinding);
+        mKeysMenuCategory.setEnabled(!harwareKeysDisable && enableHWKeyRebinding);
+        mKeysAppSwitchCategory.setEnabled(!harwareKeysDisable && enableHWKeyRebinding);
+        mKeysAssistCategory.setEnabled(!harwareKeysDisable && enableHWKeyRebinding);
+    }
 }
diff --git a/src/org/omnirom/omnigears/batterylight/BatteryLightDialog.java b/src/org/omnirom/omnigears/batterylight/BatteryLightDialog.java
index 062ed11bb..e31f00261 100644
--- a/src/org/omnirom/omnigears/batterylight/BatteryLightDialog.java
+++ b/src/org/omnirom/omnigears/batterylight/BatteryLightDialog.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Daniel Nilsson
- * Copyright (C) 2012 THe CyanogenMod Project
+ * Copyright (C) 2012 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/org/omnirom/omnigears/batterylight/BatteryLightPreference.java b/src/org/omnirom/omnigears/batterylight/BatteryLightPreference.java
index 90e6f8fb6..1b6cdf0c7 100644
--- a/src/org/omnirom/omnigears/batterylight/BatteryLightPreference.java
+++ b/src/org/omnirom/omnigears/batterylight/BatteryLightPreference.java
@@ -88,8 +88,8 @@ protected void onBindView(View view) {
     }
 
     private void updatePreferenceViews() {
-        final int width = (int) mResources.getDimension(R.dimen.device_memory_usage_button_width);
-        final int height = (int) mResources.getDimension(R.dimen.device_memory_usage_button_height);
+        final int width = (int) mResources.getDimension(R.dimen.color_preference_width);
+        final int height = (int) mResources.getDimension(R.dimen.color_preference_height);
 
         if (mLightColorView != null) {
             mLightColorView.setEnabled(true);
diff --git a/src/org/omnirom/omnigears/brightness/AutoBrightnessDialog.java b/src/org/omnirom/omnigears/brightness/AutoBrightnessDialog.java
index 801609f17..672767a32 100644
--- a/src/org/omnirom/omnigears/brightness/AutoBrightnessDialog.java
+++ b/src/org/omnirom/omnigears/brightness/AutoBrightnessDialog.java
@@ -266,12 +266,19 @@ private void updateSettings(boolean forceDefault) {
 
         if (lux == null || values == null) {
             final Resources res = getContext().getResources();
-            lux = res.getIntArray(com.android.internal.R.array.config_autoBrightnessLevels);
-            if (mScreenMode){
-                values = res.getIntArray(com.android.internal.R.array.config_autoBrightnessLcdBacklightValues);
-            } else {
-                values = res.getIntArray(com.android.internal.R.array.config_autoBrightnessButtonBacklightValues);
+            if (lux == null){
+                lux = res.getIntArray(com.android.internal.R.array.config_autoBrightnessLevels);
+            }
+            if (values == null){
+                if (mScreenMode){
+                    values = res.getIntArray(com.android.internal.R.array.config_autoBrightnessLcdBacklightValues);
+                } else {
+                    values = res.getIntArray(com.android.internal.R.array.config_autoBrightnessButtonBacklightValues);
+                }
             }
+        }
+
+        if (lux == null && values == null) {
             mIsDefault = true;
         } else {
             mIsDefault = false;
diff --git a/src/org/omnirom/omnigears/brightness/BrightnessSettings.java b/src/org/omnirom/omnigears/brightness/BrightnessSettings.java
index 1283f279e..58f9c891c 100644
--- a/src/org/omnirom/omnigears/brightness/BrightnessSettings.java
+++ b/src/org/omnirom/omnigears/brightness/BrightnessSettings.java
@@ -40,39 +40,22 @@
 import android.app.AlertDialog;
 import android.text.TextWatcher;
 import android.text.Editable;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
 import org.omnirom.omnigears.R;
-import org.omnirom.omnigears.chameleonos.SeekBarPreference;
 
 public class BrightnessSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "BrightnessSettings";
 
     private static final String KEY_AUTOMATIC_SENSITIVITY = "auto_brightness_sensitivity";
-    private static final String KEY_BUTTON_BRIGHTNESS_CATEGORY = "button_brightness_category";
-    private static final String KEY_BUTTON_NO_BRIGHTNESS = "button_no_brightness";
-    private static final String KEY_BUTTON_LINK_BRIGHTNESS = "button_link_brightness";
     private static final String KEY_SCREEN_AUTO_BRIGHTNESS = "screen_auto_brightness";
-    private static final String KEY_BUTTON_AUTO_BRIGHTNESS = "button_auto_brightness";
-    private static final String KEY_BUTTON_MANUAL_BRIGHTNESS = "button_manual_brightness";
-    private static final String KEY_BUTTON_TIMEOUT = "button_timeout";
 
     private ListPreference mAutomaticSensitivity;
-    private CheckBoxPreference mNoButtonBrightness;
-    private CheckBoxPreference mLinkButtonBrightness;
     private Preference mAutomaticScreenBrightness;
-    private Preference mAutomaticButtonBrightness;
-    private Preference mManualButtonBrightness;
     private AutoBrightnessDialog mScreenBrightnessDialog;
-    private AutoBrightnessDialog mButtonBrightnessDialog;
-    private ManualButtonBrightnessDialog mManualBrightnessDialog;
-    private boolean mButtonBrightnessSupport;
-    private IPowerManager mPowerService;
-    private SeekBarPreference mButtonTimoutBar;
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -81,8 +64,6 @@ public void onCreate(Bundle savedInstanceState) {
         PreferenceScreen prefSet = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
 
-        mButtonBrightnessSupport = getResources().getBoolean(com.android.internal.R.bool.config_button_brightness_support);
-
         mAutomaticSensitivity = (ListPreference) findPreference(KEY_AUTOMATIC_SENSITIVITY);
         float currentSensitivity = Settings.System.getFloat(resolver,
             Settings.System.AUTO_BRIGHTNESS_RESPONSIVENESS, 1.0f);
@@ -93,52 +74,6 @@ public void onCreate(Bundle savedInstanceState) {
         mAutomaticSensitivity.setOnPreferenceChangeListener(this);
 
         mAutomaticScreenBrightness = (Preference) findPreference(KEY_SCREEN_AUTO_BRIGHTNESS);
-
-        if (!mButtonBrightnessSupport){
-            removePreference(KEY_BUTTON_BRIGHTNESS_CATEGORY);
-        } else {
-            mNoButtonBrightness = (CheckBoxPreference) findPreference(KEY_BUTTON_NO_BRIGHTNESS);
-            mNoButtonBrightness.setChecked(Settings.System.getInt(resolver,
-                    Settings.System.CUSTOM_BUTTON_DISABLE_BRIGHTNESS, 0) != 0);
-
-            mLinkButtonBrightness = (CheckBoxPreference) findPreference(KEY_BUTTON_LINK_BRIGHTNESS);
-            mLinkButtonBrightness.setChecked(Settings.System.getInt(resolver,
-                    Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, 0) != 0);
-
-            mAutomaticButtonBrightness = (Preference) findPreference(KEY_BUTTON_AUTO_BRIGHTNESS);
-            mManualButtonBrightness = (Preference) findPreference(KEY_BUTTON_MANUAL_BRIGHTNESS);
-
-            mButtonTimoutBar = (SeekBarPreference) findPreference(KEY_BUTTON_TIMEOUT);
-            int currentTimeout = Settings.System.getInt(resolver,
-                            Settings.System.BUTTON_BACKLIGHT_TIMEOUT, 0);
-            mButtonTimoutBar.setValue(currentTimeout);
-            mButtonTimoutBar.setOnPreferenceChangeListener(this);
-
-            mPowerService = IPowerManager.Stub.asInterface(ServiceManager.getService("power"));
-
-            updateEnablement();
-        }
-    }
-
-    private void updateEnablement() {
-        if (mButtonBrightnessSupport){
-            if (mNoButtonBrightness.isChecked()){
-                mLinkButtonBrightness.setEnabled(false);
-                mButtonTimoutBar.setEnabled(false);
-                mAutomaticButtonBrightness.setEnabled(false);
-                mManualButtonBrightness.setEnabled(false);
-            } else if (mLinkButtonBrightness.isChecked()){
-                mNoButtonBrightness.setEnabled(false);
-                mAutomaticButtonBrightness.setEnabled(false);
-                mManualButtonBrightness.setEnabled(false);
-            } else {
-                mNoButtonBrightness.setEnabled(true);
-                mLinkButtonBrightness.setEnabled(true);
-                mButtonTimoutBar.setEnabled(true);
-                mAutomaticButtonBrightness.setEnabled(true);
-                mManualButtonBrightness.setEnabled(true);
-            }
-        }
     }
 
     @Override
@@ -153,36 +88,15 @@ public void onPause() {
         if (mScreenBrightnessDialog != null) {
             mScreenBrightnessDialog.dismiss();
         }
-        if (mButtonBrightnessDialog != null) {
-            mButtonBrightnessDialog.dismiss();
-        }
-        if (mManualBrightnessDialog != null) {
-            mManualBrightnessDialog.dismiss();
-        }
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAutomaticScreenBrightness) {
             showScreenAutoBrightnessDialog();
-        } else if (preference == mAutomaticButtonBrightness) {
-            showButtonAutoBrightnessDialog();
-        } else if (preference == mManualButtonBrightness) {
-            showButtonManualBrightnessDialog();
-        } else if (preference == mNoButtonBrightness) {
-            boolean checked = ((CheckBoxPreference)preference).isChecked();
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.CUSTOM_BUTTON_DISABLE_BRIGHTNESS, checked ? 1:0);
-            updateEnablement();
-        } else if (preference == mLinkButtonBrightness) {
-            boolean checked = ((CheckBoxPreference)preference).isChecked();
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, checked ? 1:0);
-            updateEnablement();
-        } else {
-            return false;
+            return true;
         }
-        return true;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     @Override
@@ -197,10 +111,6 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                         Settings.System.AUTO_BRIGHTNESS_RESPONSIVENESS, sensitivity);
 
             updateAutomaticSensityDescription(value);
-        } else if (preference == mButtonTimoutBar) {
-            int buttonTimeout = (Integer) objValue;
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.BUTTON_BACKLIGHT_TIMEOUT, buttonTimeout);
         } else {
             return false;
         }
@@ -228,155 +138,4 @@ private void showScreenAutoBrightnessDialog() {
         mScreenBrightnessDialog = new AutoBrightnessDialog(getActivity(), true);
         mScreenBrightnessDialog.show();
     }
-
-    private void showButtonAutoBrightnessDialog() {
-        if (mButtonBrightnessDialog != null && mButtonBrightnessDialog.isShowing()) {
-            return;
-        }
-
-        mButtonBrightnessDialog = new AutoBrightnessDialog(getActivity(), false);
-        mButtonBrightnessDialog.show();
-    }
-
-    private void showButtonManualBrightnessDialog() {
-        if (mManualBrightnessDialog != null && mManualBrightnessDialog.isShowing()) {
-            return;
-        }
-
-        mManualBrightnessDialog = new ManualButtonBrightnessDialog(getActivity());
-        mManualBrightnessDialog.show();
-    }
-
-    private class ManualButtonBrightnessDialog extends AlertDialog implements DialogInterface.OnClickListener {
-
-        private SeekBar mBacklightBar;
-        private EditText mBacklightInput;
-        private int mCurrentBrightness;
-        private boolean mIsDragging = false;
-
-        public ManualButtonBrightnessDialog(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            final View v = getLayoutInflater().inflate(R.layout.dialog_manual_brightness, null);
-            final Context context = getContext();
-
-            mBacklightBar = (SeekBar) v.findViewById(R.id.backlight);
-            mBacklightInput = (EditText) v.findViewById(R.id.backlight_input);
-
-            setTitle(R.string.dialog_manual_brightness_title);
-            setCancelable(true);
-            setView(v);
-
-            try {
-                mCurrentBrightness = mPowerService.getCurrentButtonBrightnessValue();
-            } catch(Exception e){
-            }
-
-            mBacklightBar.setMax(brightnessToProgress(PowerManager.BRIGHTNESS_ON));
-            initListeners();
-            init();
-
-            setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.ok), this);
-            setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), this);
-
-            super.onCreate(savedInstanceState);
-        }
-
-        private int brightnessToProgress(int brightness) {
-            return brightness * 100;
-        }
-
-        private int progressToBrightness(int progress) {
-            int brightness = progress / 100;
-            return brightness;
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                try {
-                    int newBacklight = Integer.valueOf(mBacklightInput.getText().toString());
-                    Settings.System.putInt(getContext().getContentResolver(),
-                            Settings.System.CUSTOM_BUTTON_BRIGHTNESS, newBacklight);
-                } catch (NumberFormatException e) {
-                    Log.d(TAG, "NumberFormatException " + e);
-                }
-            }
-        }
-
-        private void init() {
-            int currentValue = Settings.System.getInt(getContext().getContentResolver(),
-                            Settings.System.CUSTOM_BUTTON_BRIGHTNESS, 100);
-
-            mBacklightBar.setProgress(brightnessToProgress(currentValue));
-            mBacklightInput.setText(String.valueOf(currentValue));
-        }
-
-        private void initListeners() {
-            mBacklightBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    if (mIsDragging) {
-                        int brightness = progressToBrightness(seekBar.getProgress());
-                        mBacklightInput.setText(String.valueOf(brightness));
-                        try {
-                            mPowerService.setButtonBrightness(brightness);
-                        } catch(Exception e){
-                        }
-                    }
-                }
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                    int brightness = progressToBrightness(seekBar.getProgress());
-                    try {
-                        mPowerService.setButtonBrightness(brightness);
-                    } catch(Exception e){
-                    }
-                    mIsDragging = true;
-                }
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                    try {
-                        mPowerService.setButtonBrightness(mCurrentBrightness);
-                    } catch(Exception e){
-                    }
-                    mIsDragging = false;
-                }
-            });
-
-            mBacklightInput.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-                @Override
-                public void afterTextChanged(Editable s) {
-                    boolean ok = false;
-                    try {
-                        int minValue = 0;
-                        int maxValue = PowerManager.BRIGHTNESS_ON;
-                        int newBrightness = Integer.valueOf(s.toString());
-
-                        if (newBrightness >= minValue && newBrightness <= maxValue) {
-                            ok = true;
-                            mBacklightBar.setProgress(brightnessToProgress(newBrightness));
-                        }
-                    } catch (NumberFormatException e) {
-                        //ignored, ok is false ayway
-                    }
-
-                    Button okButton = mManualBrightnessDialog.getButton(DialogInterface.BUTTON_POSITIVE);
-                    if (okButton != null) {
-                        okButton.setEnabled(ok);
-                    }
-                }
-            });
-        }
-    }
 }
-
diff --git a/src/org/omnirom/omnigears/brightness/ButtonBrightnessSettings.java b/src/org/omnirom/omnigears/brightness/ButtonBrightnessSettings.java
new file mode 100644
index 000000000..1948fc92a
--- /dev/null
+++ b/src/org/omnirom/omnigears/brightness/ButtonBrightnessSettings.java
@@ -0,0 +1,323 @@
+/*
+ *  Copyright (C) 2014 The OmniROM Project
+ *
+ * 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/>.
+ *
+ */
+
+package org.omnirom.omnigears.brightness;
+
+import com.android.settings.SettingsPreferenceFragment;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.PowerManager;
+import android.os.IPowerManager;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.preference.ListPreference;
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceCategory;
+import android.provider.Settings;
+import android.view.View;
+import android.util.Log;
+import android.app.AlertDialog;
+import android.text.TextWatcher;
+import android.text.Editable;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import org.omnirom.omnigears.R;
+import org.omnirom.omnigears.chameleonos.SeekBarPreference;
+
+public class ButtonBrightnessSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "ButtonBrightnessSettings";
+
+    private static final String KEY_BUTTON_NO_BRIGHTNESS = "button_no_brightness";
+    private static final String KEY_BUTTON_LINK_BRIGHTNESS = "button_link_brightness";
+    private static final String KEY_BUTTON_AUTO_BRIGHTNESS = "button_auto_brightness";
+    private static final String KEY_BUTTON_MANUAL_BRIGHTNESS = "button_manual_brightness";
+    private static final String KEY_BUTTON_TIMEOUT = "button_timeout";
+
+    private CheckBoxPreference mNoButtonBrightness;
+    private CheckBoxPreference mLinkButtonBrightness;
+    private Preference mAutomaticButtonBrightness;
+    private Preference mManualButtonBrightness;
+    private AutoBrightnessDialog mButtonBrightnessDialog;
+    private ManualButtonBrightnessDialog mManualBrightnessDialog;
+    private IPowerManager mPowerService;
+    private SeekBarPreference mButtonTimoutBar;
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.button_brightness_settings);
+
+        PreferenceScreen prefSet = getPreferenceScreen();
+        ContentResolver resolver = getActivity().getContentResolver();
+
+        mNoButtonBrightness = (CheckBoxPreference) findPreference(KEY_BUTTON_NO_BRIGHTNESS);
+        mNoButtonBrightness.setChecked(Settings.System.getInt(resolver,
+                Settings.System.CUSTOM_BUTTON_DISABLE_BRIGHTNESS, 0) != 0);
+
+        mLinkButtonBrightness = (CheckBoxPreference) findPreference(KEY_BUTTON_LINK_BRIGHTNESS);
+        mLinkButtonBrightness.setChecked(Settings.System.getInt(resolver,
+                Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, 0) != 0);
+
+        mAutomaticButtonBrightness = (Preference) findPreference(KEY_BUTTON_AUTO_BRIGHTNESS);
+        mManualButtonBrightness = (Preference) findPreference(KEY_BUTTON_MANUAL_BRIGHTNESS);
+
+        mButtonTimoutBar = (SeekBarPreference) findPreference(KEY_BUTTON_TIMEOUT);
+        int currentTimeout = Settings.System.getInt(resolver,
+                        Settings.System.BUTTON_BACKLIGHT_TIMEOUT, 0);
+        mButtonTimoutBar.setValue(currentTimeout);
+        mButtonTimoutBar.setOnPreferenceChangeListener(this);
+
+        mPowerService = IPowerManager.Stub.asInterface(ServiceManager.getService("power"));
+
+        updateEnablement();
+    }
+
+    private void updateEnablement() {
+        if (mNoButtonBrightness.isChecked()){
+            mLinkButtonBrightness.setEnabled(false);
+            mButtonTimoutBar.setEnabled(false);
+            mAutomaticButtonBrightness.setEnabled(false);
+            mManualButtonBrightness.setEnabled(false);
+        } else if (mLinkButtonBrightness.isChecked()){
+            mNoButtonBrightness.setEnabled(false);
+            mAutomaticButtonBrightness.setEnabled(false);
+            mManualButtonBrightness.setEnabled(false);
+        } else {
+            mNoButtonBrightness.setEnabled(true);
+            mLinkButtonBrightness.setEnabled(true);
+            mButtonTimoutBar.setEnabled(true);
+            mAutomaticButtonBrightness.setEnabled(true);
+            mManualButtonBrightness.setEnabled(true);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (mButtonBrightnessDialog != null) {
+            mButtonBrightnessDialog.dismiss();
+        }
+        if (mManualBrightnessDialog != null) {
+            mManualBrightnessDialog.dismiss();
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mAutomaticButtonBrightness) {
+            showButtonAutoBrightnessDialog();
+            return true;
+        } else if (preference == mManualButtonBrightness) {
+            showButtonManualBrightnessDialog();
+            return true;
+        } else if (preference == mNoButtonBrightness) {
+            boolean checked = ((CheckBoxPreference)preference).isChecked();
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.CUSTOM_BUTTON_DISABLE_BRIGHTNESS, checked ? 1:0);
+            updateEnablement();
+            return true;
+        } else if (preference == mLinkButtonBrightness) {
+            boolean checked = ((CheckBoxPreference)preference).isChecked();
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, checked ? 1:0);
+            updateEnablement();
+            return true;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        final String key = preference.getKey();
+
+        if (preference == mButtonTimoutBar) {
+            int buttonTimeout = (Integer) objValue;
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.BUTTON_BACKLIGHT_TIMEOUT, buttonTimeout);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    private void showButtonAutoBrightnessDialog() {
+        if (mButtonBrightnessDialog != null && mButtonBrightnessDialog.isShowing()) {
+            return;
+        }
+
+        mButtonBrightnessDialog = new AutoBrightnessDialog(getActivity(), false);
+        mButtonBrightnessDialog.show();
+    }
+
+    private void showButtonManualBrightnessDialog() {
+        if (mManualBrightnessDialog != null && mManualBrightnessDialog.isShowing()) {
+            return;
+        }
+
+        mManualBrightnessDialog = new ManualButtonBrightnessDialog(getActivity());
+        mManualBrightnessDialog.show();
+    }
+
+    private class ManualButtonBrightnessDialog extends AlertDialog implements DialogInterface.OnClickListener {
+
+        private SeekBar mBacklightBar;
+        private EditText mBacklightInput;
+        private int mCurrentBrightness;
+        private boolean mIsDragging = false;
+
+        public ManualButtonBrightnessDialog(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            final View v = getLayoutInflater().inflate(R.layout.dialog_manual_brightness, null);
+            final Context context = getContext();
+
+            mBacklightBar = (SeekBar) v.findViewById(R.id.backlight);
+            mBacklightInput = (EditText) v.findViewById(R.id.backlight_input);
+
+            setTitle(R.string.dialog_manual_brightness_title);
+            setCancelable(true);
+            setView(v);
+
+            try {
+                mCurrentBrightness = mPowerService.getCurrentButtonBrightnessValue();
+            } catch(Exception e){
+            }
+
+            mBacklightBar.setMax(brightnessToProgress(PowerManager.BRIGHTNESS_ON));
+            initListeners();
+            init();
+
+            setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.ok), this);
+            setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), this);
+
+            super.onCreate(savedInstanceState);
+        }
+
+        private int brightnessToProgress(int brightness) {
+            return brightness * 100;
+        }
+
+        private int progressToBrightness(int progress) {
+            int brightness = progress / 100;
+            return brightness;
+        }
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                try {
+                    int newBacklight = Integer.valueOf(mBacklightInput.getText().toString());
+                    Settings.System.putInt(getContext().getContentResolver(),
+                            Settings.System.CUSTOM_BUTTON_BRIGHTNESS, newBacklight);
+                } catch (NumberFormatException e) {
+                    Log.d(TAG, "NumberFormatException " + e);
+                }
+            }
+        }
+
+        private void init() {
+            int currentValue = Settings.System.getInt(getContext().getContentResolver(),
+                            Settings.System.CUSTOM_BUTTON_BRIGHTNESS, 100);
+
+            mBacklightBar.setProgress(brightnessToProgress(currentValue));
+            mBacklightInput.setText(String.valueOf(currentValue));
+        }
+
+        private void initListeners() {
+            mBacklightBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    if (mIsDragging) {
+                        int brightness = progressToBrightness(seekBar.getProgress());
+                        mBacklightInput.setText(String.valueOf(brightness));
+                        try {
+                            mPowerService.setButtonBrightness(brightness);
+                        } catch(Exception e){
+                        }
+                    }
+                }
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                    int brightness = progressToBrightness(seekBar.getProgress());
+                    try {
+                        mPowerService.setButtonBrightness(brightness);
+                    } catch(Exception e){
+                    }
+                    mIsDragging = true;
+                }
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                    try {
+                        mPowerService.setButtonBrightness(mCurrentBrightness);
+                    } catch(Exception e){
+                    }
+                    mIsDragging = false;
+                }
+            });
+
+            mBacklightInput.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
+                @Override
+                public void afterTextChanged(Editable s) {
+                    boolean ok = false;
+                    try {
+                        int minValue = 0;
+                        int maxValue = PowerManager.BRIGHTNESS_ON;
+                        int newBrightness = Integer.valueOf(s.toString());
+
+                        if (newBrightness >= minValue && newBrightness <= maxValue) {
+                            ok = true;
+                            mBacklightBar.setProgress(brightnessToProgress(newBrightness));
+                        }
+                    } catch (NumberFormatException e) {
+                        //ignored, ok is false ayway
+                    }
+
+                    Button okButton = mManualBrightnessDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+                    if (okButton != null) {
+                        okButton.setEnabled(ok);
+                    }
+                }
+            });
+        }
+    }
+}
+
diff --git a/src/org/omnirom/omnigears/chameleonos/ActiveDisplaySettings.java b/src/org/omnirom/omnigears/chameleonos/ActiveDisplaySettings.java
index b13c80be7..5de3a49ed 100644
--- a/src/org/omnirom/omnigears/chameleonos/ActiveDisplaySettings.java
+++ b/src/org/omnirom/omnigears/chameleonos/ActiveDisplaySettings.java
@@ -45,43 +45,43 @@ public class ActiveDisplaySettings extends SettingsPreferenceFragment implements
     private static final String TAG = "ActiveDisplaySettings";
 
     private static final String KEY_ENABLED = "ad_enable";
-    private static final String KEY_SHOW_TEXT = "ad_text";
-    private static final String KEY_SHOW_CONTENT = "ad_content";
+    private static final String KEY_ANNOYING = "ad_annoying";
     private static final String KEY_BYPASS_CONTENT = "ad_bypass";
-    private static final String KEY_ALL_NOTIFICATIONS = "ad_all_notifications";
-    private static final String KEY_HIDE_LOW_PRIORITY = "ad_hide_low_priority";
     private static final String KEY_POCKET_MODE = "ad_pocket_mode";
     private static final String KEY_SUNLIGHT_MODE = "ad_sunlight_mode";
     private static final String KEY_REDISPLAY = "ad_redisplay";
     private static final String KEY_EXCLUDED_APPS = "ad_excluded_apps";
     private static final String KEY_PRIVACY_APPS = "ad_privacy_apps";
-    private static final String KEY_SHOW_DATE = "ad_show_date";
     private static final String KEY_SHOW_AMPM = "ad_show_ampm";
     private static final String KEY_BRIGHTNESS = "ad_brightness";
     private static final String KEY_TIMEOUT = "ad_timeout";
     private static final String KEY_THRESHOLD = "ad_threshold";
     private static final String KEY_TURNOFF_MODE = "ad_turnoff_mode";
+    private static final String KEY_SHAKE_THRESHOLD = "ad_shake_threshold";
+    private static final String KEY_SHAKE_LONGTHRESHOLD = "ad_shake_long_threshold";
+    private static final String KEY_SHAKE_TIMEOUT = "ad_shake_timeout";
 
     private ContentResolver mResolver;
     private Context mContext;
 
     private SwitchPreference mEnabledPref;
-    private CheckBoxPreference mShowTextPref;
-    private CheckBoxPreference mShowContentPref;
-    private CheckBoxPreference mBypassPref;
-    private CheckBoxPreference mAllNotificationsPref;
-    private CheckBoxPreference mHideLowPriorityPref;
-    private ListPreference mPocketModePref;
-    private CheckBoxPreference mSunlightModePref;
-    private ListPreference mRedisplayPref;
     private AppMultiSelectListPreference mExcludedAppsPref;
     private AppMultiSelectListPreference mPrivacyAppsPref;
-    private CheckBoxPreference mShowDatePref;
+    private CheckBoxPreference mBypassPref;
     private CheckBoxPreference mShowAmPmPref;
+    private CheckBoxPreference mSunlightModePref;
+    private CheckBoxPreference mTurnOffModePref;
     private SeekBarPreference mBrightnessLevel;
+    private SeekBarPreference mAnnoyingNotification;
+    private SeekBarPreference mShakeThreshold;
+    private SeekBarPreference mShakeLongThreshold;
+    private SeekBarPreference mShakeTimeout;
     private ListPreference mDisplayTimeout;
+    private ListPreference mPocketModePref;
     private ListPreference mProximityThreshold;
-    private CheckBoxPreference mTurnOffModePref;
+    private ListPreference mRedisplayPref;
+    private int mMinimumBacklight;
+    private int mMaximumBacklight;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -98,14 +98,6 @@ public void onCreate(Bundle savedInstanceState) {
                 Settings.System.ENABLE_ACTIVE_DISPLAY, 0) == 1));
         mEnabledPref.setOnPreferenceChangeListener(this);
 
-        mShowTextPref = (CheckBoxPreference) prefSet.findPreference(KEY_SHOW_TEXT);
-        mShowTextPref.setChecked((Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_TEXT, 0) == 1));
-
-        mShowContentPref = (CheckBoxPreference) prefSet.findPreference(KEY_SHOW_CONTENT);
-        mShowContentPref.setChecked((Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_CONTENT, 1) != 0));
-
         mBypassPref = (CheckBoxPreference) prefSet.findPreference(KEY_BYPASS_CONTENT);
         mPocketModePref = (ListPreference) prefSet.findPreference(KEY_POCKET_MODE);
         mProximityThreshold = (ListPreference) prefSet.findPreference(KEY_THRESHOLD);
@@ -123,27 +115,19 @@ public void onCreate(Bundle savedInstanceState) {
             int mode = Settings.System.getInt(mResolver,
                     Settings.System.ACTIVE_DISPLAY_POCKET_MODE, 0);
             mPocketModePref.setValue(String.valueOf(mode));
-            updatePocketModeSummary(mode);
+            mPocketModePref.setSummary(mPocketModePref.getEntry());
             mPocketModePref.setOnPreferenceChangeListener(this);
 
             long threshold = Settings.System.getLong(mResolver,
                 Settings.System.ACTIVE_DISPLAY_THRESHOLD, 5000L);
             mProximityThreshold.setValue(String.valueOf(threshold));
-            updateThresholdSummary(threshold);
+            mProximityThreshold.setSummary(mProximityThreshold.getEntry());
             mProximityThreshold.setOnPreferenceChangeListener(this);
 
             mTurnOffModePref.setChecked((Settings.System.getInt(mResolver,
                 Settings.System.ACTIVE_DISPLAY_TURNOFF_MODE, 0) == 1));
         }
 
-        mAllNotificationsPref = (CheckBoxPreference) prefSet.findPreference(KEY_ALL_NOTIFICATIONS);
-        mAllNotificationsPref.setChecked((Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_ALL_NOTIFICATIONS, 0) == 1));
-
-        mHideLowPriorityPref = (CheckBoxPreference) prefSet.findPreference(KEY_HIDE_LOW_PRIORITY);
-        mHideLowPriorityPref.setChecked((Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_HIDE_LOW_PRIORITY_NOTIFICATIONS, 0) == 1));
-
         mSunlightModePref = (CheckBoxPreference) prefSet.findPreference(KEY_SUNLIGHT_MODE);
 
         if (!DeviceUtils.deviceSupportsLightSensor(mContext)) {
@@ -157,37 +141,57 @@ public void onCreate(Bundle savedInstanceState) {
         long timeout = Settings.System.getLong(mResolver,
                 Settings.System.ACTIVE_DISPLAY_REDISPLAY, 0);
         mRedisplayPref.setValue(String.valueOf(timeout));
-        updateRedisplaySummary(timeout);
+        mRedisplayPref.setSummary(mRedisplayPref.getEntry());
         mRedisplayPref.setOnPreferenceChangeListener(this);
 
+        mAnnoyingNotification = (SeekBarPreference) prefSet.findPreference(KEY_ANNOYING);
+        mAnnoyingNotification.setValue(Settings.System.getInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_ANNOYING, 0));
+        mAnnoyingNotification.setOnPreferenceChangeListener(this);
+
+        mShakeThreshold = (SeekBarPreference) prefSet.findPreference(KEY_SHAKE_THRESHOLD);
+        mShakeThreshold.setValue(Settings.System.getInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_SHAKE_THRESHOLD, 10));
+        mShakeThreshold.setOnPreferenceChangeListener(this);
+
+        mShakeLongThreshold = (SeekBarPreference) prefSet.findPreference(KEY_SHAKE_LONGTHRESHOLD);
+        mShakeLongThreshold.setValue(Settings.System.getInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_SHAKE_LONGTHRESHOLD, 2));
+        mShakeLongThreshold.setOnPreferenceChangeListener(this);
+
+        mShakeTimeout = (SeekBarPreference) prefSet.findPreference(KEY_SHAKE_TIMEOUT);
+        mShakeTimeout.setValue(Settings.System.getInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_SHAKE_TIMEOUT, 10));
+        mShakeTimeout.setOnPreferenceChangeListener(this);
+
         mExcludedAppsPref = (AppMultiSelectListPreference) prefSet.findPreference(KEY_EXCLUDED_APPS);
         Set<String> excludedApps = getExcludedApps();
-        if (excludedApps != null) mExcludedAppsPref.setValues(excludedApps);
+        if (excludedApps != null) {
+            mExcludedAppsPref.setValues(excludedApps);
+        }
         mExcludedAppsPref.setOnPreferenceChangeListener(this);
 
         mPrivacyAppsPref = (AppMultiSelectListPreference) prefSet.findPreference(KEY_PRIVACY_APPS);
         Set<String> privacyApps = getPrivacyApps();
-        if (privacyApps != null) mPrivacyAppsPref.setValues(privacyApps);
+        if (privacyApps != null) {
+            mPrivacyAppsPref.setValues(privacyApps);
+        }
         mPrivacyAppsPref.setOnPreferenceChangeListener(this);
 
-        mShowDatePref = (CheckBoxPreference) prefSet.findPreference(KEY_SHOW_DATE);
-        mShowDatePref.setChecked((Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_SHOW_DATE, 0) == 1));
-
         mShowAmPmPref = (CheckBoxPreference) prefSet.findPreference(KEY_SHOW_AMPM);
         mShowAmPmPref.setChecked((Settings.System.getInt(mResolver,
                 Settings.System.ACTIVE_DISPLAY_SHOW_AMPM, 0) == 1));
         mShowAmPmPref.setEnabled(!is24Hour());
 
         PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
-        int minimumBacklight = pm.getMinimumScreenBrightnessSetting();
-        int maximumBacklight = pm.getMaximumScreenBrightnessSetting();
+        mMinimumBacklight = pm.getMinimumScreenBrightnessSetting();
+        mMaximumBacklight = pm.getMaximumScreenBrightnessSetting();
 
         mBrightnessLevel = (SeekBarPreference) prefSet.findPreference(KEY_BRIGHTNESS);
-        mBrightnessLevel.setMaxValue(maximumBacklight - minimumBacklight);
-        mBrightnessLevel.setMinValue(minimumBacklight);
-        mBrightnessLevel.setValue(Settings.System.getInt(mResolver,
-                Settings.System.ACTIVE_DISPLAY_BRIGHTNESS, maximumBacklight) - minimumBacklight);
+        int brightness = Settings.System.getInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_BRIGHTNESS, mMaximumBacklight);
+        int realBrightness =  Math.round(((float)brightness / (float)mMaximumBacklight) * 100);
+        mBrightnessLevel.setValue(realBrightness);
         mBrightnessLevel.setOnPreferenceChangeListener(this);
 
         try {
@@ -200,18 +204,21 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         mDisplayTimeout = (ListPreference) prefSet.findPreference(KEY_TIMEOUT);
-        mDisplayTimeout.setOnPreferenceChangeListener(this);
         timeout = Settings.System.getLong(mResolver,
                 Settings.System.ACTIVE_DISPLAY_TIMEOUT, 8000L);
         mDisplayTimeout.setValue(String.valueOf(timeout));
-        updateTimeoutSummary(timeout);
+        mDisplayTimeout.setSummary(mDisplayTimeout.getEntry());
+        mDisplayTimeout.setOnPreferenceChangeListener(this);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRedisplayPref) {
-            int timeout = Integer.valueOf((String) newValue);
-            updateRedisplaySummary(timeout);
+            int val = Integer.parseInt((String) newValue);
+            int index = mRedisplayPref.findIndexOfValue((String) newValue);
+            Settings.System.putInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_REDISPLAY, val);
+            mRedisplayPref.setSummary(mRedisplayPref.getEntries()[index]);
             return true;
         } else if (preference == mEnabledPref) {
             Settings.System.putInt(mResolver,
@@ -219,8 +226,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     ((Boolean) newValue).booleanValue() ? 1 : 0);
             return true;
         } else if (preference == mPocketModePref) {
-	        int mode = Integer.valueOf((String) newValue);
-	        updatePocketModeSummary(mode);
+            int val = Integer.parseInt((String) newValue);
+            int index = mPocketModePref.findIndexOfValue((String) newValue);
+            Settings.System.putInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_POCKET_MODE, val);
+            mPocketModePref.setSummary(mPocketModePref.getEntries()[index]);
             return true;
         } else if (preference == mExcludedAppsPref) {
             storeExcludedApps((Set<String>) newValue);
@@ -228,18 +238,44 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         } else if (preference == mPrivacyAppsPref) {
             storePrivacyApps((Set<String>) newValue);
             return true;
+        } else if (preference == mAnnoyingNotification) {
+            int annoying = ((Integer)newValue).intValue();
+            Settings.System.putInt(mResolver,
+                    Settings.System.ACTIVE_DISPLAY_ANNOYING, annoying);
+            return true;
+        } else if (preference == mShakeThreshold) {
+            int threshold = ((Integer)newValue).intValue();
+            Settings.System.putInt(mResolver,
+                    Settings.System.ACTIVE_DISPLAY_SHAKE_THRESHOLD, threshold);
+            return true;
+        } else if (preference == mShakeLongThreshold) {
+            int longThreshold = ((Integer)newValue).intValue();
+            Settings.System.putInt(mResolver,
+                    Settings.System.ACTIVE_DISPLAY_SHAKE_LONGTHRESHOLD, longThreshold);
+            return true;
+        } else if (preference == mShakeTimeout) {
+            int timeout = ((Integer)newValue).intValue();
+            Settings.System.putInt(mResolver,
+                    Settings.System.ACTIVE_DISPLAY_SHAKE_TIMEOUT, timeout);
+            return true;
         } else if (preference == mBrightnessLevel) {
             int brightness = ((Integer)newValue).intValue();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_BRIGHTNESS, brightness);
+            int realBrightness =  Math.max(mMinimumBacklight, Math.round(((float)brightness / (float)100) * mMaximumBacklight));
+            Settings.System.putInt(mResolver, Settings.System.ACTIVE_DISPLAY_BRIGHTNESS, realBrightness);
             return true;
         } else if (preference == mDisplayTimeout) {
-            long timeout = Integer.valueOf((String) newValue);
-            updateTimeoutSummary(timeout);
+            int val = Integer.parseInt((String) newValue);
+            int index = mDisplayTimeout.findIndexOfValue((String) newValue);
+            Settings.System.putInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_TIMEOUT, val);
+            mDisplayTimeout.setSummary(mDisplayTimeout.getEntries()[index]);
             return true;
         } else if (preference == mProximityThreshold) {
-            long threshold = Integer.valueOf((String) newValue);
-            updateThresholdSummary(threshold);
+            int val = Integer.parseInt((String) newValue);
+            int index = mProximityThreshold.findIndexOfValue((String) newValue);
+            Settings.System.putInt(mResolver,
+                Settings.System.ACTIVE_DISPLAY_THRESHOLD, val);
+            mProximityThreshold.setSummary(mProximityThreshold.getEntries()[index]);
             return true;
         }
         return false;
@@ -248,41 +284,16 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         boolean value;
-        if (preference == mShowTextPref) {
-            value = mShowTextPref.isChecked();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_TEXT,
-                    value ? 1 : 0);
-        } else if (preference == mShowContentPref) {
-            value = mShowContentPref.isChecked();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_CONTENT,
-                    value ? 1 : 0);
-        } else if (preference == mBypassPref) {
+        if (preference == mBypassPref) {
             value = mBypassPref.isChecked();
             Settings.System.putInt(mResolver,
                     Settings.System.ACTIVE_DISPLAY_BYPASS,
                     value ? 1 : 0);
-        } else if (preference == mAllNotificationsPref) {
-            value = mAllNotificationsPref.isChecked();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_ALL_NOTIFICATIONS,
-                    value ? 1 : 0);
-        } else if (preference == mHideLowPriorityPref) {
-            value = mHideLowPriorityPref.isChecked();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_HIDE_LOW_PRIORITY_NOTIFICATIONS,
-                    value ? 1 : 0);
         } else if (preference == mSunlightModePref) {
             value = mSunlightModePref.isChecked();
             Settings.System.putInt(mResolver,
                     Settings.System.ACTIVE_DISPLAY_SUNLIGHT_MODE,
                     value ? 1 : 0);
-        } else if (preference == mShowDatePref) {
-            value = mShowDatePref.isChecked();
-            Settings.System.putInt(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_SHOW_DATE,
-                    value ? 1 : 0);
         } else if (preference == mShowAmPmPref) {
             value = mShowAmPmPref.isChecked();
             Settings.System.putInt(mResolver,
@@ -300,43 +311,12 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
         return true;
     }
 
-    private void updatePocketModeSummary(int value) {
-        mPocketModePref.setSummary(
-            mPocketModePref.getEntries()[mPocketModePref.findIndexOfValue("" + value)]);
-        Settings.System.putInt(mResolver,
-            Settings.System.ACTIVE_DISPLAY_POCKET_MODE, value);
-    }
-
-    private void updateRedisplaySummary(long value) {
-        mRedisplayPref.setSummary(mRedisplayPref.getEntries()[mRedisplayPref.findIndexOfValue("" + value)]);
-        Settings.System.putLong(mResolver,
-                Settings.System.ACTIVE_DISPLAY_REDISPLAY, value);
-    }
-
-    private void updateTimeoutSummary(long value) {
-        try {
-            mDisplayTimeout.setSummary(mDisplayTimeout.getEntries()[mDisplayTimeout.findIndexOfValue("" + value)]);
-            Settings.System.putLong(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_TIMEOUT, value);
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
-    }
-
-    private void updateThresholdSummary(long value) {
-        try {
-            mProximityThreshold.setSummary(mProximityThreshold.getEntries()[mProximityThreshold.findIndexOfValue("" + value)]);
-            Settings.System.putLong(mResolver,
-                    Settings.System.ACTIVE_DISPLAY_THRESHOLD, value);
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
-    }
-
     private Set<String> getExcludedApps() {
         String excluded = Settings.System.getString(mResolver,
                 Settings.System.ACTIVE_DISPLAY_EXCLUDED_APPS);
-        if (TextUtils.isEmpty(excluded))
+        if (TextUtils.isEmpty(excluded)) {
             return null;
-
+        }
         return new HashSet<String>(Arrays.asList(excluded.split("\\|")));
     }
 
@@ -355,9 +335,9 @@ private void storeExcludedApps(Set<String> values) {
     private Set<String> getPrivacyApps() {
         String privacies = Settings.System.getString(mResolver,
                 Settings.System.ACTIVE_DISPLAY_PRIVACY_APPS);
-        if (TextUtils.isEmpty(privacies))
+        if (TextUtils.isEmpty(privacies)) {
             return null;
-
+        }
         return new HashSet<String>(Arrays.asList(privacies.split("\\|")));
     }
 
diff --git a/src/org/omnirom/omnigears/chameleonos/AppMultiSelectListPreference.java b/src/org/omnirom/omnigears/chameleonos/AppMultiSelectListPreference.java
index 6600a47cc..2e8e19d36 100644
--- a/src/org/omnirom/omnigears/chameleonos/AppMultiSelectListPreference.java
+++ b/src/org/omnirom/omnigears/chameleonos/AppMultiSelectListPreference.java
@@ -175,14 +175,17 @@ protected void onDialogClosed(boolean positiveResult) {
     @Override
     protected Object onGetDefaultValue(TypedArray a, int index) {
         final CharSequence[] defaultValues = a.getTextArray(index);
-        final int valueCount = defaultValues.length;
-        final Set<String> result = new HashSet<String>();
+        if (defaultValues != null) {
+            final int valueCount = defaultValues.length;
+            final Set<String> result = new HashSet<String>();
 
-        for (int i = 0; i < valueCount; i++) {
-            result.add(defaultValues[i].toString());
-        }
+            for (int i = 0; i < valueCount; i++) {
+                 result.add(defaultValues[i].toString());
+            }
 
-        return result;
+            return result;
+        }
+        return null;
     }
 
     @Override
@@ -256,11 +259,11 @@ public static AppViewHolder createOrRecycle(LayoutInflater inflater, View conver
 
     private final static Comparator<MyApplicationInfo> sDisplayNameComparator
             = new Comparator<MyApplicationInfo>() {
-        public final int
-        compare(MyApplicationInfo a, MyApplicationInfo b) {
-            return collator.compare(a.label, b.label);
-        }
 
         private final Collator collator = Collator.getInstance();
+
+        public final int compare(MyApplicationInfo a, MyApplicationInfo b) {
+            return collator.compare(a.label, b.label);
+        }
     };
 }
diff --git a/src/org/omnirom/omnigears/chameleonos/SeekBarPreference.java b/src/org/omnirom/omnigears/chameleonos/SeekBarPreference.java
index 50c83e54c..ea76ca8f0 100644
--- a/src/org/omnirom/omnigears/chameleonos/SeekBarPreference.java
+++ b/src/org/omnirom/omnigears/chameleonos/SeekBarPreference.java
@@ -100,7 +100,7 @@ public void onDependencyChanged(Preference dependency, boolean disableDependent)
 
     @Override
     protected View onCreateView(ViewGroup parent){
-        
+
         RelativeLayout layout =  null;
         try {
             LayoutInflater mInflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -119,7 +119,7 @@ public void onBindView(View view) {
             // move our seekbar to the new view we've been given
             ViewParent oldContainer = mSeekBar.getParent();
             ViewGroup newContainer = (ViewGroup) view.findViewById(R.id.seekBarPrefBarContainer);
-            
+
             if (oldContainer != newContainer) {
                 // remove the seekbar from the old view
                 if (oldContainer != null) {
@@ -173,7 +173,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         // change rejected, revert to the previous value
         if (!callChangeListener(newValue)) {
             seekBar.setProgress(mCurrentValue - mMinValue);
-            return; 
+            return;
         }
 
         // change accepted, store it
@@ -190,7 +190,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         notifyChanged();
     }
 
-    @Override 
+    @Override
     protected Object onGetDefaultValue(TypedArray ta, int index){
         int defaultValue = ta.getInt(index, DEFAULT_VALUE);
         return defaultValue;
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
index 81a8f6d8c..b17869b7d 100644
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -34,10 +34,14 @@
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.preference.PreferenceCategory;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 
+import org.omnirom.omnigears.preference.SystemCheckBoxPreference;
+import org.omnirom.omnigears.chameleonos.SeekBarPreference;
 import com.android.internal.util.omni.DeviceUtils;
+import com.android.settings.Utils;
 
 public class BarsSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
@@ -54,11 +58,20 @@ public class BarsSettings extends SettingsPreferenceFragment implements
     private static final String NETWORK_TRAFFIC_PERIOD = "network_traffic_period";
     private static final String STATUS_BAR_NETWORK_ACTIVITY = "status_bar_network_activity";
     private static final String SOFT_BACK_KILL_APP = "soft_back_kill_app";
+    private static final String TINTED_STATUSBAR = "tinted_statusbar";
+    private static final String TINTED_STATUSBAR_OPTION = "tinted_statusbar_option";
+    private static final String TINTED_STATUSBAR_FILTER = "status_bar_tinted_filter";
+    private static final String TINTED_STATUSBAR_TRANSPARENT = "tinted_statusbar_transparent";
+    private static final String TINTED_NAVBAR_TRANSPARENT = "tinted_navbar_transparent";
+    private static final String TINTED_FULL_MODE = "status_bar_tinted_full_mode";
     private static final String EMULATE_MENU_KEY = "emulate_menu_key";
+    private static final String CATEGORY_TINTED = "category_tinted_statusbar";
 
     private CheckBoxPreference mStatusBarBrightnessControl;
     private CheckBoxPreference mStatusBarNotifCount;
     private CheckBoxPreference mQuickSettingsDynamic;
+    private ListPreference mTintedStatusbar;
+    private ListPreference mTintedStatusbarOption;
     private ListPreference mQuickPulldown;
     private ListPreference mSmartPulldown;
     private ListPreference mNetTrafficState;
@@ -67,6 +80,10 @@ public class BarsSettings extends SettingsPreferenceFragment implements
     private CheckBoxPreference mStatusBarNetworkActivity;
     private CheckBoxPreference mSoftBackKillApp;
     private CheckBoxPreference mEmulateMenuKey;
+    private SystemCheckBoxPreference mTintedStatusbarFilter;
+    private SystemCheckBoxPreference mTintedFullMode;
+    private SeekBarPreference mTintedStatusbarTransparency;
+    private SeekBarPreference mTintedNavbarTransparency;
 
     private int mNetTrafficVal;
     private int MASK_UP;
@@ -104,10 +121,38 @@ public void onCreate(Bundle savedInstanceState) {
                 Settings.System.STATUS_BAR_NOTIF_COUNT, 0) == 1);
         mStatusBarNotifCount.setOnPreferenceChangeListener(this);
 
+        final PreferenceCategory tintedCategory =
+                     (PreferenceCategory) prefSet.findPreference(CATEGORY_TINTED);
+
+        int tintedStatusbar = getTintedStatusbarColor(resolver);
+
+        mTintedStatusbar = (ListPreference) findPreference(TINTED_STATUSBAR);
+        mTintedStatusbar.setValue(String.valueOf(tintedStatusbar));
+        mTintedStatusbar.setSummary(mTintedStatusbar.getEntry());
+        mTintedStatusbar.setOnPreferenceChangeListener(this);
+
+        mTintedStatusbarFilter = (SystemCheckBoxPreference) findPreference(TINTED_STATUSBAR_FILTER);
+        mTintedStatusbarFilter.setEnabled(tintedStatusbar != 0);
+
+        int tintedStatusbarOption = getTintedStatusbarOption(resolver);
+
+        mTintedFullMode = (SystemCheckBoxPreference) findPreference(TINTED_FULL_MODE);
+        mTintedFullMode.setEnabled((tintedStatusbar == 2) &&
+                       (tintedStatusbarOption == 0 || tintedStatusbarOption == 2));
+
+        mTintedStatusbarTransparency = (SeekBarPreference) findPreference(TINTED_STATUSBAR_TRANSPARENT);
+        mTintedStatusbarTransparency.setValue(Settings.System.getInt(resolver,
+                Settings.System.STATUS_BAR_TINTED_STATBAR_TRANSPARENT, 100));
+        mTintedStatusbarTransparency.setEnabled(tintedStatusbar != 0);
+        mTintedStatusbarTransparency.setOnPreferenceChangeListener(this);
+
+        mTintedStatusbarOption = (ListPreference) findPreference(TINTED_STATUSBAR_OPTION);
+        mTintedNavbarTransparency = (SeekBarPreference) findPreference(TINTED_NAVBAR_TRANSPARENT);
+
         mQuickPulldown = (ListPreference) findPreference(QUICK_PULLDOWN);
         mSmartPulldown = (ListPreference) findPreference(SMART_PULLDOWN);
 
-        if (DeviceUtils.isPhone(getActivity())) {
+        if (Utils.isPhone(getActivity())) {
             int quickPulldown = Settings.System.getInt(resolver,
                     Settings.System.QS_QUICK_PULLDOWN, 0);
             mQuickPulldown.setValue(String.valueOf(quickPulldown));
@@ -168,15 +213,24 @@ public void onCreate(Bundle savedInstanceState) {
             prefSet.removePreference(findPreference(NETWORK_TRAFFIC_PERIOD));
         }
 
-        boolean hasNavBar = getResources().getBoolean(
-                com.android.internal.R.bool.config_showNavigationBar);
-        // Also check, if users without navigation bar force enabled it.
-        hasNavBar = hasNavBar || (SystemProperties.getInt("qemu.hw.mainkeys", 1) == 0);
+        boolean hasNavBar = DeviceUtils.deviceSupportNavigationBar(getActivity());
 
         // Hide navigation bar category on devices without navigation bar
         if (!hasNavBar) {
+            tintedCategory.removePreference(mTintedStatusbarOption);
+            tintedCategory.removePreference(mTintedNavbarTransparency);
             prefSet.removePreference(findPreference(CATEGORY_NAVBAR));
         } else {
+            mTintedStatusbarOption.setValue(String.valueOf(tintedStatusbarOption));
+            mTintedStatusbarOption.setSummary(mTintedStatusbarOption.getEntry());
+            mTintedStatusbarOption.setEnabled(tintedStatusbar != 0);
+            mTintedStatusbarOption.setOnPreferenceChangeListener(this);
+
+            mTintedNavbarTransparency.setValue(Settings.System.getInt(resolver,
+                    Settings.System.STATUS_BAR_TINTED_NAVBAR_TRANSPARENT, 100));
+            mTintedNavbarTransparency.setEnabled(tintedStatusbar != 0);
+            mTintedNavbarTransparency.setOnPreferenceChangeListener(this);
+
             mSoftBackKillApp = (CheckBoxPreference) prefSet.findPreference(SOFT_BACK_KILL_APP);
             mSoftBackKillApp.setChecked(Settings.System.getInt(resolver,
                     Settings.System.SOFT_BACK_KILL_APP_ENABLE, 0) == 1);
@@ -209,6 +263,41 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
             boolean value = (Boolean) objValue;
             Settings.System.putInt(resolver,
                 Settings.System.QUICK_SETTINGS_TILES_ROW, value ? 1 : 0);
+        } else if (preference == mTintedStatusbar) {
+            int val = Integer.parseInt((String) objValue);
+            int index = mTintedStatusbar.findIndexOfValue((String) objValue);
+            Settings.System.putInt(resolver,
+                Settings.System.STATUS_BAR_TINTED_COLOR, val);
+            mTintedStatusbar.setSummary(mTintedStatusbar.getEntries()[index]);
+            if (mTintedStatusbarOption != null) {
+                mTintedStatusbarOption.setEnabled(val != 0);
+            }
+            mTintedStatusbarFilter.setEnabled(val != 0);
+            mTintedFullMode.setEnabled((val == 2) &&
+                             ((getTintedStatusbarOption(resolver) == 0) ||
+                              (getTintedStatusbarOption(resolver) == 2)));
+            mTintedStatusbarTransparency.setEnabled(val != 0);
+            if (mTintedNavbarTransparency != null) {
+                mTintedNavbarTransparency.setEnabled(val != 0);
+            }
+        } else if (preference == mTintedStatusbarOption) {
+            int val = Integer.parseInt((String) objValue);
+            int index = mTintedStatusbarOption.findIndexOfValue((String) objValue);
+            Settings.System.putInt(resolver,
+                Settings.System.STATUS_BAR_TINTED_OPTION, val);
+            mTintedStatusbarOption.setSummary(mTintedStatusbarOption.getEntries()[index]);
+            mTintedFullMode.setEnabled((getTintedStatusbarColor(resolver) == 2) &&
+                             ((val == 0) || (val == 2)));
+        } else if (preference == mTintedStatusbarTransparency) {
+            int val = ((Integer)objValue).intValue();
+            Settings.System.putInt(resolver,
+                    Settings.System.STATUS_BAR_TINTED_STATBAR_TRANSPARENT, val);
+            return true;
+        } else if (preference == mTintedNavbarTransparency) {
+            int val = ((Integer)objValue).intValue();
+            Settings.System.putInt(resolver,
+                    Settings.System.STATUS_BAR_TINTED_NAVBAR_TRANSPARENT, val);
+            return true;
         } else if (preference == mQuickPulldown) {
             int val = Integer.parseInt((String) objValue);
             int index = mQuickPulldown.findIndexOfValue((String) objValue);
@@ -265,6 +354,18 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
         return true;
     }
 
+    private int getTintedStatusbarColor(ContentResolver resolver) {
+        int tintedStatusbar = Settings.System.getInt(resolver,
+                    Settings.System.STATUS_BAR_TINTED_COLOR, 0);
+        return tintedStatusbar;
+    }
+
+    private int getTintedStatusbarOption(ContentResolver resolver) {
+        int tintedStatusbarOption = Settings.System.getInt(resolver,
+                    Settings.System.STATUS_BAR_TINTED_OPTION, 0);
+        return tintedStatusbarOption;
+    }
+
     private void loadResources() {
         Resources resources = getActivity().getResources();
         MASK_UP = resources.getInteger(R.integer.maskUp);
diff --git a/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java b/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java
new file mode 100644
index 000000000..59b9b007a
--- /dev/null
+++ b/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java
@@ -0,0 +1,190 @@
+/*
+ *  Copyright (C) 2013 The OmniROM Project
+ *
+ * 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/>.
+ *
+ */
+
+package org.omnirom.omnigears.interfacesettings;
+
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.hardware.Camera;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.os.RemoteException;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.omnirom.omnigears.chameleonos.SeekBarPreference;
+
+public class LockscreenSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "LockscreenSettings";
+
+    private LockPatternUtils mLockPatternUtils;
+    private DevicePolicyManager mDPM;
+
+    private static final String KEY_MAXIMIZE_WIDGETS = "maximize_widgets";
+    private static final String KEY_ENABLE_CAMERA = "enable_camera";
+    private static final String KEY_BATTERY_AROUND_LOCKSCREEN_RING = "battery_around_lockscreen_ring";
+    private static final String KEY_LOCKSCREEN_CUSTOM_WALLPAPER = "lockscreen_custom_wallpaper";
+    private static final String KEY_BLUR = "lockscreen_blur";
+    private static final String KEY_BLUR_RADIUS = "lockscreen_blur_radius";
+
+    private CheckBoxPreference mMaximizeWidgets;
+    private CheckBoxPreference mEnableCameraWidget;
+    private CheckBoxPreference mLockRingBattery;
+    private CheckBoxPreference mBlur;
+    private Preference mLockscreenWallpaper;
+    private SeekBarPreference mBlurRadius;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.lockscreen_settings);
+
+        ContentResolver resolver = getContentResolver();
+        PreferenceScreen root = getPreferenceScreen();
+        mLockPatternUtils = new LockPatternUtils(getActivity());
+        mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        if (!mLockPatternUtils.isLockScreenDisabled() && !mLockPatternUtils.isSecure()) {
+            addPreferencesFromResource(R.xml.og_security_settings_chooser);
+        }
+
+        // Add the additional Omni settings
+        mLockRingBattery = (CheckBoxPreference) root
+                .findPreference(KEY_BATTERY_AROUND_LOCKSCREEN_RING);
+        if (mLockRingBattery != null) {
+            mLockRingBattery.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.BATTERY_AROUND_LOCKSCREEN_RING, 0) == 1);
+        }
+
+        // Enable or disable keyguard widget checkbox based on DPM state
+        mMaximizeWidgets = (CheckBoxPreference) findPreference(KEY_MAXIMIZE_WIDGETS);
+        if (ActivityManager.isLowRamDeviceStatic() || mLockPatternUtils.isLockScreenDisabled()) {
+            // Widgets take a lot of RAM, so disable them on low-memory devices
+            root.removePreference(mMaximizeWidgets);
+        } else {
+            mMaximizeWidgets.setChecked(Settings.System.getInt(resolver,
+                    Settings.System.LOCKSCREEN_MAXIMIZE_WIDGETS, 0) == 1);
+        }
+
+        // Enable or disable camera widget settings based on device
+        mEnableCameraWidget = (CheckBoxPreference) findPreference(KEY_ENABLE_CAMERA);
+        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA) ||
+                Camera.getNumberOfCameras() == 0) {
+            root.removePreference(mEnableCameraWidget);
+        } else if (isCameraDisabledByDpm()) {
+            mEnableCameraWidget.setEnabled(false);
+        } else {
+            mEnableCameraWidget.setChecked(Settings.System.getInt(resolver,
+                    Settings.System.LOCKSCREEN_ENABLE_CAMERA, 1) == 1);
+        }
+
+        int blur = Settings.System.getInt(resolver,
+                Settings.System.LOCKSCREEN_SEE_THROUGH, 0);
+
+        mLockscreenWallpaper = (Preference) findPreference(KEY_LOCKSCREEN_CUSTOM_WALLPAPER);
+        if (blur != 0) {
+            mLockscreenWallpaper.setEnabled(false);
+            mLockscreenWallpaper.setSummary(getResources().getString(R.string.lockscreen_wallpaper_disabled));
+        } else {
+            mLockscreenWallpaper.setEnabled(true);
+        }
+
+        // Lockscreen Blur
+
+        mBlur = (CheckBoxPreference) findPreference(KEY_BLUR);
+        mBlur.setChecked(blur == 1);
+        mBlur.setOnPreferenceChangeListener(this);
+
+        mBlurRadius = (SeekBarPreference) findPreference(KEY_BLUR_RADIUS);
+        mBlurRadius.setValue(Settings.System.getInt(resolver,
+                Settings.System.LOCKSCREEN_BLUR_RADIUS, 12));
+        mBlurRadius.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        ContentResolver resolver = getActivity().getContentResolver();
+        if (preference == mBlur) {
+            int blur = (Boolean) objValue ? 1 : 0;
+            Settings.System.putInt(resolver,
+                    Settings.System.LOCKSCREEN_SEE_THROUGH, blur);
+            if (blur != 0) {
+                mLockscreenWallpaper.setEnabled(false);
+                mLockscreenWallpaper.setSummary(getResources().getString(R.string.lockscreen_wallpaper_disabled));
+            } else {
+                mLockscreenWallpaper.setEnabled(true);
+                mLockscreenWallpaper.setSummary("");
+            }
+        } else if (preference == mBlurRadius) {
+            Settings.System.putInt(resolver,
+                    Settings.System.LOCKSCREEN_BLUR_RADIUS, (Integer) objValue);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        mLockPatternUtils = new LockPatternUtils(getActivity());
+        if (preference == mMaximizeWidgets) {
+            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
+                    Settings.System.LOCKSCREEN_MAXIMIZE_WIDGETS, mMaximizeWidgets.isChecked() ? 1 : 0);
+        } else if (preference == mLockRingBattery) {
+            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
+                    Settings.System.BATTERY_AROUND_LOCKSCREEN_RING, mLockRingBattery.isChecked() ? 1 : 0);
+        } else if (preference == mEnableCameraWidget) {
+            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),
+                    Settings.System.LOCKSCREEN_ENABLE_CAMERA, mEnableCameraWidget.isChecked() ? 1 : 0);
+        }
+        // If we didn't handle it, let preferences handle it.
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private boolean isCameraDisabledByDpm() {
+        final DevicePolicyManager dpm =
+                (DevicePolicyManager) this.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        if (dpm != null) {
+            try {
+                final int userId = ActivityManagerNative.getDefault().getCurrentUser().id;
+                final int disabledFlags = dpm.getKeyguardDisabledFeatures(null, userId);
+                final  boolean disabledBecauseKeyguardSecure =
+                        (disabledFlags & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0;
+                return dpm.getCameraDisabled(null) || disabledBecauseKeyguardSecure;
+            } catch (RemoteException e) {
+                Log.e(TAG, "Can't get userId", e);
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/org/omnirom/omnigears/interfacesettings/MoreInterfaceSettings.java b/src/org/omnirom/omnigears/interfacesettings/MoreInterfaceSettings.java
index 08e7e6911..68fdcad3d 100644
--- a/src/org/omnirom/omnigears/interfacesettings/MoreInterfaceSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/MoreInterfaceSettings.java
@@ -34,6 +34,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.preference.PreferenceCategory;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
@@ -49,6 +50,7 @@ public class MoreInterfaceSettings extends SettingsPreferenceFragment implements
             "recents_memory_indicator_location";
     private static final String RECENTS_USE_OMNISWITCH = "recents_use_omniswitch";
     private static final String OMNISWITCH_START_SETTINGS = "omniswitch_start_settings";
+    private static final String CATEGORY_USE_OMNISWITCH = "category_omniswitch";
 
     // Package name of the omnniswitch app
     public static final String OMNISWITCH_PACKAGE_NAME = "org.omnirom.omniswitch";
@@ -63,6 +65,7 @@ public class MoreInterfaceSettings extends SettingsPreferenceFragment implements
     private CheckBoxPreference mRecentsUseOmniSwitch;
     private Preference mOmniSwitchSettings;
     private boolean mOmniSwitchInitCalled;
+    private PreferenceCategory mOmniSwitchCategory;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -97,21 +100,23 @@ public void onCreate(Bundle savedInstanceState) {
         }
         mRecentsMemoryIndicatorPosition.setOnPreferenceChangeListener(this);
 
-        mRecentsUseOmniSwitch = (CheckBoxPreference)
-                prefSet.findPreference(RECENTS_USE_OMNISWITCH);
+        mOmniSwitchCategory = (PreferenceCategory) prefSet.findPreference(CATEGORY_USE_OMNISWITCH);
+        boolean omniSwitchAvailable = isOmniSwitchAvailable();
 
-        try {
+        if (!omniSwitchAvailable){
+            Settings.System.putInt(resolver, Settings.System.RECENTS_USE_OMNISWITCH, 0);
+            prefSet.removePreference(mOmniSwitchCategory);
+        } else {
+            mRecentsUseOmniSwitch = (CheckBoxPreference)
+                    prefSet.findPreference(RECENTS_USE_OMNISWITCH);
             mRecentsUseOmniSwitch.setChecked(Settings.System.getInt(resolver,
-                    Settings.System.RECENTS_USE_OMNISWITCH) == 1);
-            mOmniSwitchInitCalled = true;
-        } catch(SettingNotFoundException e){
-            // if the settings value is unset
-        }
-        mRecentsUseOmniSwitch.setOnPreferenceChangeListener(this);
+                    Settings.System.RECENTS_USE_OMNISWITCH, 0) == 1);
+            mRecentsUseOmniSwitch.setOnPreferenceChangeListener(this);
 
-        mOmniSwitchSettings = (Preference)
-                prefSet.findPreference(OMNISWITCH_START_SETTINGS);
-        mOmniSwitchSettings.setEnabled(mRecentsUseOmniSwitch.isChecked());
+            mOmniSwitchSettings = (Preference)
+                    prefSet.findPreference(OMNISWITCH_START_SETTINGS);
+            mOmniSwitchSettings.setEnabled(mRecentsUseOmniSwitch.isChecked());
+        }
     }
 
     @Override
@@ -142,10 +147,6 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                     resolver, Settings.System.RECENTS_MEMORY_INDICATOR_LOCATION, value);
         } else if (preference == mRecentsUseOmniSwitch) {
             boolean value = (Boolean) objValue;
-            if (value && !isOmniSwitchInstalled()){
-                openOmniSwitchNotInstalledWarning();
-                return false;
-            }
 
             // if value has never been set before
             if (value && !mOmniSwitchInitCalled){
@@ -155,10 +156,7 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
 
             Settings.System.putInt(
                     resolver, Settings.System.RECENTS_USE_OMNISWITCH, value ? 1 : 0);
-            mOmniSwitchSettings.setEnabled(value && isOmniSwitchInstalled());
-            mOmniSwitchSettings.setSummary(isOmniSwitchInstalled() ?
-                    getResources().getString(R.string.omniswitch_start_settings_summary) :
-                    getResources().getString(R.string.omniswitch_not_installed_summary));
+            mOmniSwitchSettings.setEnabled(value);
         } else {
             return false;
         }
@@ -166,16 +164,6 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
         return true;
     }
 
-    private void openOmniSwitchNotInstalledWarning() {
-        new AlertDialog.Builder(getActivity())
-                .setTitle(getResources().getString(R.string.omniswitch_not_installed_title))
-                .setMessage(getResources().getString(R.string.omniswitch_not_installed_message))
-                .setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                        }
-                }).show();
-    }
-
     private void openOmniSwitchFirstTimeWarning() {
         new AlertDialog.Builder(getActivity())
                 .setTitle(getResources().getString(R.string.omniswitch_first_time_title))
@@ -186,11 +174,13 @@ public void onClick(DialogInterface dialog, int whichButton) {
                 }).show();
     }
 
-    private boolean isOmniSwitchInstalled() {
+    private boolean isOmniSwitchAvailable() {
         final PackageManager pm = getPackageManager();
         try {
             pm.getPackageInfo(OMNISWITCH_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
-            return true;
+            int enabled = pm.getApplicationEnabledSetting(OMNISWITCH_PACKAGE_NAME);
+            return enabled != PackageManager.COMPONENT_ENABLED_STATE_DISABLED &&
+                enabled != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
         } catch (NameNotFoundException e) {
             return false;
         }
diff --git a/src/org/omnirom/omnigears/interfacesettings/NavBarDimen.java b/src/org/omnirom/omnigears/interfacesettings/NavBarDimen.java
new file mode 100644
index 000000000..be854d96c
--- /dev/null
+++ b/src/org/omnirom/omnigears/interfacesettings/NavBarDimen.java
@@ -0,0 +1,121 @@
+package org.omnirom.omnigears.interfacesettings;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.Utils;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.R;
+
+public class NavBarDimen extends SettingsPreferenceFragment implements
+        OnPreferenceChangeListener {
+
+    private static final String TAG = "NavBarDimen";
+    private static final String PREF_NAVIGATION_BAR_HEIGHT = "navigation_bar_height";
+    private static final String PREF_NAVIGATION_BAR_HEIGHT_LANDSCAPE = "navigation_bar_height_landscape";
+    private static final String PREF_NAVIGATION_BAR_WIDTH = "navigation_bar_width";
+    private static final String KEY_DIMEN_OPTIONS = "navbar_dimen";
+
+    ListPreference mNavigationBarHeight;
+    ListPreference mNavigationBarHeightLandcape;
+    ListPreference mNavigationBarWidth;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.navbar_dimen_settings);
+
+        PreferenceScreen prefSet = getPreferenceScreen();
+
+        mNavigationBarHeight =
+            (ListPreference) findPreference(PREF_NAVIGATION_BAR_HEIGHT);
+        mNavigationBarHeight.setOnPreferenceChangeListener(this);
+
+        mNavigationBarHeightLandcape =
+            (ListPreference) findPreference(PREF_NAVIGATION_BAR_HEIGHT_LANDSCAPE);
+        mNavigationBarHeightLandcape.setOnPreferenceChangeListener(this);
+
+        mNavigationBarWidth =
+            (ListPreference) findPreference(PREF_NAVIGATION_BAR_WIDTH);
+
+        if (!Utils.isPhone(getActivity())) {
+            prefSet.removePreference(mNavigationBarWidth);
+            mNavigationBarWidth = null;
+        } else {
+            mNavigationBarWidth.setOnPreferenceChangeListener(this);
+        }
+
+        updateDimensionValues();
+    }
+
+    private void updateDimensionValues() {
+        int navigationBarHeight = Settings.System.getInt(getContentResolver(),
+                Settings.System.NAVIGATION_BAR_HEIGHT, -1);
+        if (navigationBarHeight == -1) {
+            navigationBarHeight = (int) (getResources().getDimension(
+                    com.android.internal.R.dimen.navigation_bar_height)
+                    / getResources().getDisplayMetrics().density);
+        }
+        mNavigationBarHeight.setValue(String.valueOf(navigationBarHeight));
+
+        int navigationBarHeightLandscape = Settings.System.getInt(getContentResolver(),
+                            Settings.System.NAVIGATION_BAR_HEIGHT_LANDSCAPE, -1);
+        if (navigationBarHeightLandscape == -1) {
+            navigationBarHeightLandscape = (int) (getResources().getDimension(
+                    com.android.internal.R.dimen.navigation_bar_height_landscape)
+                    / getResources().getDisplayMetrics().density);
+        }
+        mNavigationBarHeightLandcape.setValue(String.valueOf(navigationBarHeightLandscape));
+
+        if (mNavigationBarWidth == null) {
+            return;
+        }
+        int navigationBarWidth = Settings.System.getInt(getContentResolver(),
+                            Settings.System.NAVIGATION_BAR_WIDTH, -1);
+        if (navigationBarWidth == -1) {
+            navigationBarWidth = (int) (getResources().getDimension(
+                    com.android.internal.R.dimen.navigation_bar_width)
+                    / getResources().getDisplayMetrics().density);
+        }
+        mNavigationBarWidth.setValue(String.valueOf(navigationBarWidth));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mNavigationBarWidth) {
+            String newVal = (String) newValue;
+            int dp = Integer.parseInt(newVal);
+            Settings.System.putInt(getContentResolver(), Settings.System.NAVIGATION_BAR_WIDTH, dp);
+            return true;
+        } else if (preference == mNavigationBarHeight) {
+            String newVal = (String) newValue;
+            int dp = Integer.parseInt(newVal);
+            Settings.System.putInt(getContentResolver(), Settings.System.NAVIGATION_BAR_HEIGHT, dp);
+            return true;
+        } else if (preference == mNavigationBarHeightLandcape) {
+            String newVal = (String) newValue;
+            int dp = Integer.parseInt(newVal);
+            Settings.System.putInt(getContentResolver(), Settings.System.NAVIGATION_BAR_HEIGHT_LANDSCAPE, dp);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/org/omnirom/omnigears/interfacesettings/NotificationPanelSettings.java b/src/org/omnirom/omnigears/interfacesettings/NotificationPanelSettings.java
index 106d92bca..aaacc8c38 100644
--- a/src/org/omnirom/omnigears/interfacesettings/NotificationPanelSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/NotificationPanelSettings.java
@@ -18,29 +18,39 @@
 
 package org.omnirom.omnigears.interfacesettings;
 
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-
+import android.app.Activity;
 import android.content.ContentResolver;
-import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
 
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.quicklaunch.BookmarkPicker;
+
+import java.net.URISyntaxException;
+
+import org.omnirom.omnigears.preference.AppSelectListPreference;
+
 public class NotificationPanelSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "NotificationPanelSettings";
 
     private static final String STATUS_BAR_CUSTOM_HEADER = "custom_status_bar_header";
     private static final String QUICK_SWIPE = "quick_swipe";
+    private static final String CLOCK_SHORTCUT = "clock_shortcut";
+    private static final String CALENDAR_SHORTCUT = "calendar_shortcut";
 
     private CheckBoxPreference mStatusBarCustomHeader;
     private CheckBoxPreference mQuickSwipe;
+    private AppSelectListPreference mClockShortcut;
+    private AppSelectListPreference mCalendarShortcut;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -59,11 +69,14 @@ public void onCreate(Bundle savedInstanceState) {
         mQuickSwipe.setChecked(Settings.System.getInt(resolver,
             Settings.System.QUICK_SWIPE, 1) == 1);
         mQuickSwipe.setOnPreferenceChangeListener(this);
-    }
 
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        return true;
+        mClockShortcut = (AppSelectListPreference)prefSet.findPreference(CLOCK_SHORTCUT);
+        mClockShortcut.setOnPreferenceChangeListener(this);
+
+        mCalendarShortcut = (AppSelectListPreference)prefSet.findPreference(CALENDAR_SHORTCUT);
+        mCalendarShortcut.setOnPreferenceChangeListener(this);
+
+        updateClockCalendarSummary();
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -76,9 +89,60 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
             boolean value = (Boolean) objValue;
             Settings.System.putInt(resolver,
                 Settings.System.QUICK_SWIPE, value ? 1 : 0);
+        } else if (preference == mClockShortcut) {
+            String value = (String) objValue;
+            // a value of null means to use the default
+            Settings.System.putString(resolver, Settings.System.CLOCK_SHORTCUT, value);
+            updateClockCalendarSummary();
+        } else if (preference == mCalendarShortcut) {
+            String value = (String) objValue;
+            // a value of null means to use the default
+            Settings.System.putString(resolver, Settings.System.CALENDAR_SHORTCUT, value);
+            updateClockCalendarSummary();
         } else {
             return false;
         }
         return true;
     }
+
+    private void updateClockCalendarSummary() {
+        final PackageManager packageManager = getPackageManager();
+
+        mClockShortcut.setSummary(getResources().getString(R.string.default_shortcut));
+        mCalendarShortcut.setSummary(getResources().getString(R.string.default_shortcut));
+
+        String clockShortcutIntentUri = Settings.System.getString(getContentResolver(), Settings.System.CLOCK_SHORTCUT);
+        if (clockShortcutIntentUri != null) {
+            Intent clockShortcutIntent = null;
+            try {
+                clockShortcutIntent = Intent.parseUri(clockShortcutIntentUri, 0);
+            } catch (URISyntaxException e) {
+                clockShortcutIntent = null;
+            }
+
+            if(clockShortcutIntent != null) {
+                ResolveInfo info = packageManager.resolveActivity(clockShortcutIntent, 0);
+                if (info != null) {
+                    mClockShortcut.setSummary(info.loadLabel(packageManager));
+                }
+            }
+        }
+
+        String calendarShortcutIntentUri = Settings.System.getString(getContentResolver(), Settings.System.CALENDAR_SHORTCUT);
+        if (calendarShortcutIntentUri != null) {
+            Intent calendarShortcutIntent = null;
+            try {
+                calendarShortcutIntent = Intent.parseUri(calendarShortcutIntentUri, 0);
+            } catch (URISyntaxException e) {
+                calendarShortcutIntent = null;
+            }
+
+            if(calendarShortcutIntent != null) {
+                ResolveInfo info = packageManager.resolveActivity(calendarShortcutIntent, 0);
+                if (info != null) {
+                    mCalendarShortcut.setSummary(info.loadLabel(packageManager));
+                }
+            }
+        }
+    }
 }
diff --git a/src/org/omnirom/omnigears/notificationlight/ApplicationLightPreference.java b/src/org/omnirom/omnigears/notificationlight/ApplicationLightPreference.java
index 2756be7cd..2341549b4 100644
--- a/src/org/omnirom/omnigears/notificationlight/ApplicationLightPreference.java
+++ b/src/org/omnirom/omnigears/notificationlight/ApplicationLightPreference.java
@@ -124,8 +124,8 @@ protected void onBindView(View view) {
     }
 
     private void updatePreferenceViews() {
-        final int width = (int) mResources.getDimension(R.dimen.device_memory_usage_button_width);
-        final int height = (int) mResources.getDimension(R.dimen.device_memory_usage_button_height);
+        final int width = (int) mResources.getDimension(R.dimen.color_preference_width);
+        final int height = (int) mResources.getDimension(R.dimen.color_preference_height_large);
 
         if (mLightColorView != null) {
             mLightColorView.setEnabled(true);
diff --git a/src/org/omnirom/omnigears/notificationlight/LightSettingsDialog.java b/src/org/omnirom/omnigears/notificationlight/LightSettingsDialog.java
index e58125b56..588c916ae 100644
--- a/src/org/omnirom/omnigears/notificationlight/LightSettingsDialog.java
+++ b/src/org/omnirom/omnigears/notificationlight/LightSettingsDialog.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Daniel Nilsson
- * Copyright (C) 2012 THe CyanogenMod Project
+ * Copyright (C) 2012 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/org/omnirom/omnigears/notificationlight/NotificationLightSettings.java b/src/org/omnirom/omnigears/notificationlight/NotificationLightSettings.java
index 44031ba5b..c0c3285b2 100644
--- a/src/org/omnirom/omnigears/notificationlight/NotificationLightSettings.java
+++ b/src/org/omnirom/omnigears/notificationlight/NotificationLightSettings.java
@@ -104,6 +104,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
     private PackageAdapter mPackageAdapter;
     private String mPackageList;
     private Map<String, Package> mPackages;
+    private boolean mNotificationPulseConfig = true;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -119,6 +120,7 @@ public void onCreate(Bundle savedInstanceState) {
                 com.android.internal.R.integer.config_defaultNotificationLedOff);
         mNotificationPulseEnabled = resources.getBoolean(
                 com.android.internal.R.bool.config_intrusiveNotificationLed);
+        mNotificationPulseConfig = resources.getBoolean(R.bool.config_notificationLedConfig);
 
         mEnabledPref = (SwitchPreference)
                 findPreference(Settings.System.NOTIFICATION_LIGHT_PULSE);
@@ -160,7 +162,15 @@ public void onCreate(Bundle savedInstanceState) {
 
         mPackages = new HashMap<String, Package>();
 
-        setHasOptionsMenu(true);
+        if (!mNotificationPulseConfig) {
+            removePreference("phone_list");
+            removePreference("applications_list");
+            PreferenceGroup generalGroup = (PreferenceGroup) findPreference("general_section");
+            generalGroup.removePreference(mDefaultPref);
+            removePreference(Settings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE);
+        } else {
+            setHasOptionsMenu(true);
+        }
     }
 
     @Override
@@ -205,9 +215,6 @@ private void refreshDefault() {
 
             mVoicemailPref.setAllValues(vmailColor, vmailTimeOn, vmailTimeOff);
         }
-
-        mApplicationPrefList = (PreferenceGroup) findPreference("applications_list");
-        mApplicationPrefList.setOrderingAsAdded(false);
     }
 
     private void refreshCustomApplicationPrefs() {
diff --git a/src/org/omnirom/omnigears/preference/AppSelectListPreference.java b/src/org/omnirom/omnigears/preference/AppSelectListPreference.java
new file mode 100644
index 000000000..dd8f26c8c
--- /dev/null
+++ b/src/org/omnirom/omnigears/preference/AppSelectListPreference.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2013 The ChameleonOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.omnirom.omnigears.preference;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ActivityInfo;
+import android.content.res.TypedArray;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.graphics.drawable.Drawable;
+import com.android.settings.R;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A preference that lists installed applications, with icons, as a single select list.
+ * It will return the launch intent as string if an app is clicked
+ *
+ * if the positive button is pressed it will return positiveButtonValue or null
+ *
+ * a neutral button can be added optional by adding the neutralButtonText
+ * attribute. Pressing it will return neutralButtonValue or null
+ *
+ * e.g.
+ *         <org.omnirom.omnigears.preference.AppSelectListPreference
+ *               android:key="calendar_shortcut"
+ *               android:title="@string/calendar_shortcut_title"
+ *               android:positiveButtonText="@string/default_shortcut"
+ *               settings:neutralButtonText="@string/default_shortcut2"
+ *               settings:neutralButtonValue="DEFAULT"
+ *               android:persistent="false"/>
+ *
+ */
+public class AppSelectListPreference extends DialogPreference {
+    private final List<MyApplicationInfo> mPackageInfoList = new ArrayList<MyApplicationInfo>();
+    private AppListAdapter mAdapter;
+    private CharSequence mReturnValue;
+    private CharSequence mNeutralButtonText;
+    private CharSequence mNeutralButtonValue;
+    private CharSequence mPositiveButtonValue;
+    private AlertDialog.Builder mBuilder;
+    private boolean mNeutralButtonPressed;
+
+    private static final String SETTINGS = "http://schemas.android.com/apk/res/com.android.settings";
+
+    public AppSelectListPreference(Context context) {
+        this(context, null);
+    }
+
+    public AppSelectListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setValuesFromXml(attrs);
+
+        final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+        mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        List<ResolveInfo> installedAppsInfo = getContext().getPackageManager().queryIntentActivities(
+                mainIntent, 0);
+
+        for (ResolveInfo info : installedAppsInfo) {
+            MyApplicationInfo myInfo = new MyApplicationInfo();
+            myInfo.resolveInfo = info;
+            myInfo.label = getResolveInfoTitle(info);
+            mPackageInfoList.add(myInfo);
+        }
+        Collections.sort(mPackageInfoList, sDisplayNameComparator);
+    }
+
+    private void setValuesFromXml(AttributeSet attrs) {
+        final TypedArray typedArray = getContext().obtainStyledAttributes(
+                      attrs, R.styleable.AppSelectListPreference);
+
+        mNeutralButtonText = getAttributeStringValue(attrs, SETTINGS, "neutralButtonText", null);
+        Integer id = typedArray.getResourceId(R.styleable.AppSelectListPreference_neutralButtonText, 0);
+        if (id > 0) {
+            mNeutralButtonText = getContext().getResources().getString(id);
+        }
+
+        mNeutralButtonValue = getAttributeStringValue(attrs, SETTINGS, "neutralButtonValue", null);
+        id = typedArray.getResourceId(R.styleable.AppSelectListPreference_neutralButtonValue, 0);
+        if (id > 0) {
+            mNeutralButtonValue = getContext().getResources().getString(id);
+        }
+
+        mPositiveButtonValue = getAttributeStringValue(attrs, SETTINGS, "positiveButtonValue", null);
+        id = typedArray.getResourceId(R.styleable.AppSelectListPreference_positiveButtonValue, 0);
+        if (id > 0) {
+            mPositiveButtonValue = getContext().getResources().getString(id);
+        }
+        typedArray.recycle();
+    }
+
+    private String getAttributeStringValue(AttributeSet attrs, String namespace, String name, String defaultValue) {
+        String value = attrs.getAttributeValue(namespace, name);
+        if(value == null) {
+            value = defaultValue;
+        }
+        return value;
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+        mAdapter = new AppListAdapter(getContext());
+        builder.setAdapter(mAdapter, null);
+    }
+
+    private String getResolveInfoTitle(ResolveInfo info) {
+        CharSequence label = info.loadLabel(getContext().getPackageManager());
+        if (label == null) label = info.activityInfo.name;
+        return label != null ? label.toString() : null;
+    }
+
+    private Intent getIntentForResolveInfo(ResolveInfo info, String action) {
+        Intent intent = new Intent(action);
+        ActivityInfo ai = info.activityInfo;
+        intent.setClassName(ai.packageName, ai.name);
+        return intent;
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+        final AlertDialog dialog = (AlertDialog) getDialog();
+        final ListView listView = dialog.getListView();
+        mReturnValue = mPositiveButtonValue;
+        listView.setItemsCanFocus(false);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                final AppViewHolder holder = (AppViewHolder) view.getTag();
+
+                MyApplicationInfo myInfo = mAdapter.getItem(position);
+                ResolveInfo info = myInfo.resolveInfo;
+                Intent intent = getIntentForResolveInfo(info, Intent.ACTION_MAIN);
+                intent.addCategory(Intent.CATEGORY_LAUNCHER);
+
+                mReturnValue = intent.toUri(0).toString();
+                onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+                dialog.dismiss();
+            }
+        });
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_NEUTRAL){
+            mReturnValue = mNeutralButtonValue;
+            mNeutralButtonPressed = true;
+        }
+        super.onClick(dialog, which);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        // can be null an intent or whatever set as mNeutralButtonValue
+        if (positiveResult || mNeutralButtonPressed) {
+            callChangeListener(mReturnValue);
+        }
+    }
+
+    class MyApplicationInfo {
+        ApplicationInfo info;
+        CharSequence label;
+        ResolveInfo resolveInfo;
+    }
+
+    public class AppListAdapter extends ArrayAdapter<MyApplicationInfo> {
+        private final LayoutInflater mInflater;
+
+        public AppListAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            addAll(mPackageInfoList);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            // A ViewHolder keeps references to children views to avoid unnecessary calls
+            // to findViewById() on each row.
+            AppViewHolder holder = AppViewHolder.createOrRecycle(mInflater, convertView);
+            convertView = holder.rootView;
+            MyApplicationInfo info = getItem(position);
+            holder.appName.setText(info.label);
+            Drawable icon = info.resolveInfo.loadIcon(getContext().getPackageManager());
+            if (icon != null) {
+                holder.appIcon.setImageDrawable(icon);
+            } else {
+                holder.appIcon.setImageDrawable(null);
+            }
+            return convertView;
+        }
+
+        @Override
+        public MyApplicationInfo getItem(int position) {
+            return mPackageInfoList.get(position);
+        }
+    }
+
+    public static class AppViewHolder {
+        public View rootView;
+        public TextView appName;
+        public ImageView appIcon;
+
+        public static AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
+            if (convertView == null) {
+                convertView = inflater.inflate(R.layout.app_item, null);
+
+                // Creates a ViewHolder and store references to the two children views
+                // we want to bind data to.
+                AppViewHolder holder = new AppViewHolder();
+                holder.rootView = convertView;
+                holder.appName = (TextView) convertView.findViewById(R.id.app_name);
+                holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon);
+                convertView.setTag(holder);
+                return holder;
+            } else {
+                // Get the ViewHolder back to get fast access to the TextView
+                // and the ImageView.
+                return (AppViewHolder)convertView.getTag();
+            }
+        }
+    }
+
+    private final static Comparator<MyApplicationInfo> sDisplayNameComparator
+            = new Comparator<MyApplicationInfo>() {
+
+        private final Collator collator = Collator.getInstance();
+
+        public final int compare(MyApplicationInfo a, MyApplicationInfo b) {
+            return collator.compare(a.label, b.label);
+        }
+    };
+
+    protected Dialog createDialog() {
+        super.createDialog();
+        Context context = getContext();
+
+        mBuilder = new AlertDialog.Builder(context)
+            .setTitle(getDialogTitle())
+            .setIcon(getDialogIcon())
+            .setPositiveButton(getPositiveButtonText(), this)
+            .setNegativeButton(getNegativeButtonText(), this);
+
+        if (mNeutralButtonText != null){
+            mBuilder.setNeutralButton(mNeutralButtonText, this);
+        }
+
+        View contentView = onCreateDialogView();
+        if (contentView != null) {
+            onBindDialogView(contentView);
+            mBuilder.setView(contentView);
+        } else {
+            mBuilder.setMessage(getDialogMessage());
+        }
+
+        onPrepareDialogBuilder(mBuilder);
+
+        return mBuilder.create();
+    }
+}
diff --git a/src/org/omnirom/omnigears/preference/ColorPickerPreference.java b/src/org/omnirom/omnigears/preference/ColorPickerPreference.java
new file mode 100644
index 000000000..5d7e23d3c
--- /dev/null
+++ b/src/org/omnirom/omnigears/preference/ColorPickerPreference.java
@@ -0,0 +1,135 @@
+/*
+ *  Copyright (C) 2014 The OmniROM Project
+ *
+ * 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/>.
+ *
+ */
+
+package org.omnirom.omnigears.preference;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.os.Bundle;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.omnirom.omnigears.ui.ColorPickerDialog;
+
+import com.android.settings.R;
+
+public class ColorPickerPreference extends DialogPreference {
+
+    private static String TAG = "ColorPickerPreference";
+    public static final int DEFAULT_COLOR = 0xFFFFFFFF; //White
+
+    private ImageView mLightColorView;
+    private Resources mResources;
+    private int mColorValue;
+
+    /**
+     * @param context
+     * @param attrs
+     */
+    public ColorPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mColorValue = DEFAULT_COLOR;
+        init();
+    }
+
+    public ColorPickerPreference(Context context, int color) {
+        super(context, null);
+        mColorValue = color;
+        init();
+    }
+
+    private void init() {
+        setLayoutResource(R.layout.preference_color_picker);
+        mResources = getContext().getResources();
+    }
+
+    public void setColor(int color) {
+        mColorValue = color;
+        updatePreferenceViews();
+    }
+
+    public int getColor() {
+        return mColorValue;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        mLightColorView = (ImageView) view.findViewById(R.id.light_color);
+
+        updatePreferenceViews();
+    }
+
+    private void updatePreferenceViews() {
+        final int width = (int) mResources.getDimension(R.dimen.color_preference_width);
+        final int height = (int) mResources.getDimension(R.dimen.color_preference_height);
+
+        if (mLightColorView != null) {
+            mLightColorView.setEnabled(true);
+            mLightColorView.setImageDrawable(createRectShape(width, height, mColorValue));
+        }
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+    }
+
+    @Override
+    protected Dialog createDialog() {
+        final ColorPickerDialog d = new ColorPickerDialog(getContext(), mColorValue);
+
+        d.setButton(AlertDialog.BUTTON_POSITIVE, mResources.getString(R.string.ok),
+                new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                mColorValue =  d.getColor();
+                updatePreferenceViews();
+                callChangeListener(new Integer(mColorValue));
+            }
+        });
+        d.setButton(AlertDialog.BUTTON_NEGATIVE, mResources.getString(R.string.cancel),
+                (DialogInterface.OnClickListener) null);
+
+        return d;
+    }
+
+    private static ShapeDrawable createRectShape(int width, int height, int color) {
+        ShapeDrawable shape = new ShapeDrawable(new RectShape());
+        shape.setIntrinsicHeight(height);
+        shape.setIntrinsicWidth(width);
+        shape.getPaint().setColor(color);
+        return shape;
+    }
+}
diff --git a/src/org/omnirom/omnigears/preference/NumberPickerPreference.java b/src/org/omnirom/omnigears/preference/NumberPickerPreference.java
new file mode 100644
index 000000000..5afa3b863
--- /dev/null
+++ b/src/org/omnirom/omnigears/preference/NumberPickerPreference.java
@@ -0,0 +1,117 @@
+/*
+ * Based on: http://www.lukehorvat.com/blog/android-numberpickerdialogpreference/
+ * Thanks to the original author!
+ */
+
+package org.omnirom.omnigears.preference;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.NumberPicker;
+import android.widget.TextView;
+
+import com.android.settings.R;
+/**
+* A {@link DialogPreference} that provides a user with the means to select an integer from a {@link NumberPicker}, and persist it.
+*
+* @author lukehorvat
+*
+*/
+public class NumberPickerPreference extends DialogPreference
+{
+    private static final int DEFAULT_MIN_VALUE = 0;
+    private static final int DEFAULT_MAX_VALUE = 100;
+    private static final int DEFAULT_VALUE = 0;
+
+    private int mMinValue;
+    private int mMaxValue;
+    private int mValue;
+    private NumberPicker mNumberPicker;
+
+    public NumberPickerPreference(Context context) {
+        this(context, null);
+    }
+
+    public NumberPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setMinValue(DEFAULT_MIN_VALUE);
+        setMaxValue(DEFAULT_MAX_VALUE);
+
+        // set layout
+        setDialogLayoutResource(R.layout.preference_number_picker_dialog);
+        setPositiveButtonText(android.R.string.ok);
+        setNegativeButtonText(android.R.string.cancel);
+        setDialogIcon(null);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restore, Object defaultValue) {
+        setValue(restore ? getPersistedInt(DEFAULT_VALUE) : (Integer) defaultValue);
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getInt(index, DEFAULT_VALUE);
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
+        mNumberPicker.setMinValue(mMinValue);
+        mNumberPicker.setMaxValue(mMaxValue);
+        mNumberPicker.setValue(mValue);
+    }
+
+    public int getMinValue() {
+        return mMinValue;
+    }
+
+    public void setMinValue(int minValue) {
+        mMinValue = minValue;
+        setValue(Math.max(mValue, mMinValue));
+    }
+
+    public int getMaxValue() {
+        return mMaxValue;
+    }
+
+    public void setMaxValue(int maxValue) {
+        mMaxValue = maxValue;
+        setValue(Math.min(mValue, mMaxValue));
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public void setValue(int value) {
+        value = Math.max(Math.min(value, mMaxValue), mMinValue);
+
+        if (value != mValue) {
+            mValue = value;
+            persistInt(value);
+            notifyChanged();
+        }
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        // when the user selects "OK", persist the new value
+        if (positiveResult) {
+            int numberPickerValue = mNumberPicker.getValue();
+            if (callChangeListener(numberPickerValue)) {
+                setValue(numberPickerValue);
+            }
+        }
+    }
+}
diff --git a/src/org/omnirom/omnigears/slim/StatusBarClockStyle.java b/src/org/omnirom/omnigears/slim/StatusBarClockStyle.java
index af73dd44b..1c3746eaf 100644
--- a/src/org/omnirom/omnigears/slim/StatusBarClockStyle.java
+++ b/src/org/omnirom/omnigears/slim/StatusBarClockStyle.java
@@ -45,6 +45,7 @@ public class StatusBarClockStyle extends SettingsPreferenceFragment
     private static final String PREF_CLOCK_DATE_STYLE = "clock_date_style";
     private static final String PREF_CLOCK_DATE_FORMAT = "clock_date_format";
     private static final String STATUS_BAR_CLOCK = "status_bar_show_clock";
+    private static final String STATUS_BAR_FORCE_CLOCK_LOCKSCREEN = "status_bar_force_clock_lockscreen";
 
     public static final int CLOCK_DATE_STYLE_LOWERCASE = 1;
     public static final int CLOCK_DATE_STYLE_UPPERCASE = 2;
@@ -55,6 +56,7 @@ public class StatusBarClockStyle extends SettingsPreferenceFragment
     private ListPreference mClockDateStyle;
     private ListPreference mClockDateFormat;
     private CheckBoxPreference mStatusBarClock;
+    private CheckBoxPreference mForceClockLockscreen;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -135,6 +137,11 @@ private PreferenceScreen createCustomView() {
             mClockDateFormat.setEnabled(false);
         }
 
+        mForceClockLockscreen = (CheckBoxPreference) findPreference(STATUS_BAR_FORCE_CLOCK_LOCKSCREEN);
+        mForceClockLockscreen.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+                Settings.System.STATUS_BAR_FORCE_CLOCK_LOCKSCREEN, 0) != 0);
+        mForceClockLockscreen.setOnPreferenceChangeListener(this);
+
         return prefSet;
     }
 
@@ -188,6 +195,10 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 mClockDateFormat.setSummary(mClockDateFormat.getEntries()[idx]);
             }
             return true;
+        } else if (preference == mForceClockLockscreen) {
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.STATUS_BAR_FORCE_CLOCK_LOCKSCREEN, (Boolean) newValue ? 1 : 0);
+            return true;
         }
         return false;
     }
diff --git a/src/org/omnirom/omnigears/ui/AlphaPatternDrawable.java b/src/org/omnirom/omnigears/ui/AlphaPatternDrawable.java
index 110912ec6..dbe4b7733 100644
--- a/src/org/omnirom/omnigears/ui/AlphaPatternDrawable.java
+++ b/src/org/omnirom/omnigears/ui/AlphaPatternDrawable.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Daniel Nilsson
- * Copyright (C) 2012 THe CyanogenMod Project
+ * Copyright (C) 2012 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/org/omnirom/omnigears/ui/ColorPanelView.java b/src/org/omnirom/omnigears/ui/ColorPanelView.java
index 45fc1093c..5941bf1b2 100644
--- a/src/org/omnirom/omnigears/ui/ColorPanelView.java
+++ b/src/org/omnirom/omnigears/ui/ColorPanelView.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Daniel Nilsson
- * Copyright (C) 2012 THe CyanogenMod Project
+ * Copyright (C) 2012 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/org/omnirom/omnigears/ui/ColorPickerDialog.java b/src/org/omnirom/omnigears/ui/ColorPickerDialog.java
new file mode 100644
index 000000000..9c0a48bd6
--- /dev/null
+++ b/src/org/omnirom/omnigears/ui/ColorPickerDialog.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2010 Daniel Nilsson
+ * Copyright (C) 2012 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.omnirom.omnigears.ui;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.PixelFormat;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.text.InputFilter;
+import android.text.InputFilter.LengthFilter;
+import android.util.Pair;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnFocusChangeListener;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import org.omnirom.omnigears.ui.ColorPanelView;
+import org.omnirom.omnigears.ui.ColorPickerView;
+import org.omnirom.omnigears.ui.ColorPickerView.OnColorChangedListener;
+
+import java.util.ArrayList;
+import java.util.IllegalFormatException;
+import java.util.Locale;
+
+public class ColorPickerDialog extends AlertDialog implements
+        ColorPickerView.OnColorChangedListener, TextWatcher, OnFocusChangeListener {
+
+    private static final String TAG = "ColorPickerDialog";
+    private final static String STATE_KEY_COLOR = "ColorPickerDialog:color";
+
+    private ColorPickerView mColorPicker;
+
+    private EditText mHexColorInput;
+    private ColorPanelView mNewColor;
+    private LayoutInflater mInflater;
+    private boolean mMultiColor = true;
+    private LinearLayout mColorPanelView;
+
+    public ColorPickerDialog(Context context, int initialColor) {
+        super(context);
+
+        init(initialColor);
+    }
+
+    private void init(int color) {
+        // To fight color banding.
+        getWindow().setFormat(PixelFormat.RGBA_8888);
+        setUp(color);
+    }
+
+    /**
+     * This function sets up the dialog with the proper values.  If the speedOff parameters
+     * has a -1 value disable both spinners
+     *
+     * @param color - the color to set
+     * @param speedOn - the flash time in ms
+     * @param speedOff - the flash length in ms
+     */
+    private void setUp(int color) {
+        mInflater = (LayoutInflater) getContext()
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View layout = mInflater.inflate(R.layout.dialog_color_picker, null);
+
+        mColorPicker = (ColorPickerView) layout.findViewById(R.id.color_picker_view);
+        mHexColorInput = (EditText) layout.findViewById(R.id.hex_color_input);
+        mNewColor = (ColorPanelView) layout.findViewById(R.id.color_panel);
+        mColorPanelView = (LinearLayout) layout.findViewById(R.id.color_panel_view);
+
+        setAlphaSliderVisible(true);
+        mColorPicker.setOnColorChangedListener(this);
+        mColorPicker.setColor(color, true);
+
+        mHexColorInput.setOnFocusChangeListener(this);
+
+        setView(layout);
+        setTitle(R.string.color_picker_dialog_title);
+
+        mColorPicker.setVisibility(View.VISIBLE);
+        mColorPanelView.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public Bundle onSaveInstanceState() {
+        Bundle state = super.onSaveInstanceState();
+        state.putInt(STATE_KEY_COLOR, getColor());
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle state) {
+        super.onRestoreInstanceState(state);
+        mColorPicker.setColor(state.getInt(STATE_KEY_COLOR), true);
+    }
+
+    @Override
+    public void onColorChanged(int color) {
+        final boolean hasAlpha = mColorPicker.isAlphaSliderVisible();
+        final String format = hasAlpha ? "%08x" : "%06x";
+        final int mask = hasAlpha ? 0xFFFFFFFF : 0x00FFFFFF;
+
+        mNewColor.setColor(color);
+        mHexColorInput.setText(String.format(Locale.US, format, color & mask));
+    }
+
+    public void setAlphaSliderVisible(boolean visible) {
+        mHexColorInput.setFilters(new InputFilter[] { new InputFilter.LengthFilter(visible ? 8 : 6) } );
+        mColorPicker.setAlphaSliderVisible(visible);
+    }
+
+    public int getColor() {
+        return mColorPicker.getColor();
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        String hexColor = mHexColorInput.getText().toString();
+        if (!hexColor.isEmpty()) {
+            try {
+                int color = Color.parseColor('#' + hexColor);
+                if (!mColorPicker.isAlphaSliderVisible()) {
+                    color |= 0xFF000000; // set opaque
+                }
+                mColorPicker.setColor(color);
+                mNewColor.setColor(color);
+            } catch (IllegalArgumentException ex) {
+                // Number format is incorrect, ignore
+            }
+        }
+    }
+
+    @Override
+    public void onFocusChange(View v, boolean hasFocus) {
+        if (!hasFocus) {
+            mHexColorInput.removeTextChangedListener(this);
+            InputMethodManager inputMethodManager = (InputMethodManager) getContext()
+                    .getSystemService(Activity.INPUT_METHOD_SERVICE);
+            inputMethodManager.hideSoftInputFromWindow(v.getWindowToken(), 0);
+        } else {
+            mHexColorInput.addTextChangedListener(this);
+        }
+    }
+}