Setup Refactoring, added .mdash file support, selectors