Revert "Revert "Revert "Theme and combo buttons"""

This reverts commit ffae0c9950b4876715c161c65da6e276be6b95dd.