Fix up theme a tad more