Replace more GDK_* with GDK_KEY