Fix references to anachronistic theme attributes

Change-Id: If05edee49f3109da1289b75cad80d6150343ad40
6 files changed