diff --git a/group.yaml b/group.yaml
index 6bb5340c..bdd50e4e 100644
--- a/group.yaml
+++ b/group.yaml
@@ -101,6 +101,13 @@ view_automation_entities:
     - group.automation_entities
     - group.current_commit
 
+view_settings:
+  name: Einstellungen
+  view: yes
+  icon: mdi:gear
+  entities:
+    - group.standards
+
 #################################################################
 ## Group
 #################################################################
@@ -363,10 +370,15 @@ alarm:
     - input_number.alarmhour
     - input_number.alarmminutes
     - input_boolean.wakemeup
-    - input_boolean.naturalwakeup
+    - input_number.alarm_natural_wakeup_fade_in
     - input_boolean.alarmweekday
+    - input_boolean.radiowakeup
     - binary_sensor.workday_today
     - binary_sensor.workday_tomorrow
+standards:
+  name: Standard Einstellungen
+  entities:
+   - input_select.next_appointment_travel_mode_standard
 #################################################################
 ## Synonym
 #################################################################
diff --git a/input_boolean.yaml b/input_boolean.yaml
index e4b6d439..3ad51115 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -25,6 +25,5 @@
   wakemeup:
     name: Weck mich
     icon: mdi:alarm-check
-  naturalwakeup:
-    name: Fade-In Licht
-    icon: mdi:theme-light-dark
\ No newline at end of file
+  radiowakeup:
+    name: Radio
\ No newline at end of file
diff --git a/input_number.yaml b/input_number.yaml
index a1fde19e..c12bfcd5 100644
--- a/input_number.yaml
+++ b/input_number.yaml
@@ -14,4 +14,10 @@ alarmminutes:
   icon: mdi:timer
   min: 0
   max: 59
+  step: 5
+alarm_natural_wakeup_fade_in:
+  name: Fade-In Dauer
+  icon: mdi:theme-light-dark
+  min: 0
+  max: 30
   step: 5
\ No newline at end of file
diff --git a/input_select.yaml b/input_select.yaml
index 10d1fb2f..af2452f2 100644
--- a/input_select.yaml
+++ b/input_select.yaml
@@ -1,5 +1,13 @@
 next_appointment_travel_mode:
   name: Reiseart
+  options:
+    - Auto
+    - Fahrrad
+    - Öffis
+    - Laufen
+
+next_appointment_travel_mode_standard:
+  name: Standard Reiseart
   options:
     - Auto
     - Fahrrad