Some octicons, templating rewrite, other things