diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
index ff4a2dd8a..c1aedb5b5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
@@ -94,7 +94,7 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
         ViewGroup parent = (ViewGroup) findViewById(R.id.taskListParent);
         getLayoutInflater().inflate(R.layout.notification_control, parent, true);
 
-        String reminder = Notifications.getRandomReminder(getResources().getStringArray(R.array.responses));
+        String reminder = Notifications.getRandomReminder(getResources().getStringArray(R.array.reminder_responses));
         ((TextView)findViewById(R.id.reminderLabel)).setText(reminder);
 
         // set up listeners
diff --git a/astrid/res/layout/rmilk_login_activity.xml b/astrid/res/layout/rmilk_login_activity.xml
index e28ee54fd..c3ff2e3d7 100644
--- a/astrid/res/layout/rmilk_login_activity.xml
+++ b/astrid/res/layout/rmilk_login_activity.xml
@@ -21,7 +21,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/rmilk_MLA_done"
+            android:text="@string/DLG_done"
         />
         
         <Button android:id="@+id/cancel"
diff --git a/astrid/res/values/arrays.xml b/astrid/res/values/arrays.xml
deleted file mode 100644
index 7417c24c5..000000000
--- a/astrid/res/values/arrays.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-    <!--
-        Translation Note: Guidelines to those translating the resources
-        
-        Dynamic Equivalence not necessary literal translation but
-        capture the idea and create the same desired effect
-        
-        Goal:  Maximize the chance that users will perform the task while 
-               minimizing the annoyance.
-    -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <!-- ==================================================== task values == -->
-    
-    <string-array name="TEA_urgency">
-        <!-- urgency: labels for edit page. item #4 -> auto filled -->
-        <item>Specific Day/Time</item>
-        <item>Today</item>
-        <item>Tomorrow</item>
-        <item>(day after)</item>
-        <item>Next Week</item>
-        <item>No Deadline</item>
-    </string-array>
-    
-    <string-array name="TEA_hideUntil">
-        <!-- hideUntil: labels for edit page. -->
-        <item>Don\'t hide</item>
-        <item>Task is due</item>
-        <item>Day before due</item>
-        <item>Week before due</item>
-        <item>Specific Day</item>
-    </string-array>
-    
-    <!-- ==================================================== preferences == -->
-    
-    <string-array name="EPr_default_importance">
-        <!-- urgency: default importance labels for preferences. -->
-        <item>!!!! (Highest)</item>
-        <item>!!!</item>
-        <item>!!</item>
-        <item>! (Lowest)</item>
-    </string-array>
-    
-    <string-array name="EPr_default_urgency">
-        <!-- urgency: default urgency labels for preferences. -->
-        <item>No Deadline</item>
-        <item>Today</item>
-        <item>Tomorrow</item>
-        <item>Day After Tomorrow</item>
-        <item>Next Week</item>
-    </string-array>
-    
-    <string-array name="EPr_default_hideUntil">
-        <!-- hideUntil: default labels for preferences. -->
-        <item>Don\'t hide</item>
-        <item>Task is due</item>
-        <item>Day before due</item>
-        <item>Week before due</item>
-    </string-array>    
-    
-</resources>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 11b017fcb..8f2d0cecc 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -41,6 +41,17 @@
     <item>2</item>
   </string-array>
   
+  <string-array name="EPr_reminder_random_hours">
+    <!-- values (in hours) associated with random reminders above. -->
+    <item>0</item>
+    <item>1</item>
+    <item>24</item>
+    <item>168</item>
+    <item>336</item>
+    <item>730</item>
+    <item>1460</item>
+  </string-array>
+  
   <string-array name="EPr_quiet_hours_start_values">
     <!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
     <item></item>
@@ -158,6 +169,25 @@
   
   <!-- ============================================================ OTHER == -->
   
