diff --git a/app/build.gradle b/app/build.gradle
index 74c6e451..ac7dbf5d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 350
-        versionName "3.5.0"
+        versionCode 395
+        versionName "4.0.0-dev"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -54,13 +54,13 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.0'
+    def lifecycle_version = '2.3.1'
     def markwon_version = '4.6.2'
     def work_version = "2.5.0"
     def acra = "5.7.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index fcec209f..c5642a6c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -7,6 +7,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.notifications.Notifications;
 
 /**
  * Author M M Arif
@@ -77,6 +78,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 		}
 
 		AppUtil.setAppLocale(getResources(), tinyDB.getString("locale"));
+
+		Notifications.startWorker(appCtx);
 	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/core/MainApplication.java b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
index c595d1f5..5fd91d2c 100644
--- a/app/src/main/java/org/mian/gitnex/core/MainApplication.java
+++ b/app/src/main/java/org/mian/gitnex/core/MainApplication.java
@@ -71,21 +71,26 @@ public class MainApplication extends Application {
 
 		}
 
+		Notifications.createChannels(appCtx);
+	}
+
+	@Override
+	protected void attachBaseContext(Context context) {
+		super.attachBaseContext(context);
+
+		tinyDB = TinyDB.getInstance(context);
+
 		if(tinyDB.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
 
 			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
-			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil
+				.getAppBuildNo(context))).setEnabled(true);
 			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
 
 			ACRA.init(this, ACRABuilder);
-
 		}
-
-		Notifications.createChannels(appCtx);
-		Notifications.startWorker(appCtx);
-
 	}
 
 	private void setDefaults() {
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 26feb1e4..34727444 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-    <release version="3.5.0" versioncode="350">
-        <change>New: Render emoji in issue/pr titles, commit message and markdown files</change>
-        <change>New: Cron tasks (Admin only)</change>
-        <change>New: Biometric support to unlock the app</change>
-        <change>New: Switch to saved instance when coming from email/links</change>
-        <change>New: Copy user login id to clipboard</change>
-        <change>New: Progress notification for downloading files</change>
-        <change>New: Rewrite file viewer in native code to move away from traditional js to load files faster</change>
+    <release version="4.0.0-dev" versioncode="395">
+        <change>Under development</change>
     </release>
 
 </changelog>