Add css color rule
Added scala plugin and default folds
Fix merge conflicts