diff --git a/app/build.gradle b/app/build.gradle
index ba4e425..9cf5fd1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
     defaultConfig {
-        applicationId "org.eu.exodus_privacy.exodusprivacy"
         minSdkVersion 17
         targetSdkVersion 30
         versionCode 10
         versionName "2.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    flavorDimensions "default"
     buildTypes {
         release {
             minifyEnabled false
@@ -20,6 +20,31 @@ android {
             }
         }
     }
+
+    lintOptions {
+        disable 'MissingTranslation'
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
+    productFlavors {
+        exodus {
+            applicationId "org.eu.exodus_privacy.exodusprivacy"
+        }
+        amal {
+            applicationId "app.fedilab.amal"
+        }
+    }
+
+    sourceSets {
+        exodus {
+            res.srcDirs = ['src/main/res', 'src/exodus/res']
+        }
+        amal {
+            res.srcDirs = ['src/main/res', 'src/amal/res']
+        }
+
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/app/src/amal/ic_launcher-playstore.png b/app/src/amal/ic_launcher-playstore.png
new file mode 100644
index 0000000..ea1ad65
Binary files /dev/null and b/app/src/amal/ic_launcher-playstore.png differ
diff --git a/app/src/amal/res/drawable/ic_launcher_foreground.xml b/app/src/amal/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..b0f3e44
--- /dev/null
+++ b/app/src/amal/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group
+      android:scaleX="0.24190092"
+      android:scaleY="0.24190092"
+      android:translateX="25.122473"
+      android:translateY="22.68">
+    <path
+        android:fillColor="#007ea5"
+        android:pathData="M59.689,30.169l59.032,-30.169l120.034,59.455l-61.001,29.469l-118.065,-58.755z" />
+    <path
+        android:fillColor="#00bedd"
+        android:pathData="M177.754,154.21l0,-65.286l-59.033,-29.469l0,60.162l59.033,34.593z" />
+    <path
+        android:fillColor="#03cfe5"
+        android:pathData="M118.721,189.589l59.033,-35.379l-59.033,-34.593l-59.032,34.593l59.032,35.379z" />
+    <path
+        android:fillColor="#0099bc"
+        android:pathData="M59.689,88.924l59.032,-29.469l0,60.162l-59.032,34.593l0,-65.286z" />
+    <path
+        android:fillColor="#005e8b"
+        android:pathData="M0,119.617l0,69.972l118.721,69.36l120.034,-69.36l0,-130.134l-61.001,29.469l0,65.286l-59.033,35.379l-59.032,-35.379l0,-65.286l-59.689,30.693z" />
+  </group>
+</vector>
diff --git a/app/src/amal/res/drawable/ic_logo.xml b/app/src/amal/res/drawable/ic_logo.xml
new file mode 100644
index 0000000..1927d8d
--- /dev/null
+++ b/app/src/amal/res/drawable/ic_logo.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="238.755dp"
+    android:height="258.949dp"
+    android:viewportWidth="238.755"
+    android:viewportHeight="258.949">
+    <path
+        android:fillColor="#007ea5"
+        android:pathData="M59.689,30.169l59.032,-30.169l120.034,59.455l-61.001,29.469l-118.065,-58.755z" />
+    <path
+        android:fillColor="#00bedd"
+        android:pathData="M177.754,154.21l0,-65.286l-59.033,-29.469l0,60.162l59.033,34.593z" />
+    <path
+        android:fillColor="#03cfe5"
+        android:pathData="M118.721,189.589l59.033,-35.379l-59.033,-34.593l-59.032,34.593l59.032,35.379z" />
+    <path
+        android:fillColor="#0099bc"
+        android:pathData="M59.689,88.924l59.032,-29.469l0,60.162l-59.032,34.593l0,-65.286z" />
+    <path
+        android:fillColor="#005e8b"
+        android:pathData="M0,119.617l0,69.972l118.721,69.36l120.034,-69.36l0,-130.134l-61.001,29.469l0,65.286l-59.033,35.379l-59.032,-35.379l0,-65.286l-59.689,30.693z" />
+</vector>
diff --git a/app/src/amal/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/amal/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..ac94b34
--- /dev/null
+++ b/app/src/amal/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/amal/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/amal/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..ac94b34
--- /dev/null
+++ b/app/src/amal/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/amal/res/mipmap-hdpi/ic_launcher.png b/app/src/amal/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..3e1a02f
Binary files /dev/null and b/app/src/amal/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/amal/res/mipmap-hdpi/ic_launcher_round.png b/app/src/amal/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..293f58c
Binary files /dev/null and b/app/src/amal/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/amal/res/mipmap-mdpi/ic_launcher.png b/app/src/amal/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..323e874
Binary files /dev/null and b/app/src/amal/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/amal/res/mipmap-mdpi/ic_launcher_round.png b/app/src/amal/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..9f806b7
Binary files /dev/null and b/app/src/amal/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/amal/res/mipmap-xhdpi/ic_launcher.png b/app/src/amal/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dc4adef
Binary files /dev/null and b/app/src/amal/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/amal/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/amal/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4bab087
Binary files /dev/null and b/app/src/amal/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/amal/res/mipmap-xxhdpi/ic_launcher.png b/app/src/amal/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..27b340e
Binary files /dev/null and b/app/src/amal/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/amal/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/amal/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f3e7a2a
Binary files /dev/null and b/app/src/amal/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/amal/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/amal/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..1219495
Binary files /dev/null and b/app/src/amal/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/amal/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/amal/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4a798f7
Binary files /dev/null and b/app/src/amal/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/amal/res/values/colors.xml b/app/src/amal/res/values/colors.xml
new file mode 100644
index 0000000..afd9fd2
--- /dev/null
+++ b/app/src/amal/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#005e8b</color>
+    <color name="colorPrimaryDark">#3d2b43</color>
+    <color name="colorAccent">#007bff</color>
+
+    <color name="colorGreen">#6fc384</color>
+    <color name="colorLightRed">#e46772</color>
+    <color name="colorLightYellow">#ffdb66</color>
+
+    <color name="colorLightBlue">#17a2b8</color>
+    <color name="colorYellow">#ffc70f</color>
+    <color name="colorDarkOrange">#ff8c00</color>
+    <color name="colorRed">#e61718</color>
+
+    <color name="colorPurple">#684971</color>
+    <color name="textColorDark">#343A40</color>
+    <color name="textColorDarkLight">#6C757D</color>
+    <color name="textColorWhite">#FFFFFF</color>
+    <color name="textDetection">#E83E8C</color>
+</resources>
diff --git a/app/src/amal/res/values/exodus.xml b/app/src/amal/res/values/exodus.xml
new file mode 100644
index 0000000..1238531
--- /dev/null
+++ b/app/src/amal/res/values/exodus.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="exodus">9c6106a229bc5f34b5802e5861bcb87d1626617d</string>
+    <string name="app_title">AMAL</string>
+    <string name="app_name">AMAL</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/amal/res/values/ic_launcher_background.xml b/app/src/amal/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/amal/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/amal/res/values/strings.xml b/app/src/amal/res/values/strings.xml
new file mode 100644
index 0000000..a6b3dae
--- /dev/null
+++ b/app/src/amal/res/values/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_logo_purple.xml b/app/src/exodus/res/drawable/ic_logo.xml
similarity index 70%
rename from app/src/main/res/drawable/ic_logo_purple.xml
rename to app/src/exodus/res/drawable/ic_logo.xml
index 58fcb9a..b1322a8 100644
--- a/app/src/main/res/drawable/ic_logo_purple.xml
+++ b/app/src/exodus/res/drawable/ic_logo.xml
@@ -1,10 +1,21 @@
-<vector android:height="100dp" android:viewportHeight="54"
-    android:viewportWidth="54" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#684971"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#684971"
         android:pathData="M2.1737,27a24.8263,24.5976 0,1 0,49.6526 0a24.8263,24.5976 0,1 0,-49.6526 0z"
-        android:strokeColor="#00000000" android:strokeWidth="0.0297731"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:strokeWidth="0.0297731"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
         android:pathData="m22.6353,26.1025c-4.3263,-1.5231 -6.4894,-3.8295 -6.4894,-6.9192 -0,-2.4369 1.1474,-4.3843 3.4423,-5.8421 2.2949,-1.4578 5.1443,-2.1867 8.5482,-2.1867 3.0964,0 5.556,0.5059 7.3788,1.5176 1.8227,1.0118 2.7341,2.2248 2.7341,3.6391 -0,0.7398 -0.2855,1.3871 -0.8565,1.9419 -0.571,0.5549 -1.2298,0.8323 -1.9765,0.8323 -1.2298,0 -2.24,-0.8486 -3.0306,-2.5457 -1.098,-2.3499 -2.7451,-3.5248 -4.9412,-3.5249 -1.7349,0 -3.1624,0.5657 -4.2823,1.6972 -1.12,1.1315 -1.68,2.7089 -1.68,4.7325 -0,3.9818 2.0753,5.9727 6.2259,5.9727 0.4392,0 0.9443,-0.0435 1.5153,-0.1305 0.9882,-0.1305 1.7568,-0.1958 2.3059,-0.1958 1.3396,0 2.0094,0.3808 2.0094,1.1423 -0,0.8486 -0.6808,1.2729 -2.0424,1.2729 -0.4832,0 -1.2079,-0.0761 -2.1741,-0.2285 -0.7247,-0.1305 -1.2847,-0.1958 -1.68,-0.1958 -4.3922,0 -6.5882,2.2194 -6.5882,6.6581 -0,2.1541 0.5819,3.8893 1.7459,5.2057 1.1639,1.3164 2.789,1.9746 4.8753,1.9746 2.6133,0 4.3482,-1.3381 5.2047,-4.0144 0.4392,-1.4143 0.9278,-2.3934 1.4659,-2.9374 0.538,-0.544 1.2572,-0.8159 2.1576,-0.8159 0.7466,0 1.4219,0.2665 2.0259,0.7996 0.6039,0.5331 0.9059,1.213 0.9059,2.0399 -0,1.98 -1.12,3.6173 -3.36,4.912 -2.24,1.2946 -4.9522,1.9419 -8.1365,1.9419 -3.4918,0 -6.5937,-0.8268 -9.3059,-2.4805 -2.7122,-1.6536 -4.0682,-3.8621 -4.0682,-6.6254 -0,-3.4596 2.6902,-6.0053 8.0706,-7.6372z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.03275258"/>
+        android:strokeWidth="0.03275258"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/exodus/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/exodus/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_background.xml b/app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_background.xml
rename to app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_foreground.xml b/app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_foreground.xml
rename to app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/exodus/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/exodus/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/exodus/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/exodus/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/exodus/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/exodus/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/exodus/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/exodus/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/exodus/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/exodus/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/exodus/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/exodus/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/exodus/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/exodus/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/exodus/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/exodus/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/exodus/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/exodus/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/exodus/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/exodus/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/exodus/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/exodus/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to app/src/exodus/res/values/colors.xml
diff --git a/app/src/main/res/values/exodus.xml b/app/src/exodus/res/values/exodus.xml
similarity index 100%
rename from app/src/main/res/values/exodus.xml
rename to app/src/exodus/res/values/exodus.xml
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/HomeFragment.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/HomeFragment.java
index 83154ad..25abeb7 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/HomeFragment.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/HomeFragment.java
@@ -204,8 +204,10 @@ public class HomeFragment extends Fragment implements ComputeAppListTask.Listene
         if (!apps.isEmpty()) {
             if (startupRefresh) {
                 Calendar cal = Calendar.getInstance();
-                cal.setTime(Utils.stringToDate(getContext(), last_refresh));
-                cal.add(Calendar.DAY_OF_YEAR, 1);
+                if (last_refresh != null) {
+                    cal.setTime(Utils.stringToDate(getContext(), last_refresh));
+                    cal.add(Calendar.DAY_OF_YEAR, 1);
+                }
                 Date refreshAfter = cal.getTime();
                 Date currentDate = new Date();
                 if (last_refresh != null && !refreshInProgress && currentDate.after(refreshAfter)) {
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml
index 0bc7f0b..3ae7294 100644
--- a/app/src/main/res/layout/home.xml
+++ b/app/src/main/res/layout/home.xml
@@ -63,7 +63,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            android:src="@drawable/ic_logo_purple"
+            android:src="@drawable/ic_logo"
             android:layout_width="200dp"
             android:layout_height="200dp" />
         <ProgressBar