Changes for theming with MIS.
Merge branch 'mis_changes'