Nikki's GTK 3 updates