Less refactor

* Fixed merge conflicts
* Ignored Idea folder
* Minor refactor on less files