Add diff options
Add reST shiftwidth