fixes

graphs now by theme