lots of renames. moves some stuff into a template css file