diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 882e1fb13..ab69029bd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,48 +2,46 @@
     package="fr.free.nrw.commons">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
-    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS"/>
-    <uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS"/>
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
+    <uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS" />
 
     <application
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat"
-        android:supportsRtl="true" >
-        <activity android:name="org.acra.CrashReportDialog"
-                  android:theme="@android:style/Theme.Dialog"
-                  android:launchMode="singleInstance"
-                  android:excludeFromRecents="true"
-                  android:finishOnTaskLaunch="true" />
+        android:supportsRtl="true"
+        android:theme="@style/Theme.AppCompat">
 
         <activity
-            android:name=".auth.LoginActivity"
-            >
+            android:name="org.acra.CrashReportDialog"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Dialog" />
+
+        <activity android:name=".auth.LoginActivity">
             <intent-filter>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".WelcomeActivity"
-            >
-        </activity>
+
+        <activity android:name=".WelcomeActivity" />
+
         <activity
             android:name=".upload.ShareActivity"
             android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -51,11 +49,11 @@
                 <data android:mimeType="audio/ogg" />
             </intent-filter>
         </activity>
+
         <activity
-                android:name=".upload.MultipleShareActivity"
-                android:icon="@drawable/ic_launcher"
-                android:label="@string/app_name"
-                >
+            android:name=".upload.MultipleShareActivity"
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -65,33 +63,34 @@
         </activity>
 
         <activity
-                android:name=".contributions.ContributionsActivity"
-                android:icon="@drawable/ic_launcher"
-                android:label="@string/app_name"
-                 >
-        </activity>
+            android:name=".contributions.ContributionsActivity"
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name" />
+
         <activity
             android:name=".settings.SettingsActivity"
-            android:label="@string/title_activity_settings"
-            />
+            android:label="@string/title_activity_settings" />
+
         <activity
             android:name=".AboutActivity"
             android:label="@string/title_activity_about"
             android:parentActivityName=".contributions.ContributionsActivity" />
+
         <activity
             android:name=".auth.SignupActivity"
-            android:label="@string/title_activity_signup"/>
+            android:label="@string/title_activity_signup" />
+
         <activity
             android:name=".nearby.NearbyActivity"
             android:label="@string/title_activity_nearby"
             android:parentActivityName=".contributions.ContributionsActivity" />
 
-        <service android:name=".upload.UploadService" >
-        </service>
+        <service android:name=".upload.UploadService" />
+
         <service
             android:name=".auth.WikiAccountAuthenticatorService"
             android:exported="true"
-            android:process=":auth" >
+            android:process=":auth">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
@@ -102,27 +101,25 @@
         </service>
 
         <service
-                android:name=".contributions.ContributionsSyncService"
-                android:exported="true">
+            android:name=".contributions.ContributionsSyncService"
+            android:exported="true">
             <intent-filter>
-                <action
-                        android:name="android.content.SyncAdapter" />
+                <action android:name="android.content.SyncAdapter" />
             </intent-filter>
             <meta-data
-                    android:name="android.content.SyncAdapter"
-                    android:resource="@xml/contributions_sync_adapter" />
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/contributions_sync_adapter" />
         </service>
 
         <service
-                android:name=".modifications.ModificationsSyncService"
-                android:exported="true">
+            android:name=".modifications.ModificationsSyncService"
+            android:exported="true">
             <intent-filter>
-                <action
-                        android:name="android.content.SyncAdapter" />
+                <action android:name="android.content.SyncAdapter" />
             </intent-filter>
             <meta-data
-                    android:name="android.content.SyncAdapter"
-                    android:resource="@xml/modifications_sync_adapter" />
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/modifications_sync_adapter" />
         </service>
 
         <provider
@@ -132,31 +129,29 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
 
         <provider
-                android:name=".contributions.ContributionsContentProvider"
-                android:label="@string/provider_contributions"
-                android:syncable="true"
-                android:authorities="fr.free.nrw.commons.contributions.contentprovider"
-                android:exported="false">
-        </provider>
+            android:name=".contributions.ContributionsContentProvider"
+            android:authorities="fr.free.nrw.commons.contributions.contentprovider"
+            android:exported="false"
+            android:label="@string/provider_contributions"
+            android:syncable="true" />
 
         <provider
