diff --git a/doze/Android.mk b/doze/Android.mk
index 07b7cac0..687b0310 100644
--- a/doze/Android.mk
+++ b/doze/Android.mk
@@ -20,6 +20,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../../../../packages/resources/devicesettings/res \
     frameworks/support/v14/preference/res \
     frameworks/support/v7/appcompat/res \
     frameworks/support/v7/preference/res \
diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index b14e9e03..7406d8de 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:targetSdkVersion="21"/>
 
     <application
-        android:label="SamsungDoze"
+        android:label="@string/device_settings_app_name"
         android:persistent="true">
 
         <receiver android:name="com.cyanogenmod.settings.device.BootCompletedReceiver">
diff --git a/doze/res/values/strings.xml b/doze/res/values/strings.xml
deleted file mode 100644
index 6a765f3c..00000000
--- a/doze/res/values/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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">
-
-    <!-- Gesture shortcuts -->
-    <string name="screen_gestures_panel_title">Gestures</string>
-
-    <string name="ambient_display_title">Ambient display</string>
-
-    <string name="ambient_display_enable_title">Ambient display</string>
-    <string name="ambient_display_enable_summary">Wake screen when you receive notifications</string>
-
-    <string name="hand_wave_gesture_title">Pulse on hand wave</string>
-    <string name="hand_wave_gesture_summary">Pulse notifications on hand wave</string>
-
-    <string name="pocket_gesture_title">Pulse on removal from pocket</string>
-    <string name="pocket_gesture_summary">Pulse notifications on removal from pocket</string>
-
-    <string name="proximity_wake_title">Proximity wake</string>
-
-    <string name="proximity_wake_enable_title">Wake on hand wave</string>
-    <string name="proximity_wake_enable_summary">Wake device on hand wave</string>
-
-</resources>
diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml
index 40a017ce..f9113785 100644
--- a/doze/res/xml/gesture_panel.xml
+++ b/doze/res/xml/gesture_panel.xml
@@ -18,7 +18,7 @@
 
     <PreferenceCategory
         android:key="ambient_display_key"
-        android:title="@string/ambient_display_title" >
+        android:title="@string/ambient_display_title">
 
         <SwitchPreference
             android:key="ambient_display_enable"
@@ -41,7 +41,7 @@
 
     <PreferenceCategory
         android:key="proximity_wake_key"
-        android:title="@string/proximity_wake_title" >
+        android:title="@string/proximity_wake_title">
 
         <SwitchPreference
             android:key="proximity_wake_enable"
@@ -50,4 +50,4 @@
             android:summary="@string/proximity_wake_enable_summary" />
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>