Add defines for more spaces; revert to thin space