diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index f85a432e..f628e0e1 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -299,7 +299,7 @@ class LuiController(object):
                 else:
                     self._ha_api.get_entity(entity_id).call_service("return_to_base")
             elif entity_id.startswith('service'):
-                self._ha_api.call_service(entity_id.replace('service.', '', 1), **le.data)
+                self._ha_api.call_service(entity_id.replace('service.', '', 1).replace('.','/', 1), **le.data)
 
         # for media page
         if button_type == "media-next":
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 7c17aeda..0c789268 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -585,6 +585,9 @@ class LuiPagesGen(object):
         brightness = "disable"
         color_temp = "disable"
         color = "disable"
+        
+        if "onoff" not in entity.attributes.supported_color_modes:
+            brightness = 0
         if entity.state == "on":
             if "brightness" in entity.attributes:
                 # scale 0-255 brightness from ha to 0-100