Index: src_plugins/hid_lesstif/lesstif.h
===================================================================
--- src_plugins/hid_lesstif/lesstif.h	(revision 1449)
+++ src_plugins/hid_lesstif/lesstif.h	(revision 1450)
@@ -1,5 +1,7 @@
 /* $Id$ */
 
+#include "hid_cfg_input.h"
+
 #define app_context lesstif_app_context
 #define appwidget lesstif_appwidget
 #define display lesstif_display
@@ -19,6 +21,8 @@
 extern Screen *screen_s;
 extern int screen;
 
+extern hid_cfg_mouse_t lesstif_mouse;
+
 extern Widget mainwind, work_area, command, hscroll, vscroll;
 extern Widget m_click;
 
Index: src_plugins/hid_lesstif/main.c
===================================================================
--- src_plugins/hid_lesstif/main.c	(revision 1449)
+++ src_plugins/hid_lesstif/main.c	(revision 1450)
@@ -47,6 +47,8 @@
 
 const char *lesstif_cookie = "lesstif HID";
 
+hid_cfg_mouse_t lesstif_mouse;
+
 #ifndef XtRDouble
 #define XtRDouble "Double"
 #endif
@@ -1314,7 +1316,8 @@
 #else
 				+ ((e->xbutton.state & Mod1Mask) ? M_Alt : 0);
 #endif
-			do_mouse_action(e->xbutton.button, mods);
+			hid_cfg_mouse_action(&lesstif_mouse, e->xbutton.button | mods);
+
 			notify_crosshair_change(true);
 			break;
 		}
@@ -1335,7 +1338,7 @@
 				+ ((e->xbutton.state & Mod1Mask) ? M_Alt : 0)
 #endif
 				+ M_Release;
-			do_mouse_action(e->xbutton.button, mods);
+			hid_cfg_mouse_action(&lesstif_mouse, e->xbutton.button | mods);
 			notify_crosshair_change(true);
 			break;
 		}
Index: src_plugins/hid_lesstif/menu.c
===================================================================
--- src_plugins/hid_lesstif/menu.c	(revision 1449)
+++ src_plugins/hid_lesstif/menu.c	(revision 1450)
@@ -1289,13 +1289,18 @@
 	}
 
 	mr = hid_cfg_get_menu(r, "/main_menu");
-	if (mr != NULL)
-		add_resource_to_menu(mb, mr, (XtCallbackProc) callback, 0);
+	if (mr != NULL) {
+		if (mr->type == LHT_LIST) {
+			lht_node_t *n;
+			for(n = mr->data.list.first; n != NULL; n = n->next)
+				add_resource_to_menu(mb, n, (XtCallbackProc) callback, 0);
+		}
+		else
+			hid_cfg_error(mr, "/main_menu should be a list");
+	}
 
-	mr = hid_cfg_get_menu(r, "/mouse");
-	if (mr != NULL)
-		load_mouse_resource(mr);
 
+	hid_cfg_mouse_init(r, &lesstif_mouse);
 	if (do_dump_keys)
 		DumpKeys2();