Another update to match ttk2 branch