Add themes and omni switch headers