Removes theme 'dependency' since that is incorrect, and removes duplicate calendar dependency