Continue color scale + refactor and fix scale computing