diff --git a/dwains-theme/configs-samples/cameras.yaml b/dwains-theme/configs-samples/cameras.yaml
index 2e3ad454..37e80557 100755
--- a/dwains-theme/configs-samples/cameras.yaml
+++ b/dwains-theme/configs-samples/cameras.yaml
@@ -1,2 +1,2 @@
-cameras:
+#cameras:
   # - entity: camera.driveway_camera
\ No newline at end of file
diff --git a/dwains-theme/configs-samples/more_addons.yaml b/dwains-theme/configs-samples/more_addons.yaml
index 02264187..3dc7b165 100755
--- a/dwains-theme/configs-samples/more_addons.yaml
+++ b/dwains-theme/configs-samples/more_addons.yaml
@@ -1,4 +1,4 @@
-more_addons:
+#more_addons:
   # - name: Statistics
   #   icon: far:chart-area
   #   path: 'user-package-sample/views/addons/statistics.yaml'
\ No newline at end of file
diff --git a/dwains-theme/configs-samples/rooms.yaml b/dwains-theme/configs-samples/rooms.yaml
index 9ed89537..0b700dde 100755
--- a/dwains-theme/configs-samples/rooms.yaml
+++ b/dwains-theme/configs-samples/rooms.yaml
@@ -1,4 +1,4 @@
-rooms:
+#rooms:
   # - name: Hallway
   #   icon: fas:key
   #   light: light.hallway
diff --git a/dwains-theme/configs-samples/scenes.yaml b/dwains-theme/configs-samples/scenes.yaml
index 932fd110..5464af4c 100755
--- a/dwains-theme/configs-samples/scenes.yaml
+++ b/dwains-theme/configs-samples/scenes.yaml
@@ -1,4 +1,4 @@
-scenes:
+#scenes:
   # - entity: scene.watching_tv
   #   icon: fas:couch
   #   icon_color: '#ffffff'
diff --git a/dwains-theme/translations/en.yaml b/dwains-theme/translations/en.yaml
index 5d027ae3..3ddb11bc 100755
--- a/dwains-theme/translations/en.yaml
+++ b/dwains-theme/translations/en.yaml
@@ -1,3 +1,4 @@
 en:
+  welcome: Welcome
   #translations here
   #coming soon
\ No newline at end of file
diff --git a/dwains-theme/translations/nl.yaml b/dwains-theme/translations/nl.yaml
index d19827e3..85ac3b01 100755
--- a/dwains-theme/translations/nl.yaml
+++ b/dwains-theme/translations/nl.yaml
@@ -1,3 +1,4 @@
 nl:
+  welcome: Welkom
   #vertalingen hier
   #coming soon
\ No newline at end of file
diff --git a/dwains-theme/views/main/01.homepage.yaml b/dwains-theme/views/main/01.homepage.yaml
index 33d413d9..1564bc68 100755
--- a/dwains-theme/views/main/01.homepage.yaml
+++ b/dwains-theme/views/main/01.homepage.yaml
@@ -135,6 +135,7 @@
               ]]]
             {% endif %}
           {% endif %}
+          {% if _d_t_config.persons %}
           {% for person in _d_t_config.persons %}
           - type: custom:button-card
             template: header_person
@@ -149,6 +150,7 @@
               action: navigate
               navigation_path: {{ person["name"]|lower|replace(" ", "_")  }}
           {% endfor %}
+          {% endif %}
     #END HOMEPAGE HEADER
     
     - type: vertical-stack
@@ -261,4 +263,10 @@
                       }
                     ]]]   
                   {% endif %}
-              {% endfor %}
\ No newline at end of file
+              {% else %}
+              - type: markdown
+                content: No rooms defined
+              {% endfor %}
+              - type: custom:button-card
+                color_type: blank-card
+                aspect_ratio: 1/1
\ No newline at end of file
diff --git a/dwains-theme/views/main/04.cameras.yaml b/dwains-theme/views/main/04.cameras.yaml
index ba77ab85..3d20a23a 100755
--- a/dwains-theme/views/main/04.cameras.yaml
+++ b/dwains-theme/views/main/04.cameras.yaml
@@ -1,7 +1,7 @@
 # dwains_theme
 
 - path: cameras
-  icon: 'fas:cctv'
+  icon: 'mdi:cctv'
   title: Cameras
   badges: []
   cards:
diff --git a/dwains-theme/views/main/persons/person.yaml b/dwains-theme/views/main/persons/person.yaml
index 8bece928..cac8a466 100755
--- a/dwains-theme/views/main/persons/person.yaml
+++ b/dwains-theme/views/main/persons/person.yaml
@@ -1,7 +1,7 @@
 # dwains_theme
 
 #Loop thought all the persons in the person section
-
+{% if _d_t_config.persons %}
 {% for person in _d_t_config.persons %}
 - title: {{ person["name"] }}
   path: {{ person["name"]|lower|replace(" ", "_")  }}
@@ -48,4 +48,5 @@
     {% if person["extend"] %}
     - !include ../../../../{{ person["extend"]}}
     {% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+{% endif %}
\ No newline at end of file