Rework editortools; Change default selector names