-  <string name="p_backup">backup</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="backup_BPr_status_key">backup_status</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="backup_BPr_auto_key">backup</string>  
+
+  <!-- Default Calendar Preference Key (do not translate) -->
+  <string name="gcal_p_default">default_calendar_id</string>
+
+  
+      <!-- Preference Key (do not translate) -->
+    <string name="rmilk_MPr_status_key">rmilk_status</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="rmilk_MPr_interval_key">sync_freq</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="rmilk_MPr_bgwifi_key">sync_bgwifi</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="rmilk_MPr_sync_key">rmilk_sync</string>
+    <!-- Preference Key (do not translate) -->
+    <string name="rmilk_MPr_forget_key">rmilk_forget</string>    
+  
 
 </resources>
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index 723637686..9a735466f 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -11,8 +11,6 @@
 
     <!-- Status Group Label -->    
     <string name="backup_BPr_group_status">Status</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="backup_BPr_status_key">backup_status</string>
     
     <!-- Status: success (%s -> last date) -->    
     <string name="backup_status_success">Latest: %s</string>
@@ -32,8 +30,6 @@
     <string name="backup_BPr_auto_disabled">Automatic Backups Disabled</string>    
     <!-- Synchronization Interval Description (when enabled) -->
     <string name="backup_BPr_auto_enabled">Backup will occur daily</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="backup_BPr_auto_key">backup</string>  
   
   <!-- ================================================= BackupActivity == -->
 
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 2db1123fd..827aa7894 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -4,6 +4,7 @@
 
   <!-- ================================================== AndroidManifest == -->
 
+  <!-- Application Name (shown on home screen & in launcher) -->
   <string name="app_name">Astrid Tasks</string>
   
   <!-- permission title for READ_TASKS -->
@@ -329,6 +330,25 @@ to the plugin creator for fastest service.
   <!-- Toast: task was deleted -->
   <string name="TEA_onTaskDelete">Task Deleted!</string>
   
+  <string-array name="TEA_urgency">
+      <!-- urgency: labels for edit page. item #4 -> auto filled -->
+      <item>Specific Day/Time</item>
+      <item>Today</item>
+      <item>Tomorrow</item>
+      <item>(day after)</item>
+      <item>Next Week</item>
+      <item>No Deadline</item>
+  </string-array>
+  
+  <string-array name="TEA_hideUntil">
+      <!-- hideUntil: labels for edit page. -->
+      <item>Don\'t hide</item>
+      <item>Task is due</item>
+      <item>Day before due</item>
+      <item>Week before due</item>
+      <item>Specific Day</item>
+  </string-array>
+  
   <!-- ============================================= IntroductionActivity == -->
   
   <!-- Introduction Window title -->
@@ -382,6 +402,31 @@ to the plugin creator for fastest service.
   <!-- Preference: Default Hide Until Description (%s => setting) -->
   <string name="EPr_default_hideUntil_desc">Currently Set To: %s</string>
   
+  <string-array name="EPr_default_importance">
+      <!-- importance: labels for "Task Defaults" preference item. -->
+      <item>!!!! (Highest)</item>
+      <item>!!!</item>
+      <item>!!</item>
+      <item>! (Lowest)</item>
+  </string-array>
+  
+  <string-array name="EPr_default_urgency">
+      <!-- urgency: labels for "Task Defaults" preference item. -->
+      <item>No Deadline</item>
+      <item>Today</item>
+      <item>Tomorrow</item>
+      <item>Day After Tomorrow</item>
+      <item>Next Week</item>
+  </string-array>
+  
+  <string-array name="EPr_default_hideUntil">
+      <!-- hideUntil: labels for "Task Defaults" preference item. -->
+      <item>Don\'t hide</item>
+      <item>Task is due</item>
+      <item>Day before due</item>
+      <item>Week before due</item>
+  </string-array>    
+  
   <!-- ==================================================== AddOnActivity == -->
   
   <!-- Add Ons: author for internal authors  -->
