Finished the port to Gtk3