Added more to the theme's structure