fix colors and add modes