More updates to match theme.