Revert "revert all widths to 840"

This reverts commit 70491d69fef39f7893ac17c6369e3ba71d69d053.