Updated patch to support Media + Image styles.