Watcher move from editor branch
Rename underscores to hyphens. Show a border when scrolled
Scroll area size fix.