Theme and combo buttons
Revert "Theme and combo buttons"

This reverts commit 304502b0ef5c26e6718121a8e47def409421c197.
Revert "Revert "Theme and combo buttons""

This reverts commit 90722d944ca401d3fbf488d8c8a91c8a410905bb.
Revert "Revert "Revert "Theme and combo buttons"""

This reverts commit ffae0c9950b4876715c161c65da6e276be6b95dd.
fix
Revert "Revert "Revert "Revert "Theme and combo buttons""""

This reverts commit 8d4ffc392213a1636f4ce184173f1e57d73c85bf.
fix2
fix3
111