Fix dependencies on themes