Lovelace switch + lock cards

Hi, I started using the new light card which is awesome. But I have other lights that are surfaced as a switch (no dimmer) and I haven’t found it easy to include both lights and switches in the same horizontal panel because the sizes don’t match.

I was wondering if anyone was working on a set of cards, the same size as the light card that could be combined together. This would include switches, locks, numbers, etc.

I hacked together a switch card myself which demonstrates what I mean: