diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index 253fd5de..a8da766e 100644
Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ
diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft
index db9c3e15..e01fbdf8 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ
diff --git a/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 24 (UTF_8).zi
new file mode 100644
index 00000000..a435ee5c
Binary files /dev/null and b/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 24 (UTF_8).zi differ
diff --git a/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 32 (UTF_8).zi
new file mode 100644
index 00000000..e9ea4ff5
Binary files /dev/null and b/HMI/fonts - Kopie/(C) HMI NotoSans-Regular 32 (UTF_8).zi differ
diff --git a/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi
new file mode 100644
index 00000000..0127a05f
Binary files /dev/null and b/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi differ
diff --git a/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi
new file mode 100644
index 00000000..18f7066a
Binary files /dev/null and b/HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi differ
diff --git a/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 24 (UTF_8).zi
new file mode 100644
index 00000000..7e154273
Binary files /dev/null and b/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 24 (UTF_8).zi differ
diff --git a/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 32 (UTF_8).zi
new file mode 100644
index 00000000..babd320c
Binary files /dev/null and b/HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 32 (UTF_8).zi differ
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index 9b40701a..b729e25c 100644
Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ
diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 82e6905e..e9bf21e8 100644
Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 7f132f99..c77eae83 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -277,7 +277,7 @@ class LuiPagesGen(object):
             command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~"
         else:
             entity       = self._ha_api.get_entity(item)
-            heading      = title if title is not None else entity.attributes.friendly_name
+            heading      = title if title == "unknown" else entity.attributes.friendly_name
             current_temp = get_attr_safe(entity, "current_temperature", "")
             dest_temp    = int(get_attr_safe(entity, "temperature", 0)*10)
             status       = get_attr_safe(entity, "hvac_action", "")
@@ -330,7 +330,7 @@ class LuiPagesGen(object):
             command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable"
         else:
             entity        = self._ha_api.get_entity(item)
-            heading       = title if title is not None else entity.attributes.friendly_name
+            heading       = title if title == "unknown" else entity.attributes.friendly_name
             icon          = get_icon_id('speaker-off')
             title         = get_attr_safe(entity, "media_title", "")
             author        = get_attr_safe(entity, "media_artist", "")