DS-1596 fix for "Kubrick" theme