Theme change prep

Its coming.