Further Theme fixes