diff --git a/res/layout-land/dialog_battery_settings.xml b/res/layout-land/dialog_battery_settings.xml
index c111ba1..569caa8 100644
--- a/res/layout-land/dialog_battery_settings.xml
+++ b/res/layout-land/dialog_battery_settings.xml
@@ -22,7 +22,7 @@
     android:paddingTop="@dimen/alert_dialog_padding_material"
     android:paddingStart="@dimen/alert_dialog_padding_material"
     android:paddingEnd="@dimen/alert_dialog_padding_material" >
-    <org.omnirom.omnigears.ui.ColorPickerView
+    <org.omnirom.omnilib.ui.ColorPickerView
         android:id="@+id/color_picker_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
@@ -39,7 +39,7 @@
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
             android:maxLength="6" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="match_parent"
             android:layout_height="40dp" />
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="0.5" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_list_panel"
             android:layout_width="0px"
             android:layout_height="40dp"
diff --git a/res/layout-land/dialog_color_picker.xml b/res/layout-land/dialog_color_picker.xml
index cc9bfe0..628fcb7 100644
--- a/res/layout-land/dialog_color_picker.xml
+++ b/res/layout-land/dialog_color_picker.xml
@@ -22,7 +22,7 @@
     android:paddingTop="@dimen/alert_dialog_padding_material"
     android:paddingStart="@dimen/alert_dialog_padding_material"
     android:paddingEnd="@dimen/alert_dialog_padding_material" >
-    <org.omnirom.omnigears.ui.ColorPickerView
+    <org.omnirom.omnilib.ui.ColorPickerView
         android:id="@+id/color_picker_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
@@ -39,7 +39,7 @@
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
             android:maxLength="6" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="match_parent"
             android:layout_height="40dp" />
diff --git a/res/layout/dialog_color_picker.xml b/res/layout/dialog_color_picker.xml
index 3d5180a..80b83f1 100644
--- a/res/layout/dialog_color_picker.xml
+++ b/res/layout/dialog_color_picker.xml
@@ -21,7 +21,7 @@
     android:paddingTop="@dimen/alert_dialog_padding_material"
     android:paddingStart="@dimen/alert_dialog_padding_material"
     android:paddingEnd="@dimen/alert_dialog_padding_material" >
-    <org.omnirom.omnigears.ui.ColorPickerView
+    <org.omnirom.omnilib.ui.ColorPickerView
         android:id="@+id/color_picker_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
             android:maxLength="6" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="0px"
             android:layout_height="match_parent"
diff --git a/res/layout/dialog_notification_settings.xml b/res/layout/dialog_notification_settings.xml
index 0963d6f..58ab9d0 100644
--- a/res/layout/dialog_notification_settings.xml
+++ b/res/layout/dialog_notification_settings.xml
@@ -21,7 +21,7 @@
     android:paddingTop="@dimen/alert_dialog_padding_material"
     android:paddingStart="@dimen/alert_dialog_padding_material"
     android:paddingEnd="@dimen/alert_dialog_padding_material" >
-    <org.omnirom.omnigears.ui.ColorPickerView
+    <org.omnirom.omnilib.ui.ColorPickerView
         android:id="@+id/color_picker_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             android:digits="0123456789ABCDEFabcdef"
             android:inputType="textNoSuggestions"
             android:maxLength="6" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_panel"
             android:layout_width="0px"
             android:layout_height="match_parent"
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="0.5" />
-        <org.omnirom.omnigears.ui.ColorPanelView
+        <org.omnirom.omnilib.ui.ColorPanelView
             android:id="@+id/color_list_panel"
             android:layout_width="0px"
             android:layout_height="40dp"
diff --git a/res/values/custom_attrs.xml b/res/values/custom_attrs.xml
deleted file mode 100644
index ce2d08f..0000000
--- a/res/values/custom_attrs.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, The ChameleonOS 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <declare-styleable name="SeekBarPreference">
-        <attr name="min" format="integer" />
-        <attr name="interval" format="integer" />
-        <attr name="unitsLeft" format="string|reference" />
-        <attr name="unitsRight" format="string|reference" />
-    </declare-styleable>
-
-    <declare-styleable name="ColorSelectPreference">
-        <attr name="ledPreview" format="boolean" />
-    </declare-styleable>
-</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 020f01c..87f9a58 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -15,7 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:key="bars_settings"
             android:title="@string/custom_bars_settings_title" >
 
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index c44bada..ee94f11 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
         android:key="led_settings"
         android:title="@string/battery_light_settings_title" >
 
@@ -49,25 +49,25 @@
 
         <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="low_color"
