diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 34ac2ba..aa888d4 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -23,6 +23,7 @@
     <string name="profiles_add">Add...</string>
     <string name="profile_choose_app">Choose app</string>
     <string name="reset">Reset</string>
+    <string name="kbs">kB/s</string>
     <!-- Hardware keys -->
     <string name="button_keys_title">Keys</string>
     <string name="keys_bindings_title">Key actions</string>
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index ee94f11..c2e2698 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -15,8 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/lib/res/org.omnirom.omnilib"
-        android:key="led_settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="led_settings"
         android:title="@string/battery_light_settings_title" >
 
     <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
index c91db2a..6f9a0c4 100644
--- a/res/xml/button_brightness_settings.xml
+++ b/res/xml/button_brightness_settings.xml
@@ -15,8 +15,8 @@
   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/lib/res/org.omnirom.omnilib"
-        android:key="button_brightness"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="button_brightness"
         android:title="@string/button_backlight_title" >
 
     <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
@@ -43,7 +43,6 @@
         android:summary="@string/button_timeout_summary"
         android:max="30"
         settings:min="0"
-        settings:unitsLeft=""
         settings:unitsRight="@string/unit_sec"
         android:persistent="false"
         android:dependency="button_backlight_enable" />
diff --git a/res/xml/event_service_settings.xml b/res/xml/event_service_settings.xml
index 89873d9..eb4fb58 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/lib/res/org.omnirom.omnilib"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="event_service_settings"
     android:title="@string/event_service_settings_title">
 
@@ -93,7 +93,6 @@
             android:persistent="false"
             android:title="@string/app_chooser_timeout_title"
             settings:min="0"
-            settings:unitsLeft=""
             settings:unitsRight="@string/unit_sec" />
 
         <ListPreference
@@ -109,10 +108,9 @@
             android:key="wired_events_threshold"
             android:max="6"
             android:persistent="false"
-            android:title="@string/wired_events_threshold_title"
             android:summary="@string/wired_events_threshold_summary"
+            android:title="@string/wired_events_threshold_title"
             settings:min="0"
-            settings:unitsLeft=""
             settings:unitsRight="@string/unit_sec" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/network_traffic.xml b/res/xml/network_traffic.xml
index 4a8e52b..c4d1dd8 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/lib/res/org.omnirom.omnilib"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="category_network_traffic"
         android:title="@string/network_traffic_title">
 
@@ -61,8 +61,7 @@
                 android:title="@string/network_traffic_autohide_threshold"
                 android:max="100"
                 settings:min="0"
-                settings:unitsLeft=""
-                settings:unitsRight="kB/s"
+                settings:unitsRight="@string/kbs"
                 android:dependency="network_traffic_autohide"
                 android:persistent="false" />
 
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
index 703eaf7..00f0f33 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/lib/res/org.omnirom.omnilib"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="style_settings"
         android:title="@string/style_settings_title" >
 
@@ -104,7 +104,6 @@
             android:summary="@string/status_bar_custom_header_shadow_summary"
             android:max="100"
             settings:min="0"
-            settings:unitsLeft=""
             settings:unitsRight="@string/unit_percent"
             android:persistent="false"
             android:dependency="status_bar_custom_header" />