Started playing with color mapping
Small style fixes