remove dimension text, original theme, simplify variables