diff --git a/custom_components/dwains_dashboard/config_flow.py b/custom_components/dwains_dashboard/config_flow.py
index ab840806..21a8299b 100755
--- a/custom_components/dwains_dashboard/config_flow.py
+++ b/custom_components/dwains_dashboard/config_flow.py
@@ -19,6 +19,7 @@
     "Romanian",
     "Swedish",
     "Dutch",
+    "Slovak"
 ]
 SIDEPANEL_TITLE = "sidepanel_title"
 SIDEPANEL_ICON = "sidepanel_icon"
@@ -67,4 +68,4 @@ async def async_step_init(self, user_input=None):
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(schema)
-        )
\ No newline at end of file
+        )
diff --git a/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/device.yaml b/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/device.yaml
index fc160f22..2f3b7e17 100755
--- a/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/device.yaml
+++ b/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/device.yaml
@@ -25,6 +25,8 @@ homepage_device:
       - color: var(--dwains-theme-accent)
       - height: 50px
       - width: 50px
+      - primary: var(--dwains-theme-accent)
+      - secondary: var(--dwains-theme-primary)
     img_cell:
       - padding-top: 20px
       - padding-bottom: 5px
@@ -47,4 +49,4 @@ homepage_device:
         - width: 40px
         - height: 40px
         - text-align: right
-        - color: var(--dwains-theme-grey)
\ No newline at end of file
+        - color: var(--dwains-theme-grey)
diff --git a/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/room.yaml b/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/room.yaml
index 835bb68c..2ef370b5 100755
--- a/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/room.yaml
+++ b/custom_components/dwains_dashboard/lovelace/plugins/button-cards-templates/homepage/room.yaml
@@ -25,6 +25,8 @@ homepage_room:
       - color: var(--dwains-theme-accent)
       - height: 50px
       - width: 50px
+      - primary: var(--dwains-theme-accent)
+      - secondary: var(--dwains-theme-primary)
     img_cell:
       - padding-top: 20px
       - padding-bottom: 5px
@@ -47,4 +49,4 @@ homepage_room:
         - width: 40px
         - height: 40px
         - text-align: right
-        - color: var(--dwains-theme-grey)
\ No newline at end of file
+        - color: var(--dwains-theme-grey)
diff --git a/custom_components/dwains_dashboard/lovelace/translations/es.yaml b/custom_components/dwains_dashboard/lovelace/translations/es.yaml
index 78723554..e23f95b9 100755
--- a/custom_components/dwains_dashboard/lovelace/translations/es.yaml
+++ b/custom_components/dwains_dashboard/lovelace/translations/es.yaml
@@ -2,12 +2,12 @@
 
 es:
   greetings:
-    good_morning: "Buenos Días"
-    good_afternoon: "Buenas Tardes"
-    good_evening: "Buena Noches"
+    good_morning: "Buenos días"
+    good_afternoon: "Buenas tardes"
+    good_evening: "Buenas noches"
 
   house_information:
-    title: "Información de la Casa"
+    title: "Información de la casa"
     favorites: "Favoritos"
     activity: "Actividad (puertas, ventanas, movimiento)"
 
@@ -29,10 +29,10 @@ es:
   climate:
     title: "Temperatura"
     title_plural: "Temperaturas"
-    inside: "adentro"
-    outside: "afuera"
+    inside: "Dentro"
+    outside: "Fuera"
     idle: "En espera"
-    heating: "Calentar a"
+    heating: "Calentando"
     off_text: "Apagado"
     auto: "Automático"
     heat: "Calentar"
@@ -51,7 +51,7 @@ es:
     title_plural: "Dispositivos"
 
   safety:
-    title_plural: 'Safties'
+    title_plural: 'Seguridad'
 
   media_player:
     title_plural: "Reproductores multimedia"
@@ -93,7 +93,7 @@ es:
       title: "Configuración de temas"
       reload_configuration: 'Recargar temas'
       theme_docs: "Lista de temas"
-      support_paypal: "Done con PayPal"
+      support_paypal: "Dona con PayPal"
       buy_coffee: "Cómprame un café"
       by: "Por"
       version: "Versión"
@@ -107,11 +107,11 @@ es:
     title_plural: 'Cerraduras'
 
   alarm:
-    title: 'Alarm'
+    title: 'Alarma'
 
   vibration:
-    title: 'Vibration'
-    title_plural: "Vibration Sensors"
+    title: 'Vibración'
+    title_plural: "Sensores de vibración"
 
   weather:
-    title: 'Weather'
\ No newline at end of file
+    title: 'Clima'
diff --git a/custom_components/dwains_dashboard/lovelace/translations/sk.yaml b/custom_components/dwains_dashboard/lovelace/translations/sk.yaml
new file mode 100644
index 00000000..7c6c9bd1
--- /dev/null
+++ b/custom_components/dwains_dashboard/lovelace/translations/sk.yaml
@@ -0,0 +1,117 @@
+# Translation by pavolholes
+
+sk:
+  greetings:
+    good_morning: 'Dobré Ráno'
+    good_afternoon: 'Dobré Popoludnie'
+    good_evening: 'Dobrý Večer'
+
+  house_information:
+    title: 'Informácie o domove'
+    favorites: 'Obľúbené'
+    activity: 'Aktivity (Dvere, okná, pohyb)'
+
+  motion:
+    title: 'Pohyb'
+    title_plural: 'Pohyby'
+
+  light:
+    title_plural: 'Svetlá'
+
+  door:
+    title: 'Dvere'
+    title_plural: 'Dverí'
+
+  window:
+    title: 'Okno'
+    title_plural: 'Okná'
+
+  climate:
+    title: 'Teplota'
+    title_plural: 'Teploty'
+    inside: 'vnútri'
+    outside: 'Vonku'
+    idle: 'nečinný'
+    heating: 'Ohrev na'
+    off_text: 'Vypnuté'
+    auto: 'Program'
+    heat: 'Ohrev'
+    cool: 'Chladenie'
+    heat_cool: 'Ohrev/Chladenie'
+    dry: 'Suchý'
+    fan_only: 'Iba ventilátor'
+    this_room: 'Táto izba'
+    temperature: 'Teplota'
+    humidity: 'Vlhkosť'
+
+  cover:
+    title_plural: 'Kryty'
+
+  device:
+    title_plural: 'Zariadenia'
+
+  safety:
+    title_plural: 'Bezpečnostné prvky'
+
+  media_player:
+    title_plural: 'Prehrávače'
+
+  vacuum:
+    title: 'Vysávač'
+    title_plural: 'Vysávače'
+
+  plant:
+    title_plural: 'Rastliny'
+
+  home:
+    title: 'Prehľad'
+
+  rooms:
+    title: 'Miestnosti'
+
+  all_lights:
+    title: 'Všetky svetlá'
+
+  scenes:
+    title: 'Scény'
+    not_defined: 'Žiadne scény nie sú definované'
+
+  cameras:
+    title: 'Kamery'
+    not_defined: 'Žiadne kamery nie sú definované'
+
+  more_page:
+    title: 'Viac'
+    house_info: 'Info o domácnosti'
+    house_data: 
+      title: 'Dáta domácnosti'
+      all_sensors: 'Všetky senzory'
+      all_batteries: 'Všetky batérie'
+      config: 'Nastavenia'
+      developer_tools: 'Vývojárske nástroje'
+    settings:
+      title: 'Nastavenie témy'
+      reload_configuration: 'Obnoviť nastavenie témy'
+      theme_docs: 'Dokumentácia témy'
+      support_paypal: 'Podporiť/Darovať pomocu PayPal'
+      buy_coffee: 'Kúp mi kávu'
+      by: 'Od'
+      version: 'Verzia'
+      update_available: 'Je dostupná aktualizácia pre Dwains Theme!'
+    more_page_addons: 'Viac doplnkov'
+
+  more_entities:
+    title: 'Viac objektov'
+
+  lock:
+    title_plural: 'Zámky'
+
+  alarm:
+    title: 'Alarm'
+
+  weather:
+    title: 'Počasie'
+
+  vibration:
+    title: 'Vibrácie'
+    title_plural: 'Vibračné Senzory'
diff --git a/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml b/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
index 6737a79e..4060b4ae 100755
--- a/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
+++ b/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
@@ -1,6 +1,13 @@
 # dwains_dashboard
 
 - path: lights
+  {% if _dd_config.lights %}
+  {% if _dd_config.lights["main_menu"] and _dd_config.lights["main_menu"] == 'false' %}
+  visible: false
+  {% else %}
+  visible: true
+  {% endif %}
+  {% endif %}
   icon: {{ _dd_icons.menu_lights|default('mdi:lightbulb-group') }}
   title: {{ _dd_trans.all_lights.title }}
   panel: true
@@ -169,4 +176,4 @@
                       items_classes: 'col-xs-12'
                   {% endif %}
               {% endif %}
-              {% endfor %}
\ No newline at end of file
+              {% endfor %}
diff --git a/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml b/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
index 5c0e6ba3..2b8e94e7 100755
--- a/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
+++ b/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
@@ -862,9 +862,15 @@
                 item_classes: 'col-xs-12 col-sm-12 col-md-12 col-lg-12'
               {% endif %}
               {% for more_entity in room["page_entities"]["entities"] %}
-              - type: custom:button-card
-                entity: {{ more_entity["entity"] }}
-                template: room_more_entity
+              {% if more_entity["type"] and more_entity["type"] == 'graph' %}
+              - type: sensor
+                entity: {{ more_entity["entity"] }}
+                graph: line
+              {% else %}
+              - type: custom:button-card
+                entity: {{ more_entity["entity"] }}
+                template: room_more_entity
+              {% endif %}
                 {% if more_entity["entity"].split('.')[0] in ('switch', 'light') %}
                 tap_action:
                     action: toggle
diff --git a/custom_components/dwains_dashboard/process_yaml.py b/custom_components/dwains_dashboard/process_yaml.py
index 1d13731d..1995c8b0 100755
--- a/custom_components/dwains_dashboard/process_yaml.py
+++ b/custom_components/dwains_dashboard/process_yaml.py
@@ -40,7 +40,8 @@ def fromjson(value):
     "Norwegian": "no",
     "Romanian": "ro",
     "Swedish": "se",
-    "Dutch": "nl"
+    "Dutch": "nl",
+    "Slovak": "sk"
 }
 
 def load_yamll(fname, secrets = None, args={}):