Add color parameters to draw functions