Quick updates to initial theme structure