Revert "Revert "Add entries for Theme Chooser""

This reverts commit 6bbd5d3ea88b9429eb34a404de8baa93b576c7ce.

-Re add theme chooser stuffs (1/2)