Update to latest styles

Change-Id: I4022831fd0bee990264340041ebf0963459dc36e