Editor variables styling, some renaming