Improve themes and make jslint happy