Updated to use theme layer name.