added end date
removed old theme functions