diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
index 09964de..fafb5a2 100644
--- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
@@ -9,7 +9,6 @@ import android.provider.MediaStore
 import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
-import com.finnmglas.launcher.list.apps.AppsRecyclerAdapter
 import com.finnmglas.launcher.tutorial.TutorialActivity
 import kotlinx.android.synthetic.main.home.*
 import java.text.SimpleDateFormat
@@ -107,8 +106,8 @@ class HomeActivity: UIObject, AppCompatActivity(),
 
         // Applying the date / time format (changeable in settings)
         val dFormat = launcherPreferences.getInt(PREF_DATE_FORMAT, 0)
-        val upperFMT = resources.getStringArray(R.array.settings_time_formats_upper)
-        val lowerFMT = resources.getStringArray(R.array.settings_time_formats_lower)
+        val upperFMT = resources.getStringArray(R.array.settings_launcher_time_formats_upper)
+        val lowerFMT = resources.getStringArray(R.array.settings_launcher_time_formats_lower)
 
         val dateFormat = SimpleDateFormat(upperFMT[dFormat], Locale.getDefault())
         val timeFormat = SimpleDateFormat(lowerFMT[dFormat], Locale.getDefault())
diff --git a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt
index 42a4ad7..9eda1c3 100644
--- a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt
@@ -60,10 +60,10 @@ class ListActivity : AppCompatActivity(), UIObject {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_UNINSTALL) {
             if (resultCode == Activity.RESULT_OK) {
-                Toast.makeText(this, getString(R.string.list_removed_toast), Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.list_removed), Toast.LENGTH_LONG).show()
                 finish()
             } else if (resultCode == Activity.RESULT_FIRST_USER) {
-                Toast.makeText(this, getString(R.string.list_not_removed_toast), Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.list_not_removed), Toast.LENGTH_LONG).show()
                 finish()
             }
         }
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt
index 27c5c5b..6d0de32 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt
@@ -61,7 +61,7 @@ class SettingsFragmentActions : Fragment(), UIObject {
                 startActivity(rateIntent)
                 intendedSettingsPause = true
             } catch (e: ActivityNotFoundException) {
-                Toast.makeText(this.context, getString(R.string.settings_toast_store_not_found), Toast.LENGTH_SHORT)
+                Toast.makeText(this.context, getString(R.string.settings_apps_toast_store_not_found), Toast.LENGTH_SHORT)
                     .show()
             }
         }
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt
index de24413..a0b55cb 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt
@@ -135,28 +135,28 @@ class ActionsRecyclerAdapter(val activity: Activity):
 
     init {
         actionsList = ArrayList()
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_up),"upApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_up),"upApp",
             upApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_down),"downApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_down),"downApp",
             downApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_left), "leftApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_left), "leftApp",
             leftApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_right), "rightApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_right), "rightApp",
             rightApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_up), "volumeUpApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_vol_up), "volumeUpApp",
             volumeUpApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_down), "volumeDownApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_vol_down), "volumeDownApp",
             volumeDownApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_double_click), "doubleClickApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_double_click), "doubleClickApp",
             doubleClickApp
         ))
