Theme header fixes