diff --git a/ChangeLog b/ChangeLog
index b395a96..cd5bfb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ClipIt-v1.3.1-17112010001 - 17 Nov. 2010
+	+ Added: Added autostart support for LXDE.
+	+ Fixed: Fixed problem with "Edit" window not appearing.
+
 ClipIt-v1.3.0-14112010001 - 14 Nov. 2010
 	+ Added: Added "Edit" and "Remove" buttons to the "Manage History" dialog.
 	+ Fixed: Major speed improvements for big history entries while:
diff --git a/configure.in b/configure.in
index 09cc86c..3329f27 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Autoconf/automake.
 # -------------------------------------------------------------------------------
 AC_PREREQ([2.5])
-AC_INIT([clipit], [1.3.0], [oss@web-tm.com])
+AC_INIT([clipit], [1.3.1], [oss@web-tm.com])
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/data/clipit-startup.desktop.in b/data/clipit-startup.desktop.in
index 15dde98..f36faec 100644
--- a/data/clipit-startup.desktop.in
+++ b/data/clipit-startup.desktop.in
@@ -5,5 +5,5 @@ Icon=gtk-paste
 Exec=clipit
 Terminal=false
 Type=Application
-OnlyShowIn=GNOME;XFCE;
+OnlyShowIn=GNOME;XFCE;LXDE;
 X-GNOME-Autostart-enabled=true
diff --git a/src/main.c b/src/main.c
index 71addfa..97d6d04 100644
--- a/src/main.c
+++ b/src/main.c
@@ -286,6 +286,7 @@ clear_selected(GtkMenuItem *menu_item, gpointer user_data)
                                                        GTK_MESSAGE_OTHER,
                                                        GTK_BUTTONS_OK_CANCEL,
                                                        _("Clear the history?"));
+    gtk_window_set_title((GtkWindow*)confirm_dialog, "Clear history");
     
     if (gtk_dialog_run((GtkDialog*)confirm_dialog) == GTK_RESPONSE_OK)
     {
diff --git a/src/manage.c b/src/manage.c
index 6277a9b..c5d7ff4 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -156,8 +156,7 @@ edit_selected()
   GtkTreeIter sel_iter;
   GtkTreeSelection* search_selection = gtk_tree_view_get_selection((GtkTreeView*)treeview_search);
   /* This helps prevent multiple instances and checks if there's anything selected */
-  if (!gtk_grab_get_current() && 
-        gtk_tree_selection_get_selected(search_selection, NULL, &sel_iter))
+  if (gtk_tree_selection_get_selected(search_selection, NULL, &sel_iter))
   {
     /* Create clipboard buffer and set its text */
     gint selected_item_nr;
diff --git a/src/preferences.h b/src/preferences.h
index a0573ee..b3382ee 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -54,6 +54,7 @@ G_BEGIN_DECLS
 #define ACTIONS_FILE          ".local/share/clipit/actions"
 #define EXCLUDES_FILE         ".local/share/clipit/excludes"
 #define PREFERENCES_FILE      ".config/clipit/clipitrc"
+#define THEMES_FOLDER         ".config/clipit/themes"
 
 void
 read_preferences();