Replacing inline styles with style block

This is ground work for allowing these to be set externally. It would give us some more flexibility with how we can use this.