Style cleanup between devices and templates.