chnages done for theming