theme support for editor
resolve merge conflicts
Merge pull request #35 from dart-lang/themes

theme support for editor