Merge pull request #529 from battaglr/mark-opinionated-declarations

Mark opinionated styles