diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 1a0b678..b72ad07 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -266,7 +266,9 @@ get_keyboard_modifiers_from_ns_event (NSEvent *nsevent)
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
   if (nsflags & NSCommandKeyMask)
-    modifiers |= GDK_MOD1_MASK;
+    modifiers |= GDK_META_MASK;
+  if (nsflags & NSAlternateKeyMask)
+    modifiers |= GDK_MOD5_MASK;
 
   return modifiers;
 }
@@ -925,7 +927,7 @@ fill_key_event (GdkWindow    *window,
         {
         case GDK_Meta_R:
         case GDK_Meta_L:
-          mask = GDK_MOD1_MASK;
+          mask = GDK_META_MASK;
           break;
         case GDK_Shift_R:
         case GDK_Shift_L:
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 80f67d3..be81902 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3129,7 +3129,7 @@ gtk_calendar_key_press (GtkWidget   *widget,
     case GDK_KP_Left:
     case GDK_Left:
       return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	calendar_set_month_prev (calendar);
       else
 	{
@@ -3142,7 +3142,7 @@ gtk_calendar_key_press (GtkWidget   *widget,
     case GDK_KP_Right:
     case GDK_Right:
       return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	calendar_set_month_next (calendar);
       else
 	{
@@ -3155,7 +3155,7 @@ gtk_calendar_key_press (GtkWidget   *widget,
     case GDK_KP_Up:
     case GDK_Up:
       return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	calendar_set_year_prev (calendar);
       else
 	{
@@ -3173,7 +3173,7 @@ gtk_calendar_key_press (GtkWidget   *widget,
     case GDK_KP_Down:
     case GDK_Down:
       return_val = TRUE;
-      if (event->state & GDK_CONTROL_MASK)
+      if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	calendar_set_year_next (calendar);
       else
 	{
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index eb37434..7ba13aa 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -43,6 +43,7 @@
 #include "gtkdnd.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 
 #include "gtkalias.h"
 
@@ -771,19 +772,19 @@ gtk_clist_class_init (GtkCListClass *klass)
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0);
@@ -821,22 +822,22 @@ gtk_clist_class_init (GtkCListClass *klass)
 				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Home,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
-                                GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+                                GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_End,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
@@ -891,11 +892,11 @@ gtk_clist_class_init (GtkCListClass *klass)
 				"toggle-add-mode", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
 				"toggle-add-mode", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, '\\', GTK_DEFAULT_ACCEL_MOD_MASK,
 				"unselect-all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
 				GDK_RELEASE_MASK | GDK_SHIFT_MASK,
@@ -905,11 +906,11 @@ gtk_clist_class_init (GtkCListClass *klass)
 				"end-selection", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
 				GDK_RELEASE_MASK | GDK_SHIFT_MASK |
-				GDK_CONTROL_MASK,
+				GTK_DEFAULT_ACCEL_MOD_MASK,
 				"end-selection", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
 				GDK_RELEASE_MASK | GDK_SHIFT_MASK |
-				GDK_CONTROL_MASK,
+				GTK_DEFAULT_ACCEL_MOD_MASK,
 				"end-selection", 0);
 }
 
@@ -4989,7 +4990,7 @@ gtk_clist_button_press (GtkWidget      *widget,
 		      break;
 		    }
 	      
-		  if (event->state & GDK_CONTROL_MASK)
+		  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 		    {
 		      if (event->state & GDK_SHIFT_MASK)
 			{
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index bd4175c..0891e8e 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -40,6 +40,7 @@
 #include "gtkmarshalers.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "gtkalias.h"
@@ -496,7 +497,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_plus, GDK_CONTROL_MASK,
+				GDK_plus, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
 
@@ -505,7 +506,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_KP_Add, GDK_CONTROL_MASK,
+				GDK_KP_Add, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
   
@@ -514,7 +515,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE);
   gtk_binding_entry_add_signal (binding_set,
-                                GDK_minus, GDK_CONTROL_MASK,
+                                GDK_minus, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM,
 				GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
@@ -523,7 +524,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_KP_Subtract, GDK_CONTROL_MASK,
+				GDK_KP_Subtract, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM,
 				GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
@@ -544,12 +545,12 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_KP_Multiply, GDK_CONTROL_MASK,
+				GDK_KP_Multiply, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM,
 				GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_asterisk, GDK_CONTROL_MASK,
+				GDK_asterisk, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"change-focus-row-expansion", 1,
 				GTK_TYPE_ENUM,
 				GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);  
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 20653b4..ea29715 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1592,16 +1592,16 @@ gtk_entry_class_init (GtkEntryClass *class)
   add_move_binding (binding_set, GDK_KP_Left, 0,
 		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
   
-  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, 1);
 
-  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, -1);
   
   add_move_binding (binding_set, GDK_Home, 0,
@@ -1616,49 +1616,49 @@ gtk_entry_class_init (GtkEntryClass *class)
   add_move_binding (binding_set, GDK_KP_End, 0,
 		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
   
-  add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, 1);
 
   /* Select all
    */
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
                                 G_TYPE_INT, -1,
 				G_TYPE_BOOLEAN, FALSE);
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
                                 G_TYPE_INT, 1,
 				G_TYPE_BOOLEAN, TRUE);  
 
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
                                 G_TYPE_INT, -1,
 				G_TYPE_BOOLEAN, FALSE);
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
                                 G_TYPE_INT, 1,
 				G_TYPE_BOOLEAN, TRUE);  
   /* Unselect all 
    */
-  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
                                 G_TYPE_INT, 0,
 				G_TYPE_BOOLEAN, FALSE);
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 3,
                                 GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
                                 G_TYPE_INT, 0,
@@ -1691,28 +1691,28 @@ gtk_entry_class_init (GtkEntryClass *class)
   gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
 				"backspace", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, 1);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, -1);
 
   /* Cut/copy/paste */
 
-  gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_x, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"cut-clipboard", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_c, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"copy-clipboard", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_v, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"paste-clipboard", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 429e8c4..465517a 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -585,7 +585,7 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
   binding_set = gtk_binding_set_by_class (class);
 
   gtk_binding_entry_add_signal (binding_set,
-				GDK_l, GDK_CONTROL_MASK,
+				GDK_l, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"location-toggle-popup",
 				0);
 
@@ -606,7 +606,7 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
 #endif
 
   gtk_binding_entry_add_signal (binding_set,
-				GDK_v, GDK_CONTROL_MASK,
+				GDK_v, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"location-popup-on-paste",
 				0);
   gtk_binding_entry_add_signal (binding_set,
@@ -644,7 +644,7 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
 				"desktop-folder",
 				0);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_h, GDK_CONTROL_MASK,
+				GDK_h, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "show-hidden",
                                 0);
   gtk_binding_entry_add_signal (binding_set,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index ebb63a1..7f23394 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -999,9 +999,9 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
 		  G_TYPE_INT);
 
   /* Key bindings */
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, 
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK, 
 				"select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, 
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK, 
 				"unselect-all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, 
 				"toggle-cursor-item", 0);