-            ledPreview="true"
+            settings:ledPreview="true"
             android:title="@string/battery_light_low_color_title"
             android:persistent="false" />
 
         <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="medium_color"
-            ledPreview="true"
+            settings:ledPreview="true"
             android:title="@string/battery_light_medium_color_title"
             android:persistent="false" />
 
         <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="full_color"
-            ledPreview="true"
+            settings:ledPreview="true"
             android:title="@string/battery_light_full_color_title"
             android:persistent="false" />
 
         <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="really_full_color"
-            ledPreview="true"
+            settings:ledPreview="true"
             android:title="@string/battery_light_really_full_color_title"
             android:persistent="false" />
 
@@ -86,7 +86,7 @@
 
         <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="fast_color"
-            ledPreview="true"
+            settings:ledPreview="true"
             android:title="@string/fast_charging_light_color_title"
             android:summary="@string/fast_charging_light_color_summary"
             android:persistent="false"
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
index 1f88019..c91db2a 100644
--- a/res/xml/button_brightness_settings.xml
+++ b/res/xml/button_brightness_settings.xml
@@ -15,7 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
         android:key="button_brightness"
         android:title="@string/button_backlight_title" >
 
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 8992d78..94684b1 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -15,7 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:key="button_settings"
         android:title="@string/button_settings_title" >
 
diff --git a/res/xml/display_rotation.xml b/res/xml/display_rotation.xml
index 0b88884..5e03c90 100644
--- a/res/xml/display_rotation.xml
+++ b/res/xml/display_rotation.xml
@@ -15,7 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:key="rotation_settings"
         android:title="@string/display_rotation_title" >
 
diff --git a/res/xml/event_service_settings.xml b/res/xml/event_service_settings.xml
index 3dd950e..89873d9 100644
--- a/res/xml/event_service_settings.xml
+++ b/res/xml/event_service_settings.xml
@@ -17,7 +17,7 @@
  -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
     android:key="event_service_settings"
     android:title="@string/event_service_settings_title">
 
diff --git a/res/xml/global_actions.xml b/res/xml/global_actions.xml
index 7e38cbe..cc50072 100644
--- a/res/xml/global_actions.xml
+++ b/res/xml/global_actions.xml
@@ -16,7 +16,6 @@
  -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:key="global_actions"
         android:title="@string/global_actions_title">
 
diff --git a/res/xml/lockscreen_settings.xml b/res/xml/lockscreen_settings.xml
index 48c1544..8dd6f2a 100644
--- a/res/xml/lockscreen_settings.xml
+++ b/res/xml/lockscreen_settings.xml
@@ -15,7 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:key="lockscreen_settings"
             android:title="@string/lockscreen_category_title" >
 
diff --git a/res/xml/lockscreenitems.xml b/res/xml/lockscreenitems.xml
index daee8b6..9f56016 100644
--- a/res/xml/lockscreenitems.xml
+++ b/res/xml/lockscreenitems.xml
@@ -16,7 +16,6 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/lockscreen_item_title"
     android:key="lockscreen_item">
 
diff --git a/res/xml/network_traffic.xml b/res/xml/network_traffic.xml
index ada186d..4a8e52b 100644
--- a/res/xml/network_traffic.xml
+++ b/res/xml/network_traffic.xml
@@ -15,7 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
         android:key="category_network_traffic"
         android:title="@string/network_traffic_title">
 
diff --git a/res/xml/statusbar_battery_settings.xml b/res/xml/statusbar_battery_settings.xml
index 5ba2974..778329c 100644
--- a/res/xml/statusbar_battery_settings.xml
+++ b/res/xml/statusbar_battery_settings.xml
@@ -15,7 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:title="@string/battery_title"
             android:key="statusbar_battery">
 
diff --git a/res/xml/statusbar_clock_settings.xml b/res/xml/statusbar_clock_settings.xml
index 22847da..eb9806e 100644
--- a/res/xml/statusbar_clock_settings.xml
+++ b/res/xml/statusbar_clock_settings.xml
@@ -14,7 +14,6 @@
 
 <PreferenceScreen
             xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:title="@string/clock_title"
             android:key="statusbar_clock">
 
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
index 3a25d72..703eaf7 100644
--- a/res/xml/style_settings.xml
+++ b/res/xml/style_settings.xml
@@ -15,7 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
         android:key="style_settings"
         android:title="@string/style_settings_title" >
 
diff --git a/res/xml/volume_steps.xml b/res/xml/volume_steps.xml
index c025273..abc1851 100644
--- a/res/xml/volume_steps.xml
+++ b/res/xml/volume_steps.xml
@@ -12,7 +12,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:title="@string/volume_steps_title"
             android:key="volume_steps">