Added more variables, element style files