diff --git a/automations.yaml b/automations.yaml
index 9d7bb7e..97c5fff 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -1424,82 +1424,60 @@
         end_date_time: "{{ (now() + timedelta(days=1)).replace(hour=0, minute=0, second=0) + timedelta(days=1) }}"
       response_variable: tomorrow_evts
 
-    # ── Helper: Events als kompakte Liste formatieren ──
-
-    # Privat heute
-    - set_var:
-        name: fmt_today_privat
-        value: >-
-          {%- set evts = today_evts['calendar.privat']['events'] if 'calendar.privat' in today_evts else [] %}
-          {%- set items = [] %}
-          {%- for e in evts[:5] %}
-            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
-            {%- set st = e['start'] if e is mapping and 'start' in e else '' %}
-            {%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
-            {%- set items = items + [hhmm ~ ' - ' ~ s] %}
-          {%- endfor -%}
-          {{ items | join('│') if items else '-' }}
-
-    # Arbeit heute
-    - set_var:
-        name: fmt_today_arbeit
-        value: >-
-          {%- set evts = today_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in today_evts else [] %}
-          {%- set items = [] %}
-          {%- for e in evts[:5] %}
-            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
-            {%- set st = e['start'] if e is mapping and 'start' in e else '' %}
-            {%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
-            {%- set items = items + [hhmm ~ ' - ' ~ s] %}
-          {%- endfor -%}
-          {{ items | join('│') if items else '-' }}
-
-    # Privat morgen
-    - set_var:
-        name: fmt_tomorrow_privat
-        value: >-
-          {%- set evts = tomorrow_evts['calendar.privat']['events'] if 'calendar.privat' in tomorrow_evts else [] %}
-          {%- set items = [] %}
-          {%- for e in evts[:5] %}
-            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
-            {%- set st = e['start'] if e is mapping and 'start' in e else '' %}
-            {%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
-            {%- set items = items + [hhmm ~ ' - ' ~ s] %}
-          {%- endfor -%}
-          {{ items | join('│') if items else '-' }}
-
-    # Arbeit morgen
-    - set_var:
-        name: fmt_tomorrow_arbeit
-        value: >-
-          {%- set evts = tomorrow_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in tomorrow_evts else [] %}
-          {%- set items = [] %}
-          {%- for e in evts[:5] %}
-            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' %}
-            {%- set st = e['start'] if e is mapping and 'start' in e else '' %}
-            {%- set hhmm = st[11:16] if st|length >= 16 else '??' %}
-            {%- set items = items + [hhmm ~ ' - ' ~ s] %}
-          {%- endfor -%}
-          {{ items | join('│') if items else '-' }}
-
     # ── input_text Helfer schreiben ──
     - action: input_text.set_value
       target:
-        entity_id: input_text.privat_heute
+        entity_id: input_text.kalender_heute_privat
       data:
-        value: "{{ fmt_today_privat }}"
+        value: >-
+          {%- set evts = today_evts['calendar.privat']['events'] if 'calendar.privat' in today_evts else [] -%}
+          {%- set items = [] -%}
+          {%- for e in evts[:5] -%}
+            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' -%}
+            {%- set st = e['start'] if e is mapping and 'start' in e else '' -%}
+            {%- set hhmm = st[11:16] if st|length >= 16 else '??' -%}
+            {%- set items = items + [hhmm ~ ' - ' ~ s] -%}
+          {%- endfor -%}
+          {{ items | join('│') if items else '-' }}
     - action: input_text.set_value
       target:
-        entity_id: input_text.arbeit_heute
+        entity_id: input_text.kalender_heute_arbeit
       data:
-        value: "{{ fmt_today_arbeit }}"
+        value: >-
+          {%- set evts = today_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in today_evts else [] -%}
+          {%- set items = [] -%}
+          {%- for e in evts[:5] -%}
+            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' -%}
+            {%- set st = e['start'] if e is mapping and 'start' in e else '' -%}
+            {%- set hhmm = st[11:16] if st|length >= 16 else '??' -%}
+            {%- set items = items + [hhmm ~ ' - ' ~ s] -%}
+          {%- endfor -%}
+          {{ items | join('│') if items else '-' }}
     - action: input_text.set_value
       target:
-        entity_id: input_text.privat_morgen
+        entity_id: input_text.kalender_morgen_privat
       data:
-        value: "{{ fmt_tomorrow_privat }}"
+        value: >-
+          {%- set evts = tomorrow_evts['calendar.privat']['events'] if 'calendar.privat' in tomorrow_evts else [] -%}
+          {%- set items = [] -%}
+          {%- for e in evts[:5] -%}
+            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' -%}
+            {%- set st = e['start'] if e is mapping and 'start' in e else '' -%}
+            {%- set hhmm = st[11:16] if st|length >= 16 else '??' -%}
+            {%- set items = items + [hhmm ~ ' - ' ~ s] -%}
+          {%- endfor -%}
+          {{ items | join('│') if items else '-' }}
     - action: input_text.set_value
       target:
-        entity_id: input_text.arbeit_morgen
+        entity_id: input_text.kalender_morgen_arbeit
       data:
-        value: "{{ fmt_tomorrow_arbeit }}"
+        value: >-
+          {%- set evts = tomorrow_evts['calendar.tkrz_kalender']['events'] if 'calendar.tkrz_kalender' in tomorrow_evts else [] -%}
+          {%- set items = [] -%}
+          {%- for e in evts[:5] -%}
+            {%- set s = (e['summary'] | default('', true) | string)[:40] if e is mapping and 'summary' in e else '-' -%}
+            {%- set st = e['start'] if e is mapping and 'start' in e else '' -%}
+            {%- set hhmm = st[11:16] if st|length >= 16 else '??' -%}
+            {%- set items = items + [hhmm ~ ' - ' ~ s] -%}
+          {%- endfor -%}
+          {{ items | join('│') if items else '-' }}