Added @todo
Theme functions clean up and organization
SHAME