Fix terminal detection.
toolbar works, adding deletion, chartwindow
Merge remote-tracking branch 'origin/master'