diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index f025cfd008a..3a70be00b38 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -63,14 +63,29 @@ def setup(hass, config):
     switches = sorted(hass.states.entity_ids('switch'))
     media_players = sorted(hass.states.entity_ids('media_player'))
     group.Group(hass, 'living room', [
-        lights[2], lights[1], switches[0], media_players[1],
+        lights[1], switches[0], 'input_select.living_room_preset',
+        'rollershutter.living_room_window', media_players[1],
         'scene.romantic_lights'])
-    group.Group(hass, 'bedroom', [lights[0], switches[1],
-                                  media_players[0]])
-    group.Group(hass, 'Rooms', [
-        'group.living_room', 'group.bedroom',
+    group.Group(hass, 'bedroom', [lights[0], switches[1], media_players[0]])
+    group.Group(hass, 'kitchen', [
+        lights[2], 'rollershutter.kitchen_window', 'lock.kitchen_door'])
+    group.Group(hass, 'doors', [
+        'lock.front_door', 'lock.kitchen_door',
+        'garage_door.right_garage_door', 'garage_door.left_garage_door'])
+    group.Group(hass, 'automations', [
+        'input_select.who_cooks', 'input_boolean.notify', ])
+    group.Group(hass, 'people', [
+        'device_tracker.demo_anne_therese', 'device_tracker.demo_home_boy',
+        'device_tracker.demo_paulus'])
+    group.Group(hass, 'thermostats', [
+        'thermostat.nest', 'thermostat.thermostat'])
+    group.Group(hass, 'downstairs', [
+        'group.living_room', 'group.kitchen',
         'scene.romantic_lights', 'rollershutter.kitchen_window',
-        'rollershutter.living_room_window',
+        'rollershutter.living_room_window', 'group.doors', 'thermostat.nest',
+    ], view=True)
+    group.Group(hass, 'Upstairs', [
+        'thermostat.thermostat', 'group.bedroom',
     ], view=True)
 
     # Setup scripts
@@ -112,6 +127,23 @@ def setup(hass, config):
              }},
             ]})
 
+    # Set up input select
+    bootstrap.setup_component(
+        hass, 'input_select',
+        {'input_select':
+         {'living_room_preset': {'options': ['Visitors',
+                                             'Visitors with kids',
+                                             'Home Alone']},
+          'who_cooks': {'icon': 'mdi:panda',
+                        'initial': 'Anne Therese',
+                        'name': 'Who cooks today',
+                        'options': ['Paulus', 'Anne Therese']}}})
+    # Set up input boolean
+    bootstrap.setup_component(
+        hass, 'input_boolean',
+        {'input_boolean': {'notify': {'icon': 'mdi:car',
+                                      'initial': False,
+                                      'name': 'Notify Anne Therese is home'}}})
     # Setup configurator
     configurator_ids = []