More updates to theme. Pre-work commit