Theme branch cherry pick

Nicer pull request of changes on theme-branch