diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_060_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_060_0.svg
index 09f19761..42ed3103 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_060_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_060_0.svg
@@ -3,9 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
   <g id="frame">
     <path d="M221,480c0,115,170,115,170,0 c115,0,115-170,0-170c0-115-170-115-170,0C106,310,106,480,221,480z" fill="#FFFF80" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-width="5"/>
-  </g>
-  <g>
-    <path d="M221,480c0,115,170,115,170,0 c115,0,115-170,0-170c0-115-170-115-170,0C106,310,106,480,221,480z" fill="#FFFF80" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-width="5"/>
     <path d="M 420.72266 314.35352 L 420.72266 475.64648 C 496.07309 451.92442 496.07309 338.07558 420.72266 314.35352 z"/>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_160_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_160_0.svg
index eba18a95..d89ef66b 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_160_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_160_0.svg
@@ -3,6 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
   <g id="frame">
     <path d="M221,480c0,115,170,115,170,0c115,0,115-170,0-170c0-115-170-115-170,0 C106,310,106,480,221,480z" fill="#FFFF80" stroke="#000000" stroke-width="5"/>
+    <path d="m 423.23718,314.35352 v 161.29296 c 75.35043,-23.72206 75.35043,-137.5709 0,-161.29296 z"/>
   </g>
-  <path d="m 423.23718,314.35352 v 161.29296 c 75.35043,-23.72206 75.35043,-137.5709 0,-161.29296 z"/>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_227_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_227_0.svg
index 29972891..964b9284 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_227_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_227_0.svg
@@ -3,13 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792" id="Version_1.0" overflow="visible" version="1.1" viewBox="0 0 612 792" width="612" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g id="frame">
     <polygon fill="#80E0FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
-  </g>
-  <g>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_227_0c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_227_0c.svg
index 6b16ec10..7e675506 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_227_0c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_227_0c.svg
@@ -3,13 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792" id="Version_1.0" overflow="visible" version="1.1" viewBox="0 0 612 792" width="612" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g id="frame">
     <polygon fill="#FFA1FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
-  </g>
-  <g>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_300_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_300_0.svg
index 587cdd87..ffc13d36 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_300_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_300_0.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <ellipse cx="306" cy="396" fill="#80E0FF" id="Group" rx="144" ry="144" stroke="#000000" stroke-width="5"/>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_300_0c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_300_0c.svg
index e088fcc2..b735eaea 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_300_0c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_300_0c.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <ellipse cx="306" cy="396" fill="#FFA1FF" id="Group" rx="144" ry="144" stroke="#000000" stroke-width="5"/>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_300_1.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_300_1.svg
index a6ed8911..25602d77 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_300_1.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_300_1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <g>
       <circle cx="306" cy="396" fill="#80E0FF" r="144"/>
       <circle cx="306" cy="396" fill="none" r="144" stroke="#000000" stroke-dasharray="24.5874,14.7524" stroke-miterlimit="10" stroke-width="5"/>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_300_1c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_300_1c.svg
index adccd24c..0002d07c 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_300_1c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_300_1c.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <g>
       <circle cx="306" cy="396" fill="#FFA1FF" r="144"/>
       <circle cx="306" cy="396" fill="none" r="144" stroke="#000000" stroke-dasharray="24.5874,14.7524" stroke-miterlimit="10" stroke-width="5"/>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_327_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_327_0.svg
index 1363728f..2d63a91c 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_327_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_327_0.svg
@@ -5,9 +5,4 @@
     <polygon fill="#80E0FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_327_0c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_327_0c.svg
index f5d76c37..e836160f 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_327_0c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_327_0c.svg
@@ -3,13 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792" id="Version_1.0" overflow="visible" version="1.1" viewBox="0 0 612 792" width="612" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g id="frame">
     <polygon fill="#FFA1FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
-  </g>
-  <g>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_327_1.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_327_1.svg
index 4ca427dc..a295bdd7 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_327_1.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_327_1.svg
@@ -3,13 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792" id="Version_1.0" overflow="visible" version="1.1" viewBox="0 0 612 792" width="612" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g id="frame">
     <polygon fill="#80E0FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
