Added ability to specify particular sites and site types
Added ability to specify themes and improved method of finding sites