Retheming and fixing a few missed things