@@ -1029,10 +1029,10 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   gtk_icon_view_add_move_binding (binding_set, GDK_KP_Down, 0,
 				  GTK_MOVEMENT_DISPLAY_LINES, 1);
 
-  gtk_icon_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
+  gtk_icon_view_add_move_binding (binding_set, GDK_p, GTK_DEFAULT_ACCEL_MOD_MASK,
 				  GTK_MOVEMENT_DISPLAY_LINES, -1);
 
-  gtk_icon_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
+  gtk_icon_view_add_move_binding (binding_set, GDK_n, GTK_DEFAULT_ACCEL_MOD_MASK,
 				  GTK_MOVEMENT_DISPLAY_LINES, 1);
 
   gtk_icon_view_add_move_binding (binding_set, GDK_Home, 0,
@@ -2172,7 +2172,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
 	    {
 	      if ((icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE ||
 		  ((icon_view->priv->selection_mode == GTK_SELECTION_SINGLE) && item->selected)) &&
-		  (event->state & GDK_CONTROL_MASK))
+		  (event->state & GTK_DEFAULT_ACCEL_MOD_MASK))
 		{
 		  item->selected = !item->selected;
 		  gtk_icon_view_queue_draw_item (icon_view, item);
@@ -2217,7 +2217,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
       else
 	{
 	  if (icon_view->priv->selection_mode != GTK_SELECTION_BROWSE &&
-	      !(event->state & GDK_CONTROL_MASK))
+	      !(event->state & GTK_DEFAULT_ACCEL_MOD_MASK))
 	    {
 	      dirty = gtk_icon_view_unselect_all_internal (icon_view);
 	    }
@@ -3798,15 +3798,15 @@ gtk_icon_view_add_move_binding (GtkBindingSet  *binding_set,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
 
-  if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+  if ((modmask & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
    return;
 
-  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, keyval, GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "move-cursor", 2,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
 
-  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, keyval, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
@@ -3834,7 +3834,7 @@ gtk_icon_view_real_move_cursor (GtkIconView     *icon_view,
 
   if (gtk_get_current_event_state (&state))
     {
-      if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+      if ((state & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
         icon_view->priv->ctrl_pressed = TRUE;
       if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
         icon_view->priv->shift_pressed = TRUE;
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 2f4ddd0..75c80ff 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -871,7 +871,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
       (context_simple->in_hex_sequence && !hex_keyval && 
        !is_hex_start && !is_hex_end && !is_escape && !is_backspace))
     {
-      if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) ||
+      if (event->state & (GDK_MOD1_MASK | GTK_DEFAULT_ACCEL_MOD_MASK) ||
 	  (context_simple->in_hex_sequence && context_simple->modifiers_dropped &&
 	   (event->keyval == GDK_Return || 
 	    event->keyval == GDK_ISO_Enter ||
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 6ba5a98..a2d8cf3 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -330,7 +330,7 @@ gtk_im_multicontext_filter_keypress (GtkIMContext *context,
   if (slave)
     return gtk_im_context_filter_keypress (slave, event);
   else if (event->type == GDK_KEY_PRESS &&
-           (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)) == 0)
+           (event->state & (GDK_MOD1_MASK | GTK_DEFAULT_ACCEL_MOD_MASK)) == 0)
     {
       gunichar ch;
 
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index c91467b..1ace074 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -636,6 +636,10 @@ gtk_input_dialog_set_key (GtkInputKeyInfo *key,
 	g_string_append (str, "Ctrl+");
       if (modifiers & GDK_MOD1_MASK)
 	g_string_append (str, "Alt+");
+#ifdef GDK_WINDOWING_QUARTZ
+      if (modifiers & GDK_META_MASK)
+	g_string_append (str, "Cmd+");
+#endif
       
       if ((keyval >= 0x20) && (keyval <= 0xFF))
 	{
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 10e5850..0128538 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -757,57 +757,57 @@ gtk_label_class_init (GtkLabelClass *class)
   add_move_binding (binding_set, GDK_KP_Left, 0,
 		    GTK_MOVEMENT_VISUAL_POSITIONS, -1);
   
-  add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_f, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
   
-  add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_b, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
   
-  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, 1);
 
-  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_WORDS, -1);
 
   /* select all */
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, -1,
 				G_TYPE_BOOLEAN, FALSE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, 1,
 				G_TYPE_BOOLEAN, TRUE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, -1,
 				G_TYPE_BOOLEAN, FALSE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, 1,
 				G_TYPE_BOOLEAN, TRUE);
 
   /* unselect all */
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, 0,
 				G_TYPE_BOOLEAN, FALSE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-cursor", 3,
 				G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
 				G_TYPE_INT, 0,
@@ -831,20 +831,20 @@ gtk_label_class_init (GtkLabelClass *class)
   add_move_binding (binding_set, GDK_KP_End, 0,
 		    GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
   
-  add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 		    GTK_MOVEMENT_BUFFER_ENDS, 1);
 
   /* copy */
-  gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_c, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"copy-clipboard", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index db4c665..796b27c 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -37,6 +37,7 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 
 #include "gtkalias.h"
 
@@ -681,7 +682,7 @@ gtk_list_button_press (GtkWidget      *widget,
 	      break;
 	    }
 	      
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    {
 	      if (event->state & GDK_SHIFT_MASK)
 		{
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 4615841..8b3fc70 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -38,6 +38,7 @@
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 
 #include "gtkalias.h"
 
@@ -246,19 +247,19 @@ gtk_list_item_class_init (GtkListItemClass *class)
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"scroll-vertical", 2,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0);
@@ -297,22 +298,22 @@ gtk_list_item_class_init (GtkListItemClass *class)
 				GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Home,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_End,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
-				GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"extend-selection", 3,
 				GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
 				GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
@@ -361,11 +362,11 @@ gtk_list_item_class_init (GtkListItemClass *class)
 				"toggle-add-mode", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
 				"toggle-add-mode", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, '\\', GTK_DEFAULT_ACCEL_MOD_MASK,
 				"unselect-all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
 				GDK_RELEASE_MASK | GDK_SHIFT_MASK,
@@ -375,7 +376,7 @@ gtk_list_item_class_init (GtkListItemClass *class)
 				"end-selection", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
 				GDK_RELEASE_MASK | GDK_SHIFT_MASK |
-				GDK_CONTROL_MASK,
+				GTK_DEFAULT_ACCEL_MOD_MASK,
 				"end-selection", 0);
 }
 
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index d038cc5..79514b7 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -479,10 +479,10 @@ add_arrow_bindings (GtkBindingSet    *binding_set,
 {
   guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
   
-  gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, keysym, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move_focus_out", 1,
                                 GTK_TYPE_DIRECTION_TYPE, direction);
-  gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, keypad_keysym, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move_focus_out", 1,
                                 GTK_TYPE_DIRECTION_TYPE, direction);
 }
@@ -1028,6 +1028,16 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                 "focus-tab", 1, 
                                 GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_LAST);
 
+#if 0
+  gtk_binding_entry_add_signal (binding_set,
+                                GDK_braceleft, GTK_DEFAULT_ACCEL_MOD_MASK,
+                                "change-current-page", 1,
+                                G_TYPE_INT, -1);
+  gtk_binding_entry_add_signal (binding_set,
+                                GDK_braceright, GTK_DEFAULT_ACCEL_MOD_MASK,
+                                "change-current-page", 1,
+                                G_TYPE_INT, 1);
+#else
   gtk_binding_entry_add_signal (binding_set,
                                 GDK_Page_Up, GDK_CONTROL_MASK,
                                 "change-current-page", 1,
@@ -1045,6 +1055,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                 GDK_Page_Down, GDK_CONTROL_MASK | GDK_MOD1_MASK,
                                 "change-current-page", 1,
                                 G_TYPE_INT, 1);
+#endif
 
   add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
   add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
@@ -1060,8 +1071,10 @@ gtk_notebook_class_init (GtkNotebookClass *class)
   add_reorder_bindings (binding_set, GDK_End, GTK_DIR_RIGHT, TRUE);
   add_reorder_bindings (binding_set, GDK_End, GTK_DIR_DOWN, TRUE);
 
+#ifndef GDK_WINDOWING_QUARTZ
   add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+#endif
 
   g_type_class_add_private (class, sizeof (GtkNotebookPrivate));
 }
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a244686..d293589 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -517,25 +517,25 @@ gtk_paned_class_init (GtkPanedClass *class)
   /* move handle */
   add_move_binding (binding_set, GDK_Left, 0, GTK_SCROLL_STEP_LEFT);
   add_move_binding (binding_set, GDK_KP_Left, 0, GTK_SCROLL_STEP_LEFT);
-  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
-  add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
+  add_move_binding (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_LEFT);
+  add_move_binding (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_LEFT);
 
   add_move_binding (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_RIGHT);
-  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
+  add_move_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_RIGHT);
   add_move_binding (binding_set, GDK_KP_Right, 0, GTK_SCROLL_STEP_RIGHT);
-  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
+  add_move_binding (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_RIGHT);
 
   add_move_binding (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_UP);
-  add_move_binding (binding_set, GDK_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
+  add_move_binding (binding_set, GDK_Up, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_UP);
   add_move_binding (binding_set, GDK_KP_Up, 0, GTK_SCROLL_STEP_UP);
-  add_move_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
+  add_move_binding (binding_set, GDK_KP_Up, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_UP);
   add_move_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_UP);
   add_move_binding (binding_set, GDK_KP_Page_Up, 0, GTK_SCROLL_PAGE_UP);
 
   add_move_binding (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_DOWN);
-  add_move_binding (binding_set, GDK_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
+  add_move_binding (binding_set, GDK_Down, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_DOWN);
   add_move_binding (binding_set, GDK_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
-  add_move_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
+  add_move_binding (binding_set, GDK_KP_Down, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_DOWN);
   add_move_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
   add_move_binding (binding_set, GDK_KP_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
 
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 9e92d9c..81a4739 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -266,55 +266,55 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_Left, 0,
                       GTK_SCROLL_STEP_LEFT);
 
-  add_slider_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_LEFT);
 
   add_slider_binding (binding_set, GDK_KP_Left, 0,
                       GTK_SCROLL_STEP_LEFT);
 
-  add_slider_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_LEFT);
 
   add_slider_binding (binding_set, GDK_Right, 0,
                       GTK_SCROLL_STEP_RIGHT);
 
-  add_slider_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
   add_slider_binding (binding_set, GDK_KP_Right, 0,
                       GTK_SCROLL_STEP_RIGHT);
 
-  add_slider_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
   add_slider_binding (binding_set, GDK_Up, 0,
                       GTK_SCROLL_STEP_UP);
 
-  add_slider_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_UP);
 
   add_slider_binding (binding_set, GDK_KP_Up, 0,
                       GTK_SCROLL_STEP_UP);
 
-  add_slider_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_UP);
 
   add_slider_binding (binding_set, GDK_Down, 0,
                       GTK_SCROLL_STEP_DOWN);
 
-  add_slider_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_DOWN);
 
   add_slider_binding (binding_set, GDK_KP_Down, 0,
                       GTK_SCROLL_STEP_DOWN);
 
-  add_slider_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_DOWN);
    
-  add_slider_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Page_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_LEFT);
 
