Style encoding changes for Picture Marker support