diff --git a/app/build.gradle b/app/build.gradle
index c8e8002..f48fd2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "de.jrpie.android.launcher"
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 20
-        versionName "j-0.0.8"
+        versionCode 22
+        versionName "j-0.0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/de/jrpie/android/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
index ea442e7..13caadb 100644
--- a/app/src/main/java/de/jrpie/android/launcher/Functions.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
@@ -56,7 +56,11 @@ const val PREF_THEME = "theme"
 
 const val PREF_SCREEN_TIMEOUT_DISABLED = "disableTimeout"
 const val PREF_SCREEN_FULLSCREEN = "useFullScreen"
-const val PREF_DATE_FORMAT = "dateFormat"
+
+const val PREF_DATE_LOCALIZED = "dateLocalized"
+const val PREF_DATE_VISIBLE = "dateVisible"
+const val PREF_TIME_VISIBLE = "timeVisible"
+const val PREF_DATE_TIME_FLIP = "dateTimeFlip"
 
 const val PREF_DOUBLE_ACTIONS_ENABLED = "enableDoubleActions"
 const val PREF_EDGE_ACTIONS_ENABLED = "enableEdgeActions"
@@ -425,6 +429,7 @@ fun loadSettings(context: Context) {
     vibrantColor = preferences.getInt(PREF_VIBRANT, 0)
 }
 
