working in progress on adding subthemes