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

This reverts commit 5dea8190b18169e84e42452e8863a86b7a81b830.
Revert "Alarm: Use dedicated alarm type for poweroff alarm."

This reverts commit 10ca9e19a17cc2bd4b61975290b006d61e3622d5.