diff --git a/__pycache__/timer_control.cpython-310.pyc b/__pycache__/timer_control.cpython-310.pyc
index 749a11d..bd6f71c 100644
Binary files a/__pycache__/timer_control.cpython-310.pyc and b/__pycache__/timer_control.cpython-310.pyc differ
diff --git a/timer_control.py b/timer_control.py
index 54fdf69..1bf6abd 100644
--- a/timer_control.py
+++ b/timer_control.py
@@ -101,24 +101,33 @@ def timer_status_info():
 
 def format_duration(seconds):
     if seconds < 60:
-        return f"{seconds} Sekunden"
+        return f"{seconds} {second_text(seconds)}"
 
     minutes = seconds // 60
     secs = seconds % 60
 
     if minutes < 10:
         if secs == 0:
-            return f"{minutes} Minuten"
-        return f"{minutes} Minuten und {secs} Sekunden"
+            return f"{minutes} {minute_text(minutes)}"
+        return f"{minutes} {minute_text(minutes)} und {secs} {second_text(secs)}"
+
     if minutes < 60:
-        return f"{minutes} Minuten"
+        return f"{minutes} {minute_text(minutes)}"
     
     hours = minutes // 60
     mins = minutse % 60
 
     if mins == 0:
-        return f"{hours} Stunden"
-    return f"{hours} Stunden und {mins} Minuten"
+        return f"{hours} {hour_text(hours)}"
+    return f"{hours} {hour_text(hours)} und {mins} {minute_text(mins)}"
 
 
 
+def minute_text(n):
+    return "Minute" if n == 1 else "Minuten"
+
+def second_text(n):
+    return "Sekunde" if n == 1 else "Sekunden"
+
+def hour_text(n):
+    return "Stunde" if n == 1 else "Stunden"