Upgraded to gtk3