Index: verbs.scc
===================================================================
--- verbs.scc	(revision 339)
+++ verbs.scc	(working copy)
@@ -58,6 +58,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn();
         setVerbKey('g');
         
         setCurrentVerb(PickUp);
@@ -67,6 +68,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('p');
 
         setCurrentVerb(Use);
@@ -76,6 +78,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('u');
 
         setCurrentVerb(Open);
@@ -85,6 +88,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('o');
 
         setCurrentVerb(LookAt);
@@ -94,6 +98,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('l');
 
         setCurrentVerb(Push);
@@ -103,6 +108,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         //setVerbKey('');
 
         setCurrentVerb(Close);
@@ -112,6 +118,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('c');
 
         setCurrentVerb(TalkTo);
@@ -121,6 +128,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         setVerbKey('t');
 
         setCurrentVerb(Pull);
@@ -130,6 +138,7 @@
         setVerbColor(color);
         setVerbHiColor(hiColor);
         setVerbDimColor(dimColor);
+        setVerbOn(); 
         //setVerbKey('');
 
         setCurrentVerb(invUp);
@@ -156,10 +165,12 @@
                 initVerb();
                 //verbCenter();
                 setVerbXY(160 + c*40,160 + l*20);
+                setVerbOn(); 
             }
         dimInt(invObj,8);
 
-
+        saveVerbs(Give, Pull, 2); // Main verbs (stored in slot 2)
+        saveVerbs(invSlot0, invSlot0+7, 3); // Inventory items (stored in slot 3)
     }
 
     // turn on all the verb for the interface 
@@ -169,32 +180,43 @@
         int i;
        
         if(!!show == verbsOn) return;
- 
-        vrb[0] = [ Give, PickUp, Use, Open,
-                   LookAt, Push, Close, TalkTo,
-                   Pull, SntcLine, invUp, invDown ];
         
-        for(i = 0 ; i < 12 ; i++) {
-            setCurrentVerb(vrb[i]);
-            if(show)
-                setVerbOn();
-            else
-                setVerbOff();
+        if (show)
+        {
+            restoreVerbs(Give, Pull, 2); // Show main verbs
+            restoreVerbs(invSlot0, invSlot0+7, 3); // Show inventory items
+            
+            ResRoom::inventoryHandler( 0 ); // reset display in case any items have been picked up
+            
+            // The rest can be turned on manually
+            setCurrentVerb(SntcLine);
+            setVerbOn(); 
             redrawVerb();
+            setCurrentVerb(invUp);
+            setVerbOn(); 
+            redrawVerb();
+            setCurrentVerb(invDown);
+            setVerbOn(); 
+            redrawVerb();
         }
-        undim(vrb);
-
-        for(i = 0 ; i < 8 ; i++) {
-            setCurrentVerb(invSlot0+i);
-            if(show)
-                setVerbOn();
-            else
-                setVerbOff();
+        else
+        {
+            saveVerbs(Give, Pull, 2); // Hide main verbs
+            saveVerbs(invSlot0, invSlot0+7, 3); // Hide inventory items 
+            
+            // The rest can be turned off manually
+            setCurrentVerb(SntcLine);
+            setVerbOff(); 
             redrawVerb();
+            setCurrentVerb(invUp);
+            setVerbOff(); 
+            redrawVerb();
+            setCurrentVerb(invDown);
+            setVerbOff(); 
+            redrawVerb();
         }
 
         verbsOn = !!show;
-
     }
 
 
Index: common.sch
===================================================================
--- common.sch	(revision 339)
+++ common.sch	(working copy)
@@ -18,9 +18,9 @@
  */
 
 // The action verbs
-verb Give,  PickUp, Use;
-verb Open,  LookAt, Push;
-verb Close, TalkTo, Pull;
+verb Give,  PickUp, Use,
+     Open,  LookAt, Push,
+     Close, TalkTo, Pull;
 
 verb WalkTo, WalkToXY;