fixing up theme