Merge of new-theme branch