Revert "Add a few layout color redirections for Theme Chooser"

This reverts commit 5dea8190b18169e84e42452e8863a86b7a81b830.