Upgraded to GTK3. Hope I will start and finish it soon