-  add_slider_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Page_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_LEFT);  
 
   add_slider_binding (binding_set, GDK_Page_Up, 0,
@@ -323,10 +323,10 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_KP_Page_Up, 0,
                       GTK_SCROLL_PAGE_UP);
   
-  add_slider_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
-  add_slider_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_RIGHT);
 
   add_slider_binding (binding_set, GDK_Page_Down, 0,
@@ -343,10 +343,10 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_minus, 0,
                       GTK_SCROLL_STEP_BACKWARD);  
 
-  add_slider_binding (binding_set, GDK_plus, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_plus, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_FORWARD);  
 
-  add_slider_binding (binding_set, GDK_minus, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_minus, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_BACKWARD);
 
 
@@ -356,10 +356,10 @@ gtk_scale_class_init (GtkScaleClass *class)
   add_slider_binding (binding_set, GDK_KP_Subtract, 0,
                       GTK_SCROLL_STEP_BACKWARD);  
 
-  add_slider_binding (binding_set, GDK_KP_Add, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Add, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_FORWARD);  
 
-  add_slider_binding (binding_set, GDK_KP_Subtract, GDK_CONTROL_MASK,
+  add_slider_binding (binding_set, GDK_KP_Subtract, GTK_DEFAULT_ACCEL_MOD_MASK,
                       GTK_SCROLL_PAGE_BACKWARD);
   
   
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 5a3cd91..319fc48 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -338,23 +338,23 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
   
   binding_set = gtk_binding_set_by_class (class);
 
-  add_scroll_binding (binding_set, GDK_Left,  GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
-  add_scroll_binding (binding_set, GDK_Right, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD,  TRUE);
-  add_scroll_binding (binding_set, GDK_Up,    GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
-  add_scroll_binding (binding_set, GDK_Down,  GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD,  FALSE);
+  add_scroll_binding (binding_set, GDK_Left,  GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
+  add_scroll_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_STEP_FORWARD,  TRUE);
+  add_scroll_binding (binding_set, GDK_Up,    GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
+  add_scroll_binding (binding_set, GDK_Down,  GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_STEP_FORWARD,  FALSE);
 
-  add_scroll_binding (binding_set, GDK_Page_Up,   GDK_CONTROL_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
-  add_scroll_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_FORWARD,  TRUE);
+  add_scroll_binding (binding_set, GDK_Page_Up,   GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
+  add_scroll_binding (binding_set, GDK_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_PAGE_FORWARD,  TRUE);
   add_scroll_binding (binding_set, GDK_Page_Up,   0,                GTK_SCROLL_PAGE_BACKWARD, FALSE);
   add_scroll_binding (binding_set, GDK_Page_Down, 0,                GTK_SCROLL_PAGE_FORWARD,  FALSE);
 
-  add_scroll_binding (binding_set, GDK_Home, GDK_CONTROL_MASK, GTK_SCROLL_START, TRUE);
-  add_scroll_binding (binding_set, GDK_End,  GDK_CONTROL_MASK, GTK_SCROLL_END,   TRUE);
+  add_scroll_binding (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_START, TRUE);
+  add_scroll_binding (binding_set, GDK_End,  GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_END,   TRUE);
   add_scroll_binding (binding_set, GDK_Home, 0,                GTK_SCROLL_START, FALSE);
   add_scroll_binding (binding_set, GDK_End,  0,                GTK_SCROLL_END,   FALSE);
 
-  add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
-  add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+  add_tab_bindings (binding_set, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_DIR_TAB_FORWARD);
+  add_tab_bindings (binding_set, GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
   g_type_class_add_private (class, sizeof (GtkScrolledWindowPrivate));
 }
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index cebdd55..bac5e2e 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -374,8 +374,8 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
   add_spin_binding (binding_set, GDK_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
   add_spin_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_UP);
   add_spin_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
-  add_spin_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
-  add_spin_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
+  add_spin_binding (binding_set, GDK_Page_Up, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_END);
+  add_spin_binding (binding_set, GDK_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK, GTK_SCROLL_START);
 }
 
 static void
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 2ba74ae..45f4f2c 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -326,18 +326,18 @@ static const GtkStockItem builtin_items [] =
   { GTK_STOCK_CANCEL, NC_("Stock label", "_Cancel"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_CDROM, NC_("Stock label", "_CD-Rom"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_CLEAR, NC_("Stock label", "_Clear"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CLOSE, NC_("Stock label", "_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE },
+  { GTK_STOCK_CLOSE, NC_("Stock label", "_Close"), GTK_DEFAULT_ACCEL_MOD_MASK, 'w', GETTEXT_PACKAGE },
   { GTK_STOCK_CONNECT, NC_("Stock label", "C_onnect"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_CONVERT, NC_("Stock label", "_Convert"), 0, 0, GETTEXT_PACKAGE },
-   { GTK_STOCK_COPY, NC_("Stock label", "_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
-  { GTK_STOCK_CUT, NC_("Stock label", "Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE },
+   { GTK_STOCK_COPY, NC_("Stock label", "_Copy"), GTK_DEFAULT_ACCEL_MOD_MASK, 'c', GETTEXT_PACKAGE },
+  { GTK_STOCK_CUT, NC_("Stock label", "Cu_t"), GTK_DEFAULT_ACCEL_MOD_MASK, 'x', GETTEXT_PACKAGE },
   { GTK_STOCK_DELETE, NC_("Stock label", "_Delete"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DISCARD, NC_("Stock label", "_Discard"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DISCONNECT, NC_("Stock label", "_Disconnect"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_EXECUTE, NC_("Stock label", "_Execute"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_EDIT, NC_("Stock label", "_Edit"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_FIND, NC_("Stock label", "_Find"), GDK_CONTROL_MASK, 'f', GETTEXT_PACKAGE },
-  { GTK_STOCK_FIND_AND_REPLACE, NC_("Stock label", "Find and _Replace"), GDK_CONTROL_MASK, 'r', GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND, NC_("Stock label", "_Find"), GTK_DEFAULT_ACCEL_MOD_MASK, 'f', GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND_AND_REPLACE, NC_("Stock label", "Find and _Replace"), GTK_DEFAULT_ACCEL_MOD_MASK, 'r', GETTEXT_PACKAGE },
   { GTK_STOCK_FLOPPY, NC_("Stock label", "_Floppy"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_FULLSCREEN, NC_("Stock label", "_Fullscreen"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_LEAVE_FULLSCREEN, NC_("Stock label", "_Leave Fullscreen"), 0, 0, GETTEXT_PACKAGE },
@@ -358,7 +358,7 @@ static const GtkStockItem builtin_items [] =
   /* This is a navigation label as in "go up" */
   { GTK_STOCK_GO_UP, NC_("Stock label, navigation", "_Up"), 0, 0, GETTEXT_PACKAGE "-navigation" },
   { GTK_STOCK_HARDDISK, NC_("Stock label", "_Harddisk"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_HELP, NC_("Stock label", "_Help"), GDK_CONTROL_MASK, 'h', GETTEXT_PACKAGE },
+  { GTK_STOCK_HELP, NC_("Stock label", "_Help"), GTK_DEFAULT_ACCEL_MOD_MASK, 'h', GETTEXT_PACKAGE },
   { GTK_STOCK_HOME, NC_("Stock label", "_Home"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_INDENT, NC_("Stock label", "Increase Indent"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_UNINDENT, NC_("Stock label", "Decrease Indent"), 0, 0, GETTEXT_PACKAGE },
@@ -392,10 +392,10 @@ static const GtkStockItem builtin_items [] =
   /* Media label */
   { GTK_STOCK_MEDIA_STOP, NC_("Stock label, media", "_Stop"), 0, 0, GETTEXT_PACKAGE "-media" },
   { GTK_STOCK_NETWORK, NC_("Stock label", "_Network"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_NEW, NC_("Stock label", "_New"), GDK_CONTROL_MASK, 'n', GETTEXT_PACKAGE },
+  { GTK_STOCK_NEW, NC_("Stock label", "_New"), GTK_DEFAULT_ACCEL_MOD_MASK, 'n', GETTEXT_PACKAGE },
   { GTK_STOCK_NO, NC_("Stock label", "_No"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_OK, NC_("Stock label", "_OK"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_OPEN, NC_("Stock label", "_Open"), GDK_CONTROL_MASK, 'o', GETTEXT_PACKAGE },
+  { GTK_STOCK_OPEN, NC_("Stock label", "_Open"), GTK_DEFAULT_ACCEL_MOD_MASK, 'o', GETTEXT_PACKAGE },
   /* Page orientation */
   { GTK_STOCK_ORIENTATION_LANDSCAPE, NC_("Stock label", "Landscape"), 0, 0, GETTEXT_PACKAGE },
   /* Page orientation */
@@ -405,17 +405,17 @@ static const GtkStockItem builtin_items [] =
   /* Page orientation */
   { GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, NC_("Stock label", "Reverse portrait"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PAGE_SETUP, NC_("Stock label", "Page Set_up"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PASTE, NC_("Stock label", "_Paste"), GDK_CONTROL_MASK, 'v', GETTEXT_PACKAGE },
+  { GTK_STOCK_PASTE, NC_("Stock label", "_Paste"), GTK_DEFAULT_ACCEL_MOD_MASK, 'v', GETTEXT_PACKAGE },
   { GTK_STOCK_PREFERENCES, NC_("Stock label", "_Preferences"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PRINT, NC_("Stock label", "_Print"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PRINT_PREVIEW, NC_("Stock label", "Print Pre_view"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_PROPERTIES, NC_("Stock label", "_Properties"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_QUIT, NC_("Stock label", "_Quit"), GDK_CONTROL_MASK, 'q', GETTEXT_PACKAGE },
+  { GTK_STOCK_QUIT, NC_("Stock label", "_Quit"), GTK_DEFAULT_ACCEL_MOD_MASK, 'q', GETTEXT_PACKAGE },
   { GTK_STOCK_REDO, NC_("Stock label", "_Redo"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_REFRESH, NC_("Stock label", "_Refresh"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_REMOVE, NC_("Stock label", "_Remove"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_REVERT_TO_SAVED, NC_("Stock label", "_Revert"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SAVE, NC_("Stock label", "_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE },
+  { GTK_STOCK_SAVE, NC_("Stock label", "_Save"), GTK_DEFAULT_ACCEL_MOD_MASK, 's', GETTEXT_PACKAGE },
   { GTK_STOCK_SAVE_AS, NC_("Stock label", "Save _As"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SELECT_ALL, NC_("Stock label", "Select _All"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SELECT_COLOR, NC_("Stock label", "_Color"), 0, 0, GETTEXT_PACKAGE },
@@ -431,7 +431,7 @@ static const GtkStockItem builtin_items [] =
   { GTK_STOCK_UNDELETE, NC_("Stock label", "_Undelete"), 0, 0, GETTEXT_PACKAGE },
   /* Font variant */
   { GTK_STOCK_UNDERLINE, NC_("Stock label", "_Underline"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_UNDO, NC_("Stock label", "_Undo"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNDO, NC_("Stock label", "_Undo"), GTK_DEFAULT_ACCEL_MOD_MASK, 'z', GETTEXT_PACKAGE },
   { GTK_STOCK_YES, NC_("Stock label", "_Yes"), 0, 0, GETTEXT_PACKAGE },
   /* Zoom */
   { GTK_STOCK_ZOOM_100, NC_("Stock label", "_Normal Size"), 0, 0, GETTEXT_PACKAGE },
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 5535d5a..b091aad 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1840,14 +1840,14 @@ gtk_text_key_press (GtkWidget   *widget,
 	{
 	case GDK_Home:
         case GDK_KP_Home:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    scroll_int (text, -text->vadj->value);
 	  else
 	    return_val = FALSE;
 	  break;
 	case GDK_End:
         case GDK_KP_End:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    scroll_int (text, +text->vadj->upper); 
 	  else
 	    return_val = FALSE;
@@ -1863,7 +1863,7 @@ gtk_text_key_press (GtkWidget   *widget,
 	case GDK_Return:
         case GDK_ISO_Enter:
         case GDK_KP_Enter:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
 	  else
 	    return_val = FALSE;
@@ -1901,14 +1901,14 @@ gtk_text_key_press (GtkWidget   *widget,
 	{
         case GDK_KP_Home:
 	case GDK_Home:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    move_cursor_buffer_ver (text, -1);
 	  else
 	    gtk_text_move_beginning_of_line (text);
 	  break;
         case GDK_KP_End:
 	case GDK_End:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    move_cursor_buffer_ver (text, +1);
 	  else
 	    gtk_text_move_end_of_line (text);
@@ -1924,21 +1924,21 @@ gtk_text_key_press (GtkWidget   *widget,
 	case GDK_Down:      move_cursor_ver (text, +1); break;
         case GDK_KP_Left:
 	case GDK_Left:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_text_move_backward_word (text);
 	  else
 	    move_cursor_hor (text, -1); 
 	  break;
         case GDK_KP_Right:
 	case GDK_Right:     
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_text_move_forward_word (text);
 	  else
 	    move_cursor_hor (text, +1); 
 	  break;
 	  
 	case GDK_BackSpace:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_text_delete_backward_word (text);
 	  else
 	    gtk_text_delete_backward_character (text);
@@ -1964,7 +1964,7 @@ gtk_text_key_press (GtkWidget   *widget,
 	  break;
 	case GDK_Delete:
         case GDK_KP_Delete:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_text_delete_forward_word (text);
 	  else if (event->state & GDK_SHIFT_MASK)
 	    {
@@ -1983,7 +1983,7 @@ gtk_text_key_press (GtkWidget   *widget,
         case GDK_KP_Enter:
         case GDK_ISO_Enter:
 	case GDK_Return:
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
 	  else
 	    {
@@ -1999,7 +1999,7 @@ gtk_text_key_press (GtkWidget   *widget,
 	default:
 	  return_val = FALSE;
 	  
-	  if (event->state & GDK_CONTROL_MASK)
+	  if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
 	    {
 	      return_val = TRUE;
 	      if ((key >= 'A') && (key <= 'Z'))
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 8baf6f7..bd93da2 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1092,16 +1092,16 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   add_move_binding (binding_set, GDK_KP_Left, 0,
                     GTK_MOVEMENT_VISUAL_POSITIONS, -1);
   
-  add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_WORDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_WORDS, 1);
   
-  add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_WORDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_WORDS, -1);
   
   add_move_binding (binding_set, GDK_Up, 0,
@@ -1116,16 +1116,16 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   add_move_binding (binding_set, GDK_KP_Down, 0,
                     GTK_MOVEMENT_DISPLAY_LINES, 1);
   
-  add_move_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_PARAGRAPHS, -1);
 
-  add_move_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_PARAGRAPHS, -1);
   
-  add_move_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_PARAGRAPHS, 1);
 
-  add_move_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_PARAGRAPHS, 1);
   
   add_move_binding (binding_set, GDK_Home, 0,
@@ -1140,16 +1140,16 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   add_move_binding (binding_set, GDK_KP_End, 0,
                     GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
   
-  add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_BUFFER_ENDS, -1);
 
-  add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Home, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_BUFFER_ENDS, -1);
   
-  add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_End, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_BUFFER_ENDS, 1);
 
-  add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_End, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_BUFFER_ENDS, 1);
   
   add_move_binding (binding_set, GDK_Page_Up, 0,
@@ -1164,33 +1164,33 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   add_move_binding (binding_set, GDK_KP_Page_Down, 0,
                     GTK_MOVEMENT_PAGES, 1);
 
-  add_move_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Page_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
 
-  add_move_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Page_Up, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
   
-  add_move_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
 
-  add_move_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
+  add_move_binding (binding_set, GDK_KP_Page_Down, GTK_DEFAULT_ACCEL_MOD_MASK,
                     GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
 
   /* Select all */
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 1,
   				G_TYPE_BOOLEAN, TRUE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"select-all", 1,
   				G_TYPE_BOOLEAN, TRUE);
   
   /* Unselect all */
-  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GTK_DEFAULT_ACCEL_MOD_MASK,
 				 "select-all", 1,
 				 G_TYPE_BOOLEAN, FALSE);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				 "select-all", 1,
 				 G_TYPE_BOOLEAN, FALSE);
 
@@ -1212,43 +1212,43 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
 				"backspace", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, 1);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
 				G_TYPE_INT, -1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"delete-from-cursor", 2,
 				G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
 				G_TYPE_INT, -1);
 
   /* Cut/copy/paste */
 
-  gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_x, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"cut-clipboard", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_c, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"copy-clipboard", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_v, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"paste-clipboard", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
@@ -1269,17 +1269,17 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
 				"toggle-cursor-visible", 0);
 
   /* Control-tab focus motion */
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
   
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GTK_DEFAULT_ACCEL_MOD_MASK,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index a543791..d130874 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -344,11 +344,11 @@ add_ctrl_tab_bindings (GtkBindingSet    *binding_set,
 		       GtkDirectionType  direction)
 {
   gtk_binding_entry_add_signal (binding_set,
-				GDK_Tab, GDK_CONTROL_MASK | modifiers,
+				GDK_Tab, GTK_DEFAULT_ACCEL_MOD_MASK | modifiers,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, direction);
   gtk_binding_entry_add_signal (binding_set,
-				GDK_KP_Tab, GDK_CONTROL_MASK | modifiers,
+				GDK_KP_Tab, GTK_DEFAULT_ACCEL_MOD_MASK | modifiers,
 				"move-focus", 1,
 				GTK_TYPE_DIRECTION_TYPE, direction);
 }
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 93bb688..23932b1 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1110,10 +1110,10 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   gtk_tree_view_add_move_binding (binding_set, GDK_KP_Down, 0, TRUE,
 				  GTK_MOVEMENT_DISPLAY_LINES, 1);
 
-  gtk_tree_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK, FALSE,
+  gtk_tree_view_add_move_binding (binding_set, GDK_p, GTK_DEFAULT_ACCEL_MOD_MASK, FALSE,
 				  GTK_MOVEMENT_DISPLAY_LINES, -1);
 
-  gtk_tree_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK, FALSE,
+  gtk_tree_view_add_move_binding (binding_set, GDK_n, GTK_DEFAULT_ACCEL_MOD_MASK, FALSE,
 				  GTK_MOVEMENT_DISPLAY_LINES, 1);
 
   gtk_tree_view_add_move_binding (binding_set, GDK_Home, 0, TRUE,
@@ -1153,22 +1153,22 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 				G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
 				G_TYPE_INT, -1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
 				G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
 				G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
 				G_TYPE_INT, -1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
 				G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
 				G_TYPE_INT, 1);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
 				G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
 				G_TYPE_INT, -1);
@@ -1176,11 +1176,11 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select-all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK, "select-all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GTK_DEFAULT_ACCEL_MOD_MASK, "select-all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_slash, GTK_DEFAULT_ACCEL_MOD_MASK, "select-all", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_A, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK, "unselect-all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_A, GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_backslash, GTK_DEFAULT_ACCEL_MOD_MASK, "unselect-all", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_SHIFT_MASK, "select-cursor-row", 1,
 				G_TYPE_BOOLEAN, TRUE);
@@ -1254,13 +1254,13 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 				G_TYPE_BOOLEAN, TRUE,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Right,
-                                GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "expand-collapse-cursor-row", 3,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, TRUE,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Right,
-                                GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "expand-collapse-cursor-row", 3,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, TRUE,
@@ -1293,24 +1293,24 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Left,
-                                GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "expand-collapse-cursor-row", 3,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Left,
-                                GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "expand-collapse-cursor-row", 3,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, FALSE,
 				G_TYPE_BOOLEAN, TRUE);
 
   gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "select-cursor-parent", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK, "select-cursor-parent", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GTK_DEFAULT_ACCEL_MOD_MASK, "select-cursor-parent", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_f, GDK_CONTROL_MASK, "start-interactive-search", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_f, GTK_DEFAULT_ACCEL_MOD_MASK, "start-interactive-search", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_F, GTK_DEFAULT_ACCEL_MOD_MASK, "start-interactive-search", 0);
 
   g_type_class_add_private (o_class, sizeof (GtkTreeViewPrivate));
 }
@@ -2755,7 +2755,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
        */
       if (event->type == GDK_BUTTON_PRESS)
         {
-          if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+          if ((event->state & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
             tree_view->priv->ctrl_pressed = TRUE;
           if ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
             tree_view->priv->shift_pressed = TRUE;
@@ -2764,7 +2764,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
           if (focus_cell)
             gtk_tree_view_column_focus_cell (column, focus_cell);
 
-          if (event->state & GDK_CONTROL_MASK)
+          if (event->state & GTK_DEFAULT_ACCEL_MOD_MASK)
             {
               gtk_tree_view_real_set_cursor (tree_view, path, FALSE, TRUE);
               gtk_tree_view_real_toggle_cursor_row (tree_view);
@@ -2812,7 +2812,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
 	      tree_view->priv->rubber_band_y = event->y + tree_view->priv->dy;
 	      tree_view->priv->rubber_band_status = RUBBER_BAND_MAYBE_START;
 
-	      if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+	      if ((event->state & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
 		tree_view->priv->rubber_band_ctrl = TRUE;
 	      if ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
 		tree_view->priv->rubber_band_shift = TRUE;
@@ -8149,7 +8149,7 @@ gtk_tree_view_real_move_cursor (GtkTreeView       *tree_view,
 
   if (gtk_get_current_event_state (&state))
     {
-      if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+      if ((state & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
         tree_view->priv->ctrl_pressed = TRUE;
       if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
         tree_view->priv->shift_pressed = TRUE;
@@ -9089,15 +9089,15 @@ gtk_tree_view_add_move_binding (GtkBindingSet  *binding_set,
 				  G_TYPE_ENUM, step,
 				  G_TYPE_INT, count);
 
-  if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+  if ((modmask & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
    return;
 
-  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+  gtk_binding_entry_add_signal (binding_set, keyval, GTK_DEFAULT_ACCEL_MOD_MASK | GDK_SHIFT_MASK,
                                 "move-cursor", 2,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
 
-  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, keyval, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "move-cursor", 2,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
@@ -10230,7 +10230,7 @@ gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view)
 
       if (gtk_get_current_event_state (&state))
 	{
-	  if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+	  if ((state & GTK_DEFAULT_ACCEL_MOD_MASK) == GTK_DEFAULT_ACCEL_MOD_MASK)
 	    tree_view->priv->ctrl_pressed = TRUE;
 	}
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 687c686..75a5947 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2382,11 +2382,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_Menu, 0,
                                 "popup-menu", 0);  
 
-  gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_F1, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "show-help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
                                 GTK_WIDGET_HELP_TOOLTIP);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_F1, GDK_CONTROL_MASK,
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_F1, GTK_DEFAULT_ACCEL_MOD_MASK,
                                 "show-help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
                                 GTK_WIDGET_HELP_TOOLTIP);
