Ensure theme override grid options & change private vars to protected