diff --git a/homeassistant/components/flux_led/services.yaml b/homeassistant/components/flux_led/services.yaml
index 73f479825da4..8311be5b9a8d 100644
--- a/homeassistant/components/flux_led/services.yaml
+++ b/homeassistant/components/flux_led/services.yaml
@@ -113,9 +113,9 @@ set_music_mode:
       example: "[255, 100, 100]"
       required: false
       selector:
-        object:
+        color_rgb:
     background_color:
       example: "[255, 100, 100]"
       required: false
       selector:
-        object:
+        color_rgb:
diff --git a/homeassistant/components/group/services.yaml b/homeassistant/components/group/services.yaml
index e5ac921cc77d..ceed4bb7b42c 100644
--- a/homeassistant/components/group/services.yaml
+++ b/homeassistant/components/group/services.yaml
@@ -18,15 +18,18 @@ set:
     entities:
       example: domain.entity_id1, domain.entity_id2
       selector:
-        object:
+        entity:
+          multiple: true
     add_entities:
       example: domain.entity_id1, domain.entity_id2
       selector:
-        object:
+        entity:
+          multiple: true
     remove_entities:
       example: domain.entity_id1, domain.entity_id2
       selector:
-        object:
+        entity:
+          multiple: true
     all:
       selector:
         boolean:
diff --git a/homeassistant/components/light/services.yaml b/homeassistant/components/light/services.yaml
index 1ba204e5eda9..433da53a5702 100644
--- a/homeassistant/components/light/services.yaml
+++ b/homeassistant/components/light/services.yaml
@@ -422,7 +422,7 @@ toggle:
       advanced: true
       example: "[255, 100, 100]"
       selector:
-        object:
+        color_rgb:
     color_name:
       filter:
         attribute:
diff --git a/homeassistant/components/mqtt/services.yaml b/homeassistant/components/mqtt/services.yaml
index 4960cf9fb826..5102d481143e 100644
--- a/homeassistant/components/mqtt/services.yaml
+++ b/homeassistant/components/mqtt/services.yaml
@@ -15,7 +15,7 @@ publish:
       advanced: true
       example: "{{ states('sensor.temperature') }}"
       selector:
-        object:
+        template:
     qos:
       advanced: true
       default: 0
diff --git a/homeassistant/components/scene/services.yaml b/homeassistant/components/scene/services.yaml
index acd98b102553..b9e12bcc8d79 100644
--- a/homeassistant/components/scene/services.yaml
+++ b/homeassistant/components/scene/services.yaml
@@ -51,4 +51,5 @@ create:
         - light.ceiling
         - light.kitchen
       selector:
-        object:
+        entity:
+          multiple: true
diff --git a/homeassistant/components/yeelight/services.yaml b/homeassistant/components/yeelight/services.yaml
index ccfd46ef6804..825835dbcc76 100644
--- a/homeassistant/components/yeelight/services.yaml
+++ b/homeassistant/components/yeelight/services.yaml
@@ -25,7 +25,7 @@ set_color_scene:
     rgb_color:
       example: "[255, 100, 100]"
       selector:
-        object:
+        color_rgb:
     brightness:
       selector:
         number: