Revert "Add necessary changes for kanged theme chooser changes."

This reverts commit 5c0919ed1b4b4ea2d8e078b49b1a180860885c4a.