removed window-layout and friends
added less/jade
merge