Some changes in theming