refactors cyretreat and gsoc to fix new headers/footers