diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt
index f56c74266..c1b276823 100644
--- a/distribution/ReleaseNotes.txt
+++ b/distribution/ReleaseNotes.txt
@@ -7,6 +7,10 @@ HEAD, planned as v0.20
 - The external assembly IDE is able to preload also RAMs with executable code.
   The register representing the program counter must be marked as such.
 - Allows the pre-loading of program memory if a RAM is used as such.
+- Added a new more flexible shape for embedded circuits.
+- Breaking changes:
+  - In your own DIL circuits you have to reselect the DIL-Shape in the
+    circuit settings.
 
 v0.19, released on 14. June 2018
 - Added a tabbed pane to the attributes dialog to make it more beginner friendly.
diff --git a/src/test/resources/dig/MS-JK-DIL.dig b/src/test/resources/dig/MS-JK-DIL.dig
index 0972fbfd0..6dec1de34 100644
--- a/src/test/resources/dig/MS-JK-DIL.dig
+++ b/src/test/resources/dig/MS-JK-DIL.dig
@@ -6,6 +6,14 @@
       <string>isDIL</string>
       <boolean>true</boolean>
     </entry>
+    <entry>
+      <string>shapeType</string>
+      <shapeType>DIL</shapeType>
+    </entry>
+    <entry>
+      <string>Width</string>
+      <int>6</int>
+    </entry>
   </attributes>
   <visualElements>
     <visualElement>
@@ -36,20 +44,24 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
         <entry>
           <string>Label</string>
           <string>J</string>
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>1</int>
+          <string>1</string>
         </entry>
         <entry>
           <string>Default</string>
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="100" y="100"/>
+      <pos x="80" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -60,7 +72,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>2</int>
+          <string>2</string>
         </entry>
       </elementAttributes>
       <pos x="100" y="180"/>
@@ -104,7 +116,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>7</int>
+          <string>7</string>
         </entry>
       </elementAttributes>
       <pos x="620" y="120"/>
@@ -118,7 +130,7 @@
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>6</int>
+          <string>6</string>
         </entry>
       </elementAttributes>
       <pos x="620" y="240"/>
@@ -126,16 +138,20 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
         <entry>
           <string>Label</string>
           <string>K</string>
         </entry>
         <entry>
           <string>pinNumber</string>
-          <int>3</int>
+          <string>3</string>
         </entry>
       </elementAttributes>
-      <pos x="100" y="260"/>
+      <pos x="80" y="280"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -159,42 +175,6 @@
       <p1 x="140" y="320"/>
       <p2 x="480" y="320"/>
     </wire>
-    <wire>
-      <p1 x="220" y="260"/>
-      <p2 x="260" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="260"/>
-      <p2 x="500" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="100" y="260"/>
-      <p2 x="160" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="100" y="100"/>
-      <p2 x="160" y="100"/>
-    </wire>
-    <wire>
-      <p1 x="220" y="100"/>
-      <p2 x="260" y="100"/>
-    </wire>
-    <wire>
-      <p1 x="460" y="100"/>
-      <p2 x="500" y="100"/>
-    </wire>
-    <wire>
-      <p1 x="140" y="40"/>
-      <p2 x="480" y="40"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="140"/>
-      <p2 x="260" y="140"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="140"/>
-      <p2 x="500" y="140"/>
-    </wire>
     <wire>
       <p1 x="380" y="240"/>
       <p2 x="400" y="240"/>
@@ -223,6 +203,30 @@
       <p1 x="140" y="80"/>
       <p2 x="160" y="80"/>
     </wire>
+    <wire>
+      <p1 x="220" y="260"/>
+      <p2 x="260" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="260"/>
+      <p2 x="500" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="260"/>
+      <p2 x="160" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="100"/>
+      <p2 x="260" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="100"/>
+      <p2 x="500" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="100"/>
+      <p2 x="160" y="100"/>
+    </wire>
     <wire>
       <p1 x="100" y="180"/>
       <p2 x="140" y="180"/>
@@ -235,6 +239,10 @@
       <p1 x="140" y="180"/>
       <p2 x="180" y="180"/>
     </wire>
+    <wire>
+      <p1 x="140" y="40"/>
+      <p2 x="480" y="40"/>
+    </wire>
     <wire>
       <p1 x="140" y="120"/>
       <p2 x="160" y="120"/>
@@ -263,6 +271,14 @@
       <p1 x="140" y="280"/>
       <p2 x="160" y="280"/>
     </wire>
+    <wire>
+      <p1 x="240" y="140"/>
+      <p2 x="260" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="140"/>
+      <p2 x="500" y="140"/>
+    </wire>
     <wire>
       <p1 x="240" y="220"/>
       <p2 x="260" y="220"/>
@@ -271,6 +287,14 @@
       <p1 x="480" y="220"/>
       <p2 x="500" y="220"/>
     </wire>
+    <wire>
+      <p1 x="80" y="260"/>
+      <p2 x="80" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="80"/>
+      <p2 x="80" y="100"/>
+    </wire>
     <wire>
       <p1 x="480" y="40"/>
       <p2 x="480" y="140"/>
@@ -287,6 +311,14 @@
       <p1 x="480" y="220"/>
       <p2 x="480" y="320"/>
     </wire>
+    <wire>
+      <p1 x="240" y="200"/>
+      <p2 x="240" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="240" y="140"/>
+      <p2 x="240" y="160"/>
+    </wire>
     <wire>
       <p1 x="360" y="80"/>
       <p2 x="360" y="120"/>
@@ -295,13 +327,21 @@
       <p1 x="360" y="200"/>
       <p2 x="360" y="240"/>
     </wire>
+    <wire>
+      <p1 x="360" y="240"/>
+      <p2 x="360" y="280"/>
+    </wire>
     <wire>
       <p1 x="360" y="120"/>
       <p2 x="360" y="160"/>
     </wire>
     <wire>
-      <p1 x="360" y="240"/>
-      <p2 x="360" y="280"/>
+      <p1 x="600" y="200"/>
+      <p2 x="600" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="600" y="120"/>
+      <p2 x="600" y="160"/>
     </wire>
     <wire>
       <p1 x="140" y="120"/>
@@ -319,22 +359,6 @@
       <p1 x="140" y="180"/>
       <p2 x="140" y="240"/>
     </wire>
-    <wire>
-      <p1 x="240" y="200"/>
-      <p2 x="240" y="220"/>
-    </wire>
-    <wire>
-      <p1 x="240" y="140"/>
-      <p2 x="240" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="200"/>
-      <p2 x="600" y="240"/>
-    </wire>
-    <wire>
-      <p1 x="600" y="120"/>
-      <p2 x="600" y="160"/>
-    </wire>
     <wire>
       <p1 x="380" y="120"/>
       <p2 x="380" y="180"/>
diff --git a/src/test/resources/dig/shapes.dig b/src/test/resources/dig/shapes.dig
index 6579b717c..7ef590500 100644
--- a/src/test/resources/dig/shapes.dig
+++ b/src/test/resources/dig/shapes.dig
@@ -473,6 +473,16 @@
       <elementAttributes/>
       <pos x="200" y="180"/>
     </visualElement>
+    <visualElement>
+      <elementName>MS-JK-DIL.dig</elementName>
+      <elementAttributes>
+        <entry>
+          <string>shapeType</string>
+          <shapeType>LAYOUT</shapeType>
+        </entry>
+      </elementAttributes>
+      <pos x="780" y="640"/>
+    </visualElement>
   </visualElements>
   <wires/>
 </circuit>
\ No newline at end of file