diff --git a/app/build.gradle b/app/build.gradle
index 72a602e8b..d93d7a009 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,7 @@ repositories {
 String[] archs = ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']
 
 dependencies {
+  implementation project(":core")
   // use jdk8 java.time backport, as long app < Build.VERSION_CODES.O
   implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index 5854cfa09..000000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="primary">#000000</color>
-  <color name="primary_night">#ff212121</color>
-  <color name="primary_dark">#000000</color>
-  <color name="primary_dark_night">#ff212121</color>
-  <color name="primary_light">#ffffff</color>
-  <color name="accent">#2196F3</color>
-  <color name="icons">#212121</color>
-  <color name="white">#fafafa</color>
-  <color name="gray_list_bg">#0d000000</color>
-  <color name="drawer_background_day">#ffffff</color>
-  <color name="drawer_background_night">#5a5a5a</color>
-  <color name="selected_light">#0F000000</color>
-  <color name="divider_light">#2b3f6a</color>
-  <color name="greyed_out_selected">#BDBDBD</color>
-  <color name="black_regular_mat_design">#212121</color>
-  <color name="grey">#5a5a5a</color>
-  <color name="blue_grey">#ECEFF1</color>
-  <color name="foreground_material_dark">@android:color/white</color>
-  <color name="back_to_top_background">#DDFFFFFF</color>
-  <color name="picture_label">#fb8c00</color>
-  <color name="video_label">#651FFF</color>
-  <color name="blue800">#1565c0</color>
-  <color name="blueTransparent">#962e7ac4</color>
-  <color name="actionModeBackground">#4285F4</color>
-  <color name="titleBar">#000000</color>
-  <color name="greenTick">#4CAF50</color>
-  <color name="stopServer">#E53935</color>
-
-  <!-- Dark Text Color for Light Background -->
-  <color name="textDarkPrimary">#000000</color> <!-- 0% opacity-->
-  <color name="textDarkSecondary">#DE000000</color> <!--DE for 87% opacity-->
-  <color name="textDarkTertiary">#8A000000</color> <!--8A for 54% opacity-->
-
-  <!-- White Text Color for Dark Background -->
-  <color name="textLightPrimary">#FFFFFF</color> <!--100% opacity-->
-  <color name="textLightSecondary">#B2FFFFFF</color> <!--B2 for 70% opacity-->
-  <color name="textLightTertiary">#80FFFFFF</color> <!--80 for 50% opacity-->
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 8e75f9fff..000000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <style name="AppTheme" parent="AppTheme.Base" />
-
-  <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorPrimary">@color/primary</item>
-    <item name="colorPrimaryDark">@color/primary_dark</item>
-    <item name="colorAccent">@color/accent</item>
-    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-    <item name="searchViewStyle">@style/SearchViewStyle</item>
-    <item name="android:textCursorDrawable">@null</item>
-    <item name="windowNoTitle">true</item>
-    <item name="windowActionBar">false</item>
-    <item name="actionModeBackground">@color/actionModeBackground</item>
-    <item name="progressBackgroundColor">@color/primary_dark</item>
-    <item name="listBackground">@drawable/list_bg</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="windowActionModeOverlay">true</item>
-    <item name="arrowBackDrawable">@drawable/ic_action_back</item>
-    <item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
-    <item name="drawerBackground">@color/drawer_background_day</item>
-    <item name="plusDrawable">@drawable/ic_action_plus</item>
-    <item name="deleteDrawable">@drawable/ic_action_delete</item>
-    <item name="dividerColor">@color/divider_light</item>
-    <item name="selectedBackground">@drawable/list_bg_light</item>
-    <item name="android:itemBackground">@color/primary_light</item>
-    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
-    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
-    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
-    <item name="colorControlNormal">@color/accent</item>
-  </style>
-
-  <style name="StatusBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    <item name="colorPrimaryDark">@color/titleBar</item>
-    <item name="colorPrimary">@color/primary</item>
-    <item name="colorAccent">@color/accent</item>
-    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-    <item name="searchViewStyle">@style/SearchViewStyle</item>
-    <item name="android:textCursorDrawable">@null</item>
-    <item name="windowNoTitle">true</item>
-    <item name="windowActionBar">false</item>
-    <item name="actionModeBackground">@color/actionModeBackground</item>
-    <item name="progressBackgroundColor">@color/primary_dark</item>
-    <item name="listBackground">@drawable/list_bg</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="windowActionModeOverlay">true</item>
-    <item name="selectedBackground">@drawable/list_bg_light</item>
-    <item name="android:itemBackground">@color/primary_light</item>
-    <item name="drawerBackground">@color/drawer_background_day</item>
-    <item name="dividerColor">@color/divider_light</item>
-    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
-    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
-    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
-    <item name="colorControlNormal">@color/accent</item>
-  </style>
-
-  <style name="AppTheme.Night" parent="AppTheme.Base">
-    <item name="colorPrimary">@color/primary_night</item>
-    <item name="colorPrimaryDark">@color/primary_dark_night</item>
-    <item name="colorAccent">@color/accent</item>
-    <item name="progressBackgroundColor">@color/primary_dark_night</item>
-    <item name="drawerBackground">@color/drawer_background_night</item>
-    <item name="listBackground">@color/grey</item>
-    <item name="android:itemBackground">@color/grey</item>
-    <item name="android:itemTextAppearance">@color/grey</item>
-    <item name="android:textColor">@color/primary_light</item>
-    <item name="android:textColorPrimary">@color/textLightPrimary</item>
-    <item name="android:textColorSecondary">@color/textLightSecondary</item>
-    <item name="android:textColorTertiary">@color/textLightTertiary</item>
-    <item name="android:alertDialogTheme">@style/AppTheme.Dialog.Night</item>
-    <item name="colorControlNormal">@color/accent</item>
-  </style>
-
-  <style name="AppTheme.Launcher">
-    <item name="android:windowBackground">@drawable/launch_screen</item>
-  </style>
-
-  <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
-    <item name="spinBars">true</item>
-  </style>
-
-  <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView" />
-
-  <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-
-  </style>
-
-  <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat">
-    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
-    <item name="actionMenuTextColor">@color/textDarkPrimary</item>
-  </style>
-
-  <style name="AppTheme.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
-    <item name="colorAccent">@color/accent</item>
-    <item name="android:textColorPrimary">@color/primary_dark</item>
-    <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-    <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-    <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-    <item name="android:textColorAlertDialogListItem">@color/primary_dark</item>
-    <item name="android:windowBackground">@color/white</item>
-    <item name="android:textColorSecondary">@color/primary_light</item>
-  </style>
-
-  <style name="AppTheme.Dialog.Night" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-    <item name="colorAccent">@color/accent</item>
-    <item name="android:textColorPrimary">@color/white</item>
-    <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-    <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-    <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-    <item name="android:textColorAlertDialogListItem">@color/white</item>
-    <item name="android:windowBackground">@color/cardview_dark_background</item>
-    <item name="android:textColorSecondary">@color/primary_light</item>
-  </style>
-
-  <style name="NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-    <item name="android:textColor">@color/accent</item>
-  </style>
-
-  <style name="PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-    <item name="android:textColor">@color/accent</item>
-  </style>
-
-  <style name="NeutralButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-    <item name="android:textColor">@color/accent</item>
-  </style>
-
-  <style name="AddNoteDialogStyle" parent="Theme.AppCompat.Dialog">
-    <item name="android:windowNoTitle">true</item>
-    <item name="colorPrimaryDark">@color/primary_dark</item>
-    <item name="colorPrimary">@color/primary</item>
-    <item name="android:textColor">#000000</item>
-    <item name="android:editTextColor">#000000</item>
-    <item name="android:textColorHint">@color/textDarkTertiary</item>
-    <item name="android:windowFullscreen">false</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@color/white</item>
-  </style>
-
-  <style name="AddNoteDialogStyle.Night" parent="Theme.AppCompat.Dialog">
-    <item name="android:windowNoTitle">true</item>
-    <item name="colorPrimaryDark">@color/primary_dark</item>
-    <item name="colorPrimary">@color/primary</item>
-    <item name="android:textColor">#ffffff</item>
-    <item name="android:editTextColor">#ffffff</item>
-    <item name="android:textColorHint">@color/grey</item>
-    <item name="android:windowFullscreen">false</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@color/cardview_dark_background</item>
-  </style>
-
-  <style name="no_list_content_text" parent="TextAppearance.AppCompat">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:textSize">20sp</item>
-    <item name="android:textColor">@color/grey</item>
-    <item name="android:visibility">gone</item>
-    <item name="layout_constraintLeft_toLeftOf">parent</item>
-    <item name="layout_constraintRight_toRightOf">parent</item>
-    <item name="layout_constraintVertical_bias">0.4</item>
-    <item name="layout_constraintTop_toTopOf">parent</item>
-    <item name="layout_constraintBottom_toBottomOf">parent</item>
-  </style>
-
-</resources>
diff --git a/app/src/main/res/anim/fade_in.xml b/core/src/main/res/anim/fade_in.xml
similarity index 100%
rename from app/src/main/res/anim/fade_in.xml
rename to core/src/main/res/anim/fade_in.xml
diff --git a/app/src/main/res/anim/fade_out.xml b/core/src/main/res/anim/fade_out.xml
similarity index 100%
rename from app/src/main/res/anim/fade_out.xml
rename to core/src/main/res/anim/fade_out.xml
diff --git a/app/src/main/res/color/material_dark_foreground_hint.xml b/core/src/main/res/color/material_dark_foreground_hint.xml
similarity index 100%
rename from app/src/main/res/color/material_dark_foreground_hint.xml
rename to core/src/main/res/color/material_dark_foreground_hint.xml
diff --git a/app/src/main/res/drawable-hdpi/ic_home_kiwix_banner.9.png b/core/src/main/res/drawable-hdpi/ic_home_kiwix_banner.9.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_home_kiwix_banner.9.png
rename to core/src/main/res/drawable-hdpi/ic_home_kiwix_banner.9.png
diff --git a/app/src/main/res/drawable-hdpi/ic_home_kiwix_banner_night.9.png b/core/src/main/res/drawable-hdpi/ic_home_kiwix_banner_night.9.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_home_kiwix_banner_night.9.png
rename to core/src/main/res/drawable-hdpi/ic_home_kiwix_banner_night.9.png
diff --git a/app/src/main/res/drawable-hdpi/ic_kiwix_widget.png b/core/src/main/res/drawable-hdpi/ic_kiwix_widget.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_kiwix_widget.png
rename to core/src/main/res/drawable-hdpi/ic_kiwix_widget.png
diff --git a/app/src/main/res/drawable-hdpi/kiwix_notification.png b/core/src/main/res/drawable-hdpi/kiwix_notification.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/kiwix_notification.png
rename to core/src/main/res/drawable-hdpi/kiwix_notification.png
diff --git a/app/src/main/res/drawable-mdpi/ic_home_kiwix_banner.9.png b/core/src/main/res/drawable-mdpi/ic_home_kiwix_banner.9.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_home_kiwix_banner.9.png
rename to core/src/main/res/drawable-mdpi/ic_home_kiwix_banner.9.png
diff --git a/app/src/main/res/drawable-mdpi/ic_home_kiwix_banner_night.9.png b/core/src/main/res/drawable-mdpi/ic_home_kiwix_banner_night.9.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_home_kiwix_banner_night.9.png
rename to core/src/main/res/drawable-mdpi/ic_home_kiwix_banner_night.9.png
diff --git a/app/src/main/res/drawable-mdpi/ic_kiwix_widget.png b/core/src/main/res/drawable-mdpi/ic_kiwix_widget.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_kiwix_widget.png
rename to core/src/main/res/drawable-mdpi/ic_kiwix_widget.png
diff --git a/app/src/main/res/drawable-mdpi/kiwix_notification.png b/core/src/main/res/drawable-mdpi/kiwix_notification.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/kiwix_notification.png
rename to core/src/main/res/drawable-mdpi/kiwix_notification.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_kiwix_banner.9.png b/core/src/main/res/drawable-xhdpi/ic_home_kiwix_banner.9.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_home_kiwix_banner.9.png
rename to core/src/main/res/drawable-xhdpi/ic_home_kiwix_banner.9.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_kiwix_banner_night.9.png b/core/src/main/res/drawable-xhdpi/ic_home_kiwix_banner_night.9.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_home_kiwix_banner_night.9.png
rename to core/src/main/res/drawable-xhdpi/ic_home_kiwix_banner_night.9.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_kiwix_widget.png b/core/src/main/res/drawable-xhdpi/ic_kiwix_widget.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_kiwix_widget.png
rename to core/src/main/res/drawable-xhdpi/ic_kiwix_widget.png
diff --git a/app/src/main/res/drawable-xhdpi/kiwix_notification.png b/core/src/main/res/drawable-xhdpi/kiwix_notification.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/kiwix_notification.png
rename to core/src/main/res/drawable-xhdpi/kiwix_notification.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner.9.png b/core/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner.9.png
rename to core/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner.9.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner_night.9.png b/core/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner_night.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner_night.9.png
rename to core/src/main/res/drawable-xxhdpi/ic_home_kiwix_banner_night.9.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_kiwix_widget.png b/core/src/main/res/drawable-xxhdpi/ic_kiwix_widget.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_kiwix_widget.png
rename to core/src/main/res/drawable-xxhdpi/ic_kiwix_widget.png
diff --git a/app/src/main/res/drawable-xxhdpi/kiwix_notification.png b/core/src/main/res/drawable-xxhdpi/kiwix_notification.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/kiwix_notification.png
rename to core/src/main/res/drawable-xxhdpi/kiwix_notification.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner.9.png b/core/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner.9.png
rename to core/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner.9.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner_night.9.png b/core/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner_night.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner_night.9.png
rename to core/src/main/res/drawable-xxxhdpi/ic_home_kiwix_banner_night.9.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_kiwix_widget.png b/core/src/main/res/drawable-xxxhdpi/ic_kiwix_widget.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_kiwix_widget.png
rename to core/src/main/res/drawable-xxxhdpi/ic_kiwix_widget.png
diff --git a/app/src/main/res/drawable/action_find_next.xml b/core/src/main/res/drawable/action_find_next.xml
similarity index 100%
rename from app/src/main/res/drawable/action_find_next.xml
rename to core/src/main/res/drawable/action_find_next.xml
diff --git a/app/src/main/res/drawable/action_find_previous.xml b/core/src/main/res/drawable/action_find_previous.xml
similarity index 100%
rename from app/src/main/res/drawable/action_find_previous.xml
rename to core/src/main/res/drawable/action_find_previous.xml
diff --git a/app/src/main/res/drawable/action_home.xml b/core/src/main/res/drawable/action_home.xml
similarity index 100%
rename from app/src/main/res/drawable/action_home.xml
rename to core/src/main/res/drawable/action_home.xml
diff --git a/app/src/main/res/drawable/action_open_file.xml b/core/src/main/res/drawable/action_open_file.xml
similarity index 100%
rename from app/src/main/res/drawable/action_open_file.xml
rename to core/src/main/res/drawable/action_open_file.xml
diff --git a/app/src/main/res/drawable/action_randomarticle.xml b/core/src/main/res/drawable/action_randomarticle.xml
similarity index 100%
rename from app/src/main/res/drawable/action_randomarticle.xml
rename to core/src/main/res/drawable/action_randomarticle.xml
diff --git a/app/src/main/res/drawable/action_search.xml b/core/src/main/res/drawable/action_search.xml
similarity index 100%
rename from app/src/main/res/drawable/action_search.xml
rename to core/src/main/res/drawable/action_search.xml
diff --git a/app/src/main/res/drawable/action_voice.xml b/core/src/main/res/drawable/action_voice.xml
similarity index 100%
rename from app/src/main/res/drawable/action_voice.xml
rename to core/src/main/res/drawable/action_voice.xml
diff --git a/app/src/main/res/drawable/baseline_share_24.xml b/core/src/main/res/drawable/baseline_share_24.xml
similarity index 85%
rename from app/src/main/res/drawable/baseline_share_24.xml
rename to core/src/main/res/drawable/baseline_share_24.xml
index a70027243..6f2ccd518 100644
--- a/app/src/main/res/drawable/baseline_share_24.xml
+++ b/core/src/main/res/drawable/baseline_share_24.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
   android:height="24dp"
-  android:viewportHeight="24.0"
   android:viewportWidth="24.0"
-  android:width="24dp">
+  android:viewportHeight="24.0">
   <path
-    android:fillColor="@android:color/white"
+    android:fillColor="#FFFFFF"
     android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>
diff --git a/app/src/main/res/drawable/border_label_picture.xml b/core/src/main/res/drawable/border_label_picture.xml
similarity index 100%
rename from app/src/main/res/drawable/border_label_picture.xml
rename to core/src/main/res/drawable/border_label_picture.xml
diff --git a/app/src/main/res/drawable/border_label_video.xml b/core/src/main/res/drawable/border_label_video.xml
similarity index 100%
rename from app/src/main/res/drawable/border_label_video.xml
rename to core/src/main/res/drawable/border_label_video.xml
diff --git a/app/src/main/res/drawable/border_tab_switcher.xml b/core/src/main/res/drawable/border_tab_switcher.xml
similarity index 100%
rename from app/src/main/res/drawable/border_tab_switcher.xml
rename to core/src/main/res/drawable/border_tab_switcher.xml
diff --git a/app/src/main/res/drawable/fullscreen_exit.xml b/core/src/main/res/drawable/fullscreen_exit.xml
similarity index 100%
rename from app/src/main/res/drawable/fullscreen_exit.xml
rename to core/src/main/res/drawable/fullscreen_exit.xml
diff --git a/app/src/main/res/drawable/ic_action_back.xml b/core/src/main/res/drawable/ic_action_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_action_back.xml
rename to core/src/main/res/drawable/ic_action_back.xml
diff --git a/app/src/main/res/drawable/ic_action_delete.xml b/core/src/main/res/drawable/ic_action_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_action_delete.xml
rename to core/src/main/res/drawable/ic_action_delete.xml
diff --git a/app/src/main/res/drawable/ic_action_forward.xml b/core/src/main/res/drawable/ic_action_forward.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_action_forward.xml
rename to core/src/main/res/drawable/ic_action_forward.xml
diff --git a/app/src/main/res/drawable/ic_action_plus.xml b/core/src/main/res/drawable/ic_action_plus.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_action_plus.xml
rename to core/src/main/res/drawable/ic_action_plus.xml
diff --git a/app/src/main/res/drawable/ic_add_blue_24dp.xml b/core/src/main/res/drawable/ic_add_blue_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_blue_24dp.xml
rename to core/src/main/res/drawable/ic_add_blue_24dp.xml
diff --git a/app/src/main/res/drawable/ic_add_note.xml b/core/src/main/res/drawable/ic_add_note.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_note.xml
rename to core/src/main/res/drawable/ic_add_note.xml
diff --git a/app/src/main/res/drawable/ic_airplane.xml b/core/src/main/res/drawable/ic_airplane.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_airplane.xml
rename to core/src/main/res/drawable/ic_airplane.xml
diff --git a/app/src/main/res/drawable/ic_baseline_check_24px.xml b/core/src/main/res/drawable/ic_baseline_check_24px.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_baseline_check_24px.xml
rename to core/src/main/res/drawable/ic_baseline_check_24px.xml
diff --git a/app/src/main/res/drawable/ic_baseline_error_24px.xml b/core/src/main/res/drawable/ic_baseline_error_24px.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_baseline_error_24px.xml
rename to core/src/main/res/drawable/ic_baseline_error_24px.xml
diff --git a/app/src/main/res/drawable/ic_baseline_mobile_screen_share_24px.xml b/core/src/main/res/drawable/ic_baseline_mobile_screen_share_24px.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_baseline_mobile_screen_share_24px.xml
rename to core/src/main/res/drawable/ic_baseline_mobile_screen_share_24px.xml
diff --git a/app/src/main/res/drawable/ic_baseline_wait_24px.xml b/core/src/main/res/drawable/ic_baseline_wait_24px.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_baseline_wait_24px.xml
rename to core/src/main/res/drawable/ic_baseline_wait_24px.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/core/src/main/res/drawable/ic_bookmark_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_24dp.xml
rename to core/src/main/res/drawable/ic_bookmark_24dp.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_border_24dp.xml b/core/src/main/res/drawable/ic_bookmark_border_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_border_24dp.xml
rename to core/src/main/res/drawable/ic_bookmark_border_24dp.xml
diff --git a/app/src/main/res/drawable/ic_check_circle_blue_24dp.xml b/core/src/main/res/drawable/ic_check_circle_blue_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_check_circle_blue_24dp.xml
rename to core/src/main/res/drawable/ic_check_circle_blue_24dp.xml
diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/core/src/main/res/drawable/ic_check_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_check_white_24dp.xml
rename to core/src/main/res/drawable/ic_check_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_clear_white_24dp.xml b/core/src/main/res/drawable/ic_clear_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear_white_24dp.xml
rename to core/src/main/res/drawable/ic_clear_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/core/src/main/res/drawable/ic_close_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_black_24dp.xml
rename to core/src/main/res/drawable/ic_close_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/core/src/main/res/drawable/ic_close_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_white_24dp.xml
rename to core/src/main/res/drawable/ic_close_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/core/src/main/res/drawable/ic_delete_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_white_24dp.xml
rename to core/src/main/res/drawable/ic_delete_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/core/src/main/res/drawable/ic_done_white_24dp.xml
similarity index 61%
rename from app/src/main/res/drawable/ic_done_white_24dp.xml
rename to core/src/main/res/drawable/ic_done_white_24dp.xml
index f962108e1..d4ca004ed 100644
--- a/app/src/main/res/drawable/ic_done_white_24dp.xml
+++ b/core/src/main/res/drawable/ic_done_white_24dp.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
   android:height="24dp"
-  android:tint="@color/greenTick"
-  android:viewportHeight="24.0"
+  android:tint="#4CAF50"
   android:viewportWidth="24.0"
-  android:width="24dp">
+  android:viewportHeight="24.0">
   <path
-    android:fillColor="@android:color/white"
+    android:fillColor="#FFFFFF"
     android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_feedback_blue_24dp.xml b/core/src/main/res/drawable/ic_feedback_blue_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_feedback_blue_24dp.xml
rename to core/src/main/res/drawable/ic_feedback_blue_24dp.xml
diff --git a/app/src/main/res/drawable/ic_file_download_blue_24dp.xml b/core/src/main/res/drawable/ic_file_download_blue_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download_blue_24dp.xml
rename to core/src/main/res/drawable/ic_file_download_blue_24dp.xml
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_left_24dp.xml b/core/src/main/res/drawable/ic_keyboard_arrow_left_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_keyboard_arrow_left_24dp.xml
rename to core/src/main/res/drawable/ic_keyboard_arrow_left_24dp.xml
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml b/core/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
rename to core/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml
diff --git a/app/src/main/res/drawable/ic_language_white_24dp.xml b/core/src/main/res/drawable/ic_language_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_language_white_24dp.xml
rename to core/src/main/res/drawable/ic_language_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_mic_black_24dp.xml b/core/src/main/res/drawable/ic_mic_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_mic_black_24dp.xml
rename to core/src/main/res/drawable/ic_mic_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/core/src/main/res/drawable/ic_pause_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pause_black_24dp.xml
rename to core/src/main/res/drawable/ic_pause_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_round_add_white_36dp.xml b/core/src/main/res/drawable/ic_round_add_white_36dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_round_add_white_36dp.xml
rename to core/src/main/res/drawable/ic_round_add_white_36dp.xml
diff --git a/app/src/main/res/drawable/ic_save.xml b/core/src/main/res/drawable/ic_save.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_save.xml
rename to core/src/main/res/drawable/ic_save.xml
diff --git a/app/src/main/res/drawable/ic_shortcut_get_content.xml b/core/src/main/res/drawable/ic_shortcut_get_content.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shortcut_get_content.xml
rename to core/src/main/res/drawable/ic_shortcut_get_content.xml
diff --git a/app/src/main/res/drawable/ic_shortcut_new_tab.xml b/core/src/main/res/drawable/ic_shortcut_new_tab.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shortcut_new_tab.xml
rename to core/src/main/res/drawable/ic_shortcut_new_tab.xml
diff --git a/app/src/main/res/drawable/ic_stars_black_24dp.xml b/core/src/main/res/drawable/ic_stars_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stars_black_24dp.xml
rename to core/src/main/res/drawable/ic_stars_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_stop_black_24dp.xml b/core/src/main/res/drawable/ic_stop_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stop_black_24dp.xml
rename to core/src/main/res/drawable/ic_stop_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_toc_24dp.xml b/core/src/main/res/drawable/ic_toc_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_toc_24dp.xml
rename to core/src/main/res/drawable/ic_toc_24dp.xml
diff --git a/app/src/main/res/drawable/ic_warning_black.xml b/core/src/main/res/drawable/ic_warning_black.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_warning_black.xml
rename to core/src/main/res/drawable/ic_warning_black.xml
diff --git a/app/src/main/res/drawable/ic_warning_white.xml b/core/src/main/res/drawable/ic_warning_white.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_warning_white.xml
rename to core/src/main/res/drawable/ic_warning_white.xml
diff --git a/app/src/main/res/drawable/icon_question.xml b/core/src/main/res/drawable/icon_question.xml
similarity index 100%
rename from app/src/main/res/drawable/icon_question.xml
rename to core/src/main/res/drawable/icon_question.xml
diff --git a/app/src/main/res/drawable/kiwix_icon_with_title.png b/core/src/main/res/drawable/kiwix_icon_with_title.png
similarity index 100%
rename from app/src/main/res/drawable/kiwix_icon_with_title.png
rename to core/src/main/res/drawable/kiwix_icon_with_title.png
diff --git a/app/src/main/res/drawable/launch_screen.xml b/core/src/main/res/drawable/launch_screen.xml
similarity index 100%
rename from app/src/main/res/drawable/launch_screen.xml
rename to core/src/main/res/drawable/launch_screen.xml
diff --git a/app/src/main/res/drawable/list_bg.xml b/core/src/main/res/drawable/list_bg.xml
similarity index 100%
rename from app/src/main/res/drawable/list_bg.xml
rename to core/src/main/res/drawable/list_bg.xml
diff --git a/app/src/main/res/drawable/list_bg_light.xml b/core/src/main/res/drawable/list_bg_light.xml
similarity index 100%
rename from app/src/main/res/drawable/list_bg_light.xml
rename to core/src/main/res/drawable/list_bg_light.xml
diff --git a/app/src/main/res/drawable/scrollbar_handle_vertical.xml b/core/src/main/res/drawable/scrollbar_handle_vertical.xml
similarity index 100%
rename from app/src/main/res/drawable/scrollbar_handle_vertical.xml
rename to core/src/main/res/drawable/scrollbar_handle_vertical.xml
diff --git a/app/src/main/res/drawable/search_widget_background.xml b/core/src/main/res/drawable/search_widget_background.xml
similarity index 100%
rename from app/src/main/res/drawable/search_widget_background.xml
rename to core/src/main/res/drawable/search_widget_background.xml
diff --git a/app/src/main/res/drawable/search_widget_preview.png b/core/src/main/res/drawable/search_widget_preview.png
similarity index 100%
rename from app/src/main/res/drawable/search_widget_preview.png
rename to core/src/main/res/drawable/search_widget_preview.png
diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/core/src/main/res/layout/activity_bookmarks.xml
similarity index 100%
rename from app/src/main/res/layout/activity_bookmarks.xml
rename to core/src/main/res/layout/activity_bookmarks.xml
diff --git a/app/src/main/res/layout/activity_help.xml b/core/src/main/res/layout/activity_help.xml
similarity index 100%
rename from app/src/main/res/layout/activity_help.xml
rename to core/src/main/res/layout/activity_help.xml
diff --git a/app/src/main/res/layout/activity_history.xml b/core/src/main/res/layout/activity_history.xml
similarity index 100%
rename from app/src/main/res/layout/activity_history.xml
rename to core/src/main/res/layout/activity_history.xml
diff --git a/app/src/main/res/layout/activity_intro.xml b/core/src/main/res/layout/activity_intro.xml
similarity index 100%
rename from app/src/main/res/layout/activity_intro.xml
rename to core/src/main/res/layout/activity_intro.xml
diff --git a/app/src/main/res/layout/activity_kiwix_error.xml b/core/src/main/res/layout/activity_kiwix_error.xml
similarity index 100%
rename from app/src/main/res/layout/activity_kiwix_error.xml
rename to core/src/main/res/layout/activity_kiwix_error.xml
diff --git a/app/src/main/res/layout/activity_language.xml b/core/src/main/res/layout/activity_language.xml
similarity index 100%
rename from app/src/main/res/layout/activity_language.xml
rename to core/src/main/res/layout/activity_language.xml
diff --git a/app/src/main/res/layout/activity_library.xml b/core/src/main/res/layout/activity_library.xml
similarity index 100%
rename from app/src/main/res/layout/activity_library.xml
rename to core/src/main/res/layout/activity_library.xml
diff --git a/app/src/main/res/layout/activity_local_file_transfer.xml b/core/src/main/res/layout/activity_local_file_transfer.xml
similarity index 100%
rename from app/src/main/res/layout/activity_local_file_transfer.xml
rename to core/src/main/res/layout/activity_local_file_transfer.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/core/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to core/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_zim_host.xml b/core/src/main/res/layout/activity_zim_host.xml
similarity index 100%
rename from app/src/main/res/layout/activity_zim_host.xml
rename to core/src/main/res/layout/activity_zim_host.xml
diff --git a/app/src/main/res/layout/bottom_toolbar.xml b/core/src/main/res/layout/bottom_toolbar.xml
similarity index 100%
rename from app/src/main/res/layout/bottom_toolbar.xml
rename to core/src/main/res/layout/bottom_toolbar.xml
diff --git a/app/src/main/res/layout/content_main.xml b/core/src/main/res/layout/content_main.xml
similarity index 100%
rename from app/src/main/res/layout/content_main.xml
rename to core/src/main/res/layout/content_main.xml
diff --git a/app/src/main/res/layout/credits_webview.xml b/core/src/main/res/layout/credits_webview.xml
similarity index 100%
rename from app/src/main/res/layout/credits_webview.xml
rename to core/src/main/res/layout/credits_webview.xml
diff --git a/app/src/main/res/layout/device_item.xml b/core/src/main/res/layout/device_item.xml
similarity index 100%
rename from app/src/main/res/layout/device_item.xml
rename to core/src/main/res/layout/device_item.xml
diff --git a/app/src/main/res/layout/dialog_add_note.xml b/core/src/main/res/layout/dialog_add_note.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_add_note.xml
rename to core/src/main/res/layout/dialog_add_note.xml
diff --git a/app/src/main/res/layout/download_item.xml b/core/src/main/res/layout/download_item.xml
similarity index 100%
rename from app/src/main/res/layout/download_item.xml
rename to core/src/main/res/layout/download_item.xml
diff --git a/app/src/main/res/layout/drawer_right.xml b/core/src/main/res/layout/drawer_right.xml
similarity index 100%
rename from app/src/main/res/layout/drawer_right.xml
rename to core/src/main/res/layout/drawer_right.xml
diff --git a/app/src/main/res/layout/header_date.xml b/core/src/main/res/layout/header_date.xml
similarity index 100%
rename from app/src/main/res/layout/header_date.xml
rename to core/src/main/res/layout/header_date.xml
diff --git a/app/src/main/res/layout/header_language.xml b/core/src/main/res/layout/header_language.xml
similarity index 100%
rename from app/src/main/res/layout/header_language.xml
rename to core/src/main/res/layout/header_language.xml
diff --git a/app/src/main/res/layout/ic_tab_switcher.xml b/core/src/main/res/layout/ic_tab_switcher.xml
similarity index 100%
rename from app/src/main/res/layout/ic_tab_switcher.xml
rename to core/src/main/res/layout/ic_tab_switcher.xml
diff --git a/app/src/main/res/layout/item_book.xml b/core/src/main/res/layout/item_book.xml
similarity index 100%
rename from app/src/main/res/layout/item_book.xml
rename to core/src/main/res/layout/item_book.xml
diff --git a/app/src/main/res/layout/item_bookmark_history.xml b/core/src/main/res/layout/item_bookmark_history.xml
similarity index 100%
rename from app/src/main/res/layout/item_bookmark_history.xml
rename to core/src/main/res/layout/item_bookmark_history.xml
diff --git a/app/src/main/res/layout/item_help.xml b/core/src/main/res/layout/item_help.xml
similarity index 100%
rename from app/src/main/res/layout/item_help.xml
rename to core/src/main/res/layout/item_help.xml
diff --git a/app/src/main/res/layout/item_intro_1.xml b/core/src/main/res/layout/item_intro_1.xml
similarity index 100%
rename from app/src/main/res/layout/item_intro_1.xml
rename to core/src/main/res/layout/item_intro_1.xml
diff --git a/app/src/main/res/layout/item_intro_2.xml b/core/src/main/res/layout/item_intro_2.xml
similarity index 100%
rename from app/src/main/res/layout/item_intro_2.xml
rename to core/src/main/res/layout/item_intro_2.xml
diff --git a/app/src/main/res/layout/item_language.xml b/core/src/main/res/layout/item_language.xml
similarity index 100%
rename from app/src/main/res/layout/item_language.xml
rename to core/src/main/res/layout/item_language.xml
diff --git a/app/src/main/res/layout/item_transfer_list.xml b/core/src/main/res/layout/item_transfer_list.xml
similarity index 100%
rename from app/src/main/res/layout/item_transfer_list.xml
rename to core/src/main/res/layout/item_transfer_list.xml
diff --git a/app/src/main/res/layout/kiwix_search_widget.xml b/core/src/main/res/layout/kiwix_search_widget.xml
similarity index 100%
rename from app/src/main/res/layout/kiwix_search_widget.xml
rename to core/src/main/res/layout/kiwix_search_widget.xml
diff --git a/app/src/main/res/layout/layout_download_management.xml b/core/src/main/res/layout/layout_download_management.xml
similarity index 100%
rename from app/src/main/res/layout/layout_download_management.xml
rename to core/src/main/res/layout/layout_download_management.xml
diff --git a/app/src/main/res/layout/library_divider.xml b/core/src/main/res/layout/library_divider.xml
similarity index 100%
rename from app/src/main/res/layout/library_divider.xml
rename to core/src/main/res/layout/library_divider.xml
diff --git a/app/src/main/res/layout/library_item.xml b/core/src/main/res/layout/library_item.xml
similarity index 100%
rename from app/src/main/res/layout/library_item.xml
rename to core/src/main/res/layout/library_item.xml
diff --git a/app/src/main/res/layout/main_activity_content.xml b/core/src/main/res/layout/main_activity_content.xml
similarity index 100%
rename from app/src/main/res/layout/main_activity_content.xml
rename to core/src/main/res/layout/main_activity_content.xml
diff --git a/app/src/main/res/layout/progress_bar.xml b/core/src/main/res/layout/progress_bar.xml
similarity index 100%
rename from app/src/main/res/layout/progress_bar.xml
rename to core/src/main/res/layout/progress_bar.xml
diff --git a/app/src/main/res/layout/row_peer_device.xml b/core/src/main/res/layout/row_peer_device.xml
similarity index 100%
rename from app/src/main/res/layout/row_peer_device.xml
rename to core/src/main/res/layout/row_peer_device.xml
diff --git a/app/src/main/res/layout/search.xml b/core/src/main/res/layout/search.xml
similarity index 100%
rename from app/src/main/res/layout/search.xml
rename to core/src/main/res/layout/search.xml
diff --git a/app/src/main/res/layout/section_list.xml b/core/src/main/res/layout/section_list.xml
similarity index 100%
rename from app/src/main/res/layout/section_list.xml
rename to core/src/main/res/layout/section_list.xml
diff --git a/app/src/main/res/layout/settings.xml b/core/src/main/res/layout/settings.xml
similarity index 100%
rename from app/src/main/res/layout/settings.xml
rename to core/src/main/res/layout/settings.xml
diff --git a/app/src/main/res/layout/slider_dialog.xml b/core/src/main/res/layout/slider_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/slider_dialog.xml
rename to core/src/main/res/layout/slider_dialog.xml
diff --git a/app/src/main/res/layout/storage_select_dialog.xml b/core/src/main/res/layout/storage_select_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/storage_select_dialog.xml
rename to core/src/main/res/layout/storage_select_dialog.xml
diff --git a/app/src/main/res/layout/tab_switcher.xml b/core/src/main/res/layout/tab_switcher.xml
similarity index 100%
rename from app/src/main/res/layout/tab_switcher.xml
rename to core/src/main/res/layout/tab_switcher.xml
diff --git a/app/src/main/res/layout/webview_search.xml b/core/src/main/res/layout/webview_search.xml
similarity index 100%
rename from app/src/main/res/layout/webview_search.xml
rename to core/src/main/res/layout/webview_search.xml
diff --git a/app/src/main/res/layout/zim_list.xml b/core/src/main/res/layout/zim_list.xml
similarity index 100%
rename from app/src/main/res/layout/zim_list.xml
rename to core/src/main/res/layout/zim_list.xml
diff --git a/app/src/main/res/layout/zim_manager.xml b/core/src/main/res/layout/zim_manager.xml
similarity index 100%
rename from app/src/main/res/layout/zim_manager.xml
rename to core/src/main/res/layout/zim_manager.xml
diff --git a/app/src/main/res/menu/menu_add_note_dialog.xml b/core/src/main/res/menu/menu_add_note_dialog.xml
similarity index 100%
rename from app/src/main/res/menu/menu_add_note_dialog.xml
rename to core/src/main/res/menu/menu_add_note_dialog.xml
diff --git a/app/src/main/res/menu/menu_bookmarks.xml b/core/src/main/res/menu/menu_bookmarks.xml
similarity index 100%
rename from app/src/main/res/menu/menu_bookmarks.xml
rename to core/src/main/res/menu/menu_bookmarks.xml
diff --git a/app/src/main/res/menu/menu_context_delete.xml b/core/src/main/res/menu/menu_context_delete.xml
similarity index 100%
rename from app/src/main/res/menu/menu_context_delete.xml
rename to core/src/main/res/menu/menu_context_delete.xml
diff --git a/app/src/main/res/menu/menu_history.xml b/core/src/main/res/menu/menu_history.xml
similarity index 100%
rename from app/src/main/res/menu/menu_history.xml
rename to core/src/main/res/menu/menu_history.xml
diff --git a/app/src/main/res/menu/menu_language.xml b/core/src/main/res/menu/menu_language.xml
similarity index 100%
rename from app/src/main/res/menu/menu_language.xml
rename to core/src/main/res/menu/menu_language.xml
diff --git a/app/src/main/res/menu/menu_main.xml b/core/src/main/res/menu/menu_main.xml
similarity index 100%
rename from app/src/main/res/menu/menu_main.xml
rename to core/src/main/res/menu/menu_main.xml
diff --git a/app/src/main/res/menu/menu_search.xml b/core/src/main/res/menu/menu_search.xml
similarity index 100%
rename from app/src/main/res/menu/menu_search.xml
rename to core/src/main/res/menu/menu_search.xml
diff --git a/app/src/main/res/menu/menu_webview.xml b/core/src/main/res/menu/menu_webview.xml
similarity index 100%
rename from app/src/main/res/menu/menu_webview.xml
rename to core/src/main/res/menu/menu_webview.xml
diff --git a/app/src/main/res/menu/menu_webview_action.xml b/core/src/main/res/menu/menu_webview_action.xml
similarity index 100%
rename from app/src/main/res/menu/menu_webview_action.xml
rename to core/src/main/res/menu/menu_webview_action.xml
diff --git a/app/src/main/res/menu/menu_zim_files_contextual.xml b/core/src/main/res/menu/menu_zim_files_contextual.xml
similarity index 100%
rename from app/src/main/res/menu/menu_zim_files_contextual.xml
rename to core/src/main/res/menu/menu_zim_files_contextual.xml
diff --git a/app/src/main/res/menu/menu_zim_manager.xml b/core/src/main/res/menu/menu_zim_manager.xml
similarity index 100%
rename from app/src/main/res/menu/menu_zim_manager.xml
rename to core/src/main/res/menu/menu_zim_manager.xml
diff --git a/app/src/main/res/menu/wifi_file_share_items.xml b/core/src/main/res/menu/wifi_file_share_items.xml
similarity index 100%
rename from app/src/main/res/menu/wifi_file_share_items.xml
rename to core/src/main/res/menu/wifi_file_share_items.xml
diff --git a/app/src/main/res/mipmap-hdpi/kiwix_icon.png b/core/src/main/res/mipmap-hdpi/kiwix_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/kiwix_icon.png
rename to core/src/main/res/mipmap-hdpi/kiwix_icon.png
diff --git a/app/src/main/res/mipmap-hdpi/kiwix_icon_round.png b/core/src/main/res/mipmap-hdpi/kiwix_icon_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/kiwix_icon_round.png
rename to core/src/main/res/mipmap-hdpi/kiwix_icon_round.png
diff --git a/app/src/main/res/mipmap-mdpi/kiwix_icon.png b/core/src/main/res/mipmap-mdpi/kiwix_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/kiwix_icon.png
rename to core/src/main/res/mipmap-mdpi/kiwix_icon.png
diff --git a/app/src/main/res/mipmap-mdpi/kiwix_icon_round.png b/core/src/main/res/mipmap-mdpi/kiwix_icon_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/kiwix_icon_round.png
rename to core/src/main/res/mipmap-mdpi/kiwix_icon_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/kiwix_icon.png b/core/src/main/res/mipmap-xhdpi/kiwix_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/kiwix_icon.png
rename to core/src/main/res/mipmap-xhdpi/kiwix_icon.png
diff --git a/app/src/main/res/mipmap-xhdpi/kiwix_icon_round.png b/core/src/main/res/mipmap-xhdpi/kiwix_icon_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/kiwix_icon_round.png
rename to core/src/main/res/mipmap-xhdpi/kiwix_icon_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/kiwix_icon.png b/core/src/main/res/mipmap-xxhdpi/kiwix_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/kiwix_icon.png
rename to core/src/main/res/mipmap-xxhdpi/kiwix_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/kiwix_icon_round.png b/core/src/main/res/mipmap-xxhdpi/kiwix_icon_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/kiwix_icon_round.png
rename to core/src/main/res/mipmap-xxhdpi/kiwix_icon_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/kiwix_icon.png b/core/src/main/res/mipmap-xxxhdpi/kiwix_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/kiwix_icon.png
rename to core/src/main/res/mipmap-xxxhdpi/kiwix_icon.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/kiwix_icon_round.png b/core/src/main/res/mipmap-xxxhdpi/kiwix_icon_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/kiwix_icon_round.png
rename to core/src/main/res/mipmap-xxxhdpi/kiwix_icon_round.png
diff --git a/app/src/main/res/values-af/strings.xml b/core/src/main/res/values-af/strings.xml
similarity index 100%
rename from app/src/main/res/values-af/strings.xml
rename to core/src/main/res/values-af/strings.xml
diff --git a/app/src/main/res/values-am/strings.xml b/core/src/main/res/values-am/strings.xml
similarity index 100%
rename from app/src/main/res/values-am/strings.xml
rename to core/src/main/res/values-am/strings.xml
diff --git a/app/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
similarity index 100%
rename from app/src/main/res/values-ar/strings.xml
rename to core/src/main/res/values-ar/strings.xml
diff --git a/app/src/main/res/values-as/strings.xml b/core/src/main/res/values-as/strings.xml
similarity index 100%
rename from app/src/main/res/values-as/strings.xml
rename to core/src/main/res/values-as/strings.xml
diff --git a/app/src/main/res/values-az/strings.xml b/core/src/main/res/values-az/strings.xml
similarity index 100%
rename from app/src/main/res/values-az/strings.xml
rename to core/src/main/res/values-az/strings.xml
diff --git a/app/src/main/res/values-ba/strings.xml b/core/src/main/res/values-ba/strings.xml
similarity index 100%
rename from app/src/main/res/values-ba/strings.xml
rename to core/src/main/res/values-ba/strings.xml
diff --git a/app/src/main/res/values-be/strings.xml b/core/src/main/res/values-be/strings.xml
similarity index 100%
rename from app/src/main/res/values-be/strings.xml
rename to core/src/main/res/values-be/strings.xml
diff --git a/app/src/main/res/values-bg/strings.xml b/core/src/main/res/values-bg/strings.xml
similarity index 100%
rename from app/src/main/res/values-bg/strings.xml
rename to core/src/main/res/values-bg/strings.xml
diff --git a/app/src/main/res/values-bm/strings.xml b/core/src/main/res/values-bm/strings.xml
similarity index 100%
rename from app/src/main/res/values-bm/strings.xml
rename to core/src/main/res/values-bm/strings.xml
diff --git a/app/src/main/res/values-bn/strings.xml b/core/src/main/res/values-bn/strings.xml
similarity index 100%
rename from app/src/main/res/values-bn/strings.xml
rename to core/src/main/res/values-bn/strings.xml
diff --git a/app/src/main/res/values-br/strings.xml b/core/src/main/res/values-br/strings.xml
similarity index 100%
rename from app/src/main/res/values-br/strings.xml
rename to core/src/main/res/values-br/strings.xml
diff --git a/app/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml
similarity index 100%
rename from app/src/main/res/values-ca/strings.xml
rename to core/src/main/res/values-ca/strings.xml
diff --git a/app/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml
similarity index 100%
rename from app/src/main/res/values-cs/strings.xml
rename to core/src/main/res/values-cs/strings.xml
diff --git a/app/src/main/res/values-cv/strings.xml b/core/src/main/res/values-cv/strings.xml
similarity index 100%
rename from app/src/main/res/values-cv/strings.xml
rename to core/src/main/res/values-cv/strings.xml
diff --git a/app/src/main/res/values-cy/strings.xml b/core/src/main/res/values-cy/strings.xml
similarity index 100%
rename from app/src/main/res/values-cy/strings.xml
rename to core/src/main/res/values-cy/strings.xml
diff --git a/app/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
similarity index 100%
rename from app/src/main/res/values-da/strings.xml
rename to core/src/main/res/values-da/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to core/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-el/strings.xml b/core/src/main/res/values-el/strings.xml
similarity index 100%
rename from app/src/main/res/values-el/strings.xml
rename to core/src/main/res/values-el/strings.xml
diff --git a/app/src/main/res/values-eo/strings.xml b/core/src/main/res/values-eo/strings.xml
similarity index 100%
rename from app/src/main/res/values-eo/strings.xml
rename to core/src/main/res/values-eo/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to core/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-et/strings.xml b/core/src/main/res/values-et/strings.xml
similarity index 100%
rename from app/src/main/res/values-et/strings.xml
rename to core/src/main/res/values-et/strings.xml
diff --git a/app/src/main/res/values-eu/strings.xml b/core/src/main/res/values-eu/strings.xml
similarity index 100%
rename from app/src/main/res/values-eu/strings.xml
rename to core/src/main/res/values-eu/strings.xml
diff --git a/app/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml
similarity index 100%
rename from app/src/main/res/values-fa/strings.xml
rename to core/src/main/res/values-fa/strings.xml
diff --git a/app/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
similarity index 100%
rename from app/src/main/res/values-fi/strings.xml
rename to core/src/main/res/values-fi/strings.xml
diff --git a/app/src/main/res/values-fo/strings.xml b/core/src/main/res/values-fo/strings.xml
similarity index 100%
rename from app/src/main/res/values-fo/strings.xml
rename to core/src/main/res/values-fo/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to core/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-gl/strings.xml b/core/src/main/res/values-gl/strings.xml
similarity index 100%
rename from app/src/main/res/values-gl/strings.xml
rename to core/src/main/res/values-gl/strings.xml
diff --git a/app/src/main/res/values-gu/strings.xml b/core/src/main/res/values-gu/strings.xml
similarity index 100%
rename from app/src/main/res/values-gu/strings.xml
rename to core/src/main/res/values-gu/strings.xml
diff --git a/app/src/main/res/values-hi/strings.xml b/core/src/main/res/values-hi/strings.xml
similarity index 100%
rename from app/src/main/res/values-hi/strings.xml
rename to core/src/main/res/values-hi/strings.xml
diff --git a/app/src/main/res/values-hr/strings.xml b/core/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app/src/main/res/values-hr/strings.xml
rename to core/src/main/res/values-hr/strings.xml
diff --git a/app/src/main/res/values-hu/strings.xml b/core/src/main/res/values-hu/strings.xml
similarity index 100%
rename from app/src/main/res/values-hu/strings.xml
rename to core/src/main/res/values-hu/strings.xml
diff --git a/app/src/main/res/values-ia/strings.xml b/core/src/main/res/values-ia/strings.xml
similarity index 100%
rename from app/src/main/res/values-ia/strings.xml
rename to core/src/main/res/values-ia/strings.xml
diff --git a/app/src/main/res/values-ie/strings.xml b/core/src/main/res/values-ie/strings.xml
similarity index 100%
rename from app/src/main/res/values-ie/strings.xml
rename to core/src/main/res/values-ie/strings.xml
diff --git a/app/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
similarity index 100%
rename from app/src/main/res/values-in/strings.xml
rename to core/src/main/res/values-in/strings.xml
diff --git a/app/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/strings.xml
rename to core/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
similarity index 100%
rename from app/src/main/res/values-iw/strings.xml
rename to core/src/main/res/values-iw/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/strings.xml
rename to core/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-ji/strings.xml b/core/src/main/res/values-ji/strings.xml
similarity index 100%
rename from app/src/main/res/values-ji/strings.xml
rename to core/src/main/res/values-ji/strings.xml
diff --git a/app/src/main/res/values-jv/strings.xml b/core/src/main/res/values-jv/strings.xml
similarity index 100%
rename from app/src/main/res/values-jv/strings.xml
rename to core/src/main/res/values-jv/strings.xml
diff --git a/app/src/main/res/values-ka/strings.xml b/core/src/main/res/values-ka/strings.xml
similarity index 100%
rename from app/src/main/res/values-ka/strings.xml
rename to core/src/main/res/values-ka/strings.xml
diff --git a/app/src/main/res/values-km/strings.xml b/core/src/main/res/values-km/strings.xml
similarity index 100%
rename from app/src/main/res/values-km/strings.xml
rename to core/src/main/res/values-km/strings.xml
diff --git a/app/src/main/res/values-kn/strings.xml b/core/src/main/res/values-kn/strings.xml
similarity index 100%
rename from app/src/main/res/values-kn/strings.xml
rename to core/src/main/res/values-kn/strings.xml
diff --git a/app/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
similarity index 100%
rename from app/src/main/res/values-ko/strings.xml
rename to core/src/main/res/values-ko/strings.xml
diff --git a/app/src/main/res/values-ky/strings.xml b/core/src/main/res/values-ky/strings.xml
similarity index 100%
rename from app/src/main/res/values-ky/strings.xml
rename to core/src/main/res/values-ky/strings.xml
diff --git a/app/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml
similarity index 100%
rename from app/src/main/res/values-lb/strings.xml
rename to core/src/main/res/values-lb/strings.xml
diff --git a/app/src/main/res/values-li/strings.xml b/core/src/main/res/values-li/strings.xml
similarity index 100%
rename from app/src/main/res/values-li/strings.xml
rename to core/src/main/res/values-li/strings.xml
diff --git a/app/src/main/res/values-lt/strings.xml b/core/src/main/res/values-lt/strings.xml
similarity index 100%
rename from app/src/main/res/values-lt/strings.xml
rename to core/src/main/res/values-lt/strings.xml
diff --git a/app/src/main/res/values-lv/strings.xml b/core/src/main/res/values-lv/strings.xml
similarity index 100%
rename from app/src/main/res/values-lv/strings.xml
rename to core/src/main/res/values-lv/strings.xml
diff --git a/app/src/main/res/values-mg/strings.xml b/core/src/main/res/values-mg/strings.xml
similarity index 100%
rename from app/src/main/res/values-mg/strings.xml
rename to core/src/main/res/values-mg/strings.xml
diff --git a/app/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
similarity index 100%
rename from app/src/main/res/values-mk/strings.xml
rename to core/src/main/res/values-mk/strings.xml
diff --git a/app/src/main/res/values-ml/strings.xml b/core/src/main/res/values-ml/strings.xml
similarity index 100%
rename from app/src/main/res/values-ml/strings.xml
rename to core/src/main/res/values-ml/strings.xml
diff --git a/app/src/main/res/values-mn/strings.xml b/core/src/main/res/values-mn/strings.xml
similarity index 100%
rename from app/src/main/res/values-mn/strings.xml
rename to core/src/main/res/values-mn/strings.xml
diff --git a/app/src/main/res/values-ms/strings.xml b/core/src/main/res/values-ms/strings.xml
similarity index 100%
rename from app/src/main/res/values-ms/strings.xml
rename to core/src/main/res/values-ms/strings.xml
diff --git a/app/src/main/res/values-mt/strings.xml b/core/src/main/res/values-mt/strings.xml
similarity index 100%
rename from app/src/main/res/values-mt/strings.xml
rename to core/src/main/res/values-mt/strings.xml
diff --git a/app/src/main/res/values-my/strings.xml b/core/src/main/res/values-my/strings.xml
similarity index 100%
rename from app/src/main/res/values-my/strings.xml
rename to core/src/main/res/values-my/strings.xml
diff --git a/app/src/main/res/values-nb/strings.xml b/core/src/main/res/values-nb/strings.xml
similarity index 100%
rename from app/src/main/res/values-nb/strings.xml
rename to core/src/main/res/values-nb/strings.xml
diff --git a/app/src/main/res/values-ne/strings.xml b/core/src/main/res/values-ne/strings.xml
similarity index 100%
rename from app/src/main/res/values-ne/strings.xml
rename to core/src/main/res/values-ne/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl/strings.xml
rename to core/src/main/res/values-nl/strings.xml
diff --git a/app/src/main/res/values-nn/strings.xml b/core/src/main/res/values-nn/strings.xml
similarity index 100%
rename from app/src/main/res/values-nn/strings.xml
rename to core/src/main/res/values-nn/strings.xml
diff --git a/app/src/main/res/values-oc/strings.xml b/core/src/main/res/values-oc/strings.xml
similarity index 100%
rename from app/src/main/res/values-oc/strings.xml
rename to core/src/main/res/values-oc/strings.xml
diff --git a/app/src/main/res/values-or/strings.xml b/core/src/main/res/values-or/strings.xml
similarity index 100%
rename from app/src/main/res/values-or/strings.xml
rename to core/src/main/res/values-or/strings.xml
diff --git a/app/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
similarity index 100%
rename from app/src/main/res/values-pl/strings.xml
rename to core/src/main/res/values-pl/strings.xml
diff --git a/app/src/main/res/values-ps/strings.xml b/core/src/main/res/values-ps/strings.xml
similarity index 100%
rename from app/src/main/res/values-ps/strings.xml
rename to core/src/main/res/values-ps/strings.xml
diff --git a/app/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt/strings.xml
rename to core/src/main/res/values-pt/strings.xml
diff --git a/app/src/main/res/values-qu/strings.xml b/core/src/main/res/values-qu/strings.xml
similarity index 100%
rename from app/src/main/res/values-qu/strings.xml
rename to core/src/main/res/values-qu/strings.xml
diff --git a/app/src/main/res/values-rm/strings.xml b/core/src/main/res/values-rm/strings.xml
similarity index 100%
rename from app/src/main/res/values-rm/strings.xml
rename to core/src/main/res/values-rm/strings.xml
diff --git a/app/src/main/res/values-ro/strings.xml b/core/src/main/res/values-ro/strings.xml
similarity index 100%
rename from app/src/main/res/values-ro/strings.xml
rename to core/src/main/res/values-ro/strings.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
similarity index 100%
rename from app/src/main/res/values-ru/strings.xml
rename to core/src/main/res/values-ru/strings.xml
diff --git a/app/src/main/res/values-sa/strings.xml b/core/src/main/res/values-sa/strings.xml
similarity index 100%
rename from app/src/main/res/values-sa/strings.xml
rename to core/src/main/res/values-sa/strings.xml
diff --git a/app/src/main/res/values-sc/strings.xml b/core/src/main/res/values-sc/strings.xml
similarity index 100%
rename from app/src/main/res/values-sc/strings.xml
rename to core/src/main/res/values-sc/strings.xml
diff --git a/app/src/main/res/values-sh/strings.xml b/core/src/main/res/values-sh/strings.xml
similarity index 100%
rename from app/src/main/res/values-sh/strings.xml
rename to core/src/main/res/values-sh/strings.xml
diff --git a/app/src/main/res/values-si/strings.xml b/core/src/main/res/values-si/strings.xml
similarity index 100%
rename from app/src/main/res/values-si/strings.xml
rename to core/src/main/res/values-si/strings.xml
diff --git a/app/src/main/res/values-sk/strings.xml b/core/src/main/res/values-sk/strings.xml
similarity index 100%
rename from app/src/main/res/values-sk/strings.xml
rename to core/src/main/res/values-sk/strings.xml
diff --git a/app/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml
similarity index 100%
rename from app/src/main/res/values-sl/strings.xml
rename to core/src/main/res/values-sl/strings.xml
diff --git a/app/src/main/res/values-so/strings.xml b/core/src/main/res/values-so/strings.xml
similarity index 100%
rename from app/src/main/res/values-so/strings.xml
rename to core/src/main/res/values-so/strings.xml
diff --git a/app/src/main/res/values-sq/strings.xml b/core/src/main/res/values-sq/strings.xml
similarity index 100%
rename from app/src/main/res/values-sq/strings.xml
rename to core/src/main/res/values-sq/strings.xml
diff --git a/app/src/main/res/values-su/strings.xml b/core/src/main/res/values-su/strings.xml
similarity index 100%
rename from app/src/main/res/values-su/strings.xml
rename to core/src/main/res/values-su/strings.xml
diff --git a/app/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
similarity index 100%
rename from app/src/main/res/values-sv/strings.xml
rename to core/src/main/res/values-sv/strings.xml
diff --git a/app/src/main/res/values-sw/strings.xml b/core/src/main/res/values-sw/strings.xml
similarity index 100%
rename from app/src/main/res/values-sw/strings.xml
rename to core/src/main/res/values-sw/strings.xml
diff --git a/app/src/main/res/values-ta/strings.xml b/core/src/main/res/values-ta/strings.xml
similarity index 100%
rename from app/src/main/res/values-ta/strings.xml
rename to core/src/main/res/values-ta/strings.xml
diff --git a/app/src/main/res/values-te/strings.xml b/core/src/main/res/values-te/strings.xml
similarity index 100%
rename from app/src/main/res/values-te/strings.xml
rename to core/src/main/res/values-te/strings.xml
diff --git a/app/src/main/res/values-th/strings.xml b/core/src/main/res/values-th/strings.xml
similarity index 100%
rename from app/src/main/res/values-th/strings.xml
rename to core/src/main/res/values-th/strings.xml
diff --git a/app/src/main/res/values-tl/strings.xml b/core/src/main/res/values-tl/strings.xml
similarity index 100%
rename from app/src/main/res/values-tl/strings.xml
rename to core/src/main/res/values-tl/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to core/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml
similarity index 100%
rename from app/src/main/res/values-uk/strings.xml
rename to core/src/main/res/values-uk/strings.xml
diff --git a/app/src/main/res/values-ur/strings.xml b/core/src/main/res/values-ur/strings.xml
similarity index 100%
rename from app/src/main/res/values-ur/strings.xml
rename to core/src/main/res/values-ur/strings.xml
diff --git a/app/src/main/res/values-uz/strings.xml b/core/src/main/res/values-uz/strings.xml
similarity index 100%
rename from app/src/main/res/values-uz/strings.xml
rename to core/src/main/res/values-uz/strings.xml
diff --git a/app/src/main/res/values-v19/styles.xml b/core/src/main/res/values-v19/styles.xml
similarity index 100%
rename from app/src/main/res/values-v19/styles.xml
rename to core/src/main/res/values-v19/styles.xml
diff --git a/app/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
similarity index 100%
rename from app/src/main/res/values-v21/styles.xml
rename to core/src/main/res/values-v21/styles.xml
diff --git a/app/src/main/res/values-vi/strings.xml b/core/src/main/res/values-vi/strings.xml
similarity index 100%
rename from app/src/main/res/values-vi/strings.xml
rename to core/src/main/res/values-vi/strings.xml
diff --git a/app/src/main/res/values-yo/strings.xml b/core/src/main/res/values-yo/strings.xml
similarity index 100%
rename from app/src/main/res/values-yo/strings.xml
rename to core/src/main/res/values-yo/strings.xml
diff --git a/app/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh/strings.xml
rename to core/src/main/res/values-zh/strings.xml
diff --git a/app/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
similarity index 100%
rename from app/src/main/res/values/attrs.xml
rename to core/src/main/res/values/attrs.xml
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 3ea04e700..5854cfa09 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -1,2 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+  <color name="primary">#000000</color>
+  <color name="primary_night">#ff212121</color>
+  <color name="primary_dark">#000000</color>
+  <color name="primary_dark_night">#ff212121</color>
+  <color name="primary_light">#ffffff</color>
+  <color name="accent">#2196F3</color>
+  <color name="icons">#212121</color>
+  <color name="white">#fafafa</color>
+  <color name="gray_list_bg">#0d000000</color>
+  <color name="drawer_background_day">#ffffff</color>
+  <color name="drawer_background_night">#5a5a5a</color>
+  <color name="selected_light">#0F000000</color>
+  <color name="divider_light">#2b3f6a</color>
+  <color name="greyed_out_selected">#BDBDBD</color>
+  <color name="black_regular_mat_design">#212121</color>
+  <color name="grey">#5a5a5a</color>
+  <color name="blue_grey">#ECEFF1</color>
+  <color name="foreground_material_dark">@android:color/white</color>
+  <color name="back_to_top_background">#DDFFFFFF</color>
+  <color name="picture_label">#fb8c00</color>
+  <color name="video_label">#651FFF</color>
+  <color name="blue800">#1565c0</color>
+  <color name="blueTransparent">#962e7ac4</color>
+  <color name="actionModeBackground">#4285F4</color>
+  <color name="titleBar">#000000</color>
+  <color name="greenTick">#4CAF50</color>
+  <color name="stopServer">#E53935</color>
+
+  <!-- Dark Text Color for Light Background -->
+  <color name="textDarkPrimary">#000000</color> <!-- 0% opacity-->
+  <color name="textDarkSecondary">#DE000000</color> <!--DE for 87% opacity-->
+  <color name="textDarkTertiary">#8A000000</color> <!--8A for 54% opacity-->
+
+  <!-- White Text Color for Dark Background -->
+  <color name="textLightPrimary">#FFFFFF</color> <!--100% opacity-->
+  <color name="textLightSecondary">#B2FFFFFF</color> <!--B2 for 70% opacity-->
+  <color name="textLightTertiary">#80FFFFFF</color> <!--80 for 50% opacity-->
+
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to core/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/ids.xml b/core/src/main/res/values/ids.xml
similarity index 100%
rename from app/src/main/res/values/ids.xml
rename to core/src/main/res/values/ids.xml
diff --git a/app/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to core/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/strings_nontranslatable.xml b/core/src/main/res/values/strings_nontranslatable.xml
similarity index 100%
rename from app/src/main/res/values/strings_nontranslatable.xml
rename to core/src/main/res/values/strings_nontranslatable.xml
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 3ea04e700..8e75f9fff 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -1,2 +1,165 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+
+  <style name="AppTheme" parent="AppTheme.Base" />
+
+  <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorPrimary">@color/primary</item>
+    <item name="colorPrimaryDark">@color/primary_dark</item>
+    <item name="colorAccent">@color/accent</item>
+    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+    <item name="searchViewStyle">@style/SearchViewStyle</item>
+    <item name="android:textCursorDrawable">@null</item>
+    <item name="windowNoTitle">true</item>
+    <item name="windowActionBar">false</item>
+    <item name="actionModeBackground">@color/actionModeBackground</item>
+    <item name="progressBackgroundColor">@color/primary_dark</item>
+    <item name="listBackground">@drawable/list_bg</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="windowActionModeOverlay">true</item>
+    <item name="arrowBackDrawable">@drawable/ic_action_back</item>
+    <item name="arrowForwardDrawable">@drawable/ic_action_forward</item>
+    <item name="drawerBackground">@color/drawer_background_day</item>
+    <item name="plusDrawable">@drawable/ic_action_plus</item>
+    <item name="deleteDrawable">@drawable/ic_action_delete</item>
+    <item name="dividerColor">@color/divider_light</item>
+    <item name="selectedBackground">@drawable/list_bg_light</item>
+    <item name="android:itemBackground">@color/primary_light</item>
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
+    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
+    <item name="colorControlNormal">@color/accent</item>
+  </style>
+
+  <style name="StatusBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <item name="colorPrimaryDark">@color/titleBar</item>
+    <item name="colorPrimary">@color/primary</item>
+    <item name="colorAccent">@color/accent</item>
+    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+    <item name="searchViewStyle">@style/SearchViewStyle</item>
+    <item name="android:textCursorDrawable">@null</item>
+    <item name="windowNoTitle">true</item>
+    <item name="windowActionBar">false</item>
+    <item name="actionModeBackground">@color/actionModeBackground</item>
+    <item name="progressBackgroundColor">@color/primary_dark</item>
+    <item name="listBackground">@drawable/list_bg</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="windowActionModeOverlay">true</item>
+    <item name="selectedBackground">@drawable/list_bg_light</item>
+    <item name="android:itemBackground">@color/primary_light</item>
+    <item name="drawerBackground">@color/drawer_background_day</item>
+    <item name="dividerColor">@color/divider_light</item>
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
+    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
+    <item name="colorControlNormal">@color/accent</item>
+  </style>
+
+  <style name="AppTheme.Night" parent="AppTheme.Base">
+    <item name="colorPrimary">@color/primary_night</item>
+    <item name="colorPrimaryDark">@color/primary_dark_night</item>
+    <item name="colorAccent">@color/accent</item>
+    <item name="progressBackgroundColor">@color/primary_dark_night</item>
+    <item name="drawerBackground">@color/drawer_background_night</item>
+    <item name="listBackground">@color/grey</item>
+    <item name="android:itemBackground">@color/grey</item>
+    <item name="android:itemTextAppearance">@color/grey</item>
+    <item name="android:textColor">@color/primary_light</item>
+    <item name="android:textColorPrimary">@color/textLightPrimary</item>
+    <item name="android:textColorSecondary">@color/textLightSecondary</item>
+    <item name="android:textColorTertiary">@color/textLightTertiary</item>
+    <item name="android:alertDialogTheme">@style/AppTheme.Dialog.Night</item>
+    <item name="colorControlNormal">@color/accent</item>
+  </style>
+
+  <style name="AppTheme.Launcher">
+    <item name="android:windowBackground">@drawable/launch_screen</item>
+  </style>
+
+  <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+    <item name="spinBars">true</item>
+  </style>
+
+  <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView" />
+
+  <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+
+  </style>
+
+  <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat">
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="actionMenuTextColor">@color/textDarkPrimary</item>
+  </style>
+
+  <style name="AppTheme.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="colorAccent">@color/accent</item>
+    <item name="android:textColorPrimary">@color/primary_dark</item>
+    <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+    <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+    <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+    <item name="android:textColorAlertDialogListItem">@color/primary_dark</item>
+    <item name="android:windowBackground">@color/white</item>
+    <item name="android:textColorSecondary">@color/primary_light</item>
+  </style>
+
+  <style name="AppTheme.Dialog.Night" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+    <item name="colorAccent">@color/accent</item>
+    <item name="android:textColorPrimary">@color/white</item>
+    <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+    <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+    <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+    <item name="android:textColorAlertDialogListItem">@color/white</item>
+    <item name="android:windowBackground">@color/cardview_dark_background</item>
+    <item name="android:textColorSecondary">@color/primary_light</item>
+  </style>
+
+  <style name="NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+    <item name="android:textColor">@color/accent</item>
+  </style>
+
+  <style name="PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+    <item name="android:textColor">@color/accent</item>
+  </style>
+
+  <style name="NeutralButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+    <item name="android:textColor">@color/accent</item>
+  </style>
+
+  <style name="AddNoteDialogStyle" parent="Theme.AppCompat.Dialog">
+    <item name="android:windowNoTitle">true</item>
+    <item name="colorPrimaryDark">@color/primary_dark</item>
+    <item name="colorPrimary">@color/primary</item>
+    <item name="android:textColor">#000000</item>
+    <item name="android:editTextColor">#000000</item>
+    <item name="android:textColorHint">@color/textDarkTertiary</item>
+    <item name="android:windowFullscreen">false</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowBackground">@color/white</item>
+  </style>
+
+  <style name="AddNoteDialogStyle.Night" parent="Theme.AppCompat.Dialog">
+    <item name="android:windowNoTitle">true</item>
+    <item name="colorPrimaryDark">@color/primary_dark</item>
+    <item name="colorPrimary">@color/primary</item>
+    <item name="android:textColor">#ffffff</item>
+    <item name="android:editTextColor">#ffffff</item>
+    <item name="android:textColorHint">@color/grey</item>
+    <item name="android:windowFullscreen">false</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowBackground">@color/cardview_dark_background</item>
+  </style>
+
+  <style name="no_list_content_text" parent="TextAppearance.AppCompat">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textSize">20sp</item>
+    <item name="android:textColor">@color/grey</item>
+    <item name="android:visibility">gone</item>
+    <item name="layout_constraintLeft_toLeftOf">parent</item>
+    <item name="layout_constraintRight_toRightOf">parent</item>
+    <item name="layout_constraintVertical_bias">0.4</item>
+    <item name="layout_constraintTop_toTopOf">parent</item>
+    <item name="layout_constraintBottom_toBottomOf">parent</item>
+  </style>
+
+</resources>
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/core/src/main/res/xml-v25/shortcuts.xml
similarity index 100%
rename from app/src/main/res/xml-v25/shortcuts.xml
rename to core/src/main/res/xml-v25/shortcuts.xml
diff --git a/app/src/main/res/xml/kiwix_widget_provider_info.xml b/core/src/main/res/xml/kiwix_widget_provider_info.xml
similarity index 100%
rename from app/src/main/res/xml/kiwix_widget_provider_info.xml
rename to core/src/main/res/xml/kiwix_widget_provider_info.xml
diff --git a/app/src/main/res/xml/network_security_config.xml b/core/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from app/src/main/res/xml/network_security_config.xml
rename to core/src/main/res/xml/network_security_config.xml
diff --git a/app/src/main/res/xml/preferences.xml b/core/src/main/res/xml/preferences.xml
similarity index 100%
rename from app/src/main/res/xml/preferences.xml
rename to core/src/main/res/xml/preferences.xml
diff --git a/app/src/main/res/xml/provider_paths.xml b/core/src/main/res/xml/provider_paths.xml
similarity index 100%
rename from app/src/main/res/xml/provider_paths.xml
rename to core/src/main/res/xml/provider_paths.xml
diff --git a/app/src/main/res/xml/webview.xml b/core/src/main/res/xml/webview.xml
similarity index 100%
rename from app/src/main/res/xml/webview.xml
rename to core/src/main/res/xml/webview.xml