Adding in changes from theming