something something icons, diff theme for ace, ace event listeners, and globals!
Merge branch 'master', remote-tracking branch 'origin'