merge two themes and add some comments