Custom header theme, more code cleanup