Revert "Reorder Theme header"

This reverts commit 58568783c7bd62da010022ed9787dec105731ab0.