-                android:name=".modifications.ModificationsContentProvider"
-                android:label="@string/provider_modifications"
-                android:syncable="true"
-                android:authorities="fr.free.nrw.commons.modifications.contentprovider"
-                android:exported="false">
-        </provider>
+            android:name=".modifications.ModificationsContentProvider"
+            android:authorities="fr.free.nrw.commons.modifications.contentprovider"
+            android:exported="false"
+            android:label="@string/provider_modifications"
+            android:syncable="true" />
+
         <provider
-                android:name=".category.CategoryContentProvider"
-                android:label="@string/provider_categories"
-                android:syncable="false"
-                android:authorities="fr.free.nrw.commons.categories.contentprovider"
-                android:exported="false">
-        </provider>
+            android:name=".category.CategoryContentProvider"
+            android:authorities="fr.free.nrw.commons.categories.contentprovider"
+            android:exported="false"
+            android:label="@string/provider_categories"
+            android:syncable="false" />
 
     </application>
 
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 7e75f8718..a3fcb746c 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -276,7 +276,4 @@ public class Utils {
         return value == null || value.trim().isEmpty();
     }
 
-    public static boolean isDarkTheme(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",false);
-    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
index 28acf341b..d89c3ac84 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
@@ -16,16 +16,25 @@ import fr.free.nrw.commons.upload.ShareActivity;
 public abstract class ActivityBuilderModule {
 
     @ContributesAndroidInjector
-    abstract ContributionsActivity bindContributionsActivity();
+    abstract LoginActivity bindLoginActivity();
 
     @ContributesAndroidInjector
-    abstract MultipleShareActivity bindMultipleShareActivity();
+    abstract WelcomeActivity bindWelcomeActivity();
 
     @ContributesAndroidInjector
     abstract ShareActivity bindShareActivity();
 
     @ContributesAndroidInjector
-    abstract LoginActivity bindLoginActivity();
+    abstract MultipleShareActivity bindMultipleShareActivity();
+
+    @ContributesAndroidInjector
+    abstract ContributionsActivity bindContributionsActivity();
+
+    @ContributesAndroidInjector
+    abstract SettingsActivity bindSettingsActivity();
+
+    @ContributesAndroidInjector
+    abstract AboutActivity bindAboutActivity();
 
     @ContributesAndroidInjector
     abstract SignupActivity bindSignupActivity();
@@ -33,13 +42,4 @@ public abstract class ActivityBuilderModule {
     @ContributesAndroidInjector
     abstract NearbyActivity bindNearbyActivity();
 
-    @ContributesAndroidInjector
-    abstract AboutActivity bindAboutActivity();
-
-    @ContributesAndroidInjector
-    abstract SettingsActivity bindSettingsActivity();
-
-    @ContributesAndroidInjector
-    abstract WelcomeActivity bindWelcomeActivity();
-
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java
index 9d5e91f65..ac9af26a8 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java
@@ -12,13 +12,13 @@ import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 @Module
 public abstract class ContentProviderBuilderModule {
 
-    @ContributesAndroidInjector
-    abstract CategoryContentProvider bindCategoryContentProvider();
-
     @ContributesAndroidInjector
     abstract ContributionsContentProvider bindContributionsContentProvider();
 
     @ContributesAndroidInjector
     abstract ModificationsContentProvider bindModificationsContentProvider();
 
+    @ContributesAndroidInjector
+    abstract CategoryContentProvider bindCategoryContentProvider();
+
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
index 8bef4f6ae..c9c4f5cdd 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
@@ -3,19 +3,17 @@ package fr.free.nrw.commons.theme;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 
-import dagger.android.AndroidInjection;
+import dagger.android.DaggerActivity;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
 
-public class BaseActivity extends AppCompatActivity {
+public class BaseActivity extends DaggerActivity {
     boolean currentTheme;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AndroidInjection.inject(this);
-        if(Utils.isDarkTheme(this)){
+        boolean currentThemeIsDark = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme", false);
+        if (currentThemeIsDark) {
             currentTheme = true;
             setTheme(R.style.DarkAppTheme);
         } else {
@@ -28,8 +26,8 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         // Restart activity if theme is changed
-        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
-        if(currentTheme!=newTheme){ //is activity theme changed
+        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme", false);
+        if (currentTheme != newTheme) { //is activity theme changed
             Intent intent = getIntent();
             finish();
             startActivity(intent);