Updating to handle the currently activated theme.