diff --git a/klayout/EBeam/EBeam.lyp b/klayout/EBeam/EBeam.lyp
index 2dc90312..77ba6f90 100644
--- a/klayout/EBeam/EBeam.lyp
+++ b/klayout/EBeam/EBeam.lyp
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-properties>
 
+
+
 <properties>
+  <expanded>true</expanded>
   <frame-color/>
   <fill-color/>
   <frame-brightness>0</frame-brightness>
@@ -17,6 +20,7 @@
   <animation>0</animation>
   <name>Waveguides</name>
   <source>*/*@*</source>
+
   <group-members>
    <frame-color>#ff80a8</frame-color>
    <fill-color>#ff80a8</fill-color>
@@ -32,6 +36,8 @@
    <name>Waveguide</name>
    <source>1/99@1</source>
   </group-members>  
+
+
   <group-members>
   <frame-color>#ff80a8</frame-color>
   <fill-color>#ff80a8</fill-color>
@@ -100,7 +106,23 @@
   <source>1/69@1</source>
   <width>2.0</width>
   </group-members>
-  
+
+ <group-members>
+  <frame-color>#ffae00</frame-color>
+  <fill-color>#ffae00</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width>1</width>
+  <marked>false</marked>
+  <animation>0</animation>
+  <name>Oxide open (to BOX)</name>
+  <source>6/0@1</source>
+ </group-members>
+
  </properties>
  
  <properties>
@@ -133,7 +155,7 @@
   <marked>false</marked>
   <xfill>false</xfill>
   <animation>0</animation>
-  <name>Doping/Epitaxial growth</name>
+  <name>Doping</name>
   <source>*/*@*</source>
   
   <group-members>
@@ -249,88 +271,111 @@
   <name>VC</name>
   <source>40/0@1</source>
  </group-members>
- </properties>
  
- <properties>
-  <frame-color>#ffae00</frame-color>
-  <fill-color>#ffae00</fill-color>
-  <frame-brightness>0</frame-brightness>
-  <fill-brightness>0</fill-brightness>
-  <dither-pattern>I5</dither-pattern>
-  <valid>true</valid>
-  <visible>true</visible>
-  <transparent>false</transparent>
-  <width>1</width>
-  <marked>false</marked>
-  <animation>0</animation>
-  <name>Oxide open (to BOX)</name>
-  <source>6/0@1</source>
  </properties>
  
- <properties>
-  <frame-color>#8000ff</frame-color>
-  <fill-color>#8000ff</fill-color>
-  <frame-brightness>0</frame-brightness>
-  <fill-brightness>0</fill-brightness>
-  <dither-pattern>I1</dither-pattern>
-  <valid>true</valid>
-  <visible>true</visible>
-  <transparent>false</transparent>
-  <width>3</width>
-  <marked>false</marked>
-  <animation>0</animation>
-  <name>FloorPlan</name>
-  <source>99/0@1</source>
- </properties>
- <properties>
-  <frame-color>#c0c0c0</frame-color>
-  <fill-color>#c0c0c0</fill-color>
-  <frame-brightness>0</frame-brightness>
-  <fill-brightness>0</fill-brightness>
-  <dither-pattern>I0</dither-pattern>
-  <line-style/>
-  <valid>true</valid>
-  <visible>true</visible>
-  <transparent>true</transparent>
-  <width>0</width>
-  <marked>false</marked>
-  <xfill>false</xfill>
-  <animation>0</animation>
-  <name>Deep Trench</name>
-  <source>201/0@1</source>
- </properties>
- <properties>
-  <frame-color>#303030</frame-color>
-  <fill-color>#a0a0c0</fill-color>
+<properties>
+  <frame-color/>
+  <fill-color/>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>I0</dither-pattern>
+  <dither-pattern/>
   <line-style/>
   <valid>true</valid>
   <visible>true</visible>
-  <transparent>true</transparent>
-  <width>2</width>
+  <transparent>false</transparent>
+  <width/>
   <marked>false</marked>
   <xfill>false</xfill>
   <animation>0</animation>
