Bench updates
Theme fix