Fix calendar colors and more option listing