diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 780496043..903ea8973 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,10 +21,6 @@
     <string name="label_categories">Categories</string>
     <string name="label_backup">Backup</string>
     <string name="label_migration">Source migration</string>
-    <string name="label_reorganize_by">Reorder</string>
-    <string name="label_alpha_reverse">Alpha. (descending)</string>
-    <string name="label_hide_title">Hide title</string>
-    <string name="label_show_title">Show title</string>
     <string name="label_extensions">Extensions</string>
     <string name="label_extension_info">Extension info</string>
     <string name="label_help">Help</string>
@@ -45,12 +41,8 @@
     <string name="action_sort_total">Total chapters</string>
     <string name="action_sort_last_read">Last read</string>
     <string name="action_sort_last_checked">Last checked</string>
-    <string name="action_sort_first_checked">First checked</string>
     <string name="action_sort_latest_chapter">Latest chapter</string>
-    <string name="action_sort_drag_and_drop">Drag &amp; Drop</string>
-    <string name="action_sort_enabled">Enabled</string>
     <string name="action_search">Search</string>
-    <string name="action_skip_manga">Don\'t migrate</string>
     <string name="action_global_search">Global search</string>
     <string name="action_select_all">Select all</string>
     <string name="action_select_inverse">Select inverse</string>
@@ -115,9 +107,6 @@
     <string name="action_webview_back">Back</string>
     <string name="action_webview_forward">Forward</string>
     <string name="action_webview_refresh">Refresh</string>
-    <string name="action_search_manually">Search manually</string>
-    <string name="action_migrate_now">Migrate now</string>
-    <string name="action_copy_now">Copy now</string>
 
     <!-- Operations -->
     <string name="loading">Loading…</string>
@@ -127,17 +116,16 @@
     <string name="short_recent_updates">Updates</string>
 
     <!-- Preferences -->
-      <!-- Subsections -->
+    <!-- Subsections -->
     <string name="pref_category_general">General</string>
     <string name="pref_category_library">Library</string>
     <string name="pref_category_reader">Reader</string>
     <string name="pref_category_downloads">Downloads</string>
-    <string name="pref_category_all_sources">All Sources</string>
     <string name="pref_category_tracking">Tracking</string>
     <string name="pref_category_advanced">Advanced</string>
     <string name="pref_category_about">About</string>
 
-      <!-- General section -->
+    <!-- General section -->
     <string name="pref_theme_mode">App theme</string>
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
@@ -169,7 +157,7 @@
     <string name="secure_screen_summary">Hide app contents when switching apps and block screenshots</string>
     <string name="hide_notification_content">Hide notification content</string>
 
-      <!-- Library section -->
+    <!-- Library section -->
     <string name="pref_category_display">Display</string>
     <string name="pref_library_columns">Items per row</string>
     <string name="portrait">Portrait</string>
@@ -194,9 +182,7 @@
     <string name="wifi">Wi-Fi</string>
     <string name="charging">Charging</string>
     <string name="pref_update_only_non_completed">Only update ongoing manga</string>
-    <string name="pref_skip_pre_migration">Skip pre-migration</string>
-    <string name="pref_skip_pre_migration_summary">Use last saved pre-migration preferences
-    and sources to mass migrate</string>
+
     <string name="pref_category_library_categories">Categories</string>
     <string name="default_category">Default category</string>
     <string name="default_category_summary">Always ask</string>
@@ -207,7 +193,7 @@
     <string name="pref_library_update_categories">Categories to include in global update</string>
     <string name="all">All</string>
 
-      <!-- Extension section -->
+    <!-- Extension section -->
     <string name="all_lang">All</string>
     <string name="ext_details">Details</string>
     <string name="ext_updates_pending">Updates pending</string>
@@ -230,7 +216,7 @@
     <string name="ext_language_info">Language: %1$s</string>
     <string name="ext_empty_preferences">No preferences to edit for this extension</string>
 
-      <!-- Reader section -->
+    <!-- Reader section -->
     <string name="pref_fullscreen">Fullscreen</string>
     <string name="pref_cutout_short">Show content in cutout area</string>
     <string name="pref_lock_orientation">Lock orientation</string>
@@ -303,7 +289,7 @@
     <string name="webtoon_side_padding_20">20%</string>
     <string name="webtoon_side_padding_25">25%</string>
 
-      <!-- Downloads section -->
+    <!-- Downloads section -->
     <string name="pref_download_directory">Download location</string>
     <string name="pref_download_only_over_wifi">Only download over Wi-Fi</string>
     <string name="pref_remove_after_marked_as_read">Remove when marked as read</string>
@@ -318,15 +304,15 @@
     <string name="pref_download_new">Download new chapters</string>
     <string name="pref_download_new_categories">Categories to include in download</string>
 
