Reorder Theme header
(cherry picked from commit 58568783c7bd62da010022ed9787dec105731ab0)