DSSSM-359 Adding functionality for theming