oops extra menu_layout

diff --git a/DESIGN/themes.txt b/DESIGN/themes.txt
index 0651cd5fe9526ccbc20fbc9e4749a9177f638f8c..eee2efdf0514cc628c100a248a7d247c7bb0ae43 100644 (file)
--- a/DESIGN/themes.txt
+++ b/DESIGN/themes.txt
@@ -46,25 +46,17 @@
 </texture>
 
 <button_layout id="funlayout">
-  <enabled>
-    <pressed>
-      <focus style="fun" />
-      <unfocus style="fun" />
-    </pressed>
-    <unpressed>
-      <focus style="fun" />
-      <unfocus style="fun" />
-    </unpressed>
-  </enabled>
+  <pressed>
+    <focus style="fun" />
+    <unfocus style="fun" />
+  </pressed>
+  <unpressed>
+    <focus style="fun" />
+    <unfocus style="fun" />
+  </unpressed>
   <disabled>
-    <pressed>
-      <focus style="fun" />
-      <unfocus style="fun" />
-    </pressed>
-    <unpressed>
-      <focus style="fun" />
-      <unfocus style="fun" />
-    </unpressed>
+    <focus style="fun" />
+    <unfocus style="fun" />
   </disabled>
 </button>
 
@@ -73,11 +65,6 @@
   <unfocus style="blah-sunken" text="vroom" />
 </surface>
 
-<menu_layout id="titlelayout">
-  <focus   style="blah-flat"   text="vroom" />
-  <unfocus style="blah-sunken" text="vroom" />
-</surface>
-
 <window>
   <button id="close"    layout="funlayout" />
   <button id="stick"    layout="funlayout" />
@@ -86,8 +73,10 @@
   <button id="icon"     layout="funlayout" />
   <button id="shade"    layout="funlayout" />
 
-  <surface id="title"  layout="titlelayout" />
-  <surface id="handle" layout="titlelayout" />
+  <surface id="title"    layout="titlelayout" />
+  <surface id="handle"    layout="titlelayout" />
+  <surface id="leftgrip"  layout="titlelayout" />
+  <surface id="rightgrip" layout="titlelayout" />
 </window>
 
 <menu>