Power Socket for M5 frame?

So I purchased few Switchman and frames from Sonoff. Great stuff indeed but, i have many outlets that have both switches and power sockets in the same frame that i need to convert to Switchman.
I cannot find smart power sockets that has the same color and fit in the 2Gang slot among your products. is this something that will be available in the near future? Also, will it be in different styles? Like European Power Socket style?

Have forward this request to SONOFF team, but i think it’s not prior for them, so much to-do on the list.
btw, have you try to fine one suitable on aliexpress?