diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c
index dd34ada3..7c0aee27 100644
--- a/veejay-current/veejay-client/src/callback.c
+++ b/veejay-current/veejay-client/src/callback.c
@@ -2813,89 +2813,89 @@ void	on_kf_none_toggled( GtkToggleButton *widget, gpointer user_data)
 
 void	on_kf_p0_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if(is_button_toggled("kf_p0"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 0 );
 }
 void	on_kf_p1_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p1")) 
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 1 );
 }
 void	on_kf_p2_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p2"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 2 );
 }
 void	on_kf_p3_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p3"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 3 );
 }
 void	on_kf_p4_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p4"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 4 );
 }
 void	on_kf_p5_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p5"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 5 );
 }
 void	on_kf_p6_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p6"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 6 );
 }
 void	on_kf_p7_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p7"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 7 );
 }
 void	on_kf_p8_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p8"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 8 );
 }
 void	on_kf_p9_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p9"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 9 );
 }
 void	on_kf_p10_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p10"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 10 );
 }
 
 void	on_kf_p11_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p11"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 11 );
 }
 
 void	on_kf_p12_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p12"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 12 );
 }
 
 
 void	on_kf_p13_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p13"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 13 );
 }
 
 
 void	on_kf_p14_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p14"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 14 );
 }
 
 void	on_kf_p15_toggled( GtkToggleButton *widget, gpointer user_data)
 {
-	if( is_button_toggled("kf_p15"))
+	if(gtk_toggle_button_get_active( widget ))
 		KF_CHANGED( 15 );
 }