Merged in changes from local copy. Note nick coloring code graciously lifted from the Frugal style by jeenaparadies.