#10156
ThemeofWP
Keymaster

Your solution looks better I don’t think there is another solution needed.