diff --git a/build.gradle b/build.gradle
index 64b57c46d..54d98f6fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,7 @@ dependencies {
     compile 'com.jakewharton.timber:timber:4.1.2'
     compile 'com.google.guava:guava:19.0'
     compile 'com.jakewharton:process-phoenix:1.0.2'
+    compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
     compile ('com.rubiconproject.oss:jchronic:0.2.6') {
         transitive = false
     }
@@ -136,7 +137,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
     }
 
-    googleplayCompile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
     googleplayCompile 'com.twofortyfouram:android-plugin-api-for-locale:1.0.2'
     googleplayCompile "com.google.android.gms:play-services-location:${GPS_VERSION}"
     googleplayCompile "com.google.android.gms:play-services-analytics:${GPS_VERSION}"
diff --git a/src/amazon/java/org/tasks/injection/ActivityComponent.java b/src/amazon/java/org/tasks/injection/ActivityComponent.java
index 5ee882648..7f7255540 100644
--- a/src/amazon/java/org/tasks/injection/ActivityComponent.java
+++ b/src/amazon/java/org/tasks/injection/ActivityComponent.java
@@ -20,6 +20,7 @@ import org.tasks.activities.DateAndTimePickerActivity;
 import org.tasks.activities.DatePickerActivity;
 import org.tasks.activities.FilterSelectionActivity;
 import org.tasks.activities.TimePickerActivity;
+import org.tasks.dashclock.DashClockSettings;
 import org.tasks.files.FileExplore;
 import org.tasks.files.MyFilePickerActivity;
 import org.tasks.preferences.AppearancePreferences;
@@ -49,6 +50,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(DashClockSettings dashClockSettings);
+
     void inject(AACRecordingActivity aacRecordingActivity);
 
     void inject(CustomFilterActivity customFilterActivity);
diff --git a/src/amazon/java/org/tasks/injection/ApplicationComponent.java b/src/amazon/java/org/tasks/injection/ApplicationComponent.java
index ef2f66ea4..543da3e4f 100644
--- a/src/amazon/java/org/tasks/injection/ApplicationComponent.java
+++ b/src/amazon/java/org/tasks/injection/ApplicationComponent.java
@@ -1,6 +1,7 @@
 package org.tasks.injection;
 
 import org.tasks.Tasks;
+import org.tasks.dashclock.DashClockExtension;
 import org.tasks.widget.ScrollableWidgetUpdateService;
 
 import dagger.Component;
@@ -8,6 +9,8 @@ import dagger.Component;
 @ApplicationScope
 @Component(modules = ApplicationModule.class)
 public interface ApplicationComponent {
+    void inject(DashClockExtension dashClockExtension);
+
     void inject(Tasks tasks);
 
     void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
diff --git a/src/generic/java/org/tasks/injection/ActivityComponent.java b/src/generic/java/org/tasks/injection/ActivityComponent.java
index 5ee882648..7f7255540 100644
--- a/src/generic/java/org/tasks/injection/ActivityComponent.java
+++ b/src/generic/java/org/tasks/injection/ActivityComponent.java
@@ -20,6 +20,7 @@ import org.tasks.activities.DateAndTimePickerActivity;
 import org.tasks.activities.DatePickerActivity;
 import org.tasks.activities.FilterSelectionActivity;
 import org.tasks.activities.TimePickerActivity;
+import org.tasks.dashclock.DashClockSettings;
 import org.tasks.files.FileExplore;
 import org.tasks.files.MyFilePickerActivity;
 import org.tasks.preferences.AppearancePreferences;
@@ -49,6 +50,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(DashClockSettings dashClockSettings);
+
     void inject(AACRecordingActivity aacRecordingActivity);
 
     void inject(CustomFilterActivity customFilterActivity);
diff --git a/src/generic/java/org/tasks/injection/ApplicationComponent.java b/src/generic/java/org/tasks/injection/ApplicationComponent.java
index ef2f66ea4..543da3e4f 100644
--- a/src/generic/java/org/tasks/injection/ApplicationComponent.java
+++ b/src/generic/java/org/tasks/injection/ApplicationComponent.java
@@ -1,6 +1,7 @@
 package org.tasks.injection;
 
 import org.tasks.Tasks;
+import org.tasks.dashclock.DashClockExtension;
 import org.tasks.widget.ScrollableWidgetUpdateService;
 
 import dagger.Component;
@@ -8,6 +9,8 @@ import dagger.Component;
 @ApplicationScope
 @Component(modules = ApplicationModule.class)
 public interface ApplicationComponent {
+    void inject(DashClockExtension dashClockExtension);
+
     void inject(Tasks tasks);
 
     void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml
index e8545fca1..c37770d52 100644
--- a/src/googleplay/AndroidManifest.xml
+++ b/src/googleplay/AndroidManifest.xml
@@ -121,28 +121,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- DashClock extension -->
-
-        <service android:name=".dashclock.DashClockExtension"
-            android:icon="@drawable/ic_check_white_24dp"
-            android:label="@string/app_name"
-            android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA">
-            <intent-filter>
-                <action android:name="com.google.android.apps.dashclock.Extension" />
-            </intent-filter>
-            <meta-data android:name="protocolVersion" android:value="2" />
-            <meta-data android:name="worldReadable" android:value="true" />
-            <meta-data android:name="description"
-                android:value="Display a count of active tasks" />
-            <meta-data android:name="settingsActivity"
-                android:value=".dashclock.DashClockSettings" />
-        </service>
-
-        <!--suppress AndroidLintExportedPreferenceActivity -->
-        <activity android:name=".dashclock.DashClockSettings"
-            android:label="@string/app_name"
-            android:exported="true" />
-
         <!-- SyncService for Google Tasks -->
 
         <service
diff --git a/src/googleplay/java/org/tasks/injection/ActivityComponent.java b/src/googleplay/java/org/tasks/injection/ActivityComponent.java
index 09774d8f4..9d90f8b6f 100644
--- a/src/googleplay/java/org/tasks/injection/ActivityComponent.java
+++ b/src/googleplay/java/org/tasks/injection/ActivityComponent.java
@@ -52,8 +52,6 @@ public interface ActivityComponent {
 
     void inject(GtasksLoginActivity gtasksLoginActivity);
 
-    void inject(DashClockSettings dashClockSettings);
-
     Theme getTheme();
 
     FragmentComponent plus(FragmentModule module);
@@ -62,6 +60,8 @@ public interface ActivityComponent {
 
     NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
 
+    void inject(DashClockSettings dashClockSettings);
+
     void inject(AACRecordingActivity aacRecordingActivity);
 
     void inject(CustomFilterActivity customFilterActivity);
diff --git a/src/googleplay/res/values/keys.xml b/src/googleplay/res/values/keys.xml
index 5e8d8eb14..7303525c7 100644
--- a/src/googleplay/res/values/keys.xml
+++ b/src/googleplay/res/values/keys.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="gp_key">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk8mXRE3dDXwtinUILCEzKjov2rxs3kZbLRzNrcjFWXpG9OEsUzRGLzqEN+WwibVuMRpZLj/+IxbU2sJWq/M0q+90rOhmXn46ZPeNyr77IqX2pWKIAWpzBoWq/mshRwtm9m1FIiGdBNlXrhSE7u3TGB5FuEuuSqKWvWzxeqQ7fHmlM04Lqrh1mN3FaMne8rWv+DWVHDbLrtnXBuC36glOAj17HxrzaE2v6Pv7Df3QefJ3rM1+0fAp/5jNInaP0qHAlG8WTbUmDShQ5kG3urbv3HLByyx6TSqhmNudXUK/6TusvIj50OptAG7x+UFYf956dD3diXhY3yoICvyFWx1sNwIDAQAB</string>
     <string name="sku_themes">themes</string>
-    <string name="p_dashclock_filter">dashclock_filter</string>
     <string name="tasker_message">If you purchased the stand-alone Tasker plugin please send your Google Play Store transaction ID to support@tasks.org and you will receive a promo code for this in-app purchase. You can find the transaction ID in your Google Play Store order confirmation e-mail or by visiting wallet.google.com</string>
     <string name="play_services_available">play_services_available</string>
     <string name="warned_play_services">warned_play_services</string>
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index edad1c4cf..7c5173828 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -457,6 +457,27 @@
             android:name="com.google.android.maps"
             android:required="false" />
 
+        <!-- DashClock extension -->
+
+        <service android:name=".dashclock.DashClockExtension"
+            android:icon="@drawable/ic_check_white_24dp"
+            android:label="@string/app_name"
+            android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA">
+            <intent-filter>
+                <action android:name="com.google.android.apps.dashclock.Extension" />
+            </intent-filter>
+            <meta-data android:name="protocolVersion" android:value="2" />
+            <meta-data android:name="worldReadable" android:value="true" />
+            <meta-data android:name="description"
+                android:value="Display a count of active tasks" />
+            <meta-data android:name="settingsActivity"
+                android:value=".dashclock.DashClockSettings" />
+        </service>
+
+        <!--suppress AndroidLintExportedPreferenceActivity -->
+        <activity android:name=".dashclock.DashClockSettings"
+            android:label="@string/app_name"
+            android:exported="true" />
     </application>
 
 </manifest>
diff --git a/src/googleplay/java/org/tasks/dashclock/DashClockExtension.java b/src/main/java/org/tasks/dashclock/DashClockExtension.java
similarity index 100%
rename from src/googleplay/java/org/tasks/dashclock/DashClockExtension.java
rename to src/main/java/org/tasks/dashclock/DashClockExtension.java
diff --git a/src/googleplay/java/org/tasks/dashclock/DashClockSettings.java b/src/main/java/org/tasks/dashclock/DashClockSettings.java
similarity index 100%
rename from src/googleplay/java/org/tasks/dashclock/DashClockSettings.java
rename to src/main/java/org/tasks/dashclock/DashClockSettings.java
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 623000581..c374cdb7d 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -320,6 +320,7 @@
   <string name="p_widget_show_checkboxes">widget-show-checkboxes-</string>
   <string name="p_widget_show_header">widget-show-header-</string>
   <string name="p_widget_show_settings">widget-show-settings-</string>
+  <string name="p_dashclock_filter">dashclock_filter</string>
 
   <string name="sku_tasker">tasker</string>
   <string name="sku_tesla_unread">tesla_unread</string>
diff --git a/src/googleplay/res/xml/preferences_dashclock.xml b/src/main/res/xml/preferences_dashclock.xml
similarity index 100%
rename from src/googleplay/res/xml/preferences_dashclock.xml
rename to src/main/res/xml/preferences_dashclock.xml