Fix this theme too