change and fixed the theme