Updated hat-switch