switch improve & canvas style add