Index: src/pcb-menu-lesstif.lht
===================================================================
--- src/pcb-menu-lesstif.lht	(revision 1536)
+++ src/pcb-menu-lesstif.lht	(revision 1537)
@@ -406,6 +406,52 @@
 						ha:Step +Left = { a=Shift<Key>Left; action=Cursor(Pan,-50,0,view) }
 						ha:Step +Right = { a=Shift<Key>Right; action=Cursor(Pan,50,0,view) }
 						ha:"Click" = { a=<Key>Enter; li:action={Mode(Notify); Mode(Release)} }
+						-
+						ha:layer keys {
+							li:submenu {
+								ha:Select Layer 1           = { a=<Key>1; action=SelectLayer(1) }
+								ha:Select Layer 2           = { a=<Key>2; action=SelectLayer(2) }
+								ha:Select Layer 3           = { a=<Key>3; action=SelectLayer(3) }
+								ha:Select Layer 4           = { a=<Key>4; action=SelectLayer(4) }
+								ha:Select Layer 5           = { a=<Key>5; action=SelectLayer(5) }
+								ha:Select Layer 6           = { a=<Key>6; action=SelectLayer(6) }
+								ha:Select Layer 7           = { a=<Key>7; action=SelectLayer(7) }
+								ha:Select Layer 8           = { a=<Key>8; action=SelectLayer(8) }
+								ha:Select Layer 9           = { a=<Key>9; action=SelectLayer(9) }
+								ha:Select Layer 10          = { a=<Key>0; action=SelectLayer(10) }
+								ha:Select Layer 11          = { a=Alt<Key>1; action=SelectLayer(11) }
+								ha:Select Layer 12          = { a=Alt<Key>2; action=SelectLayer(12) }
+								ha:Select Layer 13          = { a=Alt<Key>3; action=SelectLayer(13) }
+								ha:Select Layer 14          = { a=Alt<Key>4; action=SelectLayer(14) }
+								ha:Select Layer 15          = { a=Alt<Key>5; action=SelectLayer(15) }
+								ha:Select Layer 16          = { a=Alt<Key>6; action=SelectLayer(16) }
+								ha:Select Layer 17          = { a=Alt<Key>7; action=SelectLayer(17) }
+								ha:Select Layer 18          = { a=Alt<Key>8; action=SelectLayer(18) }
+								ha:Select Layer 19          = { a=Alt<Key>9; action=SelectLayer(19) }
+								ha:Select Layer 20          = { a=Alt<Key>0; action=SelectLayer(20) }
+								-
+								ha:Toggle Layer 1           = { a=Ctrl<Key>1; action=ToggleView(1) }
+								ha:Toggle Layer 2           = { a=Ctrl<Key>2; action=ToggleView(2) }
+								ha:Toggle Layer 3           = { a=Ctrl<Key>3; action=ToggleView(3) }
+								ha:Toggle Layer 4           = { a=Ctrl<Key>4; action=ToggleView(4) }
+								ha:Toggle Layer 5           = { a=Ctrl<Key>5; action=ToggleView(5) }
+								ha:Toggle Layer 6           = { a=Ctrl<Key>6; action=ToggleView(6) }
+								ha:Toggle Layer 7           = { a=Ctrl<Key>7; action=ToggleView(7) }
+								ha:Toggle Layer 8           = { a=Ctrl<Key>8; action=ToggleView(8) }
+								ha:Toggle Layer 9           = { a=Ctrl<Key>9; action=ToggleView(9) }
+								ha:Toggle Layer 10          = { a=Ctrl<Key>0; action=ToggleView(10) }
+								ha:Toggle Layer 11          = { a=Ctrl-Alt<Key>1; action=ToggleView(11) }
+								ha:Toggle Layer 12          = { a=Ctrl-Alt<Key>2; action=ToggleView(12) }
+								ha:Toggle Layer 13          = { a=Ctrl-Alt<Key>3; action=ToggleView(13) }
+								ha:Toggle Layer 14          = { a=Ctrl-Alt<Key>4; action=ToggleView(14) }
+								ha:Toggle Layer 15          = { a=Ctrl-Alt<Key>5; action=ToggleView(15) }
+								ha:Toggle Layer 16          = { a=Ctrl-Alt<Key>6; action=ToggleView(16) }
+								ha:Toggle Layer 17          = { a=Ctrl-Alt<Key>7; action=ToggleView(17) }
+								ha:Toggle Layer 18          = { a=Ctrl-Alt<Key>8; action=ToggleView(18) }
+								ha:Toggle Layer 19          = { a=Ctrl-Alt<Key>9; action=ToggleView(19) }
+								ha:Toggle Layer 20          = { a=Ctrl-Alt<Key>0; action=ToggleView(20) }
+							}
+						} # layer keys
 					}
 				} # Key Bindings
 			}
Index: src_plugins/hid_lesstif/menu.c
===================================================================
--- src_plugins/hid_lesstif/menu.c	(revision 1536)
+++ src_plugins/hid_lesstif/menu.c	(revision 1537)
@@ -476,24 +476,6 @@
 			break;
 		}
 		stdarg_n = 0;
-		if (accel_idx < 9) {
-			char buf[20], av[30], av2[30];
-			lht_node_t *ar;
-			XmString as;
-			sprintf(buf, "Ctrl-%d", accel_idx + 1);
-			as = XmStringCreatePCB(buf);
-			stdarg(XmNacceleratorText, as);
-
-			sprintf(av, "ToggleView(%d)", i + 1);
-			sprintf(av2, "Ctrl<Key>%d", accel_idx + 1);
-			ar = hid_cfg_create_hash_node(NULL, av,  "action", av, "a", av2, NULL);
-			if (ar != NULL)  {
-				note_accelerator(av2, ar);
-				stdarg(XmNmnemonic, accel_idx + '1');
-			}
-			else
-				Message("Error: faliled to create ToggleView(%d)\n", i+1);
-		}
 		btn = XmCreateToggleButton(menu, name, stdarg_args, stdarg_n);
 		XtManageChild(btn);
 		XtAddCallback(btn, XmNvalueChangedCallback, (XtCallbackProc) layer_button_callback, (XtPointer) (size_t) i);
@@ -542,22 +524,6 @@
 			break;
 		}
 		stdarg_n = 0;
-		if (accel_idx < 9) {
-			lht_node_t *ar;
-			XmString as;
-
-			sprintf(buf, "%d", i + 1);
-			ar = hid_cfg_create_hash_node(NULL, av,  "action", av, "a", buf, NULL);
-			if (ar != NULL) {
-				as = XmStringCreatePCB(buf);
-				stdarg(XmNacceleratorText, as);
-				sprintf(av, "<Key>%d", accel_idx + 1);
-				note_accelerator(av, ar);
-				stdarg(XmNmnemonic, accel_idx + '1');
-			}
-			else
-				Message("Error: failed to create accel <Key>%d\n", accel_idx+1);
-		}
 		stdarg(XmNindicatorType, XmONE_OF_MANY);
 		btn = XmCreateToggleButton(menu, name, stdarg_args, stdarg_n);
 		XtManageChild(btn);