added a workaround for themes