cleanup of theme development
corrections