Fix up themes, broke something htough