Almost final content update

with this latest update out of the way, next up are the content
switchers!