diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/configure.in.in thunar-media-tags-plugin-0.1.2_git20111117-magellan/configure.in.in
--- thunar-media-tags-plugin-0.1.2_git20111117/configure.in.in	2011-11-14 11:15:28.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/configure.in.in	2011-11-25 16:21:11.282983350 +0100
@@ -64,9 +64,9 @@
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
-XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526])
-XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.2.0])
 XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
 
 dnl ***********************************
diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/audio-tags-page.c thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/audio-tags-page.c
--- thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/audio-tags-page.c	2011-11-14 11:15:28.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/audio-tags-page.c	2011-11-25 16:11:09.549983102 +0100
@@ -90,7 +90,6 @@
   ThunarxPropertyPage __parent__;
 
   /* Widgets */
-  GtkTooltips     *tooltips;
   GtkWidget       *table;
   GtkWidget       *save_button;
   GtkWidget       *info_button;
@@ -282,10 +281,6 @@
 
   gtk_container_set_border_width (GTK_CONTAINER (page), 8);
 
-  /* Allocate the shared tooltips */
-  page->tooltips = gtk_tooltips_new ();
-  exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
-
   /* Main container */
   vbox = gtk_vbox_new (FALSE, 8);
   gtk_container_add (GTK_CONTAINER (page), vbox);
@@ -317,7 +312,7 @@
   /* Track spin button */
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0.0, 0);
   exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
-  gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
   gtk_container_add (GTK_CONTAINER (alignment), spin);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
   gtk_widget_show (spin);
@@ -340,7 +335,7 @@
   /* Year spin button */
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
   exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
-  gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
   gtk_container_add (GTK_CONTAINER (alignment), spin);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
   gtk_widget_show (spin);
@@ -355,7 +350,7 @@
   /* Artist entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
   gtk_widget_show (entry);
@@ -370,7 +365,7 @@
   /* Title entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
 
@@ -384,7 +379,7 @@
   /* Album entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
   
@@ -398,7 +393,7 @@
   /* Comment entry */
   entry = gtk_entry_new ();
   exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
-  gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
   gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 0, 0);
   gtk_widget_show (entry);
 
@@ -412,7 +407,7 @@
   /* Genre combo box */
   combo = gtk_combo_box_entry_new_text ();
   exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
-  gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
   gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
   gtk_widget_show (combo);
 
@@ -512,9 +507,6 @@
   if (G_LIKELY (page->genre != NULL))
     g_free (page->genre);
 
-  /* Release the tooltips */
-  g_object_unref (G_OBJECT (page->tooltips));
-
   (*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
 }
 
diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/tag-renamer.c thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/tag-renamer.c
--- thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/tag-renamer.c	2011-11-14 11:15:28.000000000 +0100
+++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/tag-renamer.c	2011-11-25 16:13:12.343982936 +0100
@@ -132,9 +132,6 @@
 {
   ThunarxRenamer __parent__;
 
-  /* Widgets */
-  GtkTooltips     *tooltips;
-
   /* Properties */
   TagRenamerFormat  format;
   gchar            *text;
@@ -238,10 +235,6 @@
   GtkTreeIter      iter;
   gint             n;
 
-  /* Allocate shared tooltips */
-  tag_renamer->tooltips = gtk_tooltips_new ();
-  exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
-
   table = gtk_table_new (2, 4, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_table_set_col_spacings (GTK_TABLE (table), 12);
@@ -320,14 +313,14 @@
 
   button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
   exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
-  gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
-        "with underscores."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
+        "with underscores."));
   gtk_table_attach (GTK_TABLE (table), button, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
   gtk_widget_show (button);
 
   button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
   exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
-  gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
+  gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
   gtk_table_attach (GTK_TABLE (table), button, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
   gtk_widget_show (button);
 }
@@ -341,9 +334,6 @@
 {
   TagRenamer *tag_renamer = TAG_RENAMER (object);
 
-  /* release the tooltips */
-  g_object_unref (G_OBJECT (tag_renamer->tooltips));
-
   /* Free string */
   g_free (tag_renamer->text);