-  <name>Dicing</name>
-  <source>210/0@1</source>
- </properties>
+  <name>Misc</name>
+  <source>*/*@*</source>
+  
+  <group-members>
+    <frame-color>#8000ff</frame-color>
+    <fill-color>#8000ff</fill-color>
+    <frame-brightness>0</frame-brightness>
+    <fill-brightness>0</fill-brightness>
+    <dither-pattern>I1</dither-pattern>
+    <valid>true</valid>
+    <visible>true</visible>
+    <transparent>false</transparent>
+    <width>3</width>
+    <marked>false</marked>
+    <animation>0</animation>
+    <name>FloorPlan</name>
+    <source>99/0@1</source>
+  </group-members>
+  
+  <group-members>
+    <frame-color>#c0c0c0</frame-color>
+    <fill-color>#c0c0c0</fill-color>
+    <frame-brightness>0</frame-brightness>
+    <fill-brightness>0</fill-brightness>
+    <dither-pattern>I0</dither-pattern>
+    <line-style/>
+    <valid>true</valid>
+    <visible>true</visible>
+    <transparent>true</transparent>
+    <width>0</width>
+    <marked>false</marked>
+    <xfill>false</xfill>
+    <animation>0</animation>
+    <name>Deep Trench</name>
+    <source>201/0@1</source>
+  </group-members>
+  
+  <group-members>
+    <frame-color>#303030</frame-color>
+    <fill-color>#a0a0c0</fill-color>
+    <frame-brightness>0</frame-brightness>
+    <fill-brightness>0</fill-brightness>
+    <dither-pattern>I0</dither-pattern>
+    <line-style/>
+    <valid>true</valid>
+    <visible>true</visible>
+    <transparent>true</transparent>
+    <width>2</width>
+    <marked>false</marked>
+    <xfill>false</xfill>
+    <animation>0</animation>
+    <name>Dicing</name>
+    <source>210/0@1</source>
+  </group-members>
+
+  <group-members>
+    <frame-color>#800057</frame-color>
+    <fill-color>#800057</fill-color>
+    <frame-brightness>0</frame-brightness>
+    <fill-brightness>0</fill-brightness>
+    <dither-pattern>I1</dither-pattern>
+    <valid>true</valid>
+    <visible>true</visible>
+    <transparent>false</transparent>
+    <width>10</width>
+    <marked>false</marked>
+    <xfill>false</xfill>
+    <animation>0</animation>
+    <name>Chip design area</name>
+    <source>290/0@1</source>
+  </group-members>
+  
+  <group-members>
+    <frame-color>#ff00ff</frame-color>
+    <fill-color>#ff00ff</fill-color>
+    <frame-brightness>0</frame-brightness>
+    <fill-brightness>0</fill-brightness>
+    <dither-pattern>I5</dither-pattern>
+    <valid>true</valid>
+    <visible>true</visible>
+    <transparent>false</transparent>
+    <width>1</width>
+    <marked>false</marked>
+    <animation>0</animation>
+    <name>SEM</name>
+    <source>200/0@1</source>
+  </group-members>
   
- <properties>
-  <frame-color>#ff00ff</frame-color>
-  <fill-color>#ff00ff</fill-color>
-  <frame-brightness>0</frame-brightness>
-  <fill-brightness>0</fill-brightness>
-  <dither-pattern>I5</dither-pattern>
-  <valid>true</valid>
-  <visible>true</visible>
-  <transparent>false</transparent>
-  <width>1</width>
-  <marked>false</marked>
-  <animation>0</animation>
-  <name>SEM</name>
-  <source>200/0@1</source>
  </properties>
  
  <properties>
@@ -365,6 +410,7 @@
   <name>DevRec</name>
   <source>68/0@1</source>
  </group-members>
+ 
  <group-members>
   <frame-color>#004080</frame-color>
   <fill-color>#004080</fill-color>
@@ -444,6 +490,7 @@
   <name>Lumerical</name>
   <source>733/0@1</source>
  </group-members>
+ 
  <group-members>
   <frame-color>#004080</frame-color>
   <fill-color>#004080</fill-color>
@@ -478,6 +525,7 @@
   <animation>0</animation>
   <name>Extra</name>
   <source>*/*@*</source>
+  
   <group-members>
    <frame-color>#ff80a8</frame-color>
    <fill-color>#ff80a8</fill-color>
@@ -493,7 +541,9 @@
    <name>Si</name>
    <source>1/0@1</source>
   </group-members>
+
  </properties>
+ 
  <name/>
 </layer-properties>