-      <!-- Tracking section -->
+    <!-- Tracking section -->
     <string name="pref_auto_update_manga_sync">Sync chapters after reading</string>
     <string name="services">Services</string>
 
-      <!-- Browse section -->
+    <!-- Browse section -->
     <string name="pref_enable_automatic_extension_updates">Check for extension updates</string>
     <string name="pref_search_pinned_sources_only">Only include pinned sources</string>
 
-      <!-- Backup section -->
+    <!-- Backup section -->
     <string name="backup">Backup</string>
     <string name="pref_create_backup">Create backup</string>
     <string name="pref_create_backup_summ">Can be used to restore current library</string>
@@ -351,7 +337,7 @@
     <string name="restoring_backup_error">Restoring backup failed</string>
     <string name="restoring_backup_canceled">Canceled restore</string>
 
-      <!-- Advanced section -->
+    <!-- Advanced section -->
     <string name="pref_clear_chapter_cache">Clear chapter cache</string>
     <string name="used_cache">Used: %1$s</string>
     <string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
@@ -372,7 +358,7 @@
     <string name="battery_optimization_disabled">Battery optimization is already disabled</string>
     <string name="battery_optimization_setting_activity_not_found">Couldn\'t open device settings</string>
 
-      <!-- About section -->
+    <!-- About section -->
     <string name="website">Website</string>
     <string name="version">Version</string>
     <string name="build_time">Build time</string>
@@ -559,6 +545,14 @@
     <!-- History fragment -->
     <string name="recent_manga_time">Ch. %1$s - %2$s</string>
 
+    <!-- Source migration screen -->
+    <string name="migration_info">Tap to select the source to migrate from</string>
+    <string name="migration_dialog_what_to_include">Select data to include</string>
+    <string name="migration_selection_prompt">Select a source to migrate from</string>
+    <string name="select">Select</string>
+    <string name="migrate">Migrate</string>
+    <string name="copy">Copy</string>
+
     <!-- Downloads activity and service -->
     <string name="download_queue_error">Could not download chapters. You can try again in the downloads section</string>
 
@@ -581,7 +575,6 @@
         <item quantity="one">Chapters %1$s and 1 more</item>
         <item quantity="other">Chapters %1$s and %2$d more</item>
     </plurals>
-    <string name="notification_new_chapters_text_old">For %1$d titles</string>
     <string name="notification_cover_update_failed">Failed to update cover</string>
     <string name="notification_first_add_to_library">Please add the manga to your library before doing this</string>
     <string name="notification_not_connected_to_ac_title">Sync canceled</string>
@@ -646,84 +639,5 @@
     <string name="channel_backup_restore">Backup and restore</string>
     <string name="channel_backup_restore_progress">Progress</string>
     <string name="channel_backup_restore_complete">Complete</string>
