Bring stuff up to date.
Split mixed configs