Fixed issue with template css not autocompiling
Fixed merge