Updating the theme functions and tempaltes a bit