-    
-    <!-- Migration -->
-    <string name="source_migration">Source migration</string>
-    <string name="migration">Migration</string>
-    <string name="skip_pre_migration">Skip pre-migration</string>
-    <string name="pre_migration_skip_toast">To show this screen again, go to Settings -> Library.</string>
-    <string name="select_a_source_to_migrate_from">Select a source to migrate from</string>
-    <string name="use_intelligent_search">Search title + keywords of title</string>
-    <string name="data_to_include_in_migration">Data to include in migration</string>
-    <string name="search_parameter_eg">Search parameter (e.g. language:english)</string>
-    <string name="include_extra_search_parameter">Include extra search parameter when searching</string>
-    <string name="use_most_chapters">Use source with the most chapters (slower)</string>
-    <string name="use_first_source">Use first source with alternative</string>
-    <string name="skip_this_step_next_time">Skip this step next time</string>
-    <string name="search_parameter">Search parameter (e.g. language:english)</string>
-    <string name="to_show_again_setting_library">To show this screen again, go to Settings -> Library.</string>
-    <string name="latest_">Latest: %1$s</string>
-    <string name="migrating_to">migrating to</string>
-    <string name="dont_migrate">Don\'t migrate</string>
-    <string name="search_manually">Search manually</string>
-    <string name="migrate_now">Migrate now</string>
-    <string name="copy_now">Copy now</string>
-    <string name="select">Select</string>
-    <string name="migrate">Migrate</string>
-    <string name="migrate_">Migrate %1$s</string>
-    <string name="copy_value">Copy</string>
-    <string name="no_chapters_found_for_migration">No chapters found, this manga cannot be used for
-        migration</string>
-    <string name="no_alternatives_found">No Alternatives Found</string>
-    <string name="stop_migrating">Stop migrating?</string>
-    <plurals name="migrate_manga">
-        <item quantity="one">Migrate %1$d%2$s manga?</item>
-        <item quantity="other">Migrate %1$d%2$s manga?</item>
-    </plurals>
-    <plurals name="copy_manga">
-        <item quantity="one">Copy %1$d%2$s manga?</item>
-        <item quantity="other">Copy %1$d%2$s manga?</item>
-    </plurals>
-    <string name="skipping_">(skipping %1$d)</string>
-    <plurals name="manga_migrated">
-        <item quantity="one">%d manga migrated</item>
-        <item quantity="other">%d manga migrated</item>
-    </plurals>
-
-    <!-- EXH -->
-    <string name="label_login">Login</string>
-    <string name="pref_category_eh">E-Hentai</string>
-    <string name="pref_category_nh">nhentai</string>
-    <string name="pref_category_hl">hitomi.la</string>
-    <string name="eh_batch_add">Batch Add</string>
-    <string name="eh_settings_category">EH Settings</string>
-    <string name="eh_sync_favorites">Sync favorites</string>
-    <string name="eh_find_in_another_source">Find in another source</string>
-    <string name="eh_autoscroll">Autoscroll</string>
-    <string name="eh_retry_all">Retry all</string>
-    <string name="eh_boost_page">Boost page</string>
-    <string name="eh_rounded_corner_0">No Rounded Corners</string>
-    <string name="eh_rounded_corner_1">Radius of 1</string>
-    <string name="eh_rounded_corner_2">Radius of 2</string>
-    <string name="eh_rounded_corner_3">Radius of 3</string>
-    <string name="eh_rounded_corner_4">Radius of 4</string>
-    <string name="eh_rounded_corner_5">Radius of 5</string>
-    <string name="eh_rounded_corner_6">Radius of 6</string>
-    <string name="eh_rounded_corner_7">Radius of 7</string>
-    <string name="eh_rounded_corner_8">Radius of 8</string>
-    <string name="eh_rounded_corner_9">Radius of 9</string>
-    <string name="eh_rounded_corner_10">Radius of 10</string>
-    <string name="eh_rounded_corners_desc">The level of radius that the corners are rounded to. Current value is: %s</string>
-    <string name="merge">Merge with current</string>
-    <string name="eh_merge_with_another_source">Merge With Another</string>
-    <string name="eh_autoscroll_help">Autoscroll help</string>
-    <string name="eh_autoscroll_help_message">Automatically scroll to the next page in the specified interval. Interval is specified in seconds.</string>
-    <string name="eh_retry_all_help">Retry all help</string>
-    <string name="eh_retry_all_help_message">Re-add all failed pages to the download queue.</string>
-    <string name="eh_boost_page_help">Boost page help</string>
-    <string name="eh_boost_page_help_message">Normally the downloader can only download a specific amount of pages at the same time. This means you can be waiting for a page to download but the downloader will not start downloading the page until it has a free download slot. Pressing \'Boost page\' will force the downloader to begin downloading the current page, regardless of whether or not there is an available slot.</string>
-    <string name="eh_force_sync_reset_title">Are you sure?</string>
-    <string name="eh_force_sync_reset_message">Resetting the sync state can cause your next sync to be extremely slow.</string>
-    <string name="eh_show_update_statistics_dialog">Collecting statistics…</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings_extra.xml b/app/src/main/res/values/strings_extra.xml
new file mode 100644
index 000000000..abb99821a
--- /dev/null
+++ b/app/src/main/res/values/strings_extra.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Activities and fragments labels (toolbar title) -->
+    <string name="label_reorganize_by">Reorder</string>
+    <string name="label_alpha_reverse">Alpha. (descending)</string>
+    <string name="label_hide_title">Hide title</string>
+    <string name="label_show_title">Show title</string>
+
+    <!-- Actions -->
+    <string name="action_sort_first_checked">First checked</string>
+    <string name="action_sort_drag_and_drop">Drag &amp; Drop</string>
+    <string name="action_sort_enabled">Enabled</string>
+    <string name="action_skip_manga">Don\'t migrate</string>
+    <string name="action_search_manually">Search manually</string>
+    <string name="action_migrate_now">Migrate now</string>
+    <string name="action_copy_now">Copy now</string>
+
+    <!-- Preferences -->
+    <!-- Subsections -->
+    <string name="pref_category_all_sources">All Sources</string>
+
+    <!-- Library section -->
+    <string name="pref_skip_pre_migration">Skip pre-migration</string>
+    <string name="pref_skip_pre_migration_summary">Use last saved pre-migration preferences
+    and sources to mass migrate</string>
+
+    <!-- Library update service notifications -->
+    <string name="notification_new_chapters_text_old">For %1$d titles</string>
+
+
+    <!-- Migration -->
+    <string name="source_migration">Source migration</string>
+    <string name="migration">Migration</string>
+    <string name="skip_pre_migration">Skip pre-migration</string>
+    <string name="pre_migration_skip_toast">To show this screen again, go to Settings -> Library.</string>
+    <string name="select_a_source_to_migrate_from">Select a source to migrate from</string>
+    <string name="use_intelligent_search">Search title + keywords of title</string>
+    <string name="data_to_include_in_migration">Data to include in migration</string>
+    <string name="search_parameter_eg">Search parameter (e.g. language:english)</string>
+    <string name="include_extra_search_parameter">Include extra search parameter when searching</string>
+    <string name="use_most_chapters">Use source with the most chapters (slower)</string>
+    <string name="use_first_source">Use first source with alternative</string>
+    <string name="skip_this_step_next_time">Skip this step next time</string>
+    <string name="search_parameter">Search parameter (e.g. language:english)</string>
+    <string name="to_show_again_setting_library">To show this screen again, go to Settings -> Library.</string>
+    <string name="latest_">Latest: %1$s</string>
+    <string name="migrating_to">migrating to</string>
+    <string name="dont_migrate">Don\'t migrate</string>
+    <string name="search_manually">Search manually</string>
+    <string name="migrate_now">Migrate now</string>
+    <string name="copy_now">Copy now</string>
+    <!--<string name="select">Select</string>-->
+    <!--<string name="migrate">Migrate</string>-->
+    <string name="migrate_">Migrate %1$s</string>
+    <string name="copy_value">Copy</string>
+    <string name="no_chapters_found_for_migration">No chapters found, this manga cannot be used for
+        migration</string>
+    <string name="no_alternatives_found">No Alternatives Found</string>
+    <string name="stop_migrating">Stop migrating?</string>
+    <plurals name="migrate_manga">
+        <item quantity="one">Migrate %1$d%2$s manga?</item>
+        <item quantity="other">Migrate %1$d%2$s manga?</item>
+    </plurals>
+    <plurals name="copy_manga">
+        <item quantity="one">Copy %1$d%2$s manga?</item>
+        <item quantity="other">Copy %1$d%2$s manga?</item>
+    </plurals>
+    <string name="skipping_">(skipping %1$d)</string>
+    <plurals name="manga_migrated">
+        <item quantity="one">%d manga migrated</item>
+        <item quantity="other">%d manga migrated</item>
+    </plurals>
+
+    <!-- EXH -->
+    <string name="label_login">Login</string>
+    <string name="pref_category_eh">E-Hentai</string>
+    <string name="pref_category_nh">nhentai</string>
+    <string name="pref_category_hl">hitomi.la</string>
+    <string name="eh_batch_add">Batch Add</string>
+    <string name="eh_settings_category">EH Settings</string>
+    <string name="eh_sync_favorites">Sync favorites</string>
+    <string name="eh_find_in_another_source">Find in another source</string>
+    <string name="eh_autoscroll">Autoscroll</string>
+    <string name="eh_retry_all">Retry all</string>
+    <string name="eh_boost_page">Boost page</string>
+    <string name="eh_rounded_corner_0">No Rounded Corners</string>
+    <string name="eh_rounded_corner_1">Radius of 1</string>
+    <string name="eh_rounded_corner_2">Radius of 2</string>
+    <string name="eh_rounded_corner_3">Radius of 3</string>
+    <string name="eh_rounded_corner_4">Radius of 4</string>
+    <string name="eh_rounded_corner_5">Radius of 5</string>
+    <string name="eh_rounded_corner_6">Radius of 6</string>
+    <string name="eh_rounded_corner_7">Radius of 7</string>
+    <string name="eh_rounded_corner_8">Radius of 8</string>
+    <string name="eh_rounded_corner_9">Radius of 9</string>
+    <string name="eh_rounded_corner_10">Radius of 10</string>
+    <string name="eh_rounded_corners_desc">The level of radius that the corners are rounded to. Current value is: %s</string>
+    <string name="merge">Merge with current</string>
+    <string name="eh_merge_with_another_source">Merge With Another</string>
+    <string name="eh_autoscroll_help">Autoscroll help</string>
+    <string name="eh_autoscroll_help_message">Automatically scroll to the next page in the specified interval. Interval is specified in seconds.</string>
+    <string name="eh_retry_all_help">Retry all help</string>
+    <string name="eh_retry_all_help_message">Re-add all failed pages to the download queue.</string>
+    <string name="eh_boost_page_help">Boost page help</string>
+    <string name="eh_boost_page_help_message">Normally the downloader can only download a specific amount of pages at the same time. This means you can be waiting for a page to download but the downloader will not start downloading the page until it has a free download slot. Pressing \'Boost page\' will force the downloader to begin downloading the current page, regardless of whether or not there is an available slot.</string>
+    <string name="eh_force_sync_reset_title">Are you sure?</string>
+    <string name="eh_force_sync_reset_message">Resetting the sync state can cause your next sync to be extremely slow.</string>
+    <string name="eh_show_update_statistics_dialog">Collecting statistics…</string>
+
+</resources>
\ No newline at end of file