-  </g>
-  <g>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-dasharray="25,15" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_327_1c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_327_1c.svg
index 3878ecc9..7ac66ae2 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_327_1c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_327_1c.svg
@@ -3,13 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792" id="Version_1.0" overflow="visible" version="1.1" viewBox="0 0 612 792" width="612" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g id="frame">
     <polygon fill="#FFA1FF" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5"/>
-  </g>
-  <g>
     <polygon fill="none" points="432.44,323.5 432.44,469.5 306,542.5 179.56,469.5 179.56,323.5 306,250.5" stroke="#000000" stroke-dasharray="25,15" stroke-width="5"/>
   </g>
-  <g display="none" id="octagon">
-    <polygon fill="none" points="305,516.5 218.733,480.768 183,394.5 218.733,308.233 305,272.5 391.268,308.233 427,394.5 391.268,480.768" stroke="#0000FF" stroke-width="2"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="345.7" y2="345.7"/>
-    <line fill="none" stroke="#0000FF" stroke-width="2" x1="202.5" x2="407.5" y1="443.3" y2="443.3"/>
-  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_435_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_435_0.svg
index 639fa95b..c1478b23 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_435_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_435_0.svg
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <polyline fill="#AAFFAA" id="frame_2_" points="438,252 438,540 174,540 174,252" stroke="#000000" stroke-width="5"/>
+  <g id="frame">
+    <polyline fill="#AAFFAA" points="438,252 438,540 174,540 174,252" stroke="#000000" stroke-width="5"/>
+  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_435_0c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_435_0c.svg
index e8351081..479177af 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_435_0c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_435_0c.svg
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <polyline fill="#FFA1FF" id="frame_2_" points="438,252 438,540 174,540 174,252" stroke="#000000" stroke-width="5"/>
+  <g id="frame">
+    <polyline fill="#FFA1FF" points="438,252 438,540 174,540 174,252" stroke="#000000" stroke-width="5"/>
+  </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_435_1.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_435_1.svg
index 22c40023..61015d3d 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_435_1.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_435_1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_2_">
+  <g id="frame">
     <g>
       <polyline fill="#AAFFAA" points="438,252 438,540 174,540 174,252"/>
       <g>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_435_1c.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_435_1c.svg
index c06da3f8..91598fc0 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_435_1c.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_435_1c.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_2_">
+  <g id="frame">
     <g>
       <polyline fill="#FFA1FF" points="438,252 438,540 174,540 174,252"/>
       <g>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_560_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_560_0.svg
index 6172db0b..9e0dba3e 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_560_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_560_0.svg
@@ -3,6 +3,6 @@
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
   <g id="frame">
     <polyline fill="#FF8080" points="306,568 479,395 306,222 133,395 306,568" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-width="5"/>
+    <path d="m 428.75233,341.45796 v 107.5664 l 53.7832,-53.7832 z"/>
   </g>
-  <path d="m 428.75233,341.45796 v 107.5664 l 53.7832,-53.7832 z"/>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_600_0.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_600_0.svg
index f5f1445a..357f8f70 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_600_0.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_600_0.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <polyline fill="#FF8080" id="Group" points="306,568 479,395 306,222 133,395 306,568" stroke="#000000" stroke-linecap="square" stroke-width="5"/>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/0_600_1.svg b/jmsfx-standard/src/main/resources/svg/Frames/0_600_1.svg
index 1177c8c5..4f81742c 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/0_600_1.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/0_600_1.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-  <g id="frame_1_">
+  <g id="frame">
     <g>
       <polyline fill="#FF8080" points="306,568 479,395 306,222 133,395 306,568"/>
       <g>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/1.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/1.svg
index a9f21dd4..bc34ecb3 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/1.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/1.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <text font-family="sans-serif" font-size="72" transform="matrix(1 0 0 1 452.082 269.8145)">X</text>
   </g>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/2.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/2.svg
index 7ef6425d..d3a91450 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/2.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/2.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <text font-family="sans-serif" font-size="72" transform="matrix(1 0 0 1 452.082 269.8145)">S</text>
   </g>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/3.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/3.svg
