Made GTK2 more in line with GTK3