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

This reverts commit d792ad4774c1bdb91a96e4c054102ba5b505ba26.