Adjust colors for WAF
JS fixes