Preliminary edits to the National theme.