diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 872427730..a563ca547 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -54,6 +54,14 @@ All branches should have distinct history and should be visually easy to follow,
 
 If you wish to rebase you should be following the [Golden Rule](https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing) and ahere to the advice in the heading [Aside: Rebase as cleanup is awesome in the coding lifecycle](https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase).
 
+### Design and style
+
+For an overview of how to make design changes to Kiwix Android, check out [DESIGN.md](https://github.com/kiwix/kiwix-android/edit/develop/DESIGN.md).
+
+### Adding new string resources
+
+To add a new string resource see [STRING_RESOURCES.md](https://github.com/kiwix/kiwix-android/edit/develop/STRING_RESOURCES.md).
+
 ### Building
 
 The Kiwix app is split into 3 modules
diff --git a/DESIGN.md b/DESIGN.md
new file mode 100644
index 000000000..0990f5950
--- /dev/null
+++ b/DESIGN.md
@@ -0,0 +1,72 @@
+# Design
+
+This file intends to provide information on how to work with design in the Kiwix android applicaiton. 
+
+## Colors
+
+<img src="https://user-images.githubusercontent.com/22193232/83739760-4ef07080-a656-11ea-8f87-344f48e76324.png" alt="drawing" width="300"/>
+
+The Kiwix colors are black and white with different colored accents. For Kiwix Android, black is accented by different shades of blue:
+
+- ![#000000](https://via.placeholder.com/15/000000/000000?text=+) `#000000`/`black`
+- ![#1565c0](https://via.placeholder.com/15/1565c0/000000?text=+) `#1565c0`/`denim_blue800`
+- ![#42a5f5](https://via.placeholder.com/15/42a5f5/000000?text=+) `#42a5f5`/`denim_blue400`
+- ![#2196F3](https://via.placeholder.com/15/2196F3/000000?text=+) `#2196F3`/`dodger_blue`
+
+> Color indicates which elements are interactive, how they relate to other elements, and their level of prominence. Important elements should stand out the most [1].
+
+For a guide on how to apply colors to UI, see ["Applying color to UI - Material Design"](https://material.io/design/color/applying-color-to-ui.html#backdrop).
+
+## Themes
+Kiwix uses themes to apply styles to views. This means that instead of adding a specific color or style to each view in the application, a theme should be set.
+Themes are defined in `res/values/themes.xml` or `res/values-night/themes.xml` depending on night/day.
+The following steps should be followed to set a color or style of a view.
+1. Define the color or style:
+    * Define the color in `core/colors.xml`. Use good naming (`denim_blue`, `mine_shaft_gray` etc..). Our recommended tool for color naming is [Chirag Mehta - Name that color](http://chir.ag/projects/name-that-color/#6195ED).
+    * Define the style in `core/styles.xml`. For our default styles, applied with theme attributes, the naming convention is `Widget.KiwixTheme.*` and these should ideally inherit from their `Widget.MaterialComponent.*`, should no such parent exist, it is generally advisable to google "how to style [Component]". When there are two or more of a view that differ stylistically from our default styling, but are identical to each other visually, it is appropriate to extract a style to keep the XML DRY. A non-default style should use a descriptive name. e.x. `list_item_title`. 
+2. Add the color or style to a specific theme attribute in `themes.xml`.
+3. Make sure that the color or style works in both day and night mode. If it does not, add the dark mode compatible attribute to `values-night/themes.xml`.
+
+For a video on how to work with themes, styles and colors, see [Developing Themes with Style (Android Dev Summit '19)](https://www.youtube.com/watch?v=Owkf8DhAOSo).
+
+## Night Mode / Dark Theme
+Night mode is a different theme that has many benefits such as saving battery and improving visibility in low light conditions [2]. When doing any design, make sure the new design works in dark mode. Night mode can be activated from the systems settings or from the kiwix app. 
+
+Whenever a resource exists in both `res/*-night` and `res/*` it will be used as such. For example: `kiwix_icon_with_title.png` exists in both `res/drawable` and `res/drawable-night` which means that the image in `res/drawable-night` will be used automagically in night mode. For further reading on development with dark mode, see [Material Design - Dark Theme](https://developer.android.com/guide/topics/ui/look-and-feel/darktheme). 
+
+## Typography
+Text should contrast well, use the correct weight and size to present content as clearly and efficiently as possible. 
+
+Views using the same style often use different text style. Therefore text styles, and view styles are seperated and can be used simultaneously. To keep an android application consistent in style, thirteen text style attributes should be defined. These style attributes can be generated ([Material Design type scale generator](https://material.io/design/typography/the-type-system.html#type-scale)), or defined by editing `core/../values/type.xml`. 
+
+All text should have a text style to simplifiy appearance changes. To set a text style, simply set the `textAppearance` property using one of the thirteen text style attributes from `core/../values/type.xml`. Text can also be grouped if they are related and uses the same text style. This grouping can be done by creating a style that inherits, or sets a specific text appearance. E.x. `<style name="no_content_text" parent="TextAppearance.KiwixTheme.Headline5" />`.
+
+Additional reading can be found at [Material Design - Type System](https://material.io/design/typography/the-type-system.html#type-scale). 
+
+## Resources
+Following is a list of resources that can and should be used to support a design decision.
+
+1. [Material Design](https://material.io/) - Googles design guide that should be followed to keep Android applications consistent.
+2. [Design for Android](https://developer.android.com/design) - Another design guide by Google, this one is specifically for Android while Material Design is more general.
+3. [Figma](https://www.figma.com) - A tool that can be used to mock design ideas.
+
+## Accessibility
+Accessibility is an important part of Android applications. Especially applications that are as widely used as Kiwix. As such, accessibility should be part of design decisions. This can include choices such as:
+
+- Having text with a large font and good contrast ratio.
+- Large simple controls.
+- Consistent controls and navigation. (consistent to Kiwix, and other Android applications.)
+
+Kiwix does not yet contain content descriptions for its UI elements. This can prohibit users with for example poor eyesight to use Kiwix successfully. Therefore, newly introduced interactive elements should contain content descriptions (boy scout rule applies here too!). 
+
+See ["Make apps more accessible"](https://developer.android.com/guide/topics/ui/accessibility/apps) for a more detailed guide on accessibility. [Firefox Fenix](https://github.com/mozilla-mobile/shared-docs/blob/master/android/accessibility_guide.md) also has a great concise description of accessibility. A third accessibility resource is googles [list of key steps](https://android-developers.googleblog.com/2012/04/accessibility-are-you-serving-all-your.html) for making sure an Android application is accessible.
+<br/>
+<br/>
+<br/>
+<br/>
+
+[1] https://material.io/design/color/the-color-system.html 2020-06-04
+
+[2] https://developer.android.com/guide/topics/ui/look-and-feel/darktheme 2020-07-02
+
+
diff --git a/STRING_RESOURCES.md b/STRING_RESOURCES.md
new file mode 100644
index 000000000..d6fead918
--- /dev/null
+++ b/STRING_RESOURCES.md
@@ -0,0 +1,20 @@
+# String resources
+All user visible strings in an Android application should be listed in strings.xml files to allow for easy translation, replacement and modification. Newly added string resources are imported by translatewiki and are then manually translated. After translations are complete the translations are merged with Kiwix Android. 
+
+## How do I add a new string resource?
+Start by adding your new string resource `new_string` to `values/strings.xml` in English. That is:
+```
+...
+<string name="new_string">New String</string>
+...
+```
+You will now have to describe the string in `values-qq/strings.xml` with where and how the new string is used. E.x. for the string `<string name="on">On</string>`:
+
+`values-qq/strings.xml:`
+```
+...
+<string name="on">This is used in the settings screen to turn on the night mode.</string>
+...
+```
+- The values in `values/strings.xml` are the strings that are going to be displayed in the Kiwix application to the user. 
+- The values in `values-qq/strings.xml` are only visible to the translator and are only there to help them make a correct translation. 
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index f87159fa5..67d37b8d4 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -28,7 +28,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/activity_vertical_margin"
-    app:ipi_currentPageIndicatorColor="@color/blue800"
+    app:ipi_currentPageIndicatorColor="@color/denim_blue800"
     app:ipi_pageIndicatorColor="@color/blueTransparent"
     app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_local_file_transfer.xml b/app/src/main/res/layout/activity_local_file_transfer.xml
index aaefafe4f..8ba06a1b9 100644
--- a/app/src/main/res/layout/activity_local_file_transfer.xml
+++ b/app/src/main/res/layout/activity_local_file_transfer.xml
@@ -52,7 +52,7 @@
     android:layout_height="2dp"
     android:layout_marginStart="5dp"
     android:layout_marginEnd="5dp"
-    android:background="@color/accent"
+    android:background="@color/dodger_blue"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toBottomOf="@id/text_view_device_name" />
@@ -113,7 +113,7 @@
     android:layout_marginStart="5dp"
     android:layout_marginTop="200dp"
     android:layout_marginEnd="5dp"
-    android:background="@color/accent"
+    android:background="@color/dodger_blue"
     app:layout_constraintBottom_toTopOf="@+id/text_view_files_for_transfer"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_zim_host.xml b/app/src/main/res/layout/activity_zim_host.xml
index 281d54d06..e5ef272f8 100644
--- a/app/src/main/res/layout/activity_zim_host.xml
+++ b/app/src/main/res/layout/activity_zim_host.xml
@@ -42,7 +42,7 @@
     android:layout_marginBottom="8dp"
     android:background="@color/greenTick"
     android:text="@string/start_server_label"
-    android:textColor="@color/white"
+    android:textColor="@color/alabaster_white"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index fcdacaa39..acb99fccf 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -48,7 +48,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_secondary"
+      android:textColor="?textSecondary"
       android:layout_gravity="start"
       tools:text="Description" />
 
@@ -71,7 +71,7 @@
         style="@style/list_item_body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_tertiary"
+        android:textColor="?textTertiary"
         android:layout_weight="1"
         tools:text="In Progress" />
 
@@ -80,7 +80,7 @@
         style="@style/list_item_body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_tertiary"
+        android:textColor="?textTertiary"
         tools:text="1min 10secs" />
     </LinearLayout>
   </LinearLayout>
diff --git a/app/src/main/res/layout/item_library.xml b/app/src/main/res/layout/item_library.xml
index dce98c6a7..c2a1c09d3 100644
--- a/app/src/main/res/layout/item_library.xml
+++ b/app/src/main/res/layout/item_library.xml
@@ -47,7 +47,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      android:textColor="@color/text_secondary"
+      android:textColor="?textSecondary"
       android:maxLines="2"
       android:ellipsize="end"
       app:layout_constraintEnd_toEndOf="parent"
@@ -60,7 +60,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintStart_toStartOf="@+id/libraryBookTitle"
       app:layout_constraintTop_toBottomOf="@+id/libraryBookDescription"
       tools:text="File Size" />
@@ -70,7 +70,7 @@
       style="@style/list_item_body"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       android:gravity="start"
       android:layout_marginRight="10dp"
       android:layout_marginEnd="10dp"
@@ -84,7 +84,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintStart_toStartOf="@+id/libraryBookCreator"
       app:layout_constraintTop_toBottomOf="@+id/libraryBookCreator"
       tools:text="Publisher" />
@@ -95,7 +95,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="@+id/libraryBookSize"
@@ -106,7 +106,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       android:layout_marginStart="50dp"
       app:layout_constraintEnd_toEndOf="@+id/libraryBookDate"
       app:layout_constraintTop_toBottomOf="@+id/libraryBookDate"
@@ -117,7 +117,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintEnd_toEndOf="@+id/libraryBookLanguage"
       app:layout_constraintTop_toBottomOf="@+id/libraryBookLanguage"
       tools:text="File Name" />
diff --git a/app/src/main/res/values-b+roa+tara/strings.xml b/app/src/main/res/values-b+roa+tara/strings.xml
new file mode 100644
index 000000000..d4276516d
--- /dev/null
+++ b/app/src/main/res/values-b+roa+tara/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Joetaras
+-->
+<resources>
+  <string name="file_system_does_not_support_4gb">\'U file system tune non ge supporte le file cchiù granne de 4GB</string>
+  <string name="detecting_file_system">Stoche a condrolle ce \'u file system tune pò ccrejà le file cchiù granne de 4GB</string>
+  <string name="cannot_open_file">Aprture d\‘u fail sciute a male\nPe piacere pruève arrete a cercà stu fail jndr\’à Schede d\'u despositive d\'a libbreria  toje.</string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..817cf29d1
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Susann Schweden
+-->
+<resources>
+  <string name="file_system_does_not_support_4gb">Ihr Dateisystem unterstützt keine Dateien über 4GB</string>
+  <string name="detecting_file_system">Untersuche, ob das Dateisystem Dateien mit 4GB erstellen kann</string>
+  <string name="cannot_open_file">Konnte Datei nicht öffnen\nBitte versuchen Sie, in der Geräteregisterkarte Ihrer Bibliothek nach dieser Datei zu suchen</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e1a1b2c0e..9943debd1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -5,5 +5,5 @@
 <resources>
   <string name="file_system_does_not_support_4gb">Ваша файловая система не поддерживает файлы больше 4GB</string>
   <string name="detecting_file_system">Проверка, поддерживает ли файловая система файлы больше 4GB</string>
-  <string name="cannot_open_file">Невозможно открыть файл\nПожалуйста, попытайтесь найти этот файл во вкладке \“Устройство\” в вашей библиотеке</string>
+  <string name="cannot_open_file">Невозможно открыть файл\nПожалуйста, попытайтесь найти этот файл во вкладке “Устройство” в вашей библиотеке</string>
 </resources>
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index e6d97e951..c171ed1bf 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -208,8 +208,8 @@ public abstract class CoreReaderFragment extends BaseFragment
   Button noOpenBookButton;
   @BindView(R2.id.no_open_book_text)
   TextView noOpenBookText;
-
-  View root;
+  @BindView(R2.id.activity_main_root)
+  View activityMainRoot;
 
   @Inject
   protected MainContract.Presenter presenter;
@@ -294,7 +294,7 @@ public abstract class CoreReaderFragment extends BaseFragment
     }
   };
   private Disposable bookmarkingDisposable;
-  private Boolean isBookmarked;
+  private boolean isBookmarked;
 
   @NotNull @Override public Super onActionModeStarted(@NotNull ActionMode mode,
     @NotNull AppCompatActivity activity) {
@@ -429,7 +429,7 @@ public abstract class CoreReaderFragment extends BaseFragment
   @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater,
     @Nullable ViewGroup container,
     @Nullable Bundle savedInstanceState) {
-    root = inflater.inflate(R.layout.fragment_main, container, false);
+    View root = inflater.inflate(R.layout.fragment_main, container, false);
     ButterKnife.bind(this, root);
     return root;
   }
@@ -843,12 +843,12 @@ public abstract class CoreReaderFragment extends BaseFragment
     KiwixWebView webView;
     if (!isHideToolbar) {
       webView = new ToolbarScrollingKiwixWebView(
-        getActivity(), this, attrs, (ViewGroup) root, videoView,
+        getActivity(), this, attrs, (ViewGroup) activityMainRoot, videoView,
         createWebClient(this, zimReaderContainer),
         toolbarContainer, bottomToolbar, sharedPreferenceUtil);
     } else {
       webView = new ToolbarStaticKiwixWebView(
-        getActivity(), this, attrs, (ViewGroup) root, videoView,
+        getActivity(), this, attrs, (ViewGroup) activityMainRoot, videoView,
         createWebClient(this, zimReaderContainer),
         sharedPreferenceUtil);
     }
@@ -935,7 +935,7 @@ public abstract class CoreReaderFragment extends BaseFragment
 
   @NotNull @Override public KiwixWebView getCurrentWebView() {
     if (webViewList.size() == 0) return newMainPageTab();
-    if (currentWebViewIndex < webViewList.size()) {
+    if (currentWebViewIndex < webViewList.size() && currentWebViewIndex > 0) {
       return webViewList.get(currentWebViewIndex);
     } else {
       return webViewList.get(0);
@@ -1287,7 +1287,6 @@ public abstract class CoreReaderFragment extends BaseFragment
   }
 
   private void openHomeScreen() {
-
     new Handler().postDelayed(() -> {
       if (webViewList.size() == 0) {
         createNewTab();
@@ -1317,7 +1316,7 @@ public abstract class CoreReaderFragment extends BaseFragment
               goToBookmarks();
               return Unit.INSTANCE;
             },
-            getResources().getColor(R.color.white)
+            getResources().getColor(R.color.alabaster_white)
           );
         } else {
           ContextExtensionsKt.toast(getActivity(), R.string.unable_to_add_to_bookmarks,
@@ -1677,28 +1676,30 @@ public abstract class CoreReaderFragment extends BaseFragment
 
   @Override
   public void webViewUrlFinishedLoading() {
-    updateTableOfContents();
-    tabsAdapter.notifyDataSetChanged();
-    updateUrlProcessor();
-    updateBottomToolbarArrowsAlpha();
-    String url = getCurrentWebView().getUrl();
-    final ZimFileReader zimFileReader = zimReaderContainer.getZimFileReader();
-    if (hasValidFileAndUrl(url, zimFileReader) && getActivity() != null) {
-      final long timeStamp = System.currentTimeMillis();
-      SimpleDateFormat sdf =
-        new SimpleDateFormat("d MMM yyyy", LanguageUtils.getCurrentLocale(getActivity()));
-      HistoryItem history = new HistoryItem(
-        getCurrentWebView().getUrl(),
-        getCurrentWebView().getTitle(),
-        sdf.format(new Date(timeStamp)),
-        timeStamp,
-        zimFileReader
-      );
-      presenter.saveHistory(history);
+    if (isAdded()) {
+      updateTableOfContents();
+      tabsAdapter.notifyDataSetChanged();
+      updateUrlProcessor();
+      updateBottomToolbarArrowsAlpha();
+      String url = getCurrentWebView().getUrl();
+      final ZimFileReader zimFileReader = zimReaderContainer.getZimFileReader();
+      if (hasValidFileAndUrl(url, zimFileReader)) {
+        final long timeStamp = System.currentTimeMillis();
+        SimpleDateFormat sdf =
+          new SimpleDateFormat("d MMM yyyy", LanguageUtils.getCurrentLocale(getActivity()));
+        HistoryItem history = new HistoryItem(
+          getCurrentWebView().getUrl(),
+          getCurrentWebView().getTitle(),
+          sdf.format(new Date(timeStamp)),
+          timeStamp,
+          zimFileReader
+        );
+        presenter.saveHistory(history);
+      }
+      updateBottomToolbarVisibility();
+      openFullScreenIfEnabled();
+      updateNightMode();
     }
-    updateBottomToolbarVisibility();
-    openFullScreenIfEnabled();
-    updateNightMode();
   }
 
   protected boolean hasValidFileAndUrl(String url, ZimFileReader zimFileReader) {
@@ -1774,7 +1775,7 @@ public abstract class CoreReaderFragment extends BaseFragment
             .setAction(getString(R.string.open), v -> {
               if (webViewList.size() > 1) selectTab(webViewList.size() - 1);
             })
-            .setActionTextColor(getResources().getColor(R.color.white))
+            .setActionTextColor(getResources().getColor(R.color.alabaster_white))
             .show();
         } else {
           newTab(url);
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
index 8636b1056..7ef46e884 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java
@@ -49,6 +49,7 @@ public abstract class CoreWebViewClient extends WebViewClient {
   private View home;
   private static String LEGACY_CONTENT_PREFIX =
     Uri.parse("content://" + CoreApp.getInstance().getPackageName() + ".zim.base/").toString();
+  private String urlWithAnchor;
 
   public CoreWebViewClient(
     WebViewCallback callback, ZimReaderContainer zimReaderContainer) {
@@ -60,6 +61,7 @@ public abstract class CoreWebViewClient extends WebViewClient {
   public boolean shouldOverrideUrlLoading(WebView view, String url) {
     callback.webViewUrlLoading();
     url = convertLegacyUrl(url);
+    urlWithAnchor = url.contains("#") ? url : null;
     if (zimReaderContainer.isRedirect(url)) {
       if (handleEpubAndPdf(url)) {
         return true;
@@ -131,9 +133,22 @@ public abstract class CoreWebViewClient extends WebViewClient {
     } else {
       view.removeView(home);
     }
+
+    jumpToAnchor(view, url);
     callback.webViewUrlFinishedLoading();
   }
 
+  /*
+  * If 2 urls are the same aside from the `#` component then calling load
+  * does not trigger our loading code and the webview will go to the anchor
+  * */
+  private void jumpToAnchor(WebView view, String loadedUrl) {
+    if (urlWithAnchor != null && urlWithAnchor.startsWith(loadedUrl)) {
+      view.loadUrl(urlWithAnchor);
+      urlWithAnchor = null;
+    }
+  }
+
   protected abstract void onUrlEqualToHome(WebView view);
 
   protected abstract void onInvalidUrl(WebView view);
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
index 6dff00b23..9471cfaec 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
@@ -49,7 +49,7 @@ private const val TAG = "ZimFileReader"
 
 class ZimFileReader constructor(
   val zimFile: File,
-  val jniKiwixReader: JNIKiwixReader = JNIKiwixReader(zimFile.canonicalPath),
+  private val jniKiwixReader: JNIKiwixReader = JNIKiwixReader(zimFile.canonicalPath),
   private val nightModeConfig: NightModeConfig
 ) {
   interface Factory {
@@ -125,7 +125,7 @@ class ZimFileReader constructor(
     return loadContent(uri)
   }
 
-  fun readMimeType(uri: String) = uri.removeArguments().let {
+  fun readMimeType(uri: String) = uri.filePath.let {
     it.mimeType?.takeIf(String::isNotEmpty) ?: mimeTypeFromReader(it) ?: DEFAULT_MIME_TYPE
   }.also { Log.d(TAG, "getting mimetype for $uri = $it") }
 
@@ -192,7 +192,7 @@ class ZimFileReader constructor(
   }
 
   private fun getContentAndMimeType(uri: String) = with(JNIKiwixString()) {
-    getContent(url = JNIKiwixString(uri.filePath.removeArguments()), mime = this) to value
+    getContent(url = JNIKiwixString(uri.filePath), mime = this) to value
   }
 
   private fun getContent(
@@ -258,11 +258,10 @@ class ZimFileReader constructor(
   }
 }
 
-private fun String.removeArguments() = substringBefore("?")
 private val Uri.filePath: String
   get() = toString().filePath
 private val String.filePath: String
-  get() = substringAfter(CONTENT_PREFIX).substringBefore("#")
+  get() = substringAfter(CONTENT_PREFIX).substringBefore("#").substringBefore("?")
 private val String.mimeType: String?
   get() = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
     MimeTypeMap.getFileExtensionFromUrl(this)
diff --git a/core/src/main/res/drawable-night/launch_screen.xml b/core/src/main/res/drawable-night/launch_screen.xml
new file mode 100644
index 000000000..e9df7bff5
--- /dev/null
+++ b/core/src/main/res/drawable-night/launch_screen.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+  android:opacity="opaque">
+  <!-- The background color, preferably the same as your normal theme -->
+  <item android:drawable="@color/mine_shaft_gray900" />
+  <item>
+    <bitmap
+      android:gravity="center"
+      android:src="@drawable/kiwix_icon_with_title" />
+  </item>
+</layer-list>
diff --git a/core/src/main/res/drawable/launch_screen.xml b/core/src/main/res/drawable/launch_screen.xml
index ae7b61922..6021eeb72 100644
--- a/core/src/main/res/drawable/launch_screen.xml
+++ b/core/src/main/res/drawable/launch_screen.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
   android:opacity="opaque">
   <!-- The background color, preferably the same as your normal theme -->
-  <item android:drawable="@color/color_surface" />
+  <item android:drawable="@color/alabaster_white" />
   <item>
     <bitmap
       android:gravity="center"
diff --git a/core/src/main/res/drawable/search_widget_background.xml b/core/src/main/res/drawable/search_widget_background.xml
index f7bb732aa..39428a2c4 100644
--- a/core/src/main/res/drawable/search_widget_background.xml
+++ b/core/src/main/res/drawable/search_widget_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <solid android:color="@color/white" />
+  <solid android:color="@color/alabaster_white" />
   <corners android:radius="3dip" />
   <padding
     android:bottom="0dip"
diff --git a/core/src/main/res/layout/activity_kiwix_error.xml b/core/src/main/res/layout/activity_kiwix_error.xml
index 50c3c036e..3e4a0e417 100644
--- a/core/src/main/res/layout/activity_kiwix_error.xml
+++ b/core/src/main/res/layout/activity_kiwix_error.xml
@@ -17,7 +17,7 @@
     android:layout_marginEnd="8dp"
     android:text="@string/crash_description"
     android:textAlignment="center"
-    android:textColor="@color/white"
+    android:textColor="@color/alabaster_white"
     android:textSize="14sp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
@@ -30,7 +30,7 @@
     android:layout_marginStart="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginBottom="32dp"
-    android:background="@color/white"
+    android:background="@color/alabaster_white"
     android:text="@string/crash_button_confirm"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
@@ -58,7 +58,7 @@
     android:layout_marginTop="60dp"
     android:layout_marginEnd="8dp"
     android:text="@string/crash_title"
-    android:textColor="@color/white"
+    android:textColor="@color/alabaster_white"
     android:textSize="24sp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintHorizontal_bias="0.505"
@@ -101,7 +101,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_language"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
 
       <CheckBox
         android:id="@+id/allowLogs"
@@ -112,7 +112,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_logs"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
 
       <CheckBox
         android:id="@+id/allowCrash"
@@ -123,7 +123,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_exception"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
 
       <CheckBox
         android:id="@+id/allowZims"
@@ -134,7 +134,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_zimfiles"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
 
       <CheckBox
         android:id="@+id/allowDeviceDetails"
@@ -145,7 +145,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_device"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
 
       <CheckBox
         android:id="@+id/allowFileSystemDetails"
@@ -156,7 +156,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/crash_checkbox_file_system"
-        android:textColor="@color/white" />
+        android:textColor="@color/alabaster_white" />
     </LinearLayout>
   </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/res/layout/item_book.xml b/core/src/main/res/layout/item_book.xml
index 21034e92d..975616f41 100644
--- a/core/src/main/res/layout/item_book.xml
+++ b/core/src/main/res/layout/item_book.xml
@@ -65,7 +65,7 @@
       android:layout_marginEnd="8dp"
       android:ellipsize="end"
       android:maxLines="2"
-      android:textColor="@color/text_secondary"
+      android:textColor="?textSecondary"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="@id/item_book_title"
       app:layout_constraintTop_toBottomOf="@id/item_book_title"
@@ -76,7 +76,7 @@
       style="@style/list_item_body"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintStart_toStartOf="@id/item_book_title"
       app:layout_constraintTop_toBottomOf="@id/item_book_description"
       tools:text="1 Jan 2018" />
@@ -88,7 +88,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="@dimen/activity_horizontal_margin"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintStart_toEndOf="@id/item_book_date"
       app:layout_constraintTop_toTopOf="@id/item_book_date"
       tools:text="20 GB" />
@@ -100,7 +100,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="@dimen/activity_horizontal_margin"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
-      android:textColor="@color/text_tertiary"
+      android:textColor="?textTertiary"
       app:layout_constraintStart_toEndOf="@id/item_book_size"
       app:layout_constraintTop_toTopOf="@id/item_book_size"
       tools:text="10.1 K articles" />
diff --git a/core/src/main/res/layout/item_help.xml b/core/src/main/res/layout/item_help.xml
index 223aa5400..12cc0e52b 100644
--- a/core/src/main/res/layout/item_help.xml
+++ b/core/src/main/res/layout/item_help.xml
@@ -33,8 +33,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:textColor="?textSecondary"
     android:visibility="gone"
-    android:textColor="@color/text_secondary"
     app:layout_constraintTop_toBottomOf="@id/item_help_title"
     tools:text="@string/help_3"
     tools:visibility="visible" />
diff --git a/core/src/main/res/layout/kiwix_search_widget.xml b/core/src/main/res/layout/kiwix_search_widget.xml
index 332de33a5..666440178 100644
--- a/core/src/main/res/layout/kiwix_search_widget.xml
+++ b/core/src/main/res/layout/kiwix_search_widget.xml
@@ -23,7 +23,7 @@
     android:layout_height="wrap_content"
     android:layout_weight="0.7"
     android:text="@string/search_widget_text"
-    android:textColor="@color/gray" />
+    android:textColor="@color/scorpion_gray" />
 
   <ImageView
     android:id="@+id/search_widget_star"
diff --git a/core/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml
index e15ecacdc..96ee97465 100644
--- a/core/src/main/res/values-cs/strings.xml
+++ b/core/src/main/res/values-cs/strings.xml
@@ -151,7 +151,7 @@
   <string name="next">Další</string>
   <string name="previous">Předchozí</string>
   <string name="wifi_only_title">Povolit stahování obsahu přes mobilní připojení?</string>
-  <string name="wifi_only_msg">Pokud zvolíte \“Ano\”, nebudete v budoucnu varováni. Můžete však toto vždy změnit v Nastavení.</string>
+  <string name="wifi_only_msg">Pokud zvolíte “Ano”, nebudete v budoucnu varováni. Můžete však toto vždy změnit v Nastavení.</string>
   <string name="pref_wifi_only">Stahovat obsah pouze přes WiFi</string>
   <string name="time_day">den</string>
   <string name="time_hour">h</string>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 33dacb1c2..69d6977ab 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * 1233qwer1234qwer4
+* DraconicDark
 * FF11
 * Killarnee
 * Metalhead64
+* Stephane
+* Susann Schweden
 * Symposiarch
 -->
 <resources>
@@ -17,25 +20,49 @@
   <string name="menu_exit_full_screen">Vollbild beenden</string>
   <string name="menu_read_aloud">Vorlesen</string>
   <string name="menu_read_aloud_stop">Mit dem Vorlesen aufhören</string>
+  <string name="menu_support_kiwix">Spenden</string>
   <string name="save_media">Medium speichern</string>
   <string name="save_media_error">Beim Versuch, das Medium zu speichern, ist ein Fehler aufgetreten!</string>
   <string name="save_media_saved">Medium als %s nach Android/media/org.kiwix…/ gespeichert</string>
   <string name="search_label">Suchen</string>
   <string name="choose_file">Wähle eine Inhaltsdatei aus (*.zim)</string>
   <string name="open_in_new_tab">Link in neuer Registerkarte öffnen?</string>
+  <string name="hotspot_service_channel_name">Hotspot Servicekanal</string>
+  <string name="hotspot_failed_title">Hotspot konnte nicht gestartet werden</string>
+  <string name="hotspot_failed_message">Es scheint, Ihr Hotspot ist bereits aktiviert. Bitte deaktivieren Sie Ihren Wi-Fi Hotspot, um weiterzumachen.</string>
+  <string name="go_to_wifi_settings_label">Gehen Sie zu den Wi-Fi Einstellungen</string>
+  <string name="hotspot_running">Aktiver Hotspot</string>
+  <string name="no_books_selected_toast_message">Bitte zuerst Bücher aussuchen</string>
+  <string name="server_failed_message">Konnte den Server nicht starten. Bitte aktivieren Sie Ihren Hotspot</string>
+  <string name="server_failed_toast_message">Konnte den Server nicht starten.</string>
+  <string name="server_started_successfully_toast_message">Server erfolgreich gestartet.</string>
   <string name="server_stopped_successfully_toast_message">Server erfolgreich gestoppt.</string>
+  <string name="hotspot_turned_on">Hotspot aktiviert</string>
+  <string name="hotspot_details_message">Angaben zu Ihrem lokalen Hotspot.\nSSID : %1$s \nPass : %2$s</string>
+  <string name="server_textview_default_message">Wählen Sie die Dateien aus, die Sie auf dem Server hosten möchten</string>
+  <string name="progress_dialog_starting_server">Starte den Server</string>
+  <string name="wifi_dialog_title">Wi-Fi-Verbindung festgestellt</string>
+  <string name="wifi_dialog_body">Um Bücher auf anderen Einheiten anzusehen, stellen Sie bitte sicher, dass alle Einheiten mit dem gleichen WiFi-Netzwerk verbunden sind.</string>
+  <string name="hotspot_dialog_message">Damit diese Funktion läuft, müssen Sie zuerst den Hotspot manuell aktivieren oder sicherstellen, dass Host und Empfangsgerät im gleichen Wi-Fi-Netzwerk angemeldet sind</string>
+  <string name="hotspot_dialog_neutral_button">WEITER</string>
+  <string name="hotspot_channel_description">Updates zum Status Ihres Hotspots/Servers.</string>
+  <string name="hotspot_notification_content_title">Kiwix-Hotspot</string>
+  <string name="start_server_label">Server starten</string>
+  <string name="stop_server_label">Server anhalten</string>
+  <string name="server_started_message">Geben Sie diese IP-Adresse in Ihren Browser ein, um auf den Server %s zuzugreifen</string>
   <string name="error_file_not_found">Fehler: Die ausgewählte ZIM-Datei konnte nicht gefunden werden.</string>
+  <string name="zim_not_opened">Konnte die ZIM-Datei nicht öffnen</string>
   <string name="error_file_invalid">Fehler: Die ausgewählte Datei ist keine gültige ZIM-Datei.</string>
   <string name="error_article_url_not_found">Fehler: Das Laden des Artikels (URL: %1$s) ist fehlgeschlagen.</string>
   <string name="pref_display_title">Anzeige</string>
   <string name="pref_info_title">Information</string>
   <string name="pref_info_version">Version</string>
   <string name="pref_night_mode">Nachtmodus</string>
-  <string name="pref_night_mode_summary">Artikel mit umgekehrten Farben ansehen</string>
+  <string name="pref_night_mode_summary">Artikel mit umgekehrten Farben anzeigen</string>
   <string name="pref_back_to_top">Zurück nach oben</string>
   <string name="pref_back_to_top_summary">Zeigt einen Button am Seitenende an, um zum Anfang hochzuscrollen.</string>
-  <string name="pref_hide_toolbar">Werkzeugleiste beim Scrollen ausblenden</string>
-  <string name="pref_hide_toolbar_summary">Werkzeugleiste ausblenden, wenn auf der Seite heruntergescrollt wird.</string>
+  <string name="pref_hide_toolbar">Werkzeugleiste weiterhin anzeigen</string>
+  <string name="pref_hide_toolbar_summary">Verhindert, dass die Werkzeugleiste verschwindet, wenn auf der Seite im Inhalt gebrowst wird</string>
   <string name="pref_language_title">Sprache</string>
   <string name="pref_language_chooser">Eine Sprache auswählen</string>
   <string name="pref_credits">Autoren und Lizenzen</string>
@@ -44,25 +71,30 @@
   <string name="no_reader_application_installed">Es konnte keine installierte Anwendung für diesen Dateityp gefunden werden</string>
   <string name="no_section_info">Keine Inhaltsheader gefunden</string>
   <string name="request_storage">Um auf Offlineinhalt zuzugreifen, müssen wir auf Ihren Speicher zugreifen.</string>
-  <string name="clear_recent_and_tabs_history_dialog">Sind Sie sicher, dass Sie Ihren Suchverlauf löschen und alle aktiven Reiter zurücksetzen möchten?</string>
+  <string name="clear_recent_and_tabs_history_dialog">Sind Sie sicher, dass Sie Ihren Suchverlauf löschen und alle aktiven Registerkarten zurücksetzen möchten?</string>
   <string name="delete_recent_search_item">Dieses Element löschen?</string>
   <string name="pref_clear_all_history_title">Verlauf löschen</string>
-  <string name="pref_clear_all_history_summary">Letzte Suchanfragen und Reiterverlauf löschen</string>
+  <string name="pref_clear_all_history_summary">Letzte Suchanfragen und Registerkartenverlauf löschen</string>
   <string name="all_history_cleared">Gesamter Verlauf gelöscht</string>
+  <string name="pref_clear_all_bookmarks_title">Lesezeichen löschen</string>
+  <string name="all_bookmarks_cleared">Alle Lesezeichen gelöscht</string>
+  <string name="selected_bookmarks_cleared">Ausgewählte Lesezeichen gelöscht</string>
   <string name="clear_all_history_dialog_title">Gesamten Verlauf löschen?</string>
+  <string name="share">Teilen</string>
+  <string name="selected_file_cab_app_chooser_title">Teile ZIM-Dateien mit:</string>
   <string name="delete">Löschen</string>
   <string name="cancel">Abbrechen</string>
   <string name="delete_specific_search_toast">Letzte Suche entfernt</string>
   <string name="hint_contents_drawer_message">Sie können nach links wischen, um die Inhalte dieses Artikels anzusehen.</string>
   <string name="got_it">Verstanden</string>
   <string name="did_you_know">Schon gewusst?</string>
-  <string name="undo">Rückgängig</string>
-  <string name="tab_closed">Reiter geschlossen</string>
+  <string name="undo">Rückgängig machen</string>
+  <string name="tab_closed">Registerkarte geschlossen</string>
   <string name="bookmark_added">Lesezeichen hinzugefügt</string>
-  <string name="rate_dialog_title">Bitte bewerte uns</string>
-  <string name="rate_dialog_msg_1">Wenn du</string>
-  <string name="rate_dialog_msg_2">magst, nimm dir zur Bewertung einen Moment Zeit. Vielen Dank für deine Unterstützung!</string>
-  <string name="rate_dialog_positive">Bewerten!</string>
+  <string name="rate_dialog_title">Bitte bewerten Sie uns</string>
+  <string name="rate_dialog_msg_1">Wenn Sie</string>
+  <string name="rate_dialog_msg_2">mögen, nehmen Sie sich zur Bewertung einen Moment Zeit. Vielen Dank für Ihre Unterstützung!</string>
+  <string name="rate_dialog_positive">Bewerten Sie!</string>
   <string name="no_thanks">Nein danke</string>
   <string name="rate_dialog_neutral">Später</string>
   <string name="open">Öffnen</string>
@@ -70,16 +102,17 @@
   <string name="pref_newtab_background_title">Neue Registerkarte im Hintergrund öffnen</string>
   <string name="pref_newtab_background_summary">Beim Öffnen einer neuen Registerkarte wird sie im Hintergrund geöffnet</string>
   <string name="pref_extras">Extras</string>
-  <string name="new_tab_snack_bar">Artikel in neuem Reiter geöffnet</string>
+  <string name="new_tab_snack_bar">Artikel in neuer Registerkarte geöffnet</string>
   <string name="search_widget_text">Kiwix durchsuchen</string>
   <string name="speech_prompt_text">Sprechen, um %s zu suchen</string>
   <string name="speech_not_supported">Leider unterstützt Ihr Gerät keine Spracheingabe!</string>
   <string name="local_zims">Gerät</string>
   <string name="remote_zims">Online</string>
   <string name="library">Bibliothek</string>
-  <string name="delete_zims_toast">Datei gelöscht</string>
+  <string name="delete_zim_body">Die folgende(n) ZIM-Datei(en) werden gelöscht werden: %s</string>
+  <string name="delete_zims_toast">Dateien erfolgreich gelöscht</string>
   <string name="no_files_here">Hier gibt es keine Dateien</string>
-  <string name="download_no_space">Nicht ausreichender Speicher um herunterzuladen.</string>
+  <string name="download_no_space">Unzureichender Speicherplatz für einen Download.</string>
   <string name="space_available">Verfügbarer Speicher:</string>
   <string name="zim_simple">Einfach</string>
   <string name="zim_no_pic">Keine Bilder</string>
@@ -87,17 +120,17 @@
   <string name="no_network_connection">Keine Netzwerkverbindung</string>
   <string name="help_2">Was macht Kiwix?</string>
   <string name="help_3">Kiwix ist eine Lesesoftware für Offlineinhalte. Sie funktioniert wie ein Browser, aber anstatt auf Webseiten online zuzugreifen, liest sie Inhalte von einer Datei im ZIM-Format.</string>
-  <string name="help_4" fuzzy="true">Obwohl Kiwix ursprünglich entwickelt wurde, um Wikipedia offline zur Verfügung zu stellen, liest es auch andere Inhalte.</string>
+  <string name="help_4">Obwohl Kiwix ursprünglich entwickelt wurde, um Wikipedia offline zur Verfügung zu stellen, liest es auch andere Inhalte.</string>
   <string name="help_5">Wo ist der Inhalt?</string>
   <string name="help_6">Unser Inhalt wird auf der Kiwix-Website zur Verfügung gestellt.</string>
   <string name="help_7">Sie sind verfügbar als ZIM-Dateien. Es gibt viele von ihnen:</string>
   <string name="help_8">• Wikipedia ist für jede Sprache getrennt verfügbar</string>
   <string name="help_9">• Andere Inhalte wie Wikileaks oder Wikisource sind ebenfalls verfügbar</string>
-  <string name="help_10" fuzzy="true">Sie können entweder Ihre ausgewählten ZIM-Dateien in der App herunterladen oder die gewünschten Datei(en) sorgsam auf einem Desktopcomputer auswählen und herunterladen, bevor Sie die ZIM-Dateien auf Ihre SD-Karte übertragen.</string>
+  <string name="help_10">Sie können entweder Ihre ausgewählten ZIM-Dateien in der App herunterladen oder die gewünschten Datei(en) sorgsam auf einem Desktopcomputer auswählen und herunterladen, bevor Sie die ZIM-Dateien auf Ihre SD-Karte übertragen.</string>
   <string name="help_11">Heruntergeladene ZIM-Dateien in der App befinden sich im Verzeichnis des externen Speichers in einem Ordner namens Kiwix.</string>
   <string name="pref_storage">Speicher</string>
   <string name="pref_current_folder">Aktueller Ordner</string>
-  <string name="delete_zim_failed" fuzzy="true">Leider können wir diese Datei nicht löschen. Sie sollten versuchen, stattdessen einen Dateimanager zu verwenden.</string>
+  <string name="delete_zim_failed">Leider können wir diese Datei nicht löschen. Sie sollten versuchen, stattdessen einen Dateimanager zu verwenden.</string>
   <string name="tts_pause">pausieren</string>
   <string name="tts_resume">fortfahren</string>
   <string name="stop">abbrechen</string>
@@ -109,6 +142,9 @@
   <string name="confirm_stop_download_msg">Sind Sie sicher, dass Sie diesen Download abbrechen möchten?</string>
   <string name="download_change_storage">Speichergeräteauswahl</string>
   <string name="tts_not_enabled">Text-to-Speech ist für diese ZIM-Datei nicht aktiviert</string>
+  <string name="texttospeech_initialization_failed">Die Initialisierung von Text-to-Speech ist fehlgeschlagen. Bitte versuchen Sie es noch einmal</string>
+  <string name="texttospeech_error">Unerwarteter Fehler bei Text-to-Speech. Bitte versuchen Sie es noch einmal</string>
+  <string name="search_error">Unerwarteter Fehler beim Suchen. Bitte versuchen Sie es noch einmal</string>
   <string name="next">Nächste</string>
   <string name="previous">Vorherige</string>
   <string name="wifi_only_title">Herunterladen des Inhalts über das mobile Netzwerk erlauben?</string>
@@ -119,6 +155,8 @@
   <string name="time_minute">Minuten</string>
   <string name="time_second">Sekunden</string>
   <string name="time_left">verbleibend</string>
+  <string name="time_today">Heute</string>
+  <string name="time_yesterday">Gestern</string>
   <string name="pref_external_link_popup_title">Beim Einfügen von externen Links warnen</string>
   <string name="pref_external_link_popup_summary">Popups für Warnungen über zusätzliche Kosten oder das Nichtfunktionieren von Offlinelinks anzeigen.</string>
   <string name="external_link_popup_dialog_title">Externen Link einfügen!</string>
@@ -126,12 +164,115 @@
   <string name="do_not_ask_anymore">Nicht mehr fragen</string>
   <string name="your_languages">Ausgewählte Sprachen:</string>
   <string name="other_languages">Weitere Sprachen:</string>
+  <string name="no_items_msg">Keine Objekte verfügbar</string>
+  <string name="crash_title">Also… Das ist peinlich.</string>
+  <string name="crash_description">Es sieht aus, als wären wir abgestürzt.\n\nWürde es Ihnen etwas ausmachen, uns bei der Behebung dieses Problems zu helfen, indem Sie uns die folgenden Informationen schicken?</string>
+  <string name="crash_checkbox_language">Ihre Spracheinstellungen</string>
+  <string name="crash_checkbox_zimfiles">Eine Liste Ihrer ZIM-Dateien</string>
+  <string name="crash_checkbox_exception">Einzelheiten zum Absturz</string>
+  <string name="crash_checkbox_logs">Anwendungsprotokolle</string>
+  <string name="crash_checkbox_device">Geräte-Details</string>
+  <string name="crash_button_confirm">DETAILS SCHICKEN</string>
+  <string name="shortcut_disabled_message">Abkürzung nicht verfügbar</string>
+  <string name="new_tab_shortcut_label">Neue Registerkarte</string>
+  <string name="get_content_shortcut_label">Inhalte abrufen</string>
+  <string name="fav_icon">Favicon</string>
+  <string name="articleCount">%s Artikel</string>
+  <string name="get_started">Anfangen</string>
+  <string name="download_books">Bücher herunterladen</string>
+  <string name="humankind_knowledge">Das Wissen der Menschheit, auf Ihrem Handy.</string>
+  <string name="welcome_to_the_family">Willkommen in der Familie</string>
+  <string name="save_books_offline">Bücher offline speichern</string>
+  <string name="download_books_message">Bücher herunterladen und lesen wo immer man ist</string>
+  <string name="unable_to_add_to_bookmarks">Konnte kein Lesezeichen hinzufügen</string>
+  <string name="go_to_previous_page">Zur vorherigen Seite gehen</string>
+  <string name="go_to_next_page">Zur nächsten Seite gehen</string>
+  <string name="table_of_contents">Inhaltsverzeichnis</string>
+  <string name="select_languages">Sprachen auswählen</string>
+  <string name="save_languages">Sprachen speichern</string>
+  <string name="send_feedback">Rückmeldung senden</string>
+  <string name="expand">Ausklappen</string>
+  <string name="history">Verlauf</string>
+  <string name="history_from_current_book">Zeige die Verlaufsgeschichte aller Bücher</string>
+  <string name="search_history">Suchverlauf</string>
+  <string name="selected_items">%1$d ausgewählt</string>
+  <string name="bookmarks_from_current_book">Zeige die Lesezeichen aller Bücher</string>
+  <string name="search_bookmarks">Lesezeichen durchsuchen</string>
+  <string name="switch_tabs">Registerkarten wechseln</string>
+  <string name="close_all_tabs">Alle Registerkarten schließen</string>
+  <string name="pending_state">Ausstehend</string>
+  <string name="running_state">In Bearbeitung</string>
+  <string name="complete">Vervollständigt</string>
+  <string name="paused_state">Pausiert</string>
+  <string name="failed_state">Fehlgeschlagen: %s</string>
+  <string name="save">Speichern</string>
+  <string name="note">Notiz</string>
+  <string name="wiki_article_title">Wiki-Artikel-Titel</string>
+  <string name="ext_storage_permission_rationale_add_note">Speicherzugriff ist für Notizen erforderlich</string>
+  <string name="ext_storage_write_permission_denied_add_note">Notizen können ohne Zugriff auf den Speicher nicht verwendet werden</string>
+  <string name="note_save_unsuccessful">Notiz Speichern erfolglos</string>
+  <string name="note_delete_successful">Notiz erfolgreich gelöscht</string>
+  <string name="note_delete_unsuccessful">Notiz wurde nicht gelöscht</string>
+  <string name="note_save_successful">Notiz gespeichert</string>
+  <string name="note_save_error_storage_not_writable">Fehler beim Speichern der Notiz: Speicher nicht beschreibbar</string>
+  <string name="note_share_error_file_missing">Notizdatei existiert nicht</string>
+  <string name="note_share_app_chooser_title">Teile Notizdatei mit:</string>
+  <string name="confirmation_alert_dialog_message">Nicht gespeicherte Änderungen verwerfen?</string>
+  <string name="delete_notes_confirmation_msg">Alle Notizen löschen?</string>
+  <string name="ext_storage_permission_not_granted">Fehler: Speicherberechtigungen nicht gewährt</string>
+  <string name="notes_deletion_successful">Gesamter Notizen-Ordner gelöscht</string>
+  <string name="notes_deletion_unsuccessful">Einige Dateien nicht gelöscht</string>
+  <string name="books_count">%d Buch/Bücher</string>
+  <string name="discovery_initiated">Erkennung eingeleitet</string>
+  <string name="discovery_failed">Erkennung fehlgeschlagen</string>
+  <string name="severe_loss_error">Schwerer Fehler! Versuchen Sie, Wi-Fi P2P auszuschalten und wieder einzuschalten</string>
+  <string name="connection_failed">Verbindung fehlgeschlagen</string>
+  <string name="permission_rationale_location">Android benötigt eine Standorterlaubnis, damit die App Peer-Geräte erkennen kann.</string>
+  <string name="permission_refused_location">Ohne Standortberechtigungen können Peer-Geräte nicht lokalisiert werden</string>
+  <string name="permission_refused_storage">Ohne Speichererlaubnis ist kein Zugriff auf ZIM-Dateien möglich</string>
+  <string name="request_enable_location">Standort aktivieren, um Peer-Geräte zu finden</string>
+  <string name="discovery_needs_location">Ohne standortbezogene Dienste können keine Peer-Geräte gefunden werden</string>
+  <string name="request_enable_wifi">Aktivieren Sie Wi-Fi P2P in den Systemeinstellungen</string>
+  <string name="discovery_needs_wifi">Kann ohne Wi-Fi ON keine Peer-Geräte finden</string>
+  <string name="transfer_to">Dateien an %s übertragen?</string>
+  <string name="device_not_cooperating">Das gewählte Gerät kooperiert nicht bei der Übertragung</string>
+  <string name="file_transfer_complete">Dateiübertragung abgeschlossen</string>
+  <string name="error_during_transfer">Bei der Übertragung wurde ein Fehler festgestellt</string>
+  <string name="error_transferring">Fehler beim Übertragen der Datei %s</string>
+  <string name="get_content_from_nearby_device">Inhalte von einem Gerät in der Nähe abrufen</string>
+  <string name="search_for_peers">Nach Peer-Geräten suchen</string>
+  <string name="your_device">Ihr Gerät:</string>
+  <string name="nearby_devices">GERÄTE IN DER NÄHE</string>
+  <string name="no_devices_found">Keine Geräte erkannt. Tippen Sie auf die Schaltfläche Suchen, um es erneut zu versuchen.</string>
+  <string name="files_for_transfer">DATEIEN ZUR ÜBERTRAGUNG</string>
+  <string name="preparing_files">Dateien für die Übertragung werden vorbereitet....</string>
+  <string name="performing_handshake">Führe Handshake durch....</string>
+  <string name="status">Status</string>
+  <string name="pref_clear_all_notes_summary">Löscht alle Notizen zu allen Artikeln</string>
+  <string name="pref_clear_all_notes_title">Alle Notizen löschen</string>
+  <string name="tag_pic">Bild</string>
+  <string name="tag_vid">Video</string>
+  <string name="tag_text_only">Nur Text</string>
+  <string name="tag_short_text">Kurzer Text</string>
+  <string name="storage_permission_denied">Speichergenehmigung verweigert</string>
+  <string name="grant_read_storage_permission">Diese Anwendung erfordert die Fähigkeit, Speicher zu lesen, um zu funktionieren. Bitte erteilen Sie die Erlaubnis in Ihren Einstellungen</string>
+  <string name="go_to_settings">Gehen Sie zu den Hotspot-Einstellungen</string>
   <string name="no_results">Keine Ergebnisse</string>
   <string name="no_bookmarks">Keine Lesezeichen</string>
-  <string name="delete_history" fuzzy="true">Verlauf löschen?</string>
-  <string name="delete_bookmarks" fuzzy="true">Lesezeichen löschen?</string>
+  <string name="no_history">Kein Verlauf</string>
+  <string name="device_default">Gerätevoreinstellung</string>
+  <string name="delete_history">Gesamten Verlauf löschen?</string>
+  <string name="delete_selected_history">Ausgewählter Verlauf löschen?</string>
+  <string name="delete_bookmarks">Alle Lesezeichen löschen?</string>
+  <string name="delete_selected_bookmarks">Ausgewählte Lesezeichen löschen?</string>
+  <string name="on">An</string>
+  <string name="off">Aus</string>
+  <string name="auto">Automatisch</string>
   <string name="send_report">Übermittle das Untersuchungsergebnis</string>
   <string name="crash_checkbox_file_system">Speichere System Details</string>
   <string name="diagnostic_report">Untersuchungsergebnis</string>
   <string name="diagnostic_report_message">Bitte übermittle alle nachfolgend aufgeführte Details, damit wir das Problem feststellen können</string>
+  <string name="percentage">%d%%</string>
+  <string name="pref_text_zoom_title">Text Zoom</string>
+  <string name="experimental_navigation">Experimentelle Navigation</string>
 </resources>
diff --git a/core/src/main/res/values-el/strings.xml b/core/src/main/res/values-el/strings.xml
index bcdb1784f..9d0d21c41 100644
--- a/core/src/main/res/values-el/strings.xml
+++ b/core/src/main/res/values-el/strings.xml
@@ -138,5 +138,9 @@
   <string name="your_languages">Επιλεγμένες γλώσσες:</string>
   <string name="other_languages">Άλλες γλώσσες:</string>
   <string name="no_bookmarks">Χωρίς σελιδοδείκτες</string>
+  <string name="delete_history">Διαγραφή όλου του ιστορικού;</string>
+  <string name="delete_selected_history">Διαγραφή επιλεγμένου ιστορικού;</string>
+  <string name="delete_bookmarks">Διαγραφή όλων των σελιδοδεικτών;</string>
+  <string name="delete_selected_bookmarks">Διαγραφή επιλεγμένων σελιδοδεικτών;</string>
   <string name="pref_text_zoom_title">Μεγέθυνση κειμένου</string>
 </resources>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index 9f759fb99..3c53ec47b 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -216,4 +216,5 @@
   <string name="crash_checkbox_file_system">Datos del sistema operativo</string>
   <string name="diagnostic_report">Informe de diagnóstico</string>
   <string name="diagnostic_report_message">Envíe todos los detalles siguientes para que podamos diagnosticar el problema.</string>
+  <string name="experimental_navigation">Navegación experimental</string>
 </resources>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index 714869bc8..c9b022810 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -87,6 +87,7 @@
   <string name="all_history_cleared">Tout l’historique est effacé</string>
   <string name="pref_clear_all_bookmarks_title">Supprimer les marque-pages</string>
   <string name="all_bookmarks_cleared">Tous les marque-pages ont été supprimés</string>
+  <string name="selected_bookmarks_cleared">Signets sélectionnés effacés</string>
   <string name="clear_all_history_dialog_title">Effacer tout l’historique ?</string>
   <string name="share">Partager</string>
   <string name="selected_file_cab_app_chooser_title">Partager des fichiers ZIM avec :</string>
@@ -269,8 +270,10 @@
   <string name="no_bookmarks">Aucun marque-page</string>
   <string name="no_history">Aucun historique</string>
   <string name="device_default">Appareil par défaut</string>
-  <string name="delete_history" fuzzy="true">Supprimer l’historique ?</string>
-  <string name="delete_bookmarks" fuzzy="true">Supprimer les marque-pages ?</string>
+  <string name="delete_history">Supprimer tout l’historique ?</string>
+  <string name="delete_selected_history">Supprimer l’historique sélectionné ?</string>
+  <string name="delete_bookmarks">Supprimer tous les signets  ?</string>
+  <string name="delete_selected_bookmarks">Supprimer les marque-pages sélectionnés ?</string>
   <string name="on">Activé</string>
   <string name="off">Désactivé</string>
   <string name="auto">Automatique</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index cbfc54e67..71d7a9bc6 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -3,6 +3,7 @@
 * Abijeet Patro
 * Arifin.wijaya
 * Arifpedia
+* Esiahaan
 * Iwan Novirion
 * Kenrick95
 * Relly Komaruzaman
@@ -19,13 +20,28 @@
   <string name="menu_exit_full_screen">Keluar dari modus layar penuh</string>
   <string name="menu_read_aloud">Bacakan</string>
   <string name="menu_read_aloud_stop">Hentikan pembacaan</string>
+  <string name="menu_support_kiwix">Dukung Kiwix</string>
   <string name="save_media">Simpan Media</string>
   <string name="save_media_error">Terjadi kesalahan saat menyimpan media!</string>
   <string name="save_media_saved">Simpan media sebagai %s pada Android/media/org.kiwix…/</string>
   <string name="search_label">Cari</string>
   <string name="choose_file">Pilih Berkas Konten (*.zim)</string>
   <string name="open_in_new_tab">Buka pranala di tab baru?</string>
+  <string name="hotspot_service_channel_name">Saluran Servis Hotspot</string>
+  <string name="hotspot_failed_title">Hotspot gagal dihidupkan</string>
+  <string name="hotspot_failed_message">Tampaknya hotspot Anda telah hidup. Silakan memutuskan koneksi hotspot wifi Anda untuk lanjut.</string>
+  <string name="go_to_wifi_settings_label">Ke pengaturan WIFI</string>
+  <string name="server_failed_message">Server tidak dapat dihidupkan. Silakan menyalakan hotspot Anda.</string>
+  <string name="server_failed_toast_message">Server tidak dapat dinyalakan.</string>
+  <string name="server_started_successfully_toast_message">Server berhasil dinyalakan.</string>
+  <string name="server_stopped_successfully_toast_message">Server berhasil dimatikan.</string>
+  <string name="hotspot_turned_on">Hotspot sudah menyala.</string>
+  <string name="hotspot_details_message">Berikut adalah detil hotspot lokal Anda.\nSSID : %1$s\nPass : %2$s</string>
+  <string name="progress_dialog_starting_server">Menyalakan server</string>
+  <string name="hotspot_dialog_neutral_button">LANJUT</string>
+  <string name="server_started_message">Masukkan alamat IP ini ke browser Anda untuk mengakses server %s</string>
   <string name="error_file_not_found">Galat: Berkas ZIM yang dipilih tidak ditemukan.</string>
+  <string name="zim_not_opened">Zim file tidak dapat dibuka</string>
   <string name="error_file_invalid">Galat: Berkas yang dipilih bukan berkas ZIM yang sah.</string>
   <string name="error_article_url_not_found">Galat: Pemuatan artikel (Url: %1$s) gagal.</string>
   <string name="pref_display_title">Tampilan</string>
@@ -51,7 +67,10 @@
   <string name="pref_clear_all_history_summary">Hapus riwayat penelusuran dan tab terakhir</string>
   <string name="all_history_cleared">Semua Markah Telah Dibersihkan</string>
   <string name="clear_all_history_dialog_title" fuzzy="true">Bersihkan Semua Markah</string>
+  <string name="share">Bagikan</string>
+  <string name="selected_file_cab_app_chooser_title">Bagikan ZIM file dengan:</string>
   <string name="delete">Hapus</string>
+  <string name="cancel">Batalkan</string>
   <string name="delete_specific_search_toast">Penelusuran terakhir telah dihapus</string>
   <string name="hint_contents_drawer_message">Anda bisa menggulir ke kiri untuk melihat isi artikel ini</string>
   <string name="got_it">Mengerti</string>
@@ -77,9 +96,10 @@
   <string name="local_zims">Perangkat</string>
   <string name="remote_zims">Daring</string>
   <string name="library">Perpustakaan</string>
+  <string name="delete_zim_body">Zim file berikut akan dihapus:\n\n%s</string>
   <string name="delete_zims_toast">Berkas telah dihapus</string>
   <string name="no_files_here">Tidak ada berkas disini</string>
-  <string name="download_no_space" fuzzy="true">Ruang tidak mencukupi untuk mengunduh berkas ini.</string>
+  <string name="download_no_space">Tidak tersedia cukup ruang data untuk mengunduh.</string>
   <string name="space_available">Ruang yang Tersedia:</string>
   <string name="zim_simple">Sederhana</string>
   <string name="zim_no_pic">Tanpa Gambar</string>
@@ -87,7 +107,7 @@
   <string name="no_network_connection">Tidak ada sambungan jaringan</string>
   <string name="help_2">Apa yang Kiwix lakukan?</string>
   <string name="help_3">Kiwix adalah pembaca konten luring. Ini sangat mirip peramban tapi bukannya mengakses halaman web daring, Kiwix membaca konten dari sebuah berkas dalam format ZIM.</string>
-  <string name="help_4" fuzzy="true">Pada awalnya Kiwix dirancang untuk menyediakan Wikipedia luring, namun juga dapat membaca konten lainnya.</string>
+  <string name="help_4">Meskipun Kiwix awalnya dirancang untuk menyediakan Wikipedia secara offline, Kiwix juga dapat membaca konten lainnya.</string>
   <string name="help_5">Dimana kontennya?</string>
   <string name="help_6">Konten kami disimpan di situs web Kiwix.</string>
   <string name="help_7">Mereka tersedia sebagai berkas ZIM. Ada banyak dari mereka:</string>
@@ -127,6 +147,13 @@
   <string name="your_languages">Bahasa terpilih:</string>
   <string name="other_languages">Bahasa lain:</string>
   <string name="humankind_knowledge">Humankind\'s knowledge, on your phone.</string>
+  <string name="go_to_previous_page">Ke halaman sebelumnya</string>
+  <string name="go_to_next_page">Ke halaman berikutnya</string>
+  <string name="select_languages">Pilih bahasa</string>
+  <string name="save_languages">Simpan bahasa</string>
+  <string name="send_feedback">Kirim masukan</string>
+  <string name="close_all_tabs">Tutup semua tab</string>
+  <string name="complete">Selesai</string>
   <string name="ext_storage_write_permission_denied_add_note">Notes can\'t be used without access to storage</string>
   <string name="note_share_error_file_missing">Note file doesn\'t exist</string>
   <string name="no_bookmarks">Tidak Ada Markah</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index eb8e6e5ab..d927e7274 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -4,6 +4,7 @@
 * CloeRiva
 * Einreiher
 * G.garatti
+* Gianfranco
 * Matteocng
 * Nivit
 * Purodha
@@ -100,6 +101,7 @@
   <string name="go_to_settings">Vai alle impostazioni hotspot</string>
   <string name="no_results">Nessun risultato</string>
   <string name="no_bookmarks">Nessun segnalibro</string>
-  <string name="delete_history" fuzzy="true">Cancellare la cronologia?</string>
-  <string name="delete_bookmarks" fuzzy="true">Cancellare i segnalibri?</string>
+  <string name="delete_history">Cancellare tutta la cronologia?</string>
+  <string name="delete_bookmarks">Cancellare tutti i segnalibri?</string>
+  <string name="experimental_navigation">Navigazione sperimentale</string>
 </resources>
diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml
index 8eeae71c2..724f11082 100644
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@@ -261,8 +261,10 @@
   <string name="no_bookmarks">אין סימניות</string>
   <string name="no_history">אין היסטוריה</string>
   <string name="device_default">ברירת המחדל של המכשיר</string>
-  <string name="delete_history" fuzzy="true">למחוק היסטוריה?</string>
-  <string name="delete_bookmarks" fuzzy="true">למחוק מועדפים?</string>
+  <string name="delete_history">למחוק את כל ההיסטוריה?</string>
+  <string name="delete_selected_history">למחוק את ההיסטוריה שנבחרה?</string>
+  <string name="delete_bookmarks">למחוק את כל המועדפים?</string>
+  <string name="delete_selected_bookmarks">למחוק את המועדפים שנבחרו?</string>
   <string name="on">מופעל</string>
   <string name="off">כבוי</string>
   <string name="auto">אוטומטי</string>
@@ -270,4 +272,5 @@
   <string name="crash_checkbox_file_system">פרטי מערכת קבצים</string>
   <string name="diagnostic_report">דוח אבחון</string>
   <string name="diagnostic_report_message">נא לשלוח את כל הפרטים הבאים כדי שנוכל לאבחן את התקלה</string>
+  <string name="experimental_navigation">ניווט ניסיוני</string>
 </resources>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index 47f7ec12d..76dd55e09 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -4,6 +4,7 @@
 * Alex00728
 * CYAN
 * Codenstory
+* Ellif
 * Gongsoonyee
 * Jerrykim306
 * Macofe
@@ -41,7 +42,7 @@
   <string name="server_failed_toast_message">서버를 시작하지 못했습니다.</string>
   <string name="server_started_successfully_toast_message">서버가 성공적으로 시작되었습니다.</string>
   <string name="server_stopped_successfully_toast_message">서버가 성공적으로 중단되었습니다.</string>
-  <string name="hotspot_turned_on">핫스팟이 켜져있습니다</string>
+  <string name="hotspot_turned_on">핫스팟이 켜져 있습니다</string>
   <string name="hotspot_details_message">다음은 로컬 핫스팟의 상세 정보입니다.\nSSID : %1$s \nPass : %2$s</string>
   <string name="server_textview_default_message">서버에 호스팅할 파일을 선택하십시오</string>
   <string name="progress_dialog_starting_server">서버 시작 중</string>
@@ -82,6 +83,7 @@
   <string name="all_history_cleared">모든 역사를 삭제했습니다</string>
   <string name="pref_clear_all_bookmarks_title">북마크 삭제</string>
   <string name="all_bookmarks_cleared">모든 북마크가 삭제되었습니다</string>
+  <string name="selected_bookmarks_cleared">선택한 북마크들이 삭제되었습니다.</string>
   <string name="clear_all_history_dialog_title">모든 역사를 지우시겠습니까?</string>
   <string name="share">공유</string>
   <string name="selected_file_cab_app_chooser_title">ZIM 파일을 다음과 공유:</string>
@@ -264,8 +266,10 @@
   <string name="no_bookmarks">북마크가 없습니다!</string>
   <string name="no_history">역사 없음</string>
   <string name="device_default">장치 기본값</string>
-  <string name="delete_history" fuzzy="true">역사를 삭제할까요?</string>
-  <string name="delete_bookmarks" fuzzy="true">북마크를 삭제할까요?</string>
+  <string name="delete_history">역사를 삭제할까요?</string>
+  <string name="delete_selected_history">선택한 역사를 지울까요?</string>
+  <string name="delete_bookmarks">북마크를 삭제할까요?</string>
+  <string name="delete_selected_bookmarks">선택한 북마크를 지울까요?</string>
   <string name="on">켜기</string>
   <string name="off">끄기</string>
   <string name="auto">자동</string>
@@ -273,4 +277,6 @@
   <string name="crash_checkbox_file_system">파일 시스템 세부 정보</string>
   <string name="diagnostic_report">진단 보고서</string>
   <string name="diagnostic_report_message">저희가 문제를 진단할 수 있도록 다음의 자세한 정보를 모두 보내 주세요</string>
+  <string name="percentage">%d%%</string>
+  <string name="pref_text_zoom_title">글자 크기 조정</string>
 </resources>
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
index e02f3522f..e08f1394c 100644
--- a/core/src/main/res/values-mk/strings.xml
+++ b/core/src/main/res/values-mk/strings.xml
@@ -74,6 +74,7 @@
   <string name="all_history_cleared">Сета историја е исчистена</string>
   <string name="pref_clear_all_bookmarks_title">Исчисти обележувачи</string>
   <string name="all_bookmarks_cleared">Сите обележувачи се исчистени</string>
+  <string name="selected_bookmarks_cleared">Избраните обележувачи се исчистени</string>
   <string name="clear_all_history_dialog_title">Да ја исчистам сета историја</string>
   <string name="share">Сподели</string>
   <string name="selected_file_cab_app_chooser_title">Сподели ZIM-податотеки со:</string>
@@ -256,8 +257,10 @@
   <string name="no_bookmarks">Нема обележувачи</string>
   <string name="no_history">Нема историја</string>
   <string name="device_default">Основно на уредот</string>
-  <string name="delete_history" fuzzy="true">Да ја избришам историјата?</string>
-  <string name="delete_bookmarks" fuzzy="true">Да ги избришам обележувачите?</string>
+  <string name="delete_history">Да ја избришам сета историја?</string>
+  <string name="delete_selected_history">Да ја избришам избраната историја?</string>
+  <string name="delete_bookmarks">Да ги избришам сите обележувачи?</string>
+  <string name="delete_selected_bookmarks">Да ги избришам избраните обележувачи?</string>
   <string name="on">Вкл.</string>
   <string name="off">Искл.</string>
   <string name="auto">Авто</string>
diff --git a/core/src/main/res/values-ne/strings.xml b/core/src/main/res/values-ne/strings.xml
index 22a09da40..966d4fc94 100644
--- a/core/src/main/res/values-ne/strings.xml
+++ b/core/src/main/res/values-ne/strings.xml
@@ -2,6 +2,7 @@
 <!-- Authors:
 * Ganesh Paudel
 * Macofe
+* Nirajan pant
 * पर्वत सुबेदी
 * राम प्रसाद जोशी
 * सरोज कुमार ढकाल
@@ -41,6 +42,7 @@
   <string name="pref_clear_all_history_title">इतिहास खाली गर्नुहोस्</string>
   <string name="all_history_cleared">सबै इतिहास खाली गरियो</string>
   <string name="pref_clear_all_bookmarks_title">पुस्तक चिनाेहरू हटाउनुहाेस्</string>
+  <string name="selected_bookmarks_cleared">रोजिएका बुकमार्कहरू हटाइयो</string>
   <string name="clear_all_history_dialog_title" fuzzy="true">सबै इतिहास हटाउनुहोस्</string>
   <string name="delete">हटाउने</string>
   <string name="delete_specific_search_toast">हालको खोज हटाइयो</string>
@@ -100,4 +102,9 @@
   <string name="no_bookmarks">कुनै पनि पुस्तक चिनोहरू छैनन्</string>
   <string name="no_history">कुनैपनि इतिहास छैन</string>
   <string name="device_default">पुनर्निधारित उपकरण</string>
+  <string name="delete_history">सबै इतिहास मेटाउने?</string>
+  <string name="delete_selected_history">रोजिएको इतिहास मेटाउने?</string>
+  <string name="delete_bookmarks">सबै बुकमार्कहरू मेटाउने?</string>
+  <string name="delete_selected_bookmarks">रोजिएका बुकमार्कहरू मेटाउने?</string>
+  <string name="experimental_navigation">प्रयोगात्मक नेभिगेसन</string>
 </resources>
diff --git a/core/src/main/res/values-night/color.xml b/core/src/main/res/values-night/color.xml
deleted file mode 100644
index 7ec48325f..000000000
--- a/core/src/main/res/values-night/color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <!--DARK COLOR THEME-->
-  <!--The same color values are defined for dark theme, but with values more appropriate for -->
-  <!--low-luminance UIs. These colors will be used by night/themes.xml.-->
-
-  <color name="color_primary">@color/blue400</color>
-
-  <color name="color_surface">@color/gray900</color>
-  <color name="color_error">@color/pink300</color>
-
-  <color name="color_on_primary">@color/white</color>
-  <color name="color_on_surface">@color/white</color>
-  <color name="color_on_error">@color/white</color>
-
-  <color name="text_secondary">@color/gray350</color>
-  <color name="text_tertiary">@color/gray500</color>
-  <color name="card_view_background">@color/gray850</color>
-</resources>
diff --git a/core/src/main/res/values-night/themes.xml b/core/src/main/res/values-night/themes.xml
index 31d077d1e..4569086d5 100644
--- a/core/src/main/res/values-night/themes.xml
+++ b/core/src/main/res/values-night/themes.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
   <!--Top level DayNight theme to be used in AndroidManifest.xml-->
   <style name="KiwixTheme" parent="Base.KiwixTheme">
     <!-- Dark theme customisations here-->
-  </style>
+    <item name="colorPrimary">@color/denim_blue400</item>
 
+    <item name="colorSurface">@color/mine_shaft_gray900</item>
+    <item name="colorError">@color/froly_pink300</item>
+
+    <item name="colorOnPrimary">@color/alabaster_white</item>
+    <item name="colorOnSurface">@color/alabaster_white</item>
+    <item name="colorOnError">@color/alabaster_white</item>
+
+    <item name="textSecondary">@color/mine_shaft_gray350</item>
+    <item name="textTertiary">@color/mine_shaft_gray500</item>
+    <item name="cardViewBackground">@color/mine_shaft_gray850</item>
+  </style>
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index a8e0cacf3..9b259ef8e 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -80,6 +80,7 @@
   <string name="all_history_cleared">Eliminando todo o histórico</string>
   <string name="pref_clear_all_bookmarks_title">Limpar marcadores</string>
   <string name="all_bookmarks_cleared">Todos os marcadores limpos</string>
+  <string name="selected_bookmarks_cleared">Marcadores selecionados limpos</string>
   <string name="clear_all_history_dialog_title">Limpar todo o histórico?</string>
   <string name="share">Compartilhar</string>
   <string name="selected_file_cab_app_chooser_title">Compartilhe arquivos ZIM com:</string>
@@ -262,8 +263,10 @@
   <string name="no_bookmarks">Sem Favoritos</string>
   <string name="no_history">Sem histórico</string>
   <string name="device_default">Padrão do dispositivo</string>
-  <string name="delete_history" fuzzy="true">Apagar histórico?</string>
-  <string name="delete_bookmarks" fuzzy="true">Excluir marcadores?</string>
+  <string name="delete_history">Excluir todo o histórico?</string>
+  <string name="delete_selected_history">Excluir histórico selecionado?</string>
+  <string name="delete_bookmarks">Excluir todos os favoritos?</string>
+  <string name="delete_selected_bookmarks">Excluir favoritos selecionados?</string>
   <string name="on">Lig</string>
   <string name="off">Des</string>
   <string name="auto">Auto</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 6bc7b1984..4f333b0bc 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -89,6 +89,7 @@
   <string name="all_history_cleared">Вся история очищена</string>
   <string name="pref_clear_all_bookmarks_title">Очистить закладки</string>
   <string name="all_bookmarks_cleared">Все закладки удалены</string>
+  <string name="selected_bookmarks_cleared">Выбранные Закладки Очищены</string>
   <string name="clear_all_history_dialog_title">Очистить всю историю?</string>
   <string name="share">Поделиться</string>
   <string name="selected_file_cab_app_chooser_title">Поделиться файлами ZIM с:</string>
@@ -256,7 +257,7 @@
   <string name="no_devices_found">Устройства не найдены. Нажмите кнопку Поиск чтобы попробовать ещё раз.</string>
   <string name="files_for_transfer">ФАЙЛЫ ДЛЯ ПЕРЕДАЧИ</string>
   <string name="preparing_files">Подготовка файлов для передачи…</string>
-  <string name="performing_handshake">Производим \“рукопожатие\”…</string>
+  <string name="performing_handshake">Производим “рукопожатие”…</string>
   <string name="status">Статус</string>
   <string name="pref_clear_all_notes_summary">Очистить все заметки во всех статьях</string>
   <string name="pref_clear_all_notes_title">Очистить все заметки</string>
@@ -271,8 +272,10 @@
   <string name="no_bookmarks">Нет Закладок</string>
   <string name="no_history">История пуста</string>
   <string name="device_default">Настройки устройства по умолчанию</string>
-  <string name="delete_history" fuzzy="true">Удалить историю?</string>
-  <string name="delete_bookmarks" fuzzy="true">Удалить закладки?</string>
+  <string name="delete_history">Удалить всю историю?</string>
+  <string name="delete_selected_history">Очистить Выбранную историю?</string>
+  <string name="delete_bookmarks">Удалить все закладки?</string>
+  <string name="delete_selected_bookmarks">Удалить Выбранные Закладки?</string>
   <string name="on">Вкл</string>
   <string name="off">Выкл</string>
   <string name="auto">Авто</string>
diff --git a/core/src/main/res/values-sr/strings.xml b/core/src/main/res/values-sr/strings.xml
index ceeb221d9..6720881d8 100644
--- a/core/src/main/res/values-sr/strings.xml
+++ b/core/src/main/res/values-sr/strings.xml
@@ -83,8 +83,10 @@
   <string name="no_bookmarks">Нема обележивача</string>
   <string name="no_history">Нема историјата</string>
   <string name="device_default">Подразумеване вредности уређаја</string>
-  <string name="delete_history" fuzzy="true">Избрисати историјат?</string>
-  <string name="delete_bookmarks" fuzzy="true">Избрисати обележиваче?</string>
+  <string name="delete_history">Избрисати целу историју?</string>
+  <string name="delete_selected_history">Избрисати изабрану историју?</string>
+  <string name="delete_bookmarks">Избрисати све обележиваче?</string>
+  <string name="delete_selected_bookmarks">Избрисати изабране обележиваче?</string>
   <string name="on">Укљ.</string>
   <string name="off">Искљ.</string>
   <string name="auto">Ауто</string>
@@ -92,4 +94,5 @@
   <string name="crash_checkbox_file_system">Детаљи о систему датотека</string>
   <string name="diagnostic_report">Дијагностички извештај</string>
   <string name="diagnostic_report_message">Пошаљите све детаље како бисмо могли да дијагностикујемо проблем</string>
+  <string name="experimental_navigation">Експериментална навигација</string>
 </resources>
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index ba1025f82..96b94c7a6 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -3,6 +3,7 @@
 * Abijeet Patro
 * Jopparn
 * Skalman
+* Susann Schweden
 * Technic2
 * WikiPhoenix
 -->
@@ -40,6 +41,8 @@
   <string name="server_textview_default_message">Välj filerna du vill vara värd för på servern</string>
   <string name="progress_dialog_starting_server">Startar server</string>
   <string name="hotspot_dialog_title" fuzzy="true">Aktivera din WiFi-surfpunkt</string>
+  <string name="wifi_dialog_title">WiFi-förbindelse upptäckt</string>
+  <string name="wifi_dialog_body">För att kunna se böcker på andra enheter, måste säkerställas att alla enheter är anslutna till samma WiFi-nätverk.</string>
   <string name="hotspot_dialog_message">För att denna funktion ska fungera måste du först aktivera din WiFi-surfpunkt manuellt eller se till att värdens enhet och mottagarens enhet är på samma nätverk.</string>
   <string name="hotspot_dialog_neutral_button">FORTSÄTT</string>
   <string name="hotspot_channel_description">Uppdateringar om tillståndet för din surfpunkt/server.</string>
@@ -58,8 +61,8 @@
   <string name="pref_night_mode_summary">Visa artiklar med inverterade färger</string>
   <string name="pref_back_to_top">Tillbaka till toppen</string>
   <string name="pref_back_to_top_summary">Visar en knapp i slutet på sidan för att rulla upp till toppen</string>
-  <string name="pref_hide_toolbar">Dölj verktygsfält vid rullning</string>
-  <string name="pref_hide_toolbar_summary">Dölj verktygsfältet när sidan rullar nedåt</string>
+  <string name="pref_hide_toolbar">Fortsätt visa verktygsfältet</string>
+  <string name="pref_hide_toolbar_summary">Skyddar verktygsfältet från att försvinna när du bläddrar i innehållet</string>
   <string name="pref_language_title">Språk</string>
   <string name="pref_language_chooser">Välj ett språk</string>
   <string name="pref_credits">Bidragsgivare och licenser</string>
@@ -74,7 +77,8 @@
   <string name="pref_clear_all_history_summary">Rensa senaste sökningar och flikhistorik</string>
   <string name="all_history_cleared">All historik rensades</string>
   <string name="pref_clear_all_bookmarks_title">Rensa bokmärken</string>
-  <string name="all_bookmarks_cleared">Alla bokmärken rensade</string>
+  <string name="all_bookmarks_cleared">Alla bokmärken rensades</string>
+  <string name="selected_bookmarks_cleared">Utvalda bokmärken rensades</string>
   <string name="clear_all_history_dialog_title">Rensa all historik?</string>
   <string name="share">Dela</string>
   <string name="selected_file_cab_app_chooser_title">Dela ZIM-filer med:</string>
@@ -221,6 +225,7 @@
   <string name="books_count">%d bok/böcker</string>
   <string name="connection_failed">Anslutning misslyckades</string>
   <string name="permission_refused_storage">Kan inte komma åt zim-filer utan lagringsbehörighet</string>
+  <string name="request_enable_wifi">Aktivera WiFi P2P i systeminställningar</string>
   <string name="transfer_to">Överför filer till %s?</string>
   <string name="file_transfer_complete">Filöverföring slutfördes</string>
   <string name="error_during_transfer">Ett fel uppstod under överförning</string>
@@ -246,10 +251,14 @@
   <string name="no_bookmarks">Inga bokmärken</string>
   <string name="no_history">Ingen historik</string>
   <string name="device_default">Enhetsstandard</string>
-  <string name="delete_history" fuzzy="true">Radera historik?</string>
-  <string name="delete_bookmarks" fuzzy="true">Radera bokmärken?</string>
+  <string name="delete_history">Radera all historik?</string>
+  <string name="delete_selected_history">Radera vald historik?</string>
+  <string name="delete_bookmarks">Radera alla bokmärken?</string>
+  <string name="delete_selected_bookmarks">Radera valda bokmärken?</string>
   <string name="on">På</string>
   <string name="off">Av</string>
   <string name="auto">Auto</string>
+  <string name="send_report">Skicka diagnostisk rapport</string>
   <string name="crash_checkbox_file_system">Filsystemsdetaljer</string>
+  <string name="diagnostic_report">Diagnostisk rapport</string>
 </resources>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index 82f02b1be..0f4b71115 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -85,6 +85,7 @@
   <string name="all_history_cleared">Tüm geçmiş temizlendi</string>
   <string name="pref_clear_all_bookmarks_title">Yer imlerini temizle</string>
   <string name="all_bookmarks_cleared">Tüm Yer İmleri Temizlendi</string>
+  <string name="selected_bookmarks_cleared">Seçilen Yer İşaretleri Temizlendi</string>
   <string name="clear_all_history_dialog_title">Tüm Geçmişi Silinsin mi?</string>
   <string name="share">Paylaş</string>
   <string name="selected_file_cab_app_chooser_title">ZIM dosyalarını şu kişilerle paylaş:</string>
@@ -258,7 +259,7 @@
   <string name="pref_clear_all_notes_title">Tüm notları temizle</string>
   <string name="tag_pic">Resim</string>
   <string name="tag_vid">Video</string>
-  <string name="tag_text_only">Sadece Metin</string>
+  <string name="tag_text_only">Yalnızca Metin</string>
   <string name="tag_short_text">Kısa Metin</string>
   <string name="storage_permission_denied">Depolama İzni Reddedildi</string>
   <string name="grant_read_storage_permission">Bu uygulama çalışması için depolama okuma yeteneği gerektirir. Lütfen ayarlarınızda izin verin</string>
@@ -267,8 +268,10 @@
   <string name="no_bookmarks">Yer İmi Yok</string>
   <string name="no_history">Geçmiş Yok</string>
   <string name="device_default">Cihaz Varsayılanı</string>
-  <string name="delete_history" fuzzy="true">Geçmiş Silinsin mi?</string>
-  <string name="delete_bookmarks" fuzzy="true">Yer İşaretleri Silinsin mi?</string>
+  <string name="delete_history">Tüm Geçmişi Silinsin mi?</string>
+  <string name="delete_selected_history">Seçilmiş Geçmişi Silinsin mi?</string>
+  <string name="delete_bookmarks">Tüm Yer İşaretleri Silinsin mi?</string>
+  <string name="delete_selected_bookmarks">Seçilmiş Yer İşaretleri Silinsin mi?</string>
   <string name="on">Açık</string>
   <string name="off">Kapalı</string>
   <string name="auto">Otomatik</string>
@@ -276,7 +279,7 @@
   <string name="crash_checkbox_file_system">Dosya Sistemi Ayrıntıları</string>
   <string name="diagnostic_report">Teşhis Raporu</string>
   <string name="diagnostic_report_message">Sorunu teşhis edebilmemiz için lütfen aşağıdaki tüm ayrıntıları gönderin</string>
-  <string name="percentage">%%%d</string>
+  <string name="percentage">%d%%</string>
   <string name="pref_text_zoom_title">Metin Yakınlığı</string>
   <string name="experimental_navigation">Deneysel Gezintisi</string>
 </resources>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index f6ced3f06..5bafad6ca 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -79,6 +79,7 @@
   <string name="all_history_cleared">所有歷史記錄已清除</string>
   <string name="pref_clear_all_bookmarks_title">清除書籤</string>
   <string name="all_bookmarks_cleared">已清除所有書籤</string>
+  <string name="selected_bookmarks_cleared">所選的書籤已清除</string>
   <string name="clear_all_history_dialog_title">清除所有歷史記錄？</string>
   <string name="share">分享</string>
   <string name="selected_file_cab_app_chooser_title">分享 ZIM 檔案以：</string>
@@ -261,8 +262,10 @@
   <string name="no_bookmarks">沒有書籤！</string>
   <string name="no_history">沒有歷史</string>
   <string name="device_default">設備預設</string>
-  <string name="delete_history" fuzzy="true">刪除歷史？</string>
-  <string name="delete_bookmarks" fuzzy="true">刪除書籤？</string>
+  <string name="delete_history">刪除所有歷史？</string>
+  <string name="delete_selected_history">刪除所選的歷史？</string>
+  <string name="delete_bookmarks">刪除所有書籤？</string>
+  <string name="delete_selected_bookmarks">刪除所選的書籤？</string>
   <string name="on">開啟</string>
   <string name="off">關閉</string>
   <string name="auto">自動</string>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 21b933f1e..2d8f75c76 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -4,5 +4,8 @@
   <declare-styleable name="SliderPreference">
     <attr name="android:summary" />
   </declare-styleable>
+  <attr name="textSecondary" format="color" />
+  <attr name="textTertiary" format="color" />
+  <attr name="cardViewBackground" format="color" />
 
 </resources>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 5b57d8896..1f2437afb 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <color name="white">#ffffff</color>
+  <color name="alabaster_white">#fafafa</color>
+  <color name="mine_shaft_gray350">#FFD6D6D6</color>
+  <color name="mine_shaft_gray500">#9E9E9E</color>
+  <color name="scorpion_gray">#5a5a5a</color>
+  <color name="mine_shaft_gray700">#616161</color>
+  <color name="mine_shaft_gray850">#303030</color>
+  <color name="mine_shaft_gray900">#212121</color>
   <color name="black">#000000</color>
-
-  <color name="accent">#2196F3</color>
-  <color name="white">#fafafa</color>
-  <color name="gray">#5a5a5a</color>
-  <color name="gray900">#212121</color>
-  <color name="blue400">#42a5f5</color>
-  <color name="blue800">#1565c0</color>
-  <color name="pink300">#f06292</color>
-  <color name="actionModeBackground">#4285F4</color>
-  <color name="gray350">#FFD6D6D6</color>
-  <color name="gray500">#9E9E9E</color>
-  <color name="gray700">#616161</color>
-  <color name="gray850">#303030</color>
-  <color name="card_view_background">@color/white</color>
-  <color name="text_secondary">@color/gray700</color>
-  <color name="text_tertiary">@color/gray500</color>
-
-  <!--Material Components Colors-->
-
-  <color name="color_primary">@color/blue800</color>
-
-  <color name="color_surface">@color/white</color>
-  <color name="color_error">#b00020</color>
-
-  <color name="color_on_primary">#ffffff</color>
-  <color name="color_on_surface">@color/black</color>
-  <color name="color_on_error">@color/white</color>
-
+  <color name="denim_blue400">#42a5f5</color>
+  <color name="dodger_blue">#2196F3</color>
+  <color name="cornflower_blue">#4285F4</color>
+  <color name="denim_blue800">#1565c0</color>
+  <color name="froly_pink300">#f06292</color>
+  <color name="monza_red">#b00020</color>
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index eba031e2d..3621e5eb7 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -34,7 +34,7 @@
 
   <style name="Widget.KiwixTheme.TabLayout" parent="Widget.MaterialComponents.TabLayout">
     <item name="android:background">@color/black</item>
-    <item name="tabTextColor">@color/white</item>
+    <item name="tabTextColor">@color/alabaster_white</item>
   </style>
 
   <style name="Widget.KiwixTheme.Chip.Choice.Static" parent="Widget.MaterialComponents.Chip.Choice">
@@ -57,7 +57,7 @@
   </style>
 
   <style name="Widget.KiwixTheme.CardView" parent="Widget.MaterialComponents.CardView">
-    <item name="cardBackgroundColor">@color/card_view_background</item>
+    <item name="cardBackgroundColor">?cardViewBackground</item>
   </style>
 
   <style name="Widget.KiwixTheme.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
@@ -68,7 +68,7 @@
   </style>
 
   <style name="ThemeOverlay.KiwixTheme.ProgressBar" parent="">
-    <item name="colorAccent">@color/blue400</item>
+    <item name="colorAccent">@color/denim_blue400</item>
   </style>
 
 </resources>
diff --git a/core/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml
index f0f4a0967..8fec99c34 100644
--- a/core/src/main/res/values/themes.xml
+++ b/core/src/main/res/values/themes.xml
@@ -2,38 +2,50 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
   <!--Top level theme to be used in AndroidManifest.xml-->
-  <style name="KiwixTheme" parent="Base.KiwixTheme" />
+  <style name="KiwixTheme" parent="Base.KiwixTheme">
+
+    <!--colorPrimary colors map to components and elements, such as app bars and buttons. -->
+    <item name="colorPrimary">@color/denim_blue800</item>
+
+    <!--colorSurface is mapped to the surface of components such as cards, sheets-->
+    <!--and menus. colorError is used to indicate an error state for components such as-->
+    <!--text fields.-->
+    <item name="colorSurface">@color/alabaster_white</item>
+    <item name="colorError">@color/monza_red</item>
+
+    <!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
+    <!--on which they appear.-->
+    <item name="colorOnPrimary">@color/white</item>
+    <item name="colorOnSurface">@color/black</item>
+    <item name="colorOnError">@color/alabaster_white</item>
+
+    <item name="textSecondary">@color/mine_shaft_gray700</item>
+    <item name="textTertiary">@color/mine_shaft_gray500</item>
+    <item name="cardViewBackground">@color/alabaster_white</item>
+  </style>
 
   <!--Base custom theme which will be shared between both light and dark theme variants-->
   <style name="Base.KiwixTheme" parent="Base.MaterialThemeBuilder">
     <!--Material color attributes -->
 
-    <!--colorPrimary colors map to components and elements, such as app bars and buttons. -->
+    <item name="colorPrimaryVariant">?colorPrimary</item>
+
     <!--colorSecondary colors are most often used as accents on components, such as FABs and -->
     <!--selection controls.-->
-    <item name="colorPrimary">@color/color_primary</item>
-    <item name="colorPrimaryVariant">?colorPrimary</item>
     <item name="colorSecondary">?colorPrimary</item>
     <item name="colorSecondaryVariant">?colorPrimary</item>
 
     <!--Material snackbar attributes-->
     <item name="maxActionInlineWidth">128dp</item>
 
-    <!--colorBackground appears behind scrollable content and is used for the default window-->
-    <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
-    <!--and menus. colorError is used to indicate an error state for components such as-->
-    <!--text fields.-->
-    <item name="colorSurface">@color/color_surface</item>
-    <item name="android:colorBackground">?colorSurface</item>
-    <item name="colorError">@color/color_error</item>
 
-    <!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
-    <!--on which they appear.-->
-    <item name="colorOnPrimary">@color/color_on_primary</item>
+    <!--colorBackground appears behind scrollable content and is used for the default window-->
+    <!--background.-->
+    <item name="android:colorBackground">?colorSurface</item>
+
+
     <item name="colorOnSecondary">?colorOnPrimary</item>
-    <item name="colorOnSurface">@color/color_on_surface</item>
     <item name="colorOnBackground">?colorOnSurface</item>
-    <item name="colorOnError">@color/color_on_error</item>
 
     <!--Material type attributes-->
     <item name="textAppearanceHeadline1">@style/TextAppearance.KiwixTheme.Headline1</item>
@@ -72,7 +84,7 @@
   <style name="Base.MaterialThemeBuilder" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 
     <item name="android:statusBarColor" tools:ignore="NewApi">@color/black</item>
-    <item name="actionModeBackground">@color/actionModeBackground</item>
+    <item name="actionModeBackground">@color/cornflower_blue</item>
     <item name="windowActionModeOverlay">true</item>
 
     <!--Remap legacy AppCompat attributes to MaterialComponent attributes-->
diff --git a/custom/src/main/res/values-de/strings.xml b/custom/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..8970e9aea
--- /dev/null
+++ b/custom/src/main/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Susann Schweden
+-->
+<resources>
+  <string name="retry">Erneut versuchen</string>
+  <string name="download">Herunterladen</string>
+  <string name="invalid_installation">Ungültige Installation. Bitte ZIM herunterladen.\nStellen Sie sicher, das Wi-Fi an ist und sie genügend Speicherplatz haben</string>
+</resources>