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

This reverts commit 8d4ffc392213a1636f4ce184173f1e57d73c85bf.