diff --git a/astrid/res/values/strings-gcal.xml b/astrid/res/values/strings-gcal.xml
index 57a591971..9baf018fd 100644
--- a/astrid/res/values/strings-gcal.xml
+++ b/astrid/res/values/strings-gcal.xml
@@ -26,8 +26,5 @@
   <!-- System Default Calendar (displayed if we can't figure out calendars)  -->
   <string name="gcal_GCP_default">Default Calendar</string>
 
-  <!-- Default Calendar Preference Key (do not translate) -->
-  <string name="gcal_p_default">default_calendar_id</string>
-
 
 </resources>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 17ff165ad..f22eee025 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -130,17 +130,6 @@
     <item>monthly</item>
     <item>bi-monthly</item>
   </string-array>
-
-  <string-array name="EPr_reminder_random_hours">
-    <!-- values (in hours) associated with items above. -->
-    <item>0</item>
-    <item>1</item>
-    <item>24</item>
-    <item>168</item>
-    <item>336</item>
-    <item>730</item>
-    <item>1460</item>
-  </string-array>
         
   <string-array name="EPr_quiet_hours_start">
     <!-- quiet_hours_start: options for preference menu. Translate but don't change the times!. -->
@@ -239,7 +228,7 @@
       <item>No more postponing!</item>
   </string-array>
   
-  <string-array name="responses">
+  <string-array name="reminder_responses">
       <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
       <item>I\'ve got something for you!</item> 
       <item>Ready to put this in the past?</item>
diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml
index bc04cce91..7782ab77f 100644
--- a/astrid/res/values/strings-rmilk.xml
+++ b/astrid/res/values/strings-rmilk.xml
@@ -49,8 +49,6 @@
 
     <!-- Status Group Label -->    
     <string name="rmilk_MPr_group_status">Status</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="rmilk_MPr_status_key">rmilk_status</string>
     
     <!-- Status: log in -->    
     <string name="rmilk_status_loggedout">Please Log In To RTM!</string>
@@ -74,8 +72,6 @@
     <string name="rmilk_MPr_interval_desc_disabled">Background synchronization is disabled</string>    
     <!-- Synchronization Interval Description (%s => setting) -->
     <string name="rmilk_MPr_interval_desc">Currently set to: %s</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="rmilk_MPr_interval_key">sync_freq</string>
     
     <!-- Background Wifi Title -->  
     <string name="rmilk_MPr_bgwifi_title">Wifi Only Setting</string>    
@@ -83,8 +79,6 @@
     <string name="rmilk_MPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>    
     <!-- Background Wifi Description (disabled) -->
     <string name="rmilk_MPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="rmilk_MPr_bgwifi_key">sync_bgwifi</string>
     
     <!-- Actions Group Label  -->
     <string name="rmilk_MPr_group_actions">Actions</string>
@@ -93,24 +87,17 @@
     <string name="rmilk_MPr_sync">Synchronize Now!</string>
     <!-- Synchronize Now Button if not logged in-->    
     <string name="rmilk_MPr_sync_log_in">Log In &amp; Synchronize!</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="rmilk_MPr_sync_key">rmilk_sync</string>
     
     <!-- Clear Data Title -->
     <string name="rmilk_MPr_forget">Log Out</string>
     <!-- Clear Data Description -->
     <string name="rmilk_MPr_forget_description">Clears all RTM synchronization data</string>
-    <!-- Preference Key (do not translate) -->
-    <string name="rmilk_MPr_forget_key">rmilk_forget</string>    
 
     <!-- ======================= MilkLoginActivity ========================= -->
 
     <!-- RTM Login Instructions -->
     <string name="rmilk_MLA_label">Please Log In and Authorize Astrid:</string>
     
-    <!-- RTM Login Done Button -->
-    <string name="rmilk_MLA_done">Done</string>
-    
     <!-- Login Error Dialog (%s => message) -->
     <string name="rmilk_MLA_error">
 Sorry, there was an error verifying your login. Please try again.