more fixes for light color scheme, make functions callable