Continue working with themes