Reorder properties and rename `widget-*' faces