More updates to base theme