Upgraded to GTK+3