Tweaks & fixes.
Removed redundant data
Grouped all in merged.less