more theme funcitonality work