diff --git a/res/xml-v21/preferences_application.xml b/res/xml-v21/preferences_application.xml
new file mode 100644
index 0000000..5d8ee4c
--- /dev/null
+++ b/res/xml-v21/preferences_application.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<!-- Preference screen definition for Bugle's application-wide settings -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--  KLP+ only -->
+    <PreferenceScreen
+        android:key="@string/sms_disabled_pref_key"
+        android:title="@string/sms_disabled_pref_title"
+        android:persistent="false">
+        <intent
+            android:action="android.provider.Telephony.ACTION_CHANGE_DEFAULT">
+            <extra android:name="package" android:value="com.android.messaging" />
+        </intent>
+    </PreferenceScreen>
+    <PreferenceScreen
+        android:key="@string/sms_enabled_pref_key"
+        android:title="@string/sms_enabled_pref_title"
+        android:persistent="false">
+        <intent
+            android:action="android.settings.WIRELESS_SETTINGS">
+        </intent>
+    </PreferenceScreen>
+
+    <SwitchPreference
+        android:key="@string/send_sound_pref_key"
+        android:title="@string/send_sound_pref_title"
+        android:defaultValue="@bool/send_sound_pref_default"
+        android:persistent="true" />
+
+    <SwitchPreference
+        android:key="@string/notifications_enabled_pref_key"
+        android:title="@string/notifications_enabled_pref_title"
+        android:defaultValue="@bool/notifications_enabled_pref_default"
+        android:persistent="true"
+        android:disableDependentsState="false" />
+
+    <RingtonePreference
+        android:key="@string/notification_sound_pref_key"
+        android:title="@string/notification_sound_pref_title"
+        android:ringtoneType="notification"
+        android:showSilent="true"
+        android:showDefault="true"
+        android:persistent="true"
+        android:defaultValue=""
+        android:dependency="@string/notifications_enabled_pref_key" />
+
+    <SwitchPreference
+        android:key="@string/notification_vibration_pref_key"
+        android:title="@string/notification_vibrate_pref_title"
+        android:defaultValue="@bool/notification_vibration_pref_default"
+        android:persistent="true"
+        android:dependency="@string/notifications_enabled_pref_key" />
+
+    <PreferenceScreen
+            android:key="@string/advanced_pref_key"
+            android:title="@string/advanced_settings" />
+
+    <PreferenceCategory
+        android:key="@string/debug_pref_key"
+        android:title="@string/debug_category_pref_title">
+
+        <SwitchPreference
+            android:key="@string/dump_sms_pref_key"
+            android:title="@string/dump_sms_pref_title"
+            android:summary="@string/dump_sms_pref_summary"
+            android:defaultValue="@bool/dump_sms_pref_default" />
+
+        <SwitchPreference
+            android:key="@string/dump_mms_pref_key"
+            android:title="@string/dump_mms_pref_title"
+            android:summary="@string/dump_mms_pref_summary"
+            android:defaultValue="@bool/dump_mms_pref_default" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml-v21/preferences_per_subscription.xml b/res/xml-v21/preferences_per_subscription.xml
new file mode 100644
index 0000000..d0ae3e6
--- /dev/null
+++ b/res/xml-v21/preferences_per_subscription.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<!-- Preference screen definition for Bugle's subscription-specific settings -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="@string/mms_messaging_category_pref_key"
+        android:title="@string/mms_messaging_category_pref_title">
+
+        <Preference
+            android:title="@string/group_mms_pref_title"
+            android:key="@string/group_mms_pref_key"/>
+
+        <com.android.messaging.ui.appsettings.PhoneNumberPreference
+            android:key="@string/mms_phone_number_pref_key"
+            android:title="@string/mms_phone_number_pref_title" />
+
+        <SwitchPreference
+            android:key="@string/auto_retrieve_mms_pref_key"
+            android:title="@string/auto_retrieve_mms_pref_title"
+            android:summary="@string/auto_retrieve_mms_pref_summary"
+            android:defaultValue="@bool/auto_retrieve_mms_pref_default" />
+
+        <SwitchPreference
+            android:key="@string/auto_retrieve_mms_when_roaming_pref_key"
+            android:dependency="@string/auto_retrieve_mms_pref_key"
+            android:title="@string/auto_retrieve_mms_when_roaming_pref_title"
+            android:summary="@string/auto_retrieve_mms_when_roaming_pref_summary"
+            android:defaultValue="@bool/auto_retrieve_mms_when_roaming_pref_default" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="@string/advanced_category_pref_key"
+        android:title="@string/advanced_category_pref_title">
+
+        <SwitchPreference
+            android:key="@string/delivery_reports_pref_key"
+            android:title="@string/delivery_reports_pref_title"
+            android:summary="@string/delivery_reports_pref_summary"
+            android:defaultValue="@bool/delivery_reports_pref_default" />
+
+        <Preference
+            android:key="@string/wireless_alerts_key"
+            android:title="@string/wireless_alerts_title"/>
+
+        <PreferenceScreen
+            android:key="@string/sms_apns_key"
+            android:title="@string/sms_apns_title" />
+
+    </PreferenceCategory>
+</PreferenceScreen>