move theme logic to toolbar from toolbar manager - issue #149