Removed verbose 'pad-right' etc., now only 'pad-r'. Also for margin;