Fixed up theme