+
 fun resetSettings(context: Context) {
 
     val editor = getPreferences(context).edit()
@@ -439,10 +444,13 @@ fun resetSettings(context: Context) {
         .putString(PREF_THEME, "finn")
         .putBoolean(PREF_SCREEN_TIMEOUT_DISABLED, false)
         .putBoolean(PREF_SEARCH_AUTO_LAUNCH, false)
-        .putInt(PREF_DATE_FORMAT, 0)
+        .putBoolean(PREF_DATE_VISIBLE, true)
+        .putBoolean(PREF_TIME_VISIBLE, true)
+        .putBoolean(PREF_DATE_TIME_FLIP, false)
+        .putBoolean(PREF_DATE_LOCALIZED, false)
         .putBoolean(PREF_SCREEN_FULLSCREEN, true)
-        .putBoolean(PREF_DOUBLE_ACTIONS_ENABLED, false)
-
+        .putBoolean(PREF_DOUBLE_ACTIONS_ENABLED, true)
+        .putBoolean(PREF_EDGE_ACTIONS_ENABLED, true)
     Gesture.values().forEach { editor.putString(it.id, it.pickDefaultApp(context)) }
 
     editor.apply()
diff --git a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt
index 830f0eb..d82acda 100644
--- a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt
@@ -8,10 +8,11 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
+import androidx.core.view.isVisible
 import de.jrpie.android.launcher.BuildConfig.VERSION_NAME
+import de.jrpie.android.launcher.databinding.HomeBinding
 import de.jrpie.android.launcher.list.other.LauncherAction
 import de.jrpie.android.launcher.tutorial.TutorialActivity
-import de.jrpie.android.launcher.databinding.HomeBinding
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.concurrent.fixedRateTimer
@@ -20,7 +21,6 @@ import kotlin.math.max
 import kotlin.math.min
 
 
-
 /**
  * [HomeActivity] is the actual application Launcher,
  * what makes this application special / unique.
@@ -39,8 +39,6 @@ class HomeActivity: UIObject, AppCompatActivity(),
     private lateinit var binding: HomeBinding
 
 
-
-
     private var bufferedPointerCount = 1 // how many fingers on screen
     private var pointerBufferTimer = Timer()
 
@@ -105,34 +103,58 @@ class HomeActivity: UIObject, AppCompatActivity(),
         super<UIObject>.onStart()
     }
 
-    override fun onResume() {
-        super.onResume()
+    private fun updateClock() {
+        clockTimer?.cancel()
+        val preferences = getPreferences(this)
+        val locale = Locale.getDefault()
+        val dateVisible = preferences.getBoolean(PREF_DATE_VISIBLE, true)
+        val timeVisible = preferences.getBoolean(PREF_TIME_VISIBLE, true)
 
-        // Applying the date / time format (changeable in settings)
-        val dFormat = getPreferences(this).getInt(PREF_DATE_FORMAT, 0)
-        val upperFMT = resources.getStringArray(R.array.settings_launcher_time_formats_upper)
-        val lowerFMT = resources.getStringArray(R.array.settings_launcher_time_formats_lower)
+        var dateFMT = "yyyy-MM-dd"
+        var timeFMT = "HH:mm:ss"
+        if (preferences.getBoolean(PREF_DATE_LOCALIZED, false)) {
+            dateFMT = android.text.format.DateFormat.getBestDateTimePattern(locale, dateFMT)
+            timeFMT = android.text.format.DateFormat.getBestDateTimePattern(locale, timeFMT)
+        }
 
-        val dateFormat = SimpleDateFormat(upperFMT[dFormat], Locale.getDefault())
-        val timeFormat = SimpleDateFormat(lowerFMT[dFormat], Locale.getDefault())
+        var upperFormat = SimpleDateFormat(dateFMT, locale)
+        var lowerFormat = SimpleDateFormat(timeFMT, locale)
+        var upperVisible = dateVisible
+        var lowerVisible = timeVisible
 
+        if(preferences.getBoolean(PREF_DATE_TIME_FLIP, false)) {
+            upperFormat = lowerFormat.also { lowerFormat = upperFormat }
+            upperVisible = lowerVisible.also { lowerVisible = upperVisible }
+        }
+
+        binding.homeUpperView.isVisible = upperVisible
+        binding.homeLowerView.isVisible = lowerVisible
 
         clockTimer = fixedRateTimer("clockTimer", true, 0L, 100) {
             this@HomeActivity.runOnUiThread {
-                val t = timeFormat.format(Date())
-                if (binding.homeLowerView.text != t)
-                    binding.homeLowerView.text = t
-
-                val d = dateFormat.format(Date())
-                if (binding.homeUpperView.text != d)
-                    binding.homeUpperView.text = d
+                if (lowerVisible) {
+                    val t = lowerFormat.format(Date())
+                    if (binding.homeLowerView.text != t)
+                        binding.homeLowerView.text = t
+                }
+                if (upperVisible) {
+                    val d = upperFormat.format(Date())
+                    if (binding.homeUpperView.text != d)
+                        binding.homeUpperView.text = d
+                }
             }
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        updateClock()
+    }
+
     override fun onPause() {
         super.onPause()
         clockTimer.cancel()
+
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -230,16 +252,18 @@ class HomeActivity: UIObject, AppCompatActivity(),
 
         val preferences = getPreferences(this)
         binding.homeUpperView.setOnClickListener {
-            when (preferences.getInt(PREF_DATE_FORMAT, 0)) {
-                0 -> Gesture.DATE(this)
-                else -> Gesture.TIME(this)
+            if(preferences.getBoolean(PREF_DATE_TIME_FLIP, false)) {
+                Gesture.TIME(this)
+            } else {
+                Gesture.DATE(this)
             }
         }
 
         binding.homeLowerView.setOnClickListener {
-            when (preferences.getInt(PREF_DATE_FORMAT, 0)) {
-                0 -> Gesture.TIME(this)
-                else -> Gesture.DATE(this)
+            if(preferences.getBoolean(PREF_DATE_TIME_FLIP, false)) {
+                Gesture.DATE(this)
+            } else {
+                Gesture.TIME(this)
             }
         }
     }
diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
index e4c6cf3..39ec80b 100644
--- a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -9,13 +9,16 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Switch
 import androidx.fragment.app.Fragment
-import de.jrpie.android.launcher.PREF_DATE_FORMAT
+import de.jrpie.android.launcher.PREF_DATE_LOCALIZED
+import de.jrpie.android.launcher.PREF_DATE_TIME_FLIP
+import de.jrpie.android.launcher.PREF_DATE_VISIBLE
 import de.jrpie.android.launcher.PREF_DOUBLE_ACTIONS_ENABLED
 import de.jrpie.android.launcher.PREF_EDGE_ACTIONS_ENABLED
 import de.jrpie.android.launcher.PREF_SCREEN_FULLSCREEN
 import de.jrpie.android.launcher.PREF_SCREEN_TIMEOUT_DISABLED
 import de.jrpie.android.launcher.PREF_SEARCH_AUTO_KEYBOARD
 import de.jrpie.android.launcher.PREF_SEARCH_AUTO_LAUNCH
+import de.jrpie.android.launcher.PREF_TIME_VISIBLE
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.UIObject
 import de.jrpie.android.launcher.getPreferences
@@ -62,6 +65,10 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
         setSwitchColor(binding.settingsLauncherSwitchEnableDouble, vibrantColor)
         setSwitchColor(binding.settingsLauncherSwitchEnableEdge, vibrantColor)
 
+        setSwitchColor(binding.settingsLauncherSwitchDateLocalized, vibrantColor)
+        setSwitchColor(binding.settingsLauncherSwitchDateVisible, vibrantColor)
+        setSwitchColor(binding.settingsLauncherSwitchTimeVisible, vibrantColor)
+        setSwitchColor(binding.settingsLauncherSwitchDateTimeFlip, vibrantColor)
 
         setButtonColor(binding.settingsLauncherButtonChooseWallpaper, vibrantColor)
     }
@@ -93,7 +100,10 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
             startActivity(intent)
         }
 
-
+        bindSwitchToPref(binding.settingsLauncherSwitchDateLocalized, PREF_DATE_LOCALIZED, false) { }
+        bindSwitchToPref(binding.settingsLauncherSwitchDateVisible, PREF_DATE_VISIBLE, true) {}
+        bindSwitchToPref(binding.settingsLauncherSwitchTimeVisible, PREF_TIME_VISIBLE, true) {}
+        bindSwitchToPref(binding.settingsLauncherSwitchDateTimeFlip, PREF_DATE_TIME_FLIP, false) {}
 
         bindSwitchToPref(binding.settingsLauncherSwitchScreenTimeout, PREF_SCREEN_TIMEOUT_DISABLED, false) {
             activity?.let{setWindowFlags(it.window)}
@@ -109,27 +119,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
 
     override fun adjustLayout() {
 
-        val preferences = getPreferences(requireActivity())
-        // Load values into the date-format spinner
-        val staticAdapter = ArrayAdapter.createFromResource(
-                requireActivity(), R.array.settings_launcher_time_format_spinner_items,
-                android.R.layout.simple_spinner_item )
-
-        staticAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        binding.settingsLauncherFormatSpinner.adapter = staticAdapter
-
-        binding.settingsLauncherFormatSpinner.setSelection(preferences.getInt(PREF_DATE_FORMAT, 0))
-
-        binding.settingsLauncherFormatSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-                preferences.edit()
-                    .putInt(PREF_DATE_FORMAT, position)
-                    .apply()
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) { }
-        }
-
         // Load values into the theme spinner
         val staticThemeAdapter = ArrayAdapter.createFromResource(
             requireActivity(), R.array.settings_launcher_theme_spinner_items,
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index 38a8d6f..5d085cf 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -44,33 +42,11 @@
             android:text="@string/settings_launcher_section_appearance"
             android:textColor="#ccc"
             android:textSize="18sp"
+            android:layout_marginBottom="16sp"
             tools:layout_editor_absoluteX="32dp"
             tools:layout_editor_absoluteY="16dp" />
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16sp"
-        android:layout_marginBottom="16sp"
-        android:orientation="horizontal"
-        android:paddingLeft="8sp">
-
-        <TextView
-            android:id="@+id/settings_launcher_text_time_format"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_launcher_time_format"
-            android:textSize="16sp" />
-        <Spinner
-            android:id="@+id/settings_launcher_format_spinner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:entries="@array/settings_launcher_time_format_spinner_items"
-            android:spinnerMode="dropdown" />
-    </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -108,10 +84,133 @@
             android:textAllCaps="false" />
     </LinearLayout>
 
+
+    <LinearLayout
+        android:id="@+id/settings_launcher_section_date_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/settings_launcher_section_date_time_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_section_date_time"
+            android:textColor="#ccc"
+            android:textSize="18sp"
+            tools:layout_editor_absoluteX="32dp"
+            tools:layout_editor_absoluteY="16dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_date_localized"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_date_localized"
+            android:textSize="16sp" />
+
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_date_localized"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_switch_date_visible"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_show_date"
+            android:textSize="16sp" />
+
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_date_visible"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_switch_time_visible"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_show_time"
+            android:textSize="16sp" />
+
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_time_visible"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_switch_date_time_flip"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_date_time_flip"
+            android:textSize="16sp" />
+
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_date_time_flip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp" />
+    </LinearLayout>
+
+
     <LinearLayout
         android:id="@+id/settings_launcher_section_options"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
         android:orientation="horizontal">
 
         <TextView
@@ -128,7 +227,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16sp"
         android:layout_marginBottom="16sp"
         android:gravity="top"
         android:orientation="horizontal"
@@ -182,6 +280,7 @@
         android:id="@+id/settings_launcher_section_functions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
         android:orientation="horizontal">
 
         <TextView
@@ -199,7 +298,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16sp"
         android:layout_marginBottom="16sp"
         android:gravity="top"
         android:orientation="horizontal"
@@ -301,4 +399,4 @@
     </LinearLayout>
 
 </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 336c3b3..9eeb4e5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -25,14 +25,22 @@
       - Settings : Apps
       -
       -->
-    <string name="settings_gesture_up">Hochwischen</string>
+    <string name="settings_gesture_up">Nach oben wischen</string>
     <string name="settings_gesture_double_up">Doppelt hoch</string>
-    <string name="settings_gesture_down">Runterwischen</string>
+    <string name="settings_gesture_down">Nach unten wischen</string>
     <string name="settings_gesture_double_down">Doppelt runter</string>
-    <string name="settings_gesture_left">Linkswischen</string>
+    <string name="settings_gesture_left">Nach links wischen</string>
     <string name="settings_gesture_double_left">Doppelt links</string>
-    <string name="settings_gesture_right">Rechtswischen</string>
+    <string name="settings_gesture_right">Nach rechts wischen</string>
     <string name="settings_gesture_double_right">Doppelt rechts</string>
+    <string name="settings_gesture_right_top_edge">Nach rechts wischen (oben)</string>
+    <string name="settings_gesture_right_bottom_edge">Nach rechts wischen (unten)</string>
+    <string name="settings_gesture_left_bottom_edge">"Nach links wischen (unten) "</string>
+    <string name="settings_gesture_left_top_edge">Nach links wischen (oben)</string>
+    <string name="settings_gesture_up_left_edge">Nach oben wischen (links)</string>
+    <string name="settings_gesture_up_right_edge">Nach oben wischen (rechts)</string>
+    <string name="settings_gesture_down_left_edge">Nach unten wischen (links)</string>
+    <string name="settings_gesture_down_right_edge">Nach unten wischen (rechts)</string>
     <string name="settings_gesture_vol_up">Lautstärke +</string>
     <string name="settings_gesture_vol_down">Lautstärke -</string>
     <string name="settings_gesture_double_click">Doppelklick</string>
@@ -52,17 +60,13 @@
       - Settings : Launcher
       -
       -->
-    <string name="settings_launcher_section_appearance">Erscheinung</string>
-
-    <string name="settings_launcher_time_format">Datumsformat</string>
-    <string-array name="settings_launcher_time_format_spinner_items">
-        <item>Standard</item>
-        <item>Invertiert</item>
-        <item>Uhrzeit</item>
-        <item>Deutsch</item>
-        <item>Nichts</item>
-    </string-array>
+    <string name="settings_launcher_section_appearance">Aussehen</string>
 
+    <string name="settings_launcher_show_time">Zeit anzeigen</string>
+    <string name="settings_launcher_show_date">Datum anzeigen</string>
+    <string name="settings_launcher_date_localized">Lokalisiertes Datumsformat verwenden</string>
+    <string name="settings_launcher_date_time_flip">Datum und Uhrzeit tauschen</string>
+    <string name="settings_launcher_section_date_time"><![CDATA[Datum & Uhrzeit]]></string>
     <string name="settings_launcher_theme">Theme</string>
     <string-array name="settings_launcher_theme_spinner_items">
         <item>Standard</item>
@@ -74,14 +78,15 @@
 
     <string name="settings_launcher_section_display">Bildschirm</string>
 
-    <string name="settings_launcher_disable_timeout">Bildschirm wach halten</string>
-    <string name="settings_launcher_full_screen">Vollbild verwenden</string>
+    <string name="settings_launcher_disable_timeout">Bildschirm nicht ausschalten</string>
+    <string name="settings_launcher_full_screen">Vollbild</string>
 
     <string name="settings_launcher_section_functions">Funktionen</string>
 
     <string name="settings_launcher_enable_double">Doppelte Wischaktionen</string>
-    <string name="settings_launcher_auto_launch">Suchergebisse launchen</string>
-    <string name="settings_launcher_auto_keyboard">Tastatur in Suche öffnen</string>
+    <string name="settings_launcher_enable_edge">Kantenwischaktionen</string>
+    <string name="settings_launcher_auto_launch">Suchergebnis starten</string>
+    <string name="settings_launcher_auto_keyboard">Tastatur automatisch öffnen</string>
 
     <string name="settings_launcher_sensitivity">Empfindlichkeit</string>
 
@@ -97,7 +102,7 @@
     <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_reset_confirm">Alle Einstellungen gehen verloren. Weitermachen?</string>
 
     <string name="settings_meta_report_bug">Einen Fehler melden</string>
 
@@ -164,4 +169,4 @@
     <string name="settings">Einstellungen</string>
     <string name="ic_menu_alt">Mehr Optionen</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0207fd0..2922da8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -64,30 +64,7 @@
       -->
     <string name="settings_launcher_section_appearance">Apariencia</string>
 
-    <string name="settings_launcher_time_format">Formato de fecha</string>
-    <string-array name="settings_launcher_time_format_spinner_items">
-        <item>Normal</item>
-        <item>Inverso</item>
-        <item>Solo hora</item>
-        <item>Alemán</item>
-        <item>Nada</item>
-    </string-array>
-    <string-array name="settings_launcher_time_formats_upper">
-        <item>dd-MM-yyyy</item>
-        <item>HH:mm:ss</item>
-        <item>HH:mm:ss</item>
-        <item>HH:mm:ss</item>
-        <item/>
-    </string-array>
-    <string-array name="settings_launcher_time_formats_lower">
-        <item>HH:mm:ss</item>
-        <item>dd-MM-yyyy</item>
-        <item> </item>
-        <item>dd.MM.yyyy</item>
-        <item />
-    </string-array>
-
-    <string name="settings_launcher_theme">Tema</string>
+    <string name="settings_launcher_section_date_time">Formato de fecha</string>
     <string-array name="settings_launcher_theme_spinner_items">
         <item>Normal</item>
         <item>Oscuro</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 38a2e2f..21b2b46 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -46,14 +46,7 @@
       -
       -->
     <string name="settings_launcher_section_appearance">Apparence</string>
-    <string name="settings_launcher_time_format">Format de date</string>
-    <string-array name="settings_launcher_time_format_spinner_items">
-        <item>Défaut</item>
-        <item>Inversé</item>
-        <item>Temps</item>
-        <item>Allemand</item>
-        <item>Rien</item>
-    </string-array>
+    <string name="settings_launcher_section_date_time">Format de date</string>
     <string name="settings_launcher_theme">Thème</string>
     <string-array name="settings_launcher_theme_spinner_items">
         <item>Défaut</item>
@@ -144,4 +137,4 @@
     <string name="settings_gesture_up_left_edge">Balayer vers le haut (à gauche de l\'écran)</string>
     <string name="settings_gesture_up_right_edge">Balayer vers le haut (à droite de l\'écran)</string>
     <string name="settings_gesture_down_right_edge">Balayer vers le bas (à droite de l\'écran)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6693572..48fde2c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -40,7 +40,7 @@
     <string name="settings_apps_view_all">浏览全部应用</string>
     <string name="settings_apps_install">安装应用</string>
     <string name="settings_apps_toast_store_not_found">没有找到应用市场</string>
-    <string name="settings_launcher_time_format">日期格式</string>
+    <string name="settings_launcher_section_date_time">日期格式</string>
     <string name="settings_launcher_choose_wallpaper">选择一个壁纸</string>
     <string name="settings_launcher_change_wallpaper">换壁纸</string>
     <string name="settings_launcher_disable_timeout">保持屏幕常亮</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a65b31..4f93a71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,28 +70,6 @@
       -->
     <string name="settings_launcher_section_appearance">Appearance</string>
 
-    <string name="settings_launcher_time_format">Date format</string>
-    <string-array name="settings_launcher_time_format_spinner_items">
-        <item>Default</item>
-        <item>Inverse</item>
-        <item>Time only</item>
-        <item>German</item>
-        <item>Nothing</item>
-    </string-array>
-    <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>
-        <item/>
-    </string-array>
-    <string-array name="settings_launcher_time_formats_lower">
-        <item>HH:mm:ss</item>
-        <item>yyyy-MM-dd</item>
-        <item/>
-        <item>dd.MM.yyyy</item>
-        <item/>
-    </string-array>
 
     <string name="settings_launcher_theme">Theme</string>
     <string-array name="settings_launcher_theme_spinner_items">
@@ -99,6 +77,12 @@
         <item>Dark</item>
     </string-array>
 
+    <string name="settings_launcher_section_date_time"><![CDATA[Date & time]]></string>
+    <string name="settings_launcher_show_time">Show time</string>
+    <string name="settings_launcher_show_date">Show date</string>
+    <string name="settings_launcher_date_localized">Use localized date format</string>
+    <string name="settings_launcher_date_time_flip">Flip date and time</string>
+
     <string name="settings_launcher_choose_wallpaper">Choose a wallpaper</string>
     <string name="settings_launcher_change_wallpaper">Change wallpaper</string>
 
diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt
index a139b6c..9abeb95 100644
--- a/fastlane/metadata/android/en-US/changelogs/21.txt
+++ b/fastlane/metadata/android/en-US/changelogs/21.txt
@@ -1,5 +1,6 @@
 - Chinese translation (thank you, yzqzss!)
-- improved French translation
+- improved French translation (thank you, toby-bro!)
+- improved German translation
 
 All Apps:
 - Removed three dots in app list (use long click instead)
@@ -11,3 +12,4 @@ All Apps:
 Settings:
 - Fixed settings for small displays
 - Removed sensitivity setting (everybody was setting it to maximum anyway)
+- Reworked date & time settings
diff --git a/gradle.properties b/gradle.properties
index 4795480..519dc7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,3 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+org.gradle.configuration-cache=true