theme releated changes