Updated structure and Themes