diff --git a/.gitignore b/.gitignore
index b2d90e3dc..dec113629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .idea/workspace.xml
 out/
 *~
+*.apk
+proguard_logs/
 .metadata
 *.class
 gen
diff --git a/api/locales/api.pot b/api/locales/api.pot
index 9ca34c574..c19a458f2 100644
--- a/api/locales/api.pot
+++ b/api/locales/api.pot
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ar.po b/api/locales/ar.po
index 8e878642b..e1f984a0b 100644
--- a/api/locales/ar.po
+++ b/api/locales/ar.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/bg.po b/api/locales/bg.po
index d5add2247..1870fdd6d 100644
--- a/api/locales/bg.po
+++ b/api/locales/bg.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ca.po b/api/locales/ca.po
index c24a1ce11..147c4917f 100644
--- a/api/locales/ca.po
+++ b/api/locales/ca.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/cs.po b/api/locales/cs.po
index 27579fad8..d30a7a0b9 100644
--- a/api/locales/cs.po
+++ b/api/locales/cs.po
@@ -248,8 +248,8 @@ msgstr "Synchronizace"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com, Google Tasks, uložená data, lokální záloha"
+msgid "Google Tasks, saved data, local backup"
+msgstr "Google Tasks, uložená data, lokální záloha"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/da.po b/api/locales/da.po
index 4b8bb0498..4695d76a4 100644
--- a/api/locales/da.po
+++ b/api/locales/da.po
@@ -245,7 +245,7 @@ msgstr "Synkronisering"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/de.po b/api/locales/de.po
index e79084b06..f92f803f5 100644
--- a/api/locales/de.po
+++ b/api/locales/de.po
@@ -248,8 +248,8 @@ msgstr "Synchronisation"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com, Google Tasks, gespeicherte Daten, lokale Backups"
+msgid "Google Tasks, saved data, local backup"
+msgstr "Google Tasks, gespeicherte Daten, lokale Backups"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/el.po b/api/locales/el.po
index 4cd74106f..f90efa290 100644
--- a/api/locales/el.po
+++ b/api/locales/el.po
@@ -245,7 +245,7 @@ msgstr "Συγχρονισμός"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/en_GB.po b/api/locales/en_GB.po
index 68eeef4ed..942b818d2 100644
--- a/api/locales/en_GB.po
+++ b/api/locales/en_GB.po
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/eo.po b/api/locales/eo.po
index 762a61328..d5bc7a14a 100644
--- a/api/locales/eo.po
+++ b/api/locales/eo.po
@@ -245,7 +245,7 @@ msgstr "Sinkronigo"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/es.po b/api/locales/es.po
index 3eea972f7..e26a8f851 100644
--- a/api/locales/es.po
+++ b/api/locales/es.po
@@ -248,9 +248,9 @@ msgstr "Sincronización y copia de seguridad"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
-"Astrid.com, Google Tasks, información guardada, copia de seguridad local"
+"Google Tasks, información guardada, copia de seguridad local"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/et.po b/api/locales/et.po
index 2a250f3c6..b998f570a 100644
--- a/api/locales/et.po
+++ b/api/locales/et.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/eu.po b/api/locales/eu.po
index 8d1be6de5..70471de21 100644
--- a/api/locales/eu.po
+++ b/api/locales/eu.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/fi.po b/api/locales/fi.po
index 9a600e967..aca662d3e 100644
--- a/api/locales/fi.po
+++ b/api/locales/fi.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/fo.po b/api/locales/fo.po
index 00f7a35fe..b2af9e3be 100644
--- a/api/locales/fo.po
+++ b/api/locales/fo.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/fr.po b/api/locales/fr.po
index 1772e1a60..6cd687e45 100644
--- a/api/locales/fr.po
+++ b/api/locales/fr.po
@@ -248,8 +248,8 @@ msgstr "Synchronisation"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com, Tâches Google, données enregistrées, sauvegarde locale"
+msgid "Google Tasks, saved data, local backup"
+msgstr "Tâches Google, données enregistrées, sauvegarde locale"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/ga.po b/api/locales/ga.po
index 08077249a..fe72c69d4 100644
--- a/api/locales/ga.po
+++ b/api/locales/ga.po
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/gl.po b/api/locales/gl.po
index 49029df66..4e74788cf 100644
--- a/api/locales/gl.po
+++ b/api/locales/gl.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/he.po b/api/locales/he.po
index b9e45911e..5a8b2b707 100644
--- a/api/locales/he.po
+++ b/api/locales/he.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/hr.po b/api/locales/hr.po
index 1cecef6bd..88cef927d 100644
--- a/api/locales/hr.po
+++ b/api/locales/hr.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/hu.po b/api/locales/hu.po
index 239c26e1e..39a060385 100644
--- a/api/locales/hu.po
+++ b/api/locales/hu.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/id.po b/api/locales/id.po
index 8628e500e..dc15b115b 100644
--- a/api/locales/id.po
+++ b/api/locales/id.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/it.po b/api/locales/it.po
index 634457700..43ffe1afd 100644
--- a/api/locales/it.po
+++ b/api/locales/it.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ja.po b/api/locales/ja.po
index 1eda0c4bc..8e25ee01f 100644
--- a/api/locales/ja.po
+++ b/api/locales/ja.po
@@ -245,7 +245,7 @@ msgstr "同期"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ka.po b/api/locales/ka.po
index 0add058fa..5aaf17a98 100644
--- a/api/locales/ka.po
+++ b/api/locales/ka.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ko.po b/api/locales/ko.po
index 4785d84fc..7d1c66efc 100644
--- a/api/locales/ko.po
+++ b/api/locales/ko.po
@@ -248,8 +248,8 @@ msgstr "동기화 & 백업"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com, 구글 일정, 저장한 자료, 로컬 백업"
+msgid "Google Tasks, saved data, local backup"
+msgstr "구글 일정, 저장한 자료, 로컬 백업"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/lt.po b/api/locales/lt.po
index 1a7019538..e9ce4327c 100644
--- a/api/locales/lt.po
+++ b/api/locales/lt.po
@@ -245,7 +245,7 @@ msgstr "Sinchronizacija"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ml.po b/api/locales/ml.po
index 5676c3e5b..c0f74dedd 100644
--- a/api/locales/ml.po
+++ b/api/locales/ml.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/nb.po b/api/locales/nb.po
index b3f4b7a12..3031c2906 100644
--- a/api/locales/nb.po
+++ b/api/locales/nb.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/nl.po b/api/locales/nl.po
index c66b1f332..5df2566a5 100644
--- a/api/locales/nl.po
+++ b/api/locales/nl.po
@@ -248,7 +248,7 @@ msgstr "Synchronisatie"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/pl.po b/api/locales/pl.po
index 620c45dca..bcbd60dca 100644
--- a/api/locales/pl.po
+++ b/api/locales/pl.po
@@ -248,7 +248,7 @@ msgstr "Synchronizacja"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/pt.po b/api/locales/pt.po
index 0959dc6f5..8431a696b 100644
--- a/api/locales/pt.po
+++ b/api/locales/pt.po
@@ -245,7 +245,7 @@ msgstr "Sincronização"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/pt_BR.po b/api/locales/pt_BR.po
index 28edcda92..e94555051 100644
--- a/api/locales/pt_BR.po
+++ b/api/locales/pt_BR.po
@@ -248,7 +248,7 @@ msgstr "Sincronização"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ro.po b/api/locales/ro.po
index 0fefd17ae..51449bb0b 100644
--- a/api/locales/ro.po
+++ b/api/locales/ro.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ru.po b/api/locales/ru.po
index 3b0779e8a..ba3526de7 100644
--- a/api/locales/ru.po
+++ b/api/locales/ru.po
@@ -248,9 +248,9 @@ msgstr "Синхронизация"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
-"Astrid.com, Задачи Google, сохраненные данные, локальная резервная копия"
+"Задачи Google, сохраненные данные, локальная резервная копия"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/sk.po b/api/locales/sk.po
index 2a993273a..99f562722 100644
--- a/api/locales/sk.po
+++ b/api/locales/sk.po
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/sl.po b/api/locales/sl.po
index 4a29fede4..3701be8d6 100644
--- a/api/locales/sl.po
+++ b/api/locales/sl.po
@@ -247,7 +247,7 @@ msgstr "Usklajevanje"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/sv.po b/api/locales/sv.po
index 2ca6b75b2..7460f9f27 100644
--- a/api/locales/sv.po
+++ b/api/locales/sv.po
@@ -248,7 +248,7 @@ msgstr "Synkronisering"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/ta.po b/api/locales/ta.po
index cf4c30854..b677e70a8 100644
--- a/api/locales/ta.po
+++ b/api/locales/ta.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/th.po b/api/locales/th.po
index a3bd9e12f..714599ad9 100644
--- a/api/locales/th.po
+++ b/api/locales/th.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/tr.po b/api/locales/tr.po
index 92a62015a..1508bf7de 100644
--- a/api/locales/tr.po
+++ b/api/locales/tr.po
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/uk.po b/api/locales/uk.po
index 2874e0c1d..5cab8b121 100644
--- a/api/locales/uk.po
+++ b/api/locales/uk.po
@@ -248,8 +248,8 @@ msgstr "Синхронізація"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com, Google Tasks, збережні дані, локальна резервна копія"
+msgid "Google Tasks, saved data, local backup"
+msgstr "Google Tasks, збережні дані, локальна резервна копія"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/vi.po b/api/locales/vi.po
index 4b84709d4..008647dfc 100644
--- a/api/locales/vi.po
+++ b/api/locales/vi.po
@@ -245,7 +245,7 @@ msgstr ""
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
+msgid "Google Tasks, saved data, local backup"
 msgstr ""
 
 #. Error msg when io exception
diff --git a/api/locales/zh_CN.po b/api/locales/zh_CN.po
index 88528865f..373864e53 100644
--- a/api/locales/zh_CN.po
+++ b/api/locales/zh_CN.po
@@ -248,8 +248,8 @@ msgstr "同步和备份"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com，谷歌任务，已存数据，本地备份"
+msgid "Google Tasks, saved data, local backup"
+msgstr "谷歌任务，已存数据，本地备份"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
diff --git a/api/locales/zh_TW.po b/api/locales/zh_TW.po
index 0e109f75d..755fa8e40 100644
--- a/api/locales/zh_TW.po
+++ b/api/locales/zh_TW.po
@@ -248,8 +248,8 @@ msgstr "同步和備份"
 
 #. Sync label subtitle
 msgctxt "SyP_summary"
-msgid "Astrid.com, Google Tasks, saved data, local backup"
-msgstr "Astrid.com，谷歌任務，已存數據，本地備份"
+msgid "Google Tasks, saved data, local backup"
+msgstr "谷歌任務，已存數據，本地備份"
 
 #. Error msg when io exception
 msgctxt "SyP_ioerror"
@@ -443,4 +443,4 @@ msgstr "每3天"
 
 msgctxt "sync_SPr_interval_entries:9"
 msgid "every week"
-msgstr "每週"
\ No newline at end of file
+msgstr "每週"
diff --git a/api/res/values-cs/strings.xml b/api/res/values-cs/strings.xml
index c53eae2ae..1e7b4d151 100644
--- a/api/res/values-cs/strings.xml
+++ b/api/res/values-cs/strings.xml
@@ -73,7 +73,7 @@
     <string name="SyP_progress">Probíhá synchronizace Vašich úkolů...</string>
     <string name="SyP_progress_toast">Sychronizuji...</string>
     <string name="SyP_label">Synchronizace</string>
-    <string name="SyP_summary">Astrid.com, Google Tasks, uložená data, lokální záloha</string>
+    <string name="SyP_summary">Google Tasks, uložená data, lokální záloha</string>
     <string name="SyP_ioerror">Chyba připojení! Zkontrolujte vaše internetové připojení.</string>
     <string name="sync_SPr_group_status">Stav</string>
     <string name="sync_SPr_status_subtitle">Stav: %s</string>
diff --git a/api/res/values-de/strings.xml b/api/res/values-de/strings.xml
index 205001822..b1a58a592 100755
--- a/api/res/values-de/strings.xml
+++ b/api/res/values-de/strings.xml
@@ -157,7 +157,7 @@
     <string name="Sync_now_label">Jetzt synchronisieren</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, gespeicherte Daten, lokale Backups</string>
+    <string name="SyP_summary">Google Tasks, gespeicherte Daten, lokale Backups</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Verbindungsfehler! Überprüfen Sie Ihre Internetverbindung.</string>
diff --git a/api/res/values-es/strings.xml b/api/res/values-es/strings.xml
index ccd1a4522..748775cd6 100755
--- a/api/res/values-es/strings.xml
+++ b/api/res/values-es/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Sincronizar ahora</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, información guardada, copia de seguridad
+    <string name="SyP_summary">Google Tasks, información guardada, copia de seguridad
         local
     </string>
 
diff --git a/api/res/values-fr/strings.xml b/api/res/values-fr/strings.xml
index a7b1e5cb8..90cac4354 100755
--- a/api/res/values-fr/strings.xml
+++ b/api/res/values-fr/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Tâches Google, données enregistrées, sauvegarde locale
+    <string name="SyP_summary">Tâches Google, données enregistrées, sauvegarde locale
     </string>
 
     <!-- Error msg when io exception  -->
diff --git a/api/res/values-it/strings.xml b/api/res/values-it/strings.xml
index 295caded3..8f84f2408 100755
--- a/api/res/values-it/strings.xml
+++ b/api/res/values-it/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Attività Google, dati salvati, backup locale</string>
+    <string name="SyP_summary">Attività Google, dati salvati, backup locale</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Errore di Connessione! Controlla la tua connessione Internet.
diff --git a/api/res/values-ja/strings.xml b/api/res/values-ja/strings.xml
index 77bf8f013..20d65f298 100755
--- a/api/res/values-ja/strings.xml
+++ b/api/res/values-ja/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+    <string name="SyP_summary">Google Tasks, saved data, local backup</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">接続エラー！インターネットに接続できるか確認してください。</string>
diff --git a/api/res/values-ko/strings.xml b/api/res/values-ko/strings.xml
index 873e5888a..8d8df477f 100755
--- a/api/res/values-ko/strings.xml
+++ b/api/res/values-ko/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">지금 동기화하기</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, 구글 일정, 저장한 자료, 로컬 백업</string>
+    <string name="SyP_summary">구글 일정, 저장한 자료, 로컬 백업</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">연결 오류! 인터넷 연결을 확인하세요.</string>
diff --git a/api/res/values-nl/strings.xml b/api/res/values-nl/strings.xml
index 144096d17..86c093bed 100755
--- a/api/res/values-nl/strings.xml
+++ b/api/res/values-nl/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Nu synchroniseren</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Taken, opgeslagen data, lokale back-up</string>
+    <string name="SyP_summary">Google Taken, opgeslagen data, lokale back-up</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Verbindingsfout! Controleer de internetverbinding</string>
diff --git a/api/res/values-pl/strings.xml b/api/res/values-pl/strings.xml
index 5fce6eaba..9b9119a09 100755
--- a/api/res/values-pl/strings.xml
+++ b/api/res/values-pl/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Zsynchronizuj</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Zadania Google, zapisane dane, lokalna kopia zapasowa
+    <string name="SyP_summary">Zadania Google, zapisane dane, lokalna kopia zapasowa
     </string>
 
     <!-- Error msg when io exception  -->
diff --git a/api/res/values-pt-rBR/strings.xml b/api/res/values-pt-rBR/strings.xml
index 147ac9bf1..83ed0c029 100755
--- a/api/res/values-pt-rBR/strings.xml
+++ b/api/res/values-pt-rBR/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, dados salvos, backup local</string>
+    <string name="SyP_summary">Google Tasks, dados salvos, backup local</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Erro na Conexão! Verifique sua conexão com a internet.</string>
diff --git a/api/res/values-ru/strings.xml b/api/res/values-ru/strings.xml
index a76e6d36f..e7251549d 100755
--- a/api/res/values-ru/strings.xml
+++ b/api/res/values-ru/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Синхронизировать</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Задачи Google, сохраненные данные, локальная резервная
+    <string name="SyP_summary">Задачи Google, сохраненные данные, локальная резервная
         копия
     </string>
 
diff --git a/api/res/values-sv/strings.xml b/api/res/values-sv/strings.xml
index b96effc83..08ceecf71 100755
--- a/api/res/values-sv/strings.xml
+++ b/api/res/values-sv/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Aktiviteter, sparad data, lokal backup</string>
+    <string name="SyP_summary">Google Aktiviteter, sparad data, lokal backup</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Tillkopplingsfel! Kontrollera din tillkoppling till internet.
diff --git a/api/res/values-tr/strings.xml b/api/res/values-tr/strings.xml
index b32a64e3d..114652c1a 100755
--- a/api/res/values-tr/strings.xml
+++ b/api/res/values-tr/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+    <string name="SyP_summary">Google Tasks, saved data, local backup</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Bağlantı Hatası! Internet bağlantınızı denetleyin.</string>
diff --git a/api/res/values-zh-rCN/strings.xml b/api/res/values-zh-rCN/strings.xml
index 7cd58ce03..05a7074bd 100755
--- a/api/res/values-zh-rCN/strings.xml
+++ b/api/res/values-zh-rCN/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com，谷歌任务，已存数据，本地备份</string>
+    <string name="SyP_summary">谷歌任务，已存数据，本地备份</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">连接错误！请检查您的因特网连接。</string>
diff --git a/api/res/values-zh-rTW/strings.xml b/api/res/values-zh-rTW/strings.xml
index bbde844ce..5dbfa3e9e 100755
--- a/api/res/values-zh-rTW/strings.xml
+++ b/api/res/values-zh-rTW/strings.xml
@@ -155,7 +155,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com，谷歌任務，已存數據，本地備份</string>
+    <string name="SyP_summary">谷歌任務，已存數據，本地備份</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">連結錯誤! 檢查您的網際網路連線.</string>
diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index 6fd875b71..dbd616723 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -156,7 +156,7 @@
     <string name="Sync_now_label">Sync now</string>
 
     <!-- Sync label subtitle -->
-    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+    <string name="SyP_summary">Google Tasks, saved data, local backup</string>
 
     <!-- Error msg when io exception  -->
     <string name="SyP_ioerror">Connection Error! Check your Internet connection.</string>
diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
index 8d72a06cf..d8e503779 100644
--- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -544,11 +544,11 @@ public class AndroidUtilities {
      * @return method return value, or null if nothing was called or exception
      */
 
-    public static Object callMethod(Class<?> cls, Object receiver,
+    public static void callMethod(Class<?> cls, Object receiver,
                                     String methodName, Class<?>[] params, Object... args) {
         try {
             Method method = cls.getMethod(methodName, params);
-            return method.invoke(receiver, args);
+            method.invoke(receiver, args);
         } catch (SecurityException e) {
             getExceptionService().reportError("call-method", e);
         } catch (NoSuchMethodException e) {
@@ -560,8 +560,6 @@ public class AndroidUtilities {
         } catch (InvocationTargetException e) {
             getExceptionService().reportError("call-method", e);
         }
-
-        return null;
     }
 
     /**
diff --git a/api/src/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
index 989419a4d..fec381065 100644
--- a/api/src/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
@@ -26,7 +26,7 @@ public class AstridApiConstants {
     /**
      * Astrid app base package name
      */
-    public static final String ASTRID_PACKAGE = "com.timsu.astrid";
+    public static final String ASTRID_PACKAGE = "org.astrid";
 
     /**
      * Permission for reading tasks and receiving to GET_FILTERS intent
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 02418aa89..240ff4d01 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.timsu.astrid"
-          android:versionName="4.6.5"
-          android:versionCode="306">
+          package="org.astrid"
+          android:versionName="4.6.6"
+          android:versionCode="307">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/astrid.iml b/astrid/astrid.iml
index 0f4cb1d07..e61bf42ff 100644
--- a/astrid/astrid.iml
+++ b/astrid/astrid.iml
@@ -15,6 +15,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src-legacy" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/proguard_logs" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
index 4a7d98136..5aacc82e8 100644
--- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
+++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
@@ -33,7 +33,7 @@ import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.ui.ErrorCatchingListView;
 
diff --git a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
index 8d1b24b39..fa678d5c0 100644
--- a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
+++ b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
@@ -9,6 +9,7 @@ import android.provider.Settings.Secure;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.astrid.R;
 import com.google.android.gcm.GCMBaseIntentService;
 import com.google.android.gcm.GCMConstants;
 import com.google.android.gcm.GCMRegistrar;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
index bb038a8a3..fd82ae307 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
@@ -18,7 +18,7 @@ import android.provider.MediaStore;
 import android.support.v4.app.Fragment;
 import android.widget.ArrayAdapter;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
index e2d24dad2..cca79bde7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
@@ -23,7 +23,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
index bcae97ea2..7dbca6da3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
@@ -12,7 +12,7 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.service.ThemeService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
index 673346f9a..fd75a1827 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
@@ -34,7 +34,7 @@ import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
@@ -266,8 +266,6 @@ public abstract class CommentsFragment extends SherlockListFragment {
             TextView textView = (TextView) activityContainer.findViewById(R.id.no_activity_message);
             if (actFmPreferenceService.isLoggedIn()) {
                 textView.setText(activity.getString(R.string.ENA_no_comments));
-            } else {
-                textView.setText(activity.getString(R.string.UpS_no_activity_log_in));
             }
             listView.setVisibility(View.GONE);
         } else {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
index 4504a4c4b..293b9ee30 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
@@ -15,7 +15,7 @@ import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index f528e6ec4..870df9a18 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -28,7 +28,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index f55ca3055..b8d9704bb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -22,7 +22,7 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
index 5bcb88fb6..ef17a3bc4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java
@@ -5,7 +5,7 @@ import android.database.Cursor;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index 991efde5c..669d355cc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -9,7 +9,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.timsu.astrid.GCMIntentService;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;
@@ -51,7 +51,7 @@ public class ActFmInvoker {
 
     private static final int API_VERSION = 7;
 
-    public static final boolean SYNC_DEBUG = Constants.DEBUG || true;
+    public static final boolean SYNC_DEBUG = true;
 
     @Autowired
     private RestClient restClient;
@@ -88,7 +88,7 @@ public class ActFmInvoker {
      * Authentication user with Act.fm server, returning a token
      */
     public JSONObject authenticate(String email, String firstName, String lastName, String provider,
-                                   String secret) throws ActFmServiceException, IOException {
+                                   String secret) throws IOException {
         JSONObject result = invoke(
                 "user_signin",
                 "email", email,
@@ -114,8 +114,7 @@ public class ActFmInvoker {
      * @param getParameters Name/Value pairs. Values will be URL encoded.
      * @return response object
      */
-    public JSONObject invoke(String method, Object... getParameters) throws IOException,
-            ActFmServiceException {
+    public JSONObject invoke(String method, Object... getParameters) throws IOException {
         return invokeWithApi(null, method, getParameters);
     }
 
@@ -126,8 +125,7 @@ public class ActFmInvoker {
      * @param getParameters Name/Value pairs. Values will be URL encoded.
      * @return response object
      */
-    public JSONObject invokeWithApi(String api, String method, Object... getParameters) throws IOException,
-            ActFmServiceException {
+    public JSONObject invokeWithApi(String api, String method, Object... getParameters) throws IOException {
         try {
             String request = createFetchUrl(api, method, getParameters);
 
@@ -186,8 +184,7 @@ public class ActFmInvoker {
         }
     }
 
-    public JSONObject postSync(String data, MultipartEntity entity, boolean changesHappened, String tok) throws IOException,
-            ActFmServiceException {
+    public JSONObject postSync(String data, MultipartEntity entity, boolean changesHappened, String tok) throws IOException {
         try {
             String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true);
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
index a6a458624..4c5d3b743 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
@@ -7,7 +7,7 @@ package com.todoroo.astrid.actfm.sync;
 
 import android.text.TextUtils;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index bc50dc8dc..131196901 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -13,11 +13,9 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.RemoteModel;
-import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.TagDataService;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -82,8 +80,7 @@ public final class ActFmSyncService {
     /**
      * invoke authenticated method against the server
      */
-    public JSONObject invoke(String method, Object... getParameters) throws IOException,
-            ActFmServiceException {
+    public JSONObject invoke(String method, Object... getParameters) throws IOException {
         if (!checkForToken()) {
             throw new ActFmServiceException("not logged in", null);
         }
@@ -115,10 +112,6 @@ public final class ActFmSyncService {
      */
     public static class JsonHelper {
 
-        protected static long readDate(JSONObject item, String key) {
-            return item.optLong(key, 0) * 1000L;
-        }
-
         public static void jsonFromUser(JSONObject json, User model) throws JSONException {
             json.put("id", model.getValue(User.UUID));
             json.put("name", model.getDisplayName());
@@ -126,49 +119,6 @@ public final class ActFmSyncService {
             json.put("picture", model.getPictureUrl(User.PICTURE, RemoteModel.PICTURE_THUMB));
             json.put("first_name", model.getValue(User.FIRST_NAME));
         }
-
-        public static void featuredListFromJson(JSONObject json, TagData model) throws JSONException {
-            parseTagDataFromJson(json, model, true);
-        }
-
-        private static void parseTagDataFromJson(JSONObject json, TagData model, boolean featuredList) throws JSONException {
-            model.clearValue(TagData.UUID);
-            model.setValue(TagData.UUID, Long.toString(json.getLong("id")));
-            model.setValue(TagData.NAME, json.getString("name"));
-
-            if (featuredList) {
-                model.setFlag(TagData.FLAGS, TagData.FLAG_FEATURED, true);
-            }
-
-            if (json.has("picture")) {
-                model.setValue(TagData.PICTURE, json.optString("picture", ""));
-            }
-            if (json.has("thumb")) {
-                model.setValue(TagData.THUMB, json.optString("thumb", ""));
-            }
-
-            if (json.has("is_silent")) {
-                model.setFlag(TagData.FLAGS, TagData.FLAG_SILENT, json.getBoolean("is_silent"));
-            }
-
-            if (!json.isNull("description")) {
-                model.setValue(TagData.TAG_DESCRIPTION, json.getString("description"));
-            }
-
-            if (json.has("members")) {
-                JSONArray members = json.getJSONArray("members");
-                model.setValue(TagData.MEMBERS, members.toString());
-                model.setValue(TagData.MEMBER_COUNT, members.length());
-            }
-
-            if (json.has("deleted_at")) {
-                model.setValue(TagData.DELETION_DATE, readDate(json, "deleted_at"));
-            }
-
-            if (json.has("tasks")) {
-                model.setValue(TagData.TASK_COUNT, json.getInt("tasks"));
-            }
-        }
     }
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
index c1f9fc1f2..7639c6f8c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -11,7 +11,7 @@ import android.net.NetworkInfo;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 51d65cf97..2ef48d0d0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -9,7 +9,7 @@ import android.app.Activity;
 import android.content.DialogInterface;
 
 import com.timsu.astrid.GCMIntentService;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
index ad6edaa19..a3d6fd3b2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
@@ -3,7 +3,7 @@ package com.todoroo.astrid.actfm.sync.messages;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.StringProperty;
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
index 82e60f9a1..167fb9bf9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
@@ -13,7 +13,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Metadata;
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
index 23cf7ea2d..26915de89 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
@@ -10,7 +10,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.utility.Flags;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
index 32317bc72..fa1a64603 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
@@ -14,7 +14,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.view.View;
 import android.view.ViewGroup.OnHierarchyChangeListener;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
index 1416b6e5e..fbfe01b3e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
@@ -13,7 +13,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
index 0b744ba6a..e4deee510 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
@@ -10,7 +10,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
 import java.io.File;
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
index 5e95d6095..0c0f374d0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
@@ -13,7 +13,7 @@ import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.PropertyVisitor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
index e41dde85a..e608de8a8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
@@ -18,7 +18,7 @@ import android.util.Log;
 import android.view.WindowManager.BadTokenException;
 
 import com.google.ical.values.RRule;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.PropertyVisitor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
index 2eabed18b..39ca1eb0d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
@@ -22,7 +22,7 @@ import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
index c557c551c..c51658a8b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
@@ -16,7 +16,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
index 66dbaccfa..02074eac2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
@@ -12,7 +12,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
index 5457f8058..63f9027dd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -29,7 +29,7 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
index 16fbf097b..d9270f4f2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
@@ -20,19 +20,13 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.api.MultipleSelectCriterion;
 import com.todoroo.astrid.api.TextInputCriterion;
 import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;
-import com.todoroo.astrid.data.AddOn;
 
 import java.util.List;
 
-/**
- * Adapter for {@link AddOn}s
- *
- * @author Tim Su <tim@todoroo.com>
- */
 public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
 
     private final CustomFilterActivity activity;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
index 0da22f965..d8b1fa9eb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -14,7 +14,7 @@ import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
index bd6535be8..292b4d0ca 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
@@ -11,7 +11,7 @@ import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
index 22ed61223..4e665c0da 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
@@ -18,7 +18,7 @@ import android.text.Spannable;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.api.TaskDecoration;
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
index 4b0a4ad77..7588e3886 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
@@ -15,7 +15,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 
 import com.timsu.astrid.GCMIntentService;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java b/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
index 5c1b0c7fc..4675910e3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
@@ -14,7 +14,7 @@ import android.view.View.OnClickListener;
 import android.widget.Chronometer;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.aacenc.AACRecorder;
 import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks;
 import com.todoroo.aacenc.AACToM4A;
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java b/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
index 1499b0573..2be266252 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
@@ -21,7 +21,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 
 import java.io.File;
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
index 50a9e71ee..3acc459ff 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.files;
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.TaskAttachment;
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index 1f6279b87..7b3df8b12 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -24,7 +24,7 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.aacenc.RecognizerApi;
 import com.todoroo.aacenc.RecognizerApi.PlaybackExceptionHandler;
 import com.todoroo.andlib.data.TodorooCursor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
index 5f9ce5617..e6bf8701f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
@@ -9,7 +9,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
index b6e105756..4d8683620 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
@@ -11,7 +11,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
index 0900166dc..ebc4b5338 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
@@ -9,7 +9,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
index 845b84a89..b5e1d1a77 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
@@ -13,7 +13,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java
index aad714676..77c7d47fe 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.AstridApiConstants;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
index 6ccda7059..bdb6fb315 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
@@ -14,7 +14,7 @@ import android.preference.ListPreference;
 import android.provider.CalendarContract;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
index 05a56602c..8becb26a7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
@@ -24,7 +24,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
index b13c931ed..9617ae3d7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
@@ -14,7 +14,7 @@ import android.text.TextUtils;
 import android.text.format.Time;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
index 90c6adb57..121730ecb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
@@ -14,7 +14,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
index d00227dba..2f2a10ab3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
@@ -12,7 +12,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index 5626d800d..f28f290a4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -14,7 +14,7 @@ import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
index 7111ee2e1..2e18ef9b9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
@@ -13,7 +13,7 @@ import android.text.TextUtils;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DialogUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
index 347192219..f3d0f0915 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
@@ -12,7 +12,7 @@ import android.os.Bundle;
 import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
index 7165ed725..3957a49f0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
@@ -5,7 +5,7 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 316f402d8..e0d534aa3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -10,7 +10,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DialogUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
index fafce598b..4df3b67fc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@@ -15,7 +15,7 @@ import com.google.api.services.tasks.Tasks.TasksOperations.Move;
 import com.google.api.services.tasks.model.Task;
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
index 30c09c037..7c7f5c616 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@@ -23,7 +23,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
index dc75261e7..26d38cac9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
@@ -14,7 +14,7 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index 1c8ffa146..727bdf590 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -9,7 +9,7 @@ import android.app.Activity;
 import android.text.TextUtils;
 
 import com.google.api.services.tasks.model.Tasks;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 52db6826c..3d8053ac6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -17,7 +17,7 @@ import android.view.View;
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
index 592703f77..a0c2f33f5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
@@ -13,7 +13,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 5f031d8c5..00a68f960 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -33,7 +33,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
index d72d06105..416f21774 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
@@ -9,7 +9,7 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.widget.RemoteViews;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.TaskDecoration;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
index 21ee2e2a1..c740b12a7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
@@ -11,7 +11,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
diff --git a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
index 04b66cca1..59ab14808 100644
--- a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
@@ -15,7 +15,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
index 5dcd8406e..06b7c26ec 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
@@ -19,7 +19,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
index 4d1882c3d..89ac07b8a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
@@ -20,7 +20,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementFragment.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementFragment.java
index cacaaddcf..8362a37c5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementFragment.java
@@ -11,7 +11,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.service.ThemeService;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
index 750b588d0..667cfd29c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
@@ -15,7 +15,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
index 371d40a4a..3abe58586 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -15,7 +15,7 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
index f1e03e36d..20796d8c2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.reminders;
 import android.content.res.Resources;
 import android.preference.Preference;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
index 4166f866c..ee7519f0c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
@@ -14,7 +14,7 @@ import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index 3184ebf3b..1f80958ef 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -25,7 +25,7 @@ import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
 import com.google.ical.values.WeekdayNum;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
index 96e5e51b3..4556e024a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.WeekdayNum;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java
index c416ea9f1..c523c13a3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatsPlugin.java
@@ -9,7 +9,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.api.Addon;
 import com.todoroo.astrid.api.AstridApiConstants;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
index 663542cda..743865edb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@@ -12,7 +12,7 @@ import android.widget.ListView;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
 import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
 import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
index ee8fd94f1..40a2bf984 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
@@ -17,7 +17,7 @@ import android.widget.ListView;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
 import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
 import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
index ee13392ad..89a444313 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
@@ -9,7 +9,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.adapter.TaskAdapter;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
index b59b53e37..47df02a02 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.subtasks;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.adapter.TaskAdapter;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
index 36e75b75b..c7d7804be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
@@ -12,7 +12,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Query;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index 8b5a44717..bb3797ea7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -19,7 +19,7 @@ import android.text.TextUtils;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 2c430f625..123522161 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -10,7 +10,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.CountProperty;
 import com.todoroo.andlib.data.TodorooCursor;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index 91809ba67..a6f265d2e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -23,7 +23,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
index 01a2d6dd4..fdd3e0220 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
@@ -2,7 +2,7 @@ package com.todoroo.astrid.tags.reusable;
 
 import android.content.Context;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.activity.FilterModeSpec;
 import com.todoroo.astrid.activity.TaskListFragment;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java
index 895be9ccf..2bbdccdfa 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java
@@ -2,7 +2,7 @@ package com.todoroo.astrid.tags.reusable;
 
 import android.app.Activity;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.activity.FilterListFragment;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.utility.AstridPreferences;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
index 0cae68ece..c13f06863 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
@@ -14,7 +14,7 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Query;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
index 22db4018c..efef68601 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.TaskListFragment;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
index 7d4f57403..6a74ed1b6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
@@ -15,7 +15,7 @@ import android.widget.Chronometer.OnChronometerTickListener;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
index 003e66268..b7707ed55 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
@@ -12,7 +12,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
index 300df87f8..ae7e1df0a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
@@ -13,7 +13,7 @@ import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
index 210049c4a..039e59f18 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
@@ -12,7 +12,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.QueryTemplate;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
index 354767a80..692f28f0f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
@@ -12,7 +12,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.NotificationManager;
 import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager;
diff --git a/astrid/res/layout/beast_mode_pref_activity.xml b/astrid/res/layout/beast_mode_pref_activity.xml
index 5f56f5d09..b3eb0a830 100644
--- a/astrid/res/layout/beast_mode_pref_activity.xml
+++ b/astrid/res/layout/beast_mode_pref_activity.xml
@@ -18,7 +18,7 @@
 
     <com.commonsware.cwac.tlv.TouchListView
             xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tlv="http://schemas.android.com/apk/res/com.timsu.astrid"
+            xmlns:tlv="http://schemas.android.com/apk/res/org.astrid"
 
             android:id="@android:id/list"
             android:scrollbars="vertical"
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index 0f5800ac3..29b03c140 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -5,7 +5,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+                xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/asContentBackground"
diff --git a/astrid/res/layout/repeat_until_dialog.xml b/astrid/res/layout/repeat_until_dialog.xml
index 8a1332628..c1437187d 100644
--- a/astrid/res/layout/repeat_until_dialog.xml
+++ b/astrid/res/layout/repeat_until_dialog.xml
@@ -6,7 +6,7 @@
 -->
 <ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 2cc3fd1a8..89004d54c 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -5,7 +5,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:layout_weight="100">
diff --git a/astrid/res/layout/tag_updates_header.xml b/astrid/res/layout/tag_updates_header.xml
index 2eb908b35..698284f80 100644
--- a/astrid/res/layout/tag_updates_header.xml
+++ b/astrid/res/layout/tag_updates_header.xml
@@ -5,7 +5,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical">
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index b6d91a8c1..192d0af76 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -6,7 +6,7 @@
 -->
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="?attr/asTaskRowSelector"
diff --git a/astrid/res/layout/task_adapter_row_simple.xml b/astrid/res/layout/task_adapter_row_simple.xml
index bb8b3d193..59f1e42bd 100644
--- a/astrid/res/layout/task_adapter_row_simple.xml
+++ b/astrid/res/layout/task_adapter_row_simple.xml
@@ -6,7 +6,7 @@
 -->
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="?attr/asTaskRowSelector"
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index 3fc06fd8e..965775939 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -5,7 +5,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              xmlns:astrid="http://schemas.android.com/apk/res/org.astrid"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:minHeight="55dip"
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 77cd22b92..70a369fee 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -46,11 +46,6 @@
     <attr name="asFilterSelectedIcon" format="reference"/>
     <attr name="asTaskRowSelector" format="reference"/>
 
-    <declare-styleable name="ContactsAutoComplete">
-        <attr name="allowMultiple" format="boolean"/>
-        <attr name="completeTags" format="boolean"/>
-    </declare-styleable>
-
     <declare-styleable name="DateAndTimePicker">
         <attr name="shortcutLabels" format="reference"/>
     </declare-styleable>
diff --git a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
index 057661f71..be7a39324 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
@@ -5,7 +5,7 @@
  */
 package com.timsu.astrid.data.enums;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 public enum Importance {
     // MOST IMPORTANT
diff --git a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
index c0aa04fc4..11cea955b 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
@@ -129,11 +129,10 @@ public class SyncMapping extends LegacyAbstractModel {
         putIfChangedFromDatabase(LegacyAbstractController.KEY_ROWID, id);
     }
 
-    public long getId() {
+    public void getId() {
         try {
-            return retrieveLong(LegacyAbstractController.KEY_ROWID);
+            retrieveLong(LegacyAbstractController.KEY_ROWID);
         } catch (UnsupportedOperationException e) {
-            return 0;
         }
     }
 
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
index 03efc58a5..ac9ef63c7 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
@@ -12,7 +12,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.enums.Importance;
@@ -110,12 +110,10 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
      */
     public static class TaskModelDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
-        Context context;
 
         public TaskModelDatabaseHelper(Context context, String databaseName, String tableName) {
             super(context, databaseName, null, VERSION);
             this.tableName = tableName;
-            this.context = context;
         }
 
         @Override
@@ -257,42 +255,6 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     // --- utility methods
 
-    /**
-     * Gets task color. Requires definiteDueDate and importance
-     *
-     * @param context
-     */
-    protected int getTaskColorResource(Context context) {
-        if (getDefiniteDueDate() != null && getDefiniteDueDate().getTime() <
-                System.currentTimeMillis()) {
-            return R.color.task_list_overdue;
-        } else {
-            return R.color.task_list_normal;
-        }
-    }
-
-    /**
-     * Checks whether task is done. Requires progressPercentage
-     */
-    protected boolean isTaskCompleted() {
-        return getProgressPercentage() >= COMPLETE_PERCENTAGE;
-    }
-
-    /**
-     * Stops the timer & increments elapsed time. Requires timerStart and
-     * elapsedSeconds
-     */
-    protected void stopTimerAndUpdateElapsedTime() {
-        if (getTimerStart() == null) {
-            return;
-        }
-
-        long start = getTimerStart().getTime();
-        setTimerStart(null);
-        long secondsElapsed = (System.currentTimeMillis() - start) / 1000;
-        setElapsedSeconds((int) (getElapsedSeconds() + secondsElapsed));
-    }
-
     protected void prefetchData(String[] fields) {
         for (String field : fields) {
             if (field.equals(NAME)) {
@@ -616,10 +578,6 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         putIfChangedFromDatabase(REPEAT, repeat);
     }
 
-    protected void setCalendarUri(String uri) {
-        putIfChangedFromDatabase(CALENDAR_URI, uri);
-    }
-
     protected void setFlags(int flags) {
         putIfChangedFromDatabase(FLAGS, flags);
     }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
deleted file mode 100644
index 3a4bcc3c9..000000000
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.timsu.astrid.data.task;
-
-import android.database.Cursor;
-
-import com.timsu.astrid.data.enums.Importance;
-
-import java.util.Date;
-
-
-/**
- * Fields that you would want to edit in the TaskModel
- */
-public class TaskModelForEdit extends AbstractTaskModel {
-
-    static String[] FIELD_LIST = new String[]{
-            NAME,
-            IMPORTANCE,
-            ESTIMATED_SECONDS,
-            ELAPSED_SECONDS,
-            DEFINITE_DUE_DATE,
-            PREFERRED_DUE_DATE,
-            HIDDEN_UNTIL,
-            BLOCKING_ON,
-            NOTIFICATIONS,
-            NOTIFICATION_FLAGS,
-            LAST_NOTIFIED,
-            PROGRESS_PERCENTAGE,
-            NOTES,
-            REPEAT,
-            CALENDAR_URI,
-    };
-
-    // --- constructors
-
-    public TaskModelForEdit() {
-        setCreationDate(new Date());
-    }
-
-    public TaskModelForEdit(TaskIdentifier identifier, Cursor cursor) {
-        super(identifier, cursor);
-    }
-
-    // --- getters and setters
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public Integer getNotificationIntervalSeconds() {
-        return super.getNotificationIntervalSeconds();
-    }
-
-    @Override
-    public void setNotificationIntervalSeconds(Integer intervalInSeconds) {
-        super.setNotificationIntervalSeconds(intervalInSeconds);
-    }
-
-    @Override
-    public Date getDefiniteDueDate() {
-        return super.getDefiniteDueDate();
-    }
-
-    @Override
-    public Integer getEstimatedSeconds() {
-        return super.getEstimatedSeconds();
-    }
-
-    @Override
-    public Integer getElapsedSeconds() {
-        return super.getElapsedSeconds();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public Importance getImportance() {
-        return super.getImportance();
-    }
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public String getNotes() {
-        return super.getNotes();
-    }
-
-    @Override
-    public Date getPreferredDueDate() {
-        return super.getPreferredDueDate();
-    }
-
-    @Override
-    public int getProgressPercentage() {
-        return super.getProgressPercentage();
-    }
-
-    @Override
-    public TaskIdentifier getBlockingOn() {
-        return super.getBlockingOn();
-    }
-
-    @Override
-    public int getNotificationFlags() {
-        return super.getNotificationFlags();
-    }
-
-    @Override
-    public Date getLastNotificationDate() {
-        return super.getLastNotificationDate();
-    }
-
-    @Override
-    public RepeatInfo getRepeat() {
-        return super.getRepeat();
-    }
-
-    @Override
-    public String getCalendarUri() {
-        return super.getCalendarUri();
-    }
-
-    @Override
-    public void setDefiniteDueDate(Date definiteDueDate) {
-        super.setDefiniteDueDate(definiteDueDate);
-    }
-
-    @Override
-    public void setEstimatedSeconds(Integer estimatedSeconds) {
-        super.setEstimatedSeconds(estimatedSeconds);
-    }
-
-    @Override
-    public void setElapsedSeconds(int elapsedSeconds) {
-        super.setElapsedSeconds(elapsedSeconds);
-    }
-
-    @Override
-    public void setHiddenUntil(Date hiddenUntil) {
-        super.setHiddenUntil(hiddenUntil);
-    }
-
-    @Override
-    public void setImportance(Importance importance) {
-        super.setImportance(importance);
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-    }
-
-    @Override
-    public void setNotes(String notes) {
-        super.setNotes(notes);
-    }
-
-    @Override
-    public void setPreferredDueDate(Date preferredDueDate) {
-        super.setPreferredDueDate(preferredDueDate);
-    }
-
-    @Override
-    public void setBlockingOn(TaskIdentifier blockingOn) {
-        super.setBlockingOn(blockingOn);
-    }
-
-    @Override
-    public void setNotificationFlags(int flags) {
-        super.setNotificationFlags(flags);
-    }
-
-    @Override
-    public void setRepeat(RepeatInfo taskRepeat) {
-        super.setRepeat(taskRepeat);
-    }
-
-    @Override
-    public void setCalendarUri(String uri) {
-        super.setCalendarUri(uri);
-    }
-}
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
index fafb5c588..b50b45f3b 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
@@ -90,72 +90,4 @@ public class TaskModelForHandlers extends AbstractTaskModel {
         super(cursor);
         this.setValues = setValues;
     }
-
-    // --- getters and setters
-
-    @Override
-    public RepeatInfo getRepeat() {
-        return super.getRepeat();
-    }
-
-    @Override
-    public Integer getNotificationIntervalSeconds() {
-        return super.getNotificationIntervalSeconds();
-    }
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public Date getDefiniteDueDate() {
-        return super.getDefiniteDueDate();
-    }
-
-    @Override
-    public Integer getEstimatedSeconds() {
-        return super.getEstimatedSeconds();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public Date getPreferredDueDate() {
-        return super.getPreferredDueDate();
-    }
-
-    @Override
-    public int getNotificationFlags() {
-        return super.getNotificationFlags();
-    }
-
-    @Override
-    public Date getLastNotificationDate() {
-        return super.getLastNotificationDate();
-    }
-
-    @Override
-    public int getFlags() {
-        return super.getFlags();
-    }
-
-    @Override
-    public void setDefiniteDueDate(Date definiteDueDate) {
-        super.setDefiniteDueDate(definiteDueDate);
-    }
-
-    @Override
-    public void setPreferredDueDate(Date preferredDueDate) {
-        super.setPreferredDueDate(preferredDueDate);
-    }
-
-    @Override
-    public void setHiddenUntil(Date hiddenUntil) {
-        super.setHiddenUntil(hiddenUntil);
-    }
-
 }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java
deleted file mode 100644
index ed9e27acf..000000000
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.timsu.astrid.data.task;
-
-import android.content.Context;
-import android.database.Cursor;
-
-import com.timsu.astrid.data.LegacyAbstractController;
-import com.timsu.astrid.data.enums.Importance;
-
-import java.util.Date;
-import java.util.HashMap;
-
-
-/**
- * Fields that you would want to edit in the TaskModel
- */
-public class TaskModelForList extends AbstractTaskModel {
-
-    static String[] FIELD_LIST = new String[]{
-            LegacyAbstractController.KEY_ROWID,
-            NAME,
-            IMPORTANCE,
-            ELAPSED_SECONDS,
-            ESTIMATED_SECONDS,
-            TIMER_START,
-            DEFINITE_DUE_DATE,
-            PREFERRED_DUE_DATE,
-            NOTIFICATIONS,
-            PROGRESS_PERCENTAGE,
-            COMPLETION_DATE,
-            CREATION_DATE,
-            HIDDEN_UNTIL,
-            NOTES,
-            REPEAT,
-            FLAGS,
-    };
-
-    // pre-load the cache for our column keys
-    static {
-        HashMap<String, Integer> indexCache = new HashMap<String, Integer>();
-        columnIndexCache.put(TaskModelForList.class, indexCache);
-        for (int i = 0; i < FIELD_LIST.length; i++) {
-            indexCache.put(FIELD_LIST[i], i);
-        }
-    }
-
-    /**
-     * Get the weighted score for this task. Smaller is more important
-     */
-    public int getTaskWeight() {
-        int weight = 0;
-
-        // bubble tasks with timers to the top
-        if (getTimerStart() != null) {
-            weight -= 10000;
-        }
-
-        // importance
-        weight += getImportance().ordinal() * 80;
-
-        // looming absolute deadline
-        if (getDefiniteDueDate() != null) {
-            int hoursLeft = (int) ((getDefiniteDueDate().getTime() -
-                    System.currentTimeMillis()) / 1000 / 3600);
-            if (hoursLeft < 5 * 24) {
-                weight += hoursLeft - 5 * 24;
-            }
-            weight -= 20;
-        }
-
-        // looming preferred deadline
-        if (getPreferredDueDate() != null) {
-            int hoursLeft = (int) ((getPreferredDueDate().getTime() -
-                    System.currentTimeMillis()) / 1000 / 3600);
-            if (hoursLeft < 5 * 24) {
-                weight += (hoursLeft - 5 * 24) / 2;
-            }
-            weight -= 10;
-        }
-
-        // bubble completed tasks to the bottom
-        if (isTaskCompleted()) {
-            if (getCompletionDate() == null) {
-                weight += 1e6;
-            } else {
-                weight = (int) Math.max(10000 + (System.currentTimeMillis() -
-                        getCompletionDate().getTime()) / 1000, 10000);
-            }
-            return weight;
-        }
-
-        return weight;
-    }
-
-    @Override
-    public boolean isHidden() {
-        return super.isHidden();
-    }
-
-    /**
-     * map of cached display labels
-     */
-    private final HashMap<Integer, String> displayLabels = new HashMap<Integer, String>();
-
-    public String getCachedLabel(int key) {
-        return displayLabels.get(key);
-    }
-
-    public void putCachedLabel(int key, String value) {
-        displayLabels.put(key, value);
-    }
-
-    public void clearCache() {
-        displayLabels.clear();
-    }
-
-    // --- constructors
-
-    public TaskModelForList(Cursor cursor) {
-        super(cursor);
-
-        prefetchData(FIELD_LIST);
-    }
-
-    // --- exposed getters and setters
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public int getTaskColorResource(Context context) {
-        return super.getTaskColorResource(context);
-    }
-
-    @Override
-    public Integer getElapsedSeconds() {
-        return super.getElapsedSeconds();
-    }
-
-    @Override
-    public Date getDefiniteDueDate() {
-        return super.getDefiniteDueDate();
-    }
-
-    @Override
-    public Integer getEstimatedSeconds() {
-        return super.getEstimatedSeconds();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public Importance getImportance() {
-        return super.getImportance();
-    }
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public Date getPreferredDueDate() {
-        return super.getPreferredDueDate();
-    }
-
-    @Override
-    public int getProgressPercentage() {
-        return super.getProgressPercentage();
-    }
-
-    @Override
-    public Date getTimerStart() {
-        return super.getTimerStart();
-    }
-
-    @Override
-    public Date getCompletionDate() {
-        return super.getCompletionDate();
-    }
-
-    @Override
-    public String getNotes() {
-        return super.getNotes();
-    }
-
-    @Override
-    public Integer getNotificationIntervalSeconds() {
-        return super.getNotificationIntervalSeconds();
-    }
-
-    @Override
-    public RepeatInfo getRepeat() {
-        return super.getRepeat();
-    }
-
-    @Override
-    public Date getCreationDate() {
-        return super.getCreationDate();
-    }
-
-    @Override
-    public int getFlags() {
-        return super.getFlags();
-    }
-
-    // --- setters
-
-    @Override
-    public void setProgressPercentage(int progressPercentage) {
-        super.setProgressPercentage(progressPercentage);
-    }
-
-    @Override
-    public void setTimerStart(Date timerStart) {
-        super.setTimerStart(timerStart);
-    }
-
-    @Override
-    public void stopTimerAndUpdateElapsedTime() {
-        super.stopTimerAndUpdateElapsedTime();
-    }
-
-    @Override
-    public void setPreferredDueDate(Date preferredDueDate) {
-        super.setPreferredDueDate(preferredDueDate);
-    }
-
-    @Override
-    public void setDefiniteDueDate(Date definiteDueDate) {
-        super.setDefiniteDueDate(definiteDueDate);
-    }
-
-    @Override
-    public void setImportance(Importance importance) {
-        super.setImportance(importance);
-    }
-
-    @Override
-    public void setHiddenUntil(Date hiddenUntil) {
-        super.setHiddenUntil(hiddenUntil);
-    }
-
-    @Override
-    public void setPostponeCount(int postponeCount) {
-        super.setPostponeCount(postponeCount);
-    }
-}
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
deleted file mode 100644
index 92d9b9c8e..000000000
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.timsu.astrid.data.task;
-
-import android.database.Cursor;
-
-import com.timsu.astrid.data.LegacyAbstractController;
-
-import java.util.Date;
-
-
-/**
- * Fields that you would want to see in the TaskView activity
- */
-public class TaskModelForNotify extends AbstractTaskModel {
-
-    static String[] FIELD_LIST = new String[]{
-            LegacyAbstractController.KEY_ROWID,
-            ESTIMATED_SECONDS,
-            NOTIFICATIONS,
-            NOTIFICATION_FLAGS,
-            LAST_NOTIFIED,
-            HIDDEN_UNTIL,
-            PROGRESS_PERCENTAGE,
-            DEFINITE_DUE_DATE,
-            PREFERRED_DUE_DATE,
-    };
-
-    // --- constructors
-
-    public TaskModelForNotify(Cursor cursor) {
-        super(cursor);
-
-        prefetchData(FIELD_LIST);
-    }
-
-    // --- getters
-
-    @Override
-    public Integer getEstimatedSeconds() {
-        return super.getEstimatedSeconds();
-    }
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public Integer getNotificationIntervalSeconds() {
-        return super.getNotificationIntervalSeconds();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public Date getDefiniteDueDate() {
-        return super.getDefiniteDueDate();
-    }
-
-    @Override
-    public Date getPreferredDueDate() {
-        return super.getPreferredDueDate();
-    }
-
-    @Override
-    public int getNotificationFlags() {
-        return super.getNotificationFlags();
-    }
-
-    @Override
-    public Date getLastNotificationDate() {
-        return super.getLastNotificationDate();
-    }
-
-    // --- setters
-
-    @Override
-    public void setLastNotificationTime(Date date) {
-        super.setLastNotificationTime(date);
-    }
-}
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java
deleted file mode 100644
index 8b8689d50..000000000
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.timsu.astrid.data.task;
-
-import android.database.Cursor;
-
-import com.timsu.astrid.data.LegacyAbstractController;
-
-import java.util.Date;
-
-
-/**
- * Fields that you would want to see in the TaskView activity
- */
-public class TaskModelForReminder extends AbstractTaskModel {
-
-    static String[] FIELD_LIST = new String[]{
-            LegacyAbstractController.KEY_ROWID,
-            NAME,
-            NOTIFICATION_FLAGS,
-            HIDDEN_UNTIL,
-            TIMER_START,
-            PROGRESS_PERCENTAGE,
-    };
-
-    // --- constructors
-
-    public TaskModelForReminder(Cursor cursor) {
-        super(cursor);
-
-        prefetchData(FIELD_LIST);
-    }
-
-    // --- getters
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public Date getTimerStart() {
-        return super.getTimerStart();
-    }
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public int getNotificationFlags() {
-        return super.getNotificationFlags();
-    }
-
-    // --- setters
-
-    @Override
-    public void setLastNotificationTime(Date date) {
-        super.setLastNotificationTime(date);
-    }
-}
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
index 47d01f220..024f13902 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
@@ -8,7 +8,6 @@ package com.timsu.astrid.data.task;
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
-import com.timsu.astrid.data.enums.Importance;
 
 import java.util.Date;
 
@@ -49,174 +48,5 @@ public class TaskModelForSync extends AbstractTaskModel {
         super(cursor);
         prefetchData(FIELD_LIST);
     }
-
-    // --- getters and setters
-
-    @Override
-    public boolean isTaskCompleted() {
-        return super.isTaskCompleted();
-    }
-
-    @Override
-    public Date getDefiniteDueDate() {
-        return super.getDefiniteDueDate();
-    }
-
-    @Override
-    public Integer getEstimatedSeconds() {
-        return super.getEstimatedSeconds();
-    }
-
-    @Override
-    public int getProgressPercentage() {
-        return super.getProgressPercentage();
-    }
-
-    @Override
-    public Date getCreationDate() {
-        return super.getCreationDate();
-    }
-
-    @Override
-    public Date getCompletionDate() {
-        return super.getCompletionDate();
-    }
-
-    @Override
-    public Integer getElapsedSeconds() {
-        return super.getElapsedSeconds();
-    }
-
-    @Override
-    public Date getHiddenUntil() {
-        return super.getHiddenUntil();
-    }
-
-    @Override
-    public Importance getImportance() {
-        return super.getImportance();
-    }
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public String getNotes() {
-        return super.getNotes();
-    }
-
-    @Override
-    public Date getPreferredDueDate() {
-        return super.getPreferredDueDate();
-    }
-
-    @Override
-    public TaskIdentifier getBlockingOn() {
-        return super.getBlockingOn();
-    }
-
-    @Override
-    public RepeatInfo getRepeat() {
-        return super.getRepeat();
-    }
-
-    @Override
-    public Integer getNotificationIntervalSeconds() {
-        return super.getNotificationIntervalSeconds();
-    }
-
-    @Override
-    public int getNotificationFlags() {
-        return super.getNotificationFlags();
-    }
-
-    @Override
-    public Date getLastNotificationDate() {
-        return super.getLastNotificationDate();
-    }
-
-    @Override
-    public int getFlags() {
-        return super.getFlags();
-    }
-
-    // --- setters
-
-    @Override
-    public void setDefiniteDueDate(Date definiteDueDate) {
-        super.setDefiniteDueDate(definiteDueDate);
-    }
-
-    @Override
-    public void setEstimatedSeconds(Integer estimatedSeconds) {
-        super.setEstimatedSeconds(estimatedSeconds);
-    }
-
-    @Override
-    public void setElapsedSeconds(int elapsedSeconds) {
-        super.setElapsedSeconds(elapsedSeconds);
-    }
-
-    @Override
-    public void setHiddenUntil(Date hiddenUntil) {
-        super.setHiddenUntil(hiddenUntil);
-    }
-
-    @Override
-    public void setImportance(Importance importance) {
-        super.setImportance(importance);
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-    }
-
-    @Override
-    public void setNotes(String notes) {
-        super.setNotes(notes);
-    }
-
-    @Override
-    public void setPreferredDueDate(Date preferredDueDate) {
-        super.setPreferredDueDate(preferredDueDate);
-    }
-
-    @Override
-    public void setBlockingOn(TaskIdentifier blockingOn) {
-        super.setBlockingOn(blockingOn);
-    }
-
-    @Override
-    public void setRepeat(RepeatInfo taskRepeat) {
-        super.setRepeat(taskRepeat);
-    }
-
-    @Override
-    public void setCompletionDate(Date completionDate) {
-        super.setCompletionDate(completionDate);
-    }
-
-    @Override
-    public void setCreationDate(Date creationDate) {
-        super.setCreationDate(creationDate);
-    }
-
-    @Override
-    public void setProgressPercentage(int progressPercentage) {
-        super.setProgressPercentage(progressPercentage);
-    }
-
-    @Override
-    public void setNotificationIntervalSeconds(Integer intervalInSeconds) {
-        super.setNotificationIntervalSeconds(intervalInSeconds);
-    }
-
-    @Override
-    public void setFlags(int flags) {
-        super.setFlags(flags);
-    }
 }
 
diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
index 7bf4ed156..943cec6d7 100644
--- a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
+++ b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
@@ -12,7 +12,7 @@ import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.timsu.astrid.data.alerts.AlertController;
 import com.timsu.astrid.data.sync.SyncDataController;
 import com.timsu.astrid.data.sync.SyncMapping;
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
index 59816d2d2..8c131cb9f 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@@ -20,7 +20,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
index 7a5f5a431..368adc11f 100644
--- a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -20,7 +20,7 @@ import android.widget.TextView;
 
 import com.commonsware.cwac.tlv.TouchListView;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 
 import java.util.ArrayList;
diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
index babeef5d2..196d5898f 100644
--- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
+++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
@@ -2,7 +2,7 @@ package com.todoroo.astrid.activity;
 
 import android.content.Context;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.CoreFilterExposer;
 import com.todoroo.astrid.ui.MainMenuPopover;
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index fe1e2ad19..80ce33b76 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -23,7 +23,7 @@ import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
index 20ce51488..36523c079 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@@ -41,7 +41,7 @@ import android.widget.Toast;
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
index 471e2cb3a..96b61bde7 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
@@ -13,7 +13,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;
diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
index b1b0be6df..139daf205 100644
--- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
@@ -11,7 +11,7 @@ import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
index eaf158650..136f65b91 100644
--- a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -13,7 +13,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.core.SortHelper;
 
 /**
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 7efca1d85..b2b7d7cf8 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -11,7 +11,7 @@ import android.view.KeyEvent;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 8506e0812..69c214581 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -44,7 +44,7 @@ import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
index f8061d10d..fb9f576b4 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
@@ -11,7 +11,7 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.viewpagerindicator.TitleProvider;
 
 import java.util.ArrayList;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 2a2363a01..6e4169adb 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -26,7 +26,7 @@ import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.QueryTemplate;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 93807c4e0..6b5e92325 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -43,7 +43,7 @@ import android.widget.ListView;
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -695,7 +695,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
         initiateAutomaticSync();
 
-        showFeedbackPrompt();
+//        showFeedbackPrompt();
     }
 
     private void showFeedbackPrompt() {
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index fb1d4a7bb..776e92b2f 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -32,7 +32,7 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index a78bf7ea2..4298946bc 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -42,7 +42,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.LongProperty;
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 1520f088b..e1292c431 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -29,7 +29,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.CursorAdapter;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index 64ce0b5de..090c5c8ec 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -10,7 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteConstraintException;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/src/com/todoroo/astrid/data/AddOn.java b/astrid/src/com/todoroo/astrid/data/AddOn.java
deleted file mode 100644
index 15ff6b02b..000000000
--- a/astrid/src/com/todoroo/astrid/data/AddOn.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.data;
-
-import android.graphics.Bitmap;
-
-/**
- * An add-on installable by Astrid
- *
- * @author Tim Su <tim@todoroo.com>
- */
-public class AddOn {
-
-    private final boolean free;
-    private final boolean internal;
-    private final String title;
-    private final String author;
-    private final String description;
-    private final String packageName;
-    private final Bitmap icon;
-
-    public AddOn(boolean free, boolean internal, String title, String author, String description,
-                 String packageName, Bitmap icon) {
-        this.free = free;
-        this.internal = internal;
-        this.title = title;
-        this.author = author;
-        this.description = description;
-        this.packageName = packageName;
-        this.icon = icon;
-    }
-
-    /**
-     * @return whether this add-on is available for free
-     */
-    public boolean isFree() {
-        return free;
-    }
-
-    /**
-     * @return whether this add-on is signed with the same key as Astrid
-     */
-    public boolean isInternal() {
-        return internal;
-    }
-
-    /**
-     * @return add-on title
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * @return add-on author
-     */
-    public String getAuthor() {
-        return author;
-    }
-
-    /**
-     * @return add-on description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * @return add-on java package name
-     */
-    public String getPackageName() {
-        return packageName;
-    }
-
-    /**
-     * @return add-on icon
-     */
-    public Bitmap getIcon() {
-        return icon;
-    }
-
-}
diff --git a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
index 2b924fae9..f632bf5f6 100644
--- a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
+++ b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
@@ -18,7 +18,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.widget.ArrayAdapter;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
index ec93975a0..d48ac569e 100644
--- a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
+++ b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
@@ -13,7 +13,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.EditDialogOkBackground;
diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
index 67b548ed8..3338cf9e9 100644
--- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
+++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
@@ -15,7 +15,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
 import com.google.ical.values.RRule;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.timsu.astrid.utilities.LegacyTasksXmlExporter;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.DatabaseDao;
diff --git a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
index f7f885195..e37247347 100644
--- a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
+++ b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.service;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 public abstract class MarketStrategy {
 
diff --git a/astrid/src/com/todoroo/astrid/service/PremiumUnlockService.java b/astrid/src/com/todoroo/astrid/service/PremiumUnlockService.java
deleted file mode 100644
index 31f620c49..000000000
--- a/astrid/src/com/todoroo/astrid/service/PremiumUnlockService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.todoroo.astrid.service;
-
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.andlib.service.RestClient;
-import com.todoroo.andlib.utility.Preferences;
-
-public class PremiumUnlockService {
-
-    public static final String PREF_KILL_SWITCH = "p_premium_kill_switch"; //$NON-NLS-1$
-
-    private static final String PREM_SWITCH_URL = "http://astrid.com/home/premium_check"; //$NON-NLS-1$
-
-    @Autowired
-    private RestClient restClient;
-
-    public PremiumUnlockService() {
-        DependencyInjectionService.getInstance().inject(this);
-    }
-
-    public void checkForPremium() {
-        if (Preferences.getBoolean(PREF_KILL_SWITCH, false)) {
-            return;
-        }
-
-        try {
-            String response = restClient.get(PREM_SWITCH_URL).trim();
-            if ("OFF".equals(response)) //$NON-NLS-1$
-            {
-                Preferences.setBoolean(PREF_KILL_SWITCH, true);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index ce7194b1a..3e915bb99 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -22,7 +22,7 @@ import android.media.AudioManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.DatabaseDao.ModelUpdateListener;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -241,11 +241,10 @@ public class StartupService {
 
                 // get and display update messages
                 if (finalLatestVersion != 0) {
-                    new UpdateMessageService(context).processUpdates();
+//                    disabled for now
+//                    new UpdateMessageService(context).processUpdates();
                 }
 
-                new PremiumUnlockService().checkForPremium();
-
                 checkForSubtasksUse();
                 checkForSwipeListsUse();
                 checkForVoiceRemindersUse();
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 94eda020d..5209f9269 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -10,7 +10,7 @@ import android.graphics.PixelFormat;
 import android.text.TextUtils;
 import android.view.WindowManager;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
@@ -34,14 +34,12 @@ public class ThemeService {
     public static final int FLAG_FORCE_LIGHT = 2;
     public static final int FLAG_INVERT = 3;
 
-    private static int currentTheme;
-
     // Widget config activities set this flag since they theme differently than the normal
     // filter list. In other cases this should be false
     private static boolean forceFilterInvert = false;
 
     public static void applyTheme(Activity activity) {
-        currentTheme = getTheme();
+        int currentTheme = getTheme();
         activity.setTheme(currentTheme);
 
         activity.getWindow().setFormat(PixelFormat.RGBA_8888);
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
index 79bef3410..fd8f44791 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
@@ -6,7 +6,7 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceActivity;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 
 import org.json.JSONArray;
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index 42d002e1e..ffe40fb26 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -24,7 +24,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index e5eece156..c557e8564 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -14,7 +14,7 @@ import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 
 import com.timsu.astrid.GCMIntentService;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridDialog.java b/astrid/src/com/todoroo/astrid/ui/AstridDialog.java
index 22a675e9e..43da3d0b7 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridDialog.java
@@ -6,7 +6,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.activity.AstridActivity;
 
 public class AstridDialog extends Dialog {
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
index 625d99b4f..7aa56bda5 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
@@ -17,7 +17,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
 import android.widget.ToggleButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
index 1815a4d77..8604c6acc 100644
--- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java
+++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
@@ -27,7 +27,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
index 2fd28b467..a3a296ab8 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
@@ -26,7 +26,7 @@ import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java b/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java
deleted file mode 100644
index bd2552a68..000000000
--- a/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.AutoCompleteTextView;
-
-import com.timsu.astrid.R;
-
-public class ContactsAutoComplete extends AutoCompleteTextView {
-
-    private boolean allowMultiple = false;
-    private boolean completeTags = false;
-
-    public ContactsAutoComplete(final Context context, final AttributeSet attrs,
-                                final int defStyle) {
-        super(context, attrs, defStyle);
-        this.setThreshold(0);
-        this.setUpContacts();
-    }
-
-    public ContactsAutoComplete(final Context context, final AttributeSet attrs) {
-        super(context, attrs);
-        this.setThreshold(0);
-        this.setUpContacts();
-
-        TypedArray a = getContext().obtainStyledAttributes(attrs,
-                R.styleable.ContactsAutoComplete);
-        allowMultiple = a.getBoolean(R.styleable.ContactsAutoComplete_allowMultiple, false);
-        completeTags = a.getBoolean(R.styleable.ContactsAutoComplete_completeTags, false);
-    }
-
-    public ContactsAutoComplete(final Context context) {
-        super(context);
-        this.setThreshold(0);
-        this.setUpContacts();
-    }
-
-    // --- comma separating stuff
-
-    private String previous = ""; //$NON-NLS-1$
-    private String seperator = ", "; //$NON-NLS-1$
-    private ContactListAdapter adapter;
-
-    /**
-     * This method filters out the existing text till the separator and launched
-     * the filtering process again
-     */
-    @Override
-    protected void performFiltering(final CharSequence text, final int keyCode) {
-        String filterText = text.toString().trim();
-        if (allowMultiple) {
-            previous = filterText.substring(0,
-                    filterText.lastIndexOf(getSeperator()) + 1);
-            filterText = filterText.substring(filterText.lastIndexOf(getSeperator()) + 1);
-        }
-
-        if (!TextUtils.isEmpty(filterText)) {
-            super.performFiltering(filterText, keyCode);
-        }
-    }
-
-    /**
-     * After a selection, capture the new value and append to the existing text
-     */
-    @Override
-    protected void replaceText(final CharSequence text) {
-        if (allowMultiple) {
-            super.replaceText(previous + text + getSeperator());
-        } else {
-            super.replaceText(text);
-        }
-    }
-
-    // --- cursor stuff
-
-    private void setUpContacts() {
-        try {
-            adapter = new ContactListAdapter((Activity) getContext(), null);
-            adapter.setCompleteSharedTags(completeTags);
-            setAdapter(adapter);
-        } catch (VerifyError ve) {
-            adapter = null;
-        }
-    }
-
-    // --- getters and setters
-
-    public String getSeperator() {
-        return seperator;
-    }
-
-    public void setCompleteSharedTags(boolean value) {
-        completeTags = value;
-        if (adapter != null) {
-            adapter.setCompleteSharedTags(value);
-        }
-    }
-}
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
index f2b3f3acc..cd47b1532 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
@@ -13,7 +13,7 @@ import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import android.widget.Button;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.service.ThemeService;
 
 public class DateAndTimeDialog extends Dialog {
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
index f433f9893..f38c506e6 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
@@ -17,7 +17,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ToggleButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
index 680fdddf1..1f3d41682 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
@@ -23,7 +23,7 @@ import android.widget.TextView;
 
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
index 54a2eabb4..77fb210a0 100644
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
@@ -18,7 +18,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java b/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java
index e8bef06bf..68bd646ee 100644
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.ui;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 public class DeadlineNumberPicker extends NumberPicker {
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
index c4ab6aa7d..2e98a14d7 100644
--- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
+++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
@@ -40,7 +40,7 @@ import com.commonsware.cwac.tlv.TouchListView.DragListener;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
 import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
 import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.utility.Flags;
 
 public class DraggableListView extends ListView {
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index 7c23adea4..f1f2152c8 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -16,7 +16,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
index debfae581..a6a08eef0 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -16,7 +16,7 @@ import android.view.animation.Animation;
 import android.view.animation.ScaleAnimation;
 import android.widget.EditText;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
index 52d2d6c6d..679763afc 100644
--- a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
+++ b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
@@ -5,7 +5,7 @@ import android.net.Uri;
 import android.view.View;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.activity.AstridActivity;
 
 public class FeedbackPromptDialogs {
diff --git a/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java b/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
index 20466b81a..cb7e5d207 100644
--- a/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
@@ -14,7 +14,7 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 import java.util.List;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
index 47900bb08..00613a868 100644
--- a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -16,7 +16,7 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
index f0bf723d1..b04117b87 100644
--- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
@@ -13,7 +13,7 @@ import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.ToggleButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
 import com.todoroo.astrid.service.ThemeService;
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index c036e82e2..9c2a4dff9 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -19,7 +19,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.TouchInterceptingFrameLayout.InterceptTouchListener;
diff --git a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
index d66a978a2..14c6f74e1 100644
--- a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
@@ -16,7 +16,7 @@ import android.widget.FrameLayout.LayoutParams;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
index 59d51cf8f..c11dec5d6 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
@@ -23,7 +23,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
 
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
index 0966baf47..dc5eec6f9 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
@@ -11,7 +11,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.widget.ImageButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 /**
  * This class exists purely to cancel long click events.
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
index 6aecb3199..13c549f2f 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
@@ -12,7 +12,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 public class NumberPickerDialog extends AlertDialog implements OnClickListener {
 
diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
index 89f1d9bd5..410808a06 100644
--- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
@@ -16,7 +16,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.Button;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 2a92b83f0..3160b6ef5 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -26,7 +26,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
diff --git a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
index c918e2d4f..ab8bd25df 100644
--- a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
@@ -13,7 +13,7 @@ import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.Spinner;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
index 5f991569c..70aed18de 100644
--- a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -17,7 +17,7 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.astrid.alarms.AlarmControlSet;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
diff --git a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
index d31c499fb..010fd0411 100644
--- a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
+++ b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
@@ -14,7 +14,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.TaskListFragment;
diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
index e6bafdd23..dc91d9110 100644
--- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
@@ -11,7 +11,7 @@ import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.TextView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.data.Task;
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index bae506d2e..509456756 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.BeastModePreferences;
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index 95d5bf918..7fdbe8eae 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.BeastModePreferences;
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index d14792df3..5b5767c57 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -9,7 +9,7 @@ package com.todoroo.astrid.utility;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
index 53c4271dd..cdd956684 100644
--- a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
+++ b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
@@ -3,7 +3,7 @@ package com.todoroo.astrid.utility;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 
 /**
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
index c929444b3..c3d1847d1 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
@@ -17,7 +17,7 @@ import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
index 6b3a9ab91..73a895a7d 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
@@ -17,7 +17,7 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.aacenc.ContextManager;
 import com.todoroo.aacenc.RecognizerApi;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
index 2ffffcf73..4c4fd2bcc 100644
--- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
+++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.RemoteViews;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
index a4395497b..d51df9839 100644
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -15,7 +15,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.adapter.FilterAdapter;
diff --git a/bin/find-unused-drawables.sh b/bin/find-unused-drawables.sh
index 36960682a..185c331ac 100755
--- a/bin/find-unused-drawables.sh
+++ b/bin/find-unused-drawables.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
-PROJECT=$(cd `dirname $0`/../astrid; pwd)
-for file in $(ls $PROJECT/res/drawable -l | awk '{ print $8}' | sed 's/\..\+//g'); do 
-    count=0; 
-    for SRCFILE in `find $PROJECT -name "*.xml" -print 2> /dev/null`; do 
-        let "count+=$(grep -c @drawable/$file $SRCFILE)"; 
-    done
-    for SRCFILE in `find $PROJECT -name "*.java" -print 2> /dev/null`; do 
-        let "count+=$(grep -c R.drawable.$file $SRCFILE)"; 
-    done; 
-    if [ $count -lt 1 ]; then 
-        echo -e "\e[0;31m$file\e[0m not used"; 
-    else 
-        echo -e "\e[0;32m$file\e[0m used"; 
-    fi; 
-done; 
+#PATH="../astrid/res/drawable"
+for file in $(ls -l ../astrid/res/drawable | awk '{ print $9}' | sed 's/\..\+//g'); do 
+    if [ ! -f ../astrid/res/drawable/${file} ]; then
+        continue
+    fi;
+    filename=`basename ${file}`
+    filename=${filename%.*}
+    git grep -q ${filename} ..
+    if [ $? -ne 0 ]; then
+        echo -e "${file} not used"
+    fi;
+done;
+        #let "count+=$(grep -c @drawable/$file $SRCFILE)"; 
+        #let "count+=$(grep -c R.drawable.$file $SRCFILE)"; 
diff --git a/bin/find-unused-layouts.sh b/bin/find-unused-layouts.sh
new file mode 100755
index 000000000..a7c4eed25
--- /dev/null
+++ b/bin/find-unused-layouts.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+PROJECT=$(cd `dirname $0`/..; pwd)
+pushd ${PROJECT}
+echo ${PROJECT}
+path=astrid/res/layout
+for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do 
+    if [ ! -f ${path}/${file} ]; then
+        continue
+    fi;
+    filename=`basename ${file}`
+    filename=${filename%.*}
+    git grep -q ${filename}
+    if [ $? -ne 0 ]; then
+        echo -e "${file} not used"
+    fi;
+done; 
+popd
diff --git a/store/astrid.png b/store/astrid.png
new file mode 100644
index 000000000..e471ef7e0
Binary files /dev/null and b/store/astrid.png differ
diff --git a/store/high res icon.png b/store/high res icon.png
new file mode 100644
index 000000000..6557477a9
Binary files /dev/null and b/store/high res icon.png differ
diff --git a/store/high res icon.webp b/store/high res icon.webp
new file mode 100644
index 000000000..25cb2fe1d
Binary files /dev/null and b/store/high res icon.webp differ
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
index a61ee29e3..9996f762f 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
@@ -11,7 +11,7 @@ import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
 import com.google.ical.values.WeekdayNum;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Query;
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
index ad6280b18..b7aad64f8 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
@@ -7,7 +7,7 @@ package com.todoroo.astrid.sync.repeats;
 
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Query;
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
index 32c7cbd0d..ec3379346 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
@@ -13,7 +13,7 @@ import android.os.Bundle;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
 import com.google.api.services.tasks.model.Tasks;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/tests/src/com/todoroo/andlib/test/TranslationTests.java
index b31219725..3ca5deee7 100644
--- a/tests/src/com/todoroo/andlib/test/TranslationTests.java
+++ b/tests/src/com/todoroo/andlib/test/TranslationTests.java
@@ -8,7 +8,7 @@ package com.todoroo.andlib.test;
 
 import android.content.res.Resources;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
diff --git a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
index fdac9c241..eab0dc45d 100644
--- a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
+++ b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
@@ -5,7 +5,7 @@
  */
 package com.todoroo.astrid.backup;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
index 7e49dd83b..a9a65dd9c 100644
--- a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.reminders;
 import android.app.Notification;
 import android.content.Intent;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.NotificationManager;
 import com.todoroo.andlib.utility.DateUtilities;
diff --git a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
index ccd0ed682..5a4a81844 100644
--- a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
+++ b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
@@ -11,7 +11,7 @@ import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
 import com.google.ical.values.WeekdayNum;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Query;
diff --git a/tests/src/com/todoroo/astrid/service/TitleParserTest.java b/tests/src/com/todoroo/astrid/service/TitleParserTest.java
index bed5e37d4..5c77a2377 100644
--- a/tests/src/com/todoroo/astrid/service/TitleParserTest.java
+++ b/tests/src/com/todoroo/astrid/service/TitleParserTest.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.service;
 
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
diff --git a/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java b/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
index 04608b8c2..167554932 100644
--- a/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
+++ b/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
@@ -8,7 +8,7 @@ package com.todoroo.astrid.test;
 
 import android.content.res.Resources;
 
-import com.timsu.astrid.R;
+import org.astrid.R;
 import com.todoroo.andlib.test.TranslationTests;
 
 import java.util.Locale;