Modernization

Fix Gtk 3 port (i forgot some lines) and rebase it against current master.