Follow CSS conventions, including @embed

Change-Id: I69d5e593a36b3dd5e7be94c2a68aa5e8d4e6c2dc