-        actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_long_click), "longClickApp",
+        actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_long_click), "longClickApp",
             longClickApp
         ))
     }
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
index a0a66e7..4f5aae7 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -12,7 +12,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
-import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -153,13 +152,17 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
     }
 
     override fun adjustLayout() {
+        if (getSavedTheme(activity!!) == "custom") settings_theme_custom_button_select.text = getString(
+            R.string.settings_launcher_change_wallpaper
+        )
+
         // visually load settings
         settings_launcher_switch_screen_timeout.isChecked =
             launcherPreferences.getBoolean(PREF_SCREEN_TIMEOUT_DISABLED, false)
 
         // Load values into the date-format spinner
         val staticAdapter = ArrayAdapter.createFromResource(
-                activity!!, R.array.settings_launcher_time_formats,
+                activity!!, R.array.settings_launcher_time_format_spinner_items,
                 android.R.layout.simple_spinner_item )
 
         staticAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -181,7 +184,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
 
         // Load values into the theme spinner
         val staticThemeAdapter = ArrayAdapter.createFromResource(
-            activity!!, R.array.settings_themes,
+            activity!!, R.array.settings_launcher_theme_spinner_items,
             android.R.layout.simple_spinner_item )
 
         staticThemeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
index 1a46578..3ff4d4d 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
@@ -86,8 +86,8 @@ class SettingsFragmentMeta : Fragment(), UIObject {
             // on older sdk: manage app details
             else {
                 AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom)
-                    .setTitle(getString(R.string.alert_cant_choose_launcher))
-                    .setMessage(getString(R.string.alert_cant_choose_launcher_message))
+                    .setTitle(getString(R.string.settings_meta_cant_select_launcher))
+                    .setMessage(getString(R.string.settings_meta_cant_select_launcher_msg))
                     .setPositiveButton(android.R.string.yes,
                         DialogInterface.OnClickListener { _, _ ->
                             try {
@@ -114,8 +114,8 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         // prompting for settings-reset confirmation
         settings_meta_button_reset_settings.setOnClickListener {
             AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom)
-                .setTitle(getString(R.string.settings_reset))
-                .setMessage(getString(R.string.settings_reset_message))
+                .setTitle(getString(R.string.settings_meta_reset))
+                .setMessage(getString(R.string.settings_meta_reset_confirm))
                 .setPositiveButton(android.R.string.yes,
                     DialogInterface.OnClickListener { _, _ ->
                         resetSettings(this.context!!)
@@ -130,7 +130,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         settings_meta_icon_github.setOnClickListener {
             intendedSettingsPause = true
             openNewTabWindow(
-                getString(R.string.settings_footer_repo),
+                getString(R.string.settings_meta_link_github),
                 this.context!!
             )
         }
@@ -150,7 +150,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         settings_meta_icon_globe.setOnClickListener {
             intendedSettingsPause = true
             openNewTabWindow(
-                getString(R.string.settings_footer_web),
+                getString(R.string.settings_meta_link_web),
                 this.context!!
             )
         }
diff --git a/app/src/main/res/layout/settings_actions.xml b/app/src/main/res/layout/settings_actions.xml
index 02ec01d..5904e19 100644
--- a/app/src/main/res/layout/settings_actions.xml
+++ b/app/src/main/res/layout/settings_actions.xml
@@ -34,14 +34,14 @@
             android:id="@+id/settings_actions_button_view_apps"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_apps"
+            android:text="@string/settings_apps_view_all"
             android:textAllCaps="false" />
 
         <Button
             android:id="@+id/settings_actions_button_install_apps"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_install"
+            android:text="@string/settings_apps_install"
             android:textAllCaps="false" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/settings_actions_row.xml b/app/src/main/res/layout/settings_actions_row.xml
index 9d6bf6a..460f06c 100644
--- a/app/src/main/res/layout/settings_actions_row.xml
+++ b/app/src/main/res/layout/settings_actions_row.xml
@@ -25,7 +25,7 @@
         android:id="@+id/settings_actions_row_button_choose"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/settings_choose_btn"
+        android:text="@string/settings_apps_choose"
         android:textAllCaps="false"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index 5daaea3..2e5ff71 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -23,7 +23,7 @@
             android:id="@+id/settings_launcher_section_appearance_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Appearance"
+            android:text="@string/settings_launcher_section_appearance"
             android:textColor="#ccc"
             android:textSize="18sp"
             tools:layout_editor_absoluteX="32dp"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent" />
 
         <Space
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
@@ -56,7 +56,7 @@
             android:id="@+id/settings_launcher_format_spinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:entries="@array/settings_launcher_time_formats"
+            android:entries="@array/settings_launcher_time_format_spinner_items"
             android:spinnerMode="dropdown" />
     </LinearLayout>
 
@@ -71,13 +71,13 @@
             android:id="@+id/settings_launcher_theme_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Theme"
+            android:text="@string/settings_launcher_theme"
             android:textSize="16sp"
             app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_screen_timeout"
             app:layout_constraintStart_toStartOf="parent" />
 
         <Space
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
@@ -85,7 +85,7 @@
             android:id="@+id/settings_launcher_theme_spinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:entries="@array/settings_themes"
+            android:entries="@array/settings_launcher_theme_spinner_items"
             android:spinnerMode="dropdown" />
     </LinearLayout>
 
@@ -99,7 +99,7 @@
             android:id="@+id/settings_theme_custom_button_select"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Choose a wallpaper"
+            android:text="@string/settings_launcher_choose_wallpaper"
             android:textAllCaps="false" />
     </LinearLayout>
 
@@ -113,7 +113,7 @@
             android:id="@+id/settings_launcher_section_options_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Options"
+            android:text="@string/settings_launcher_section_display"
             android:textColor="#ccc"
             android:textSize="18sp"
             tools:layout_editor_absoluteX="32dp"
@@ -126,20 +126,20 @@
         android:layout_marginTop="16sp"
         android:layout_marginBottom="16sp"
         android:gravity="top"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
 
         <TextView
             android:id="@+id/settings_launcher_text_screen_timeout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8sp"
             android:text="@string/settings_launcher_disable_timeout"
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/settings_launcher_text_time_format" />
 
         <Space
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
diff --git a/app/src/main/res/layout/settings_meta.xml b/app/src/main/res/layout/settings_meta.xml
index 5bd2702..acef2be 100644
--- a/app/src/main/res/layout/settings_meta.xml
+++ b/app/src/main/res/layout/settings_meta.xml
@@ -18,14 +18,14 @@
         android:id="@+id/settings_meta_button_select_launcher"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/settings_select_launcher"
+        android:text="@string/settings_meta_select_launcher"
         android:textAllCaps="false" />
 
     <Button
         android:id="@+id/settings_meta_button_view_tutorial"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/settings_show_tutorial"
+        android:text="@string/settings_meta_show_tutorial"
         android:textAllCaps="false" />
 
     <Button
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="32sp"
-        android:text="@string/settings_reset"
+        android:text="@string/settings_meta_reset"
         android:textAllCaps="false" />
 
     <LinearLayout
diff --git a/app/src/main/res/menu/menu_app.xml b/app/src/main/res/menu/menu_app.xml
index ade9778..c5742ac 100644
--- a/app/src/main/res/menu/menu_app.xml
+++ b/app/src/main/res/menu/menu_app.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/app_menu_delete"
-        android:title="@string/app_menu_delete_text" />
+        android:title="@string/list_app_delete" />
     <item android:id="@+id/app_menu_info"
-        android:title="@string/app_menu_info_text" />
+        android:title="@string/list_app_info" />
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 625d426..a82824b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,81 +1,125 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Errors, Exceptions (Alerts, Toasts ...) -->
-    <string name="none_found">Nicht gefunden</string>
+    <!--
+      -
+      - Home
+      -
+      -->
     <string name="alert_cant_open_title">App kann nicht geöffnet werden</string>
-    <string name="alert_cant_open_message">Willst du ihre Einstellungen anpassen (\'app zum Startbildschirm hinzufügen\')?</string>
+    <string name="alert_cant_open_message">Willst du die App-Einstellungen anpassen?</string>
+
     <string name="toast_cant_open_message">Öffne die Einstellungen um für diese Aktion eine App zu wählen</string>
 
-    <string name="alert_cant_choose_launcher">App Info</string>
-    <string name="alert_cant_choose_launcher_message">Dein Gerät unterstützt diese Funktion nicht. Stattdessen die App Details bearbeiten?</string>
-
-    <!-- Settings -->
+    <!--
+      -
+      - Settings
+      -
+      -->
     <string name="settings_title">Einstellungen</string>
 
-    <string name="settings_show_tutorial">Zum Launcher Tutorial</string>
-    <string name="settings_rate_google_play">Jetzt im Playstore bewerten</string>
+    <string name="settings_tab_app">Apps</string>
+    <string name="settings_tab_launcher">Launcher</string>
+    <string name="settings_tab_meta">Meta</string>
 
-    <string name="settings_choose_up">Hochwischen</string>
-    <string name="settings_choose_down">Runterwischen</string>
-    <string name="settings_choose_left">Linkswischen</string>
-    <string name="settings_choose_right">Rechtswischen</string>
-    <string name="settings_choose_vol_up">Lautstärke +</string>
-    <string name="settings_choose_vol_down">Lautstärke -</string>
-    <string name="settings_choose_double_click">Doppelklick</string>
-    <string name="settings_choose_long_click">Langer Klick</string>
-    <string name="settings_choose_btn">App wählen</string>
+    <!--
+      -
+      - Settings : Apps
+      -
+      -->
+    <string name="settings_apps_up">Hochwischen</string>
+    <string name="settings_apps_down">Runterwischen</string>
+    <string name="settings_apps_left">Linkswischen</string>
+    <string name="settings_apps_right">Rechtswischen</string>
+    <string name="settings_apps_vol_up">Lautstärke +</string>
+    <string name="settings_apps_vol_down">Lautstärke -</string>
+    <string name="settings_apps_double_click">Doppelklick</string>
+    <string name="settings_apps_long_click">Langer Klick</string>
 
-    <string name="app_menu_delete_text">Deinstallieren</string>
-    <string name="app_menu_info_text">App Info</string>
+    <string name="settings_apps_choose">App wählen</string>
 
-    <string name="settings_select_launcher">Launcher wählen</string>
-    <string name="settings_reset">Zurücksetzen</string>
-    <string name="settings_reset_message">All deine Einstellungen gehen verloren. Weitermachen?</string>
-    <string name="settings_apps">Alle Anwendungen</string>
-    <string name="settings_install">Apps installieren</string>
-    <string name="settings_home">Zurück</string>
+    <string name="settings_apps_view_all">Alle Anwendungen</string>
 
-    <string name="settings_toast_store_not_found">PlayStore nicht gefunden</string>
+    <string name="settings_apps_install">Apps installieren</string>
+    <string name="settings_apps_toast_store_not_found">PlayStore nicht gefunden</string>
 
-    <string name="settings_select_theme">Wählen</string>
-    <string name="settings_theme_examples">Beispiele</string>
-    <string name="settings_select_image">Bild ändern</string>
+    <!--
+      -
+      - Settings : Launcher
+      -
+      -->
+    <string name="settings_launcher_section_appearance">Erscheinung</string>
 
-    <string name="settings_launcher_disable_timeout">Bildschirm wach halten</string>
     <string name="settings_launcher_time_format">Datumsformat</string>
-
-    <string-array name="settings_launcher_time_formats">
+    <string-array name="settings_launcher_time_format_spinner_items">
         <item>Standard</item>
         <item>Invertiert</item>
         <item>Uhrzeit</item>
         <item>Deutsch</item>
     </string-array>
 
-    <string name="settings_footer_repo">https://github.com/finnmglas/Launcher#de</string>
-    <string name="settings_footer_web">https://www.finnmglas.com/de/</string>
+    <string name="settings_launcher_theme">Theme</string>
+    <string-array name="settings_launcher_theme_spinner_items">
+        <item>Standard</item>
+        <item>Dunkel</item>
+        <item>Hintergrund</item>
+    </string-array>
+
+    <string name="settings_launcher_choose_wallpaper">Hintergrund auswählen</string>
+    <string name="settings_launcher_change_wallpaper">Hintergrund ändern</string>
+
+    <string name="settings_launcher_section_display">Bildschirm</string>
+
+    <string name="settings_launcher_disable_timeout">Bildschirm wach halten</string>
+
+    <!--
+      -
+      - Settings : Meta
+      -
+      -->
+    <string name="settings_meta_select_launcher">Launcher wählen</string>
+    <string name="settings_meta_cant_select_launcher">App Info</string>
+    <string name="settings_meta_cant_select_launcher_msg">Dein Gerät unterstützt diese Funktion nicht. Stattdessen die App Details bearbeiten?</string>
+
+    <string name="settings_meta_show_tutorial">Zum Launcher Tutorial</string>
+
+    <string name="settings_meta_reset">Zurücksetzen</string>
+    <string name="settings_meta_reset_confirm">All deine Einstellungen gehen verloren. Weitermachen?</string>
+
+    <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#de</string>
+    <string name="settings_meta_link_web">https://www.finnmglas.com/de/</string>
 
     <string name="settings_meta_contact">Entwickler kontaktieren</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/de/kontakt/</string>
-    <string name="settings_meta_donate">Finanziell unterstützen</string>
 
-    <!-- List Activity -->
-    <string name="list_title_pick">App wählen</string>
+    <string name="settings_meta_donate">Finanziell unterstützen</string>
+    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+
+    <!--
+      -
+      - List (Launchers app drawer)
+      -
+      -->
     <string name="list_title_view">Alle Apps</string>
+    <string name="list_title_pick">App wählen</string>
 
     <string name="list_tab_app">Apps</string>
     <string name="list_tab_other">Andere</string>
 
-    <string name="list_back_settings">Zurück</string>
+    <string name="list_app_delete">Deinstallieren</string>
+    <string name="list_app_info">App Info</string>
 
-    <string name="list_removed_toast">Die App wurde entfernt</string>
-    <string name="list_not_removed_toast">Die App konnte nicht entfernt werden</string>
+    <string name="list_removed">Die App wurde entfernt</string>
+    <string name="list_not_removed">Die App konnte nicht entfernt werden</string>
 
     <string name="list_apps_search_hint">Anwendungen suchen</string>
 
     <string name="list_other_settings">Launcher Einstellungen</string>
     <string name="list_other_list">Launcher Apps Liste</string>
 
-    <!-- Tutorial Activity -->
+    <!--
+      -
+      - Tutorial
+      -
+      -->
     <string name="tutorial_title">Tutorial</string>
     <string name="tutorial_start_text">Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!</string>
 
@@ -94,4 +138,5 @@
     <string name="tutorial_finish_title">Los gehts!</string>
     <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist sehr wertvoll für dich!\n\n- Finn M Glas\n(der Entwickler)</string>
     <string name="tutorial_finish_button">Launcher starten</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index aa7f776..3903911 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,80 +1,125 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Errors, Exceptions (Alerts, Toasts ...) -->
-    <string name="none_found">Rien trouvé</string>
+    <!--
+      -
+      - Home
+      -
+      -->
     <string name="alert_cant_open_title">Impossible d\'ouvrir l\'application</string>
-    <string name="alert_cant_open_message">Vous souhaitez modifier ses paramètres («l\'ajouter à l\'écran des applications»)?</string>
+    <string name="alert_cant_open_message">Vous souhaitez modifier ses paramètres?</string>
+
     <string name="toast_cant_open_message">Ouvrez les paramètres pour choisir une application pour cette action</string>
 
-    <string name="alert_cant_choose_launcher">Informations sur l\'application</string>
-    <string name="alert_cant_choose_launcher_message">Votre appareil ne prend pas en charge cette fonctionnalité. Gérez plutôt les détails de l\'application?</string>
-
-    <!-- Settings -->
+    <!--
+      -
+      - Settings
+      -
+      -->
     <string name="settings_title">Réglages</string>
 
-    <string name="settings_rate_google_play">Donner une rétroaction</string>
-    <string name="settings_show_tutorial">Regardez le tutoriel</string>
+    <string name="settings_tab_app">Apps</string>
+    <string name="settings_tab_launcher">Launcher</string>
+    <string name="settings_tab_meta">Meta</string>
 
-    <string name="settings_choose_up">Balayez haut</string>
-    <string name="settings_choose_down">Balayez bas</string>
-    <string name="settings_choose_left">Balayez gauche</string>
-    <string name="settings_choose_right">Balayez droit</string>
-    <string name="settings_choose_vol_up">Monter volume</string>
-    <string name="settings_choose_vol_down">Baisser volume</string>
-    <string name="settings_choose_double_click">Double clic</string>
-    <string name="settings_choose_long_click">Clic long</string>
-    <string name="settings_choose_btn">Choisir App</string>
+    <!--
+      -
+      - Settings : Apps
+      -
+      -->
+    <string name="settings_apps_up">Balayez haut</string>
+    <string name="settings_apps_down">Balayez bas</string>
+    <string name="settings_apps_left">Balayez gauche</string>
+    <string name="settings_apps_right">Balayez droit</string>
+    <string name="settings_apps_vol_up">Monter volume</string>
+    <string name="settings_apps_vol_down">Baisser volume</string>
+    <string name="settings_apps_double_click">Double clic</string>
+    <string name="settings_apps_long_click">Clic long</string>
 
-    <string name="app_menu_delete_text">Désinstaller</string>
-    <string name="app_menu_info_text">Informations</string>
+    <string name="settings_apps_choose">Choisir App</string>
 
-    <string name="settings_select_launcher">Choisir Launcher</string>
-    <string name="settings_reset">Réinitialiser</string>
-    <string name="settings_reset_message">Vous allez supprimer toutes vos préférences. Continuer?</string>
-    <string name="settings_apps">Toutes les applications</string>
-    <string name="settings_install">Installer applications</string>
-    <string name="settings_home">Retourner</string>
+    <string name="settings_apps_view_all">Toutes les applications</string>
 
-    <string name="settings_toast_store_not_found">Pas trouvé le PlayStore</string>
+    <string name="settings_apps_install">Installer applications</string>
+    <string name="settings_apps_toast_store_not_found">Pas trouvé le PlayStore</string>
+
+    <!--
+      -
+      - Settings : Launcher
+      -
+      -->
+    <string name="settings_launcher_section_appearance">Apparence</string>
 
-    <string name="settings_select_theme">Choisir</string>
-    <string name="settings_select_image">Changer Image</string>
-    <string name="settings_theme_examples">Examples</string>
-    <string name="settings_launcher_disable_timeout">Gardez l\'écran allumé</string>
     <string name="settings_launcher_time_format">Format de date</string>
-
-    <string-array name="settings_launcher_time_formats">
+    <string-array name="settings_launcher_time_format_spinner_items">
         <item>Défaut</item>
         <item>Inversé</item>
         <item>Temps</item>
         <item>Allemand</item>
     </string-array>
 
-    <string name="settings_footer_web">https://www.finnmglas.com/fr/</string>
-    <string name="settings_footer_repo">https://github.com/finnmglas/Launcher</string>
+    <string name="settings_launcher_theme">Theme</string>
+    <string-array name="settings_launcher_theme_spinner_items">
+        <item>Défaut</item>
+        <item>Noir</item>
+        <item>Image de fond</item>
+    </string-array>
+
+    <string name="settings_launcher_choose_wallpaper">Choisir un image</string>
+    <string name="settings_launcher_change_wallpaper">Changer l\' image de fond</string>
+
+    <string name="settings_launcher_section_display">Écran</string>
+
+    <string name="settings_launcher_disable_timeout">Gardez l\'écran allumé</string>
+
+    <!--
+      -
+      - Settings : Meta
+      -
+      -->
+    <string name="settings_meta_select_launcher">Choisir Launcher</string>
+    <string name="settings_meta_cant_select_launcher">Informations sur l\'application</string>
+    <string name="settings_meta_cant_select_launcher_msg">Votre appareil ne prend pas en charge cette fonctionnalité. Gérez plutôt les détails de l\'application?</string>
+
+    <string name="settings_meta_show_tutorial">Regardez le tutoriel</string>
+
+    <string name="settings_meta_reset">Réinitialiser</string>
+    <string name="settings_meta_reset_confirm">Vous allez supprimer toutes vos préférences. Continuer?</string>
+
+    <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#fr</string>
+    <string name="settings_meta_link_web">https://www.finnmglas.com/fr/</string>
 
     <string name="settings_meta_contact">Contacter le développeur</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/fr/contact/</string>
-    <string name="settings_meta_donate">Faire un don</string>
 
-    <!-- List Activity -->
-    <string name="list_title_pick">Choisir App</string>
+    <string name="settings_meta_donate">Faire un don</string>
+    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+
+    <!--
+      -
+      - List (Launchers app drawer)
+      -
+      -->
     <string name="list_title_view">Applications</string>
+    <string name="list_title_pick">Choisir App</string>
 
     <string name="list_tab_app">Apps</string>
     <string name="list_tab_other">Autre</string>
 
-    <string name="list_back_settings">Retourner</string>
+    <string name="list_app_delete">Désinstaller</string>
+    <string name="list_app_info">Informations</string>
 
-    <string name="list_removed_toast">Application supprimée</string>
-    <string name="list_not_removed_toast">Impossible de supprimer l\'application</string>
+    <string name="list_removed">Application supprimée</string>
+    <string name="list_not_removed">Impossible de supprimer l\'application</string>
 
     <string name="list_apps_search_hint">rechercher des applications</string>
 
     <string name="list_other_settings">Launcher Réglages</string>
     <string name="list_other_list">Launcher Liste des apps</string>
 
-    <!-- Tutorial Activity -->
+    <!--
+      -
+      - Tutorial
+      -
+      -->
     <string name="tutorial_title">Le Tutoriel</string>
     <string name="tutorial_start_text">Prenez un moment et apprenez à utiliser ce lanceur!</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a259b12..5d0827d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,110 +1,145 @@
 <resources>
-    <!-- General -->
+    <!--
+      -
+      - General
+      -
+      -->
     <string name="app_name" translatable="false">Launcher</string>
     <string name="preference_file_key" translatable="false">V3RYR4ND0MK3YCR4P</string>
 
-    <!-- Errors, Exceptions (Alerts, Toasts ...) -->
-    <string name="none_found">None found</string>
-
+    <!--
+      -
+      - Home
+      -
+      -->
     <string name="alert_cant_open_title">Can\'t open app</string>
-    <string name="alert_cant_open_message">Want to change its settings (\'add it to the apps screen\')?</string>
+    <string name="alert_cant_open_message">Want to change its settings?</string>
+
     <string name="toast_cant_open_message">Open settings to choose an app for this action</string>
 
-    <string name="alert_cant_choose_launcher">App Info</string>
-    <string name="alert_cant_choose_launcher_message">Your device does not support this feature. Manage application details instead?</string>
-
-    <!-- Settings -->
+    <!--
+      -
+      - Settings
+      -
+      -->
     <string name="settings_title">Settings</string>
 
-    <string name="settings_tab_app" translatable="false">Apps</string>
-    <string name="settings_tab_launcher" translatable="false">Launcher</string>
-    <string name="settings_tab_meta" translatable="false">Meta</string>
+    <string name="settings_tab_app">Apps</string>
+    <string name="settings_tab_launcher">Launcher</string>
+    <string name="settings_tab_meta">Meta</string>
 
-    <string name="settings_rate_google_play">Rate us on Google Play</string>
-    <string name="settings_show_tutorial">View Launcher Tutorial</string>
+    <!--
+      -
+      - Settings : Apps
+      -
+      -->
+    <string name="settings_apps_up">Swipe Up</string>
+    <string name="settings_apps_down">Swipe Down</string>
+    <string name="settings_apps_left">Swipe Left</string>
+    <string name="settings_apps_right">Swipe Right</string>
+    <string name="settings_apps_vol_up">Volume Up</string>
+    <string name="settings_apps_vol_down">Volume Down</string>
+    <string name="settings_apps_double_click">Double Click</string>
+    <string name="settings_apps_long_click">Long Click</string>
 
-    <string name="settings_choose_up">Swipe Up</string>
-    <string name="settings_choose_down">Swipe Down</string>
-    <string name="settings_choose_left">Swipe Left</string>
-    <string name="settings_choose_right">Swipe Right</string>
-    <string name="settings_choose_vol_up">Volume Up</string>
-    <string name="settings_choose_vol_down">Volume Down</string>
-    <string name="settings_choose_double_click">Double Click</string>
-    <string name="settings_choose_long_click">Long Click</string>
-    <string name="settings_choose_btn">Choose App</string>
+    <string name="settings_apps_choose">Choose App</string>
 
-    <string name="app_menu_delete_text">Uninstall</string>
-    <string name="app_menu_info_text">App Info</string>
+    <string name="settings_apps_view_all">View all apps</string>
 
-    <string name="settings_select_launcher">Select Launcher</string>
-    <string name="settings_reset">Reset Settings</string>
-    <string name="settings_reset_message">You are going to discard all your preferences. Continue?</string>
-    <string name="settings_apps">View all apps</string>
-    <string name="settings_install">Install apps</string>
-    <string name="settings_home">Back Home</string>
+    <string name="settings_apps_install">Install apps</string>
+    <string name="settings_apps_toast_store_not_found">PlayStore not found</string>
 
-    <string name="settings_toast_store_not_found">PlayStore not found</string>
+    <!--
+      -
+      - Settings : Launcher
+      -
+      -->
+    <string name="settings_launcher_section_appearance">Appearance</string>
 
-    <string name="settings_select_theme">Select</string>
-    <string name="settings_select_image">Change Image</string>
-    <string name="settings_theme_examples">Examples</string>
-
-    <string-array name="settings_themes">
-        <item>Default</item>
-        <item>Dark</item>
-        <item>Custom</item>
-    </string-array>
-
-    <string name="settings_launcher_disable_timeout">Keep screen on</string>
     <string name="settings_launcher_time_format">Date format</string>
-
-    <string-array name="settings_launcher_time_formats">
+    <string-array name="settings_launcher_time_format_spinner_items">
         <item>Default</item>
         <item>Inverse</item>
         <item>Time only</item>
         <item>German</item>
     </string-array>
-
-    <string-array name="settings_time_formats_upper">
+    <string-array name="settings_launcher_time_formats_upper">
         <item>yyyy-MM-dd</item>
         <item>HH:mm:ss</item>
         <item>HH:mm:ss</item>
         <item>HH:mm:ss</item>
     </string-array>
-
-    <string-array name="settings_time_formats_lower">
+    <string-array name="settings_launcher_time_formats_lower">
         <item>HH:mm:ss</item>
         <item>yyyy-MM-dd</item>
         <item> </item>
         <item>dd.MM.yyyy</item>
     </string-array>
 
-    <string name="settings_footer_repo">https://github.com/finnmglas/Launcher#en</string>
-    <string name="settings_footer_web">https://www.finnmglas.com</string>
+    <string name="settings_launcher_theme">Theme</string>
+    <string-array name="settings_launcher_theme_spinner_items">
+        <item>Default</item>
+        <item>Dark</item>
+        <item>Wallpaper</item>
+    </string-array>
+
+    <string name="settings_launcher_choose_wallpaper">Choose a wallpaper</string>
+    <string name="settings_launcher_change_wallpaper">Change wallpaper</string>
+
+    <string name="settings_launcher_section_display">Display</string>
+
+    <string name="settings_launcher_disable_timeout">Keep screen on</string>
+
+    <!--
+      -
+      - Settings : Meta
+      -
+      -->
+    <string name="settings_meta_select_launcher">Select Launcher</string>
+    <string name="settings_meta_cant_select_launcher">App Info</string>
+    <string name="settings_meta_cant_select_launcher_msg">Your device does not support this feature. Manage application details instead?</string>
+
+    <string name="settings_meta_show_tutorial">View Launcher Tutorial</string>
+
+    <string name="settings_meta_reset">Reset Settings</string>
+    <string name="settings_meta_reset_confirm">You are going to discard all your preferences. Continue?</string>
+
+    <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#en</string>
+    <string name="settings_meta_link_web">https://www.finnmglas.com</string>
 
     <string name="settings_meta_contact">Contact the developer</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>
-    <string name="settings_meta_donate">Make a donation</string>
-    <string name="settings_meta_donate_url" translatable="false">https://sponsor.finnmglas.com</string>
 
-    <!-- List Activity -->
-    <string name="list_title_pick">Choose App</string>
+    <string name="settings_meta_donate">Make a donation</string>
+    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+
+    <!--
+      -
+      - List (Launchers app drawer)
+      -
+      -->
     <string name="list_title_view">All Apps</string>
+    <string name="list_title_pick">Choose App</string>
 
     <string name="list_tab_app">Apps</string>
     <string name="list_tab_other">Other</string>
 
-    <string name="list_back_settings">Back to Settings</string>
+    <string name="list_app_delete">Uninstall</string>
+    <string name="list_app_info">App Info</string>
 
-    <string name="list_removed_toast">Removed the selected application</string>
-    <string name="list_not_removed_toast">Unable to remove application</string>
+    <string name="list_removed">Removed the selected application</string>
+    <string name="list_not_removed">Unable to remove application</string>
 
     <string name="list_apps_search_hint">Search Applications</string>
 
     <string name="list_other_settings">Launcher Settings</string>
     <string name="list_other_list">Launcher AppsList</string>
 
-    <!-- Tutorial Activity -->
+    <!--
+      -
+      - Tutorial
+      -
+      -->
     <string name="tutorial_title">Tutorial</string>
     <string name="tutorial_start_text">Take a few seconds to learn how to use this Launcher!</string>