Updated to ChUI 3.6.1