diff --git a/src/main/angular/src/app/pages/schedule/schedule.component.html b/src/main/angular/src/app/pages/schedule/schedule.component.html
index c8836b0..90e7b4f 100644
--- a/src/main/angular/src/app/pages/schedule/schedule.component.html
+++ b/src/main/angular/src/app/pages/schedule/schedule.component.html
@@ -21,6 +21,7 @@
           <option value="ON_OFF">An / Aus</option>
           <option value="PERCENT">Prozent</option>
           <option value="SHUTTER">Rollladen</option>
+          <option value="SCENE">Szene</option>
         </select>
       </td>
     </tr>
@@ -144,6 +145,11 @@
           <option *ngFor="let _ of [].constructor(21); let value = index" [ngValue]="value * 5">{{value * 5}}%</option>
         </select>
       </td>
+      <td *ngIf="schedule.propertyType === 'SCENE'">
+        <select [(ngModel)]="entry.value" (ngModelChange)="set(entry, 'value', entry.value)">
+          <option *ngFor="let _ of [].constructor(64); let value = index" [ngValue]="value + 1">{{value + 1}}</option>
+        </select>
+      </td>
       <td *ngIf="schedule.propertyType === 'SHUTTER'" [class.true]="entry.value === 0" [class.false]="entry.value === 100" [class.tristate]="0 < entry.value && entry.value < 100">
         <select [(ngModel)]="entry.value" (ngModelChange)="set(entry, 'value', entry.value)">
           <option [ngValue]="0">100% Offen</option>
diff --git a/src/main/java/de/ph87/homeautomation/DemoDataService.java b/src/main/java/de/ph87/homeautomation/DemoDataService.java
index ed4d057..7aa2591 100644
--- a/src/main/java/de/ph87/homeautomation/DemoDataService.java
+++ b/src/main/java/de/ph87/homeautomation/DemoDataService.java
@@ -65,7 +65,7 @@ public class DemoDataService {
 
     final KnxGroup helligkeit = createKnxGroupIfNotExists("Helligkeit", 0, 5, 6, "9.004", false, true);
 
-    final KnxGroupDto szene_haus = createKnxGroupIfNotExists("Szene Haus", 0, 0, 21, "17.004", PropertyType.LUX, false, true);
+    final KnxGroup szene_haus = createKnxGroupIfNotExists("Szene Haus", 0, 0, 21, "17.004", false, true);
 
     if (deviceRepository.count() == 0) {
       createDeviceSwitch("Ambiente EG", ambiente_eg_status, ambiente_eg_schalten);
@@ -128,11 +128,11 @@ public class DemoDataService {
       createTime(scheduleBadLichtMitte, true, 1, 0, 0, MIN30, false);
       scheduleRepository.save(scheduleBadLichtMitte);
 
-      final Schedule scheduleSzeneHaus = createSchedule(true, "Dekoration", szene_haus.getProperty());
-      createSunrise(scheduleSzeneHaus, true, Zenith.ASTRONOMICAL, 0, 31);
+      final Schedule scheduleSzeneHaus = createSchedule(true, "Dekoration", szene_haus);
+      createTime(scheduleSzeneHaus, true, 6, 0, 0, 0, 31);
       createTime(scheduleSzeneHaus, true, 8, 30, 0, 0, 30);
       createSunset(scheduleSzeneHaus, true, Zenith.OFFICIAL, 0, 31);
-      createSunset(scheduleSzeneHaus, true, Zenith.ASTRONOMICAL, 0, 30);
+      createTime(scheduleSzeneHaus, true, 22, 0, 0, 0, 30);
       scheduleRepository.save(scheduleSzeneHaus);
     }
   }