Major update to the theme structure and style updates.