Controlling Lights & Switch from same entity

So I just moved and the new house has some TP Link Kasa smarts witches in a few of the rooms. I have those up and running no issue.

Down the line the actual lights on the switches are a Hue bulbs, also added and controlled no problem.

What I am wondering if it can be done is to take what is currently 2 entities on my dashboard and make them one without loss of functionality. Preferably also in the voice control arena as well.

So if you turn on the hue lights but the switch is off nothing will happen, so you have to first say “Turn on Dining Room” or click the Dining Room switch. Then you can click on the Dining Room Lights (A light group) to turn them off/on or change color. Of course they come on automatically from just the switch to the default color, but the second entity is needed for control of color/brightness/etc.

I am afraid if I bundle them all into a group as a single entity that I will lose the ability to change color, brightness, etc so that’s my biggest worry as a switch entity does not have those features.

I would love to keep all that functionality but dumb down having 2 switches to keep on the dashboard I know there has to be an easy way to do it. Maybe even as simple as creating a group and just manually telling it what “features” the entity has like I did when playing with the OHLUX smart lights that wouldn’t let me change color.

Edit: I should have googled more I got it working using Light Switch

Took me a bit to get that new entity to show up, had to reboot the whole thing but that solution works perfectly.