style factoring; added octicon support