index d124e8b2..00705099 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/3.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/3.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <path d="M 483.974,318.612 H 371.204 L 427.589,217.62612 Z" fill="#faf183" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="5" style="stroke-dasharray:none;fill:#ffff00;fill-opacity:1"/>
     <g transform="translate(-1.58918,3.118)">
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/4.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/4.svg
index 1d020908..ce528b0e 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/4.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/4.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <circle cx="428.81268" cy="273.2894" r="50.89394" style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-dasharray:none;stroke-opacity:1"/>
     <path d="m 393.21495,237.69166 71.19546,71.19547" style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"/>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/5.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/5.svg
index 8b144fe6..bb65af82 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/5.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/5.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <path d="M 483.974,318.612 H 371.204 L 427.589,217.62612 Z" fill="#faf183" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="5" style="stroke-dasharray:none;fill:#ffff00;fill-opacity:1"/>
     <g transform="translate(-1.58918,3.118)">
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/6.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/6.svg
index 133b65ec..a710cb64 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/6.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/6.svg
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <circle cx="428.81268" cy="273.2894" r="50.89394" style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-dasharray:none;stroke-opacity:1"/>
     <path d="m 393.21495,237.69166 71.19546,71.19547" style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"/>
-  </g>
-  <g id="frame_overlay-3" transform="translate(28,-22)">
-    <text font-family="sans-serif" font-size="72px" transform="translate(452.082,269.8145)">X</text>
+    <g id="frame_overlay-3" transform="translate(28,-22)">
+      <text font-family="sans-serif" font-size="72px" transform="translate(452.082,269.8145)">X</text>
+    </g>
   </g>
 </svg>
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/7.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/7.svg
index aaca25a5..85ddf365 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/7.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/7.svg
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <path d="M 483.974,318.612 H 371.204 L 427.589,217.62612 Z" fill="#faf183" stroke="#000000" stroke-dasharray="5,5" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="5" style="stroke-dasharray:none;fill:#ffff00;fill-opacity:1"/>
     <g transform="translate(-1.58918,3.118)">
diff --git a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/8.svg b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/8.svg
index 2028bea6..f6312d63 100644
--- a/jmsfx-standard/src/main/resources/svg/Frames/Overlay/8.svg
+++ b/jmsfx-standard/src/main/resources/svg/Frames/Overlay/8.svg
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg enable-background="new 0 0 612 792" height="792px" id="Version_1.0" version="1.1" viewBox="0 0 612 792" width="612px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" y="0px">
-  <g display="none" id="octagon">
-    <g display="inline" id="outFrame">
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="306" y1="309.5" y2="273"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="390.5" y1="273" y2="309.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="427" y1="309.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="427" x2="390.5" y1="396" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="390.5" x2="306" y1="482.5" y2="516"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="306" x2="220" y1="516" y2="482.5"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="220" x2="183" y1="482.5" y2="396"/>
-      <line fill="none" stroke="#0000ff" stroke-width="2" x1="183" x2="220" y1="396" y2="309.5"/>
-    </g>
-    <line display="inline" fill="none" id="mod2_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="445.01501" y2="445.295"/>
-    <line display="inline" fill="none" id="mod1_1_" stroke="#0000ff" stroke-width="2" x1="203.966" x2="406.199" y1="346.98499" y2="346.705"/>
-  </g>
   <g id="frame_overlay">
     <circle cx="428.81268" cy="273.2894" r="50.89394" style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-dasharray:none;stroke-opacity:1"/>
     <path d="m 393.21495,237.69166 71.19546,71.19547" style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"/>
-  </g>
-  <g id="frame_overlay-5" transform="translate(22,-20)">
-    <text font-family="sans-serif" font-size="72px" transform="translate(452.082,269.8145)">S</text>
+    <g id="frame_overlay-5" transform="translate(22,-20)">
+      <text font-family="sans-serif" font-size="72px" transform="translate(452.082,269.8145)">S</text>
+    </g>
   </g>
 </svg>