fixes to css varibles
merging fixes