Sometimes charts are not redrawn on theme change.

Remove Watch.JS and use event, triggered on theme change. Redraw charts on event

$(document).trigger("themechange");

$(document).on("themechange", function(){
  // redraw...
});