[482528] Add styling support on widgets

Styles are available on :
* the label common to all the widgets (text, label, button, checkbox,
  radio and select);
* text widget;
* label widget.

Bug: 482528
Change-Id: Idc6b2ff994cde33f9b97d6d4fac1eab2b3ffcf7a
Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

170 files changed, 6990 insertions, 591 deletions

diff --git a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
index 482406dca1..53d4895298 100644
--- a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -272,14 +272,69 @@
    
       </description>
    </context>
-   <context id="TextStyle">
+   <context id="TextWidgetStyle">
      <description>
        
        
          
-   <!-- Start of user code TextStyle description -->
+   <!-- Start of user code TextWidgetStyle description -->
    
-   <!-- End of user code TextStyle description -->
+   <!-- End of user code TextWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="LabelWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code LabelWidgetStyle description -->
+   
+   <!-- End of user code LabelWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="CheckboxWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code CheckboxWidgetStyle description -->
+   
+   <!-- End of user code CheckboxWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="RadioWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code RadioWidgetStyle description -->
+   
+   <!-- End of user code RadioWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="ButtonWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code ButtonWidgetStyle description -->
+   
+   <!-- End of user code ButtonWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="SelectWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code SelectWidgetStyle description -->
+   
+   <!-- End of user code SelectWidgetStyle description -->
    
       </description>
    </context>
diff --git a/incubation/org.eclipse.sirius.editor.properties/plugin.xml b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
index e908ea82c9..ede3fe4445 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -19,43 +19,121 @@
   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
     <propertySections contributorId="org.eclipse.sirius.editor.editorPlugin.SiriusEditorContributor">
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontFormatPropertySection"
-               id="properties.section.textStyle.FontFormat"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontFormatFilter"
-               afterSection="properties.section.textStyle.ForegroundColor"
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleFontFormatPropertySection"
+               id="properties.section.labelWidgetStyle.FontFormat"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleFontFormatFilter"
+               afterSection="properties.section.labelWidgetStyle.ForegroundColor"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.TextStyle"/>
+        <input type="org.eclipse.sirius.properties.LabelWidgetStyle"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleForegroundColorPropertySection"
-               id="properties.section.textStyle.ForegroundColor"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleForegroundColorFilter"
-               afterSection="properties.section.textStyle.BackgroundColor"
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleForegroundColorPropertySection"
+               id="properties.section.labelWidgetStyle.ForegroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleForegroundColorFilter"
+               afterSection="properties.section.labelWidgetStyle.BackgroundColor"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.TextStyle"/>
+        <input type="org.eclipse.sirius.properties.LabelWidgetStyle"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleBackgroundColorPropertySection"
-               id="properties.section.textStyle.BackgroundColor"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleBackgroundColorFilter"
-               afterSection="properties.section.textStyle.FontSize"
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleBackgroundColorPropertySection"
+               id="properties.section.labelWidgetStyle.BackgroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleBackgroundColorFilter"
+               afterSection="properties.section.labelWidgetStyle.FontSize"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.TextStyle"/>
+        <input type="org.eclipse.sirius.properties.LabelWidgetStyle"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontSizePropertySection"
-               id="properties.section.textStyle.FontSize"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontSizeFilter"
-               afterSection="properties.section.textStyle.FontNameExpression"
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleFontSizePropertySection"
+               id="properties.section.labelWidgetStyle.FontSize"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleFontSizeFilter"
+               afterSection="properties.section.labelWidgetStyle.FontNameExpression"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.TextStyle"/>
+        <input type="org.eclipse.sirius.properties.LabelWidgetStyle"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontNameExpressionPropertySection"
-               id="properties.section.textStyle.FontNameExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontNameExpressionFilter"
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleFontNameExpressionPropertySection"
+               id="properties.section.labelWidgetStyle.FontNameExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleFontNameExpressionFilter"
                 tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.TextStyle"/>
+        <input type="org.eclipse.sirius.properties.LabelWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle.TextWidgetStyleFontFormatPropertySection"
+               id="properties.section.textWidgetStyle.FontFormat"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle.TextWidgetStyleFontFormatFilter"
+               afterSection="properties.section.textWidgetStyle.ForegroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle.TextWidgetStyleForegroundColorPropertySection"
+               id="properties.section.textWidgetStyle.ForegroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle.TextWidgetStyleForegroundColorFilter"
+               afterSection="properties.section.textWidgetStyle.BackgroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle.TextWidgetStyleBackgroundColorPropertySection"
+               id="properties.section.textWidgetStyle.BackgroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle.TextWidgetStyleBackgroundColorFilter"
+               afterSection="properties.section.textWidgetStyle.FontSize"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle.TextWidgetStyleFontSizePropertySection"
+               id="properties.section.textWidgetStyle.FontSize"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle.TextWidgetStyleFontSizeFilter"
+               afterSection="properties.section.textWidgetStyle.FontNameExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle.TextWidgetStyleFontNameExpressionPropertySection"
+               id="properties.section.textWidgetStyle.FontNameExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle.TextWidgetStyleFontNameExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextWidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle.WidgetStyleLabelFontFormatPropertySection"
+               id="properties.section.widgetStyle.LabelFontFormat"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle.WidgetStyleLabelFontFormatFilter"
+               afterSection="properties.section.widgetStyle.LabelForegroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle.WidgetStyleLabelForegroundColorPropertySection"
+               id="properties.section.widgetStyle.LabelForegroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle.WidgetStyleLabelForegroundColorFilter"
+               afterSection="properties.section.widgetStyle.LabelBackgroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle.WidgetStyleLabelBackgroundColorPropertySection"
+               id="properties.section.widgetStyle.LabelBackgroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle.WidgetStyleLabelBackgroundColorFilter"
+               afterSection="properties.section.widgetStyle.LabelFontSize"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle.WidgetStyleLabelFontSizePropertySection"
+               id="properties.section.widgetStyle.LabelFontSize"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle.WidgetStyleLabelFontSizeFilter"
+               afterSection="properties.section.widgetStyle.LabelFontNameExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle.WidgetStyleLabelFontNameExpressionPropertySection"
+               id="properties.section.widgetStyle.LabelFontNameExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle.WidgetStyleLabelFontNameExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetStyle"/>
       </propertySection>
   	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.customoperation.CustomOperationIdentifierPropertySection"
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorFilter.java
new file mode 100644
index 0000000000..fdc9778664
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the backgroundColor property section.
+ */
+public class LabelWidgetStyleBackgroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_BackgroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.LabelWidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontFormatFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontFormatFilter.java
new file mode 100644
index 0000000000..92091f6a4e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontFormatFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the fontFormat property section.
+ */
+public class LabelWidgetStyleFontFormatFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontFormat();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.LabelWidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionFilter.java
new file mode 100644
index 0000000000..801f4ce1c1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the fontNameExpression property section.
+ */
+public class LabelWidgetStyleFontNameExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontNameExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.LabelWidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontSizeFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontSizeFilter.java
new file mode 100644
index 0000000000..64e5df2c50
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleFontSizeFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the fontSize property section.
+ */
+public class LabelWidgetStyleFontSizeFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontSize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.LabelWidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorFilter.java
new file mode 100644
index 0000000000..f16fe513d1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the foregroundColor property section.
+ */
+public class LabelWidgetStyleForegroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_ForegroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.LabelWidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleBackgroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleBackgroundColorFilter.java
index 6c35e2cc1b..24a1fb66fb 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleBackgroundColorFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleBackgroundColorFilter.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle;
 
 // Start of user code specific imports
 
@@ -20,14 +20,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 /**
  * A filter for the backgroundColor property section.
  */
-public class TextStyleBackgroundColorFilter extends ViewpointPropertyFilter {
+public class TextWidgetStyleBackgroundColorFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_BackgroundColor();
     }
 
     /**
@@ -35,7 +35,7 @@ public class TextStyleBackgroundColorFilter extends ViewpointPropertyFilter {
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+        return arg0 instanceof org.eclipse.sirius.properties.TextWidgetStyle;
     }
 
     // Start of user code user methods
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontFormatFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontFormatFilter.java
index 9222c0f5c0..2ef0c1b88c 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontFormatFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontFormatFilter.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle;
 
 // Start of user code specific imports
 
@@ -20,14 +20,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 /**
  * A filter for the fontFormat property section.
  */
-public class TextStyleFontFormatFilter extends ViewpointPropertyFilter {
+public class TextWidgetStyleFontFormatFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontFormat();
     }
 
     /**
@@ -35,7 +35,7 @@ public class TextStyleFontFormatFilter extends ViewpointPropertyFilter {
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+        return arg0 instanceof org.eclipse.sirius.properties.TextWidgetStyle;
     }
 
     // Start of user code user methods
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontNameExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontNameExpressionFilter.java
index 394052c186..7667e012f3 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontNameExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontNameExpressionFilter.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle;
 
 // Start of user code specific imports
 
@@ -20,14 +20,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 /**
  * A filter for the fontNameExpression property section.
  */
-public class TextStyleFontNameExpressionFilter extends ViewpointPropertyFilter {
+public class TextWidgetStyleFontNameExpressionFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontNameExpression();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontNameExpression();
     }
 
     /**
@@ -35,7 +35,7 @@ public class TextStyleFontNameExpressionFilter extends ViewpointPropertyFilter {
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+        return arg0 instanceof org.eclipse.sirius.properties.TextWidgetStyle;
     }
 
     // Start of user code user methods
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontSizeFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontSizeFilter.java
index f39462a0b1..31ee94fb78 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontSizeFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleFontSizeFilter.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle;
 
 // Start of user code specific imports
 
@@ -20,14 +20,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 /**
  * A filter for the fontSize property section.
  */
-public class TextStyleFontSizeFilter extends ViewpointPropertyFilter {
+public class TextWidgetStyleFontSizeFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontSize();
     }
 
     /**
@@ -35,7 +35,7 @@ public class TextStyleFontSizeFilter extends ViewpointPropertyFilter {
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+        return arg0 instanceof org.eclipse.sirius.properties.TextWidgetStyle;
     }
 
     // Start of user code user methods
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleForegroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleForegroundColorFilter.java
index df99b9ae0c..e692a38f8c 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleForegroundColorFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textwidgetstyle/TextWidgetStyleForegroundColorFilter.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.filters.properties.textwidgetstyle;
 
 // Start of user code specific imports
 
@@ -20,14 +20,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
 /**
  * A filter for the foregroundColor property section.
  */
-public class TextStyleForegroundColorFilter extends ViewpointPropertyFilter {
+public class TextWidgetStyleForegroundColorFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_ForegroundColor();
     }
 
     /**
@@ -35,7 +35,7 @@ public class TextStyleForegroundColorFilter extends ViewpointPropertyFilter {
      */
     @Override
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+        return arg0 instanceof org.eclipse.sirius.properties.TextWidgetStyle;
     }
 
     // Start of user code user methods
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelBackgroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelBackgroundColorFilter.java
new file mode 100644
index 0000000000..b6b4760c1d
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelBackgroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the labelBackgroundColor property section.
+ */
+public class WidgetStyleLabelBackgroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelBackgroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontFormatFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontFormatFilter.java
new file mode 100644
index 0000000000..8ea35cfad0
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontFormatFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the labelFontFormat property section.
+ */
+public class WidgetStyleLabelFontFormatFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontFormat();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontNameExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontNameExpressionFilter.java
new file mode 100644
index 0000000000..9b01b86ae1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontNameExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the labelFontNameExpression property section.
+ */
+public class WidgetStyleLabelFontNameExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontNameExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontSizeFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontSizeFilter.java
new file mode 100644
index 0000000000..213ac81f61
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelFontSizeFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the labelFontSize property section.
+ */
+public class WidgetStyleLabelFontSizeFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontSize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelForegroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelForegroundColorFilter.java
new file mode 100644
index 0000000000..f093b1b9ca
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetstyle/WidgetStyleLabelForegroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.widgetstyle;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the labelForegroundColor property section.
+ */
+public class WidgetStyleLabelForegroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelForegroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
index b5fe608515..914d4dd69b 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.buttondescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
index 438a192f93..9c09225735 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.checkboxdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
index c4e481b5ce..ced35f9b88 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.containerdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionCustomExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionCustomExpressionPropertySection.java
index f536a50e86..7d09b6ce44 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionCustomExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionCustomExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.customexpression;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionIdentifierPropertySection.java
index c8f21778bd..0e501d0856 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customexpression/CustomExpressionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.customexpression;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customoperation/CustomOperationIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customoperation/CustomOperationIdentifierPropertySection.java
index 2592941258..e60d7ba229 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customoperation/CustomOperationIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/customoperation/CustomOperationIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.customoperation;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
index 11090e9e7e..270d6576e4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingfor;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
index 5d1e4d93bd..e2a79e77b0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingfor;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingif/DynamicMappingIfPredicateExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingif/DynamicMappingIfPredicateExpressionPropertySection.java
index e86daee9c6..40ac7243c0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingif/DynamicMappingIfPredicateExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingif/DynamicMappingIfPredicateExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingif;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
index 1824d8221d..b2b99ca191 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.groupdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
index b388154f5f..de98966c46 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.groupdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
index e6e3ad4250..62f36a022a 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.groupdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
index b263721a15..40cde93996 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.groupdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labeldescription/LabelDescriptionBodyExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labeldescription/LabelDescriptionBodyExpressionPropertySection.java
index b3ff3c5369..4c63f1ff2e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labeldescription/LabelDescriptionBodyExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labeldescription/LabelDescriptionBodyExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.labeldescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorPropertySection.java
new file mode 100644
index 0000000000..02a35cfb59
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleBackgroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the backgroundColor property of a LabelWidgetStyle object.
+ */
+public class LabelWidgetStyleBackgroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "BackgroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_BackgroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontFormatPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontFormatPropertySection.java
new file mode 100644
index 0000000000..58029404c8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontFormatPropertySection.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the fontFormat property of a LabelWidgetStyle object.
+ */
+public class LabelWidgetStyleFontFormatPropertySection extends AbstractEditorDialogPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontFormat"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontFormat();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String string = new String();
+
+        if (eObject.eGet(getFeature()) != null) {
+            List<?> values = (List<?>) eObject.eGet(getFeature());
+            for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
+                string += getAdapterFactoryLabelProvider().getText(iterator.next());
+                if (iterator.hasNext()) {
+                    string += ", ";
+                }
+            }
+        }
+
+        return string;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(List)
+     */
+    @Override
+    protected boolean isEqual(List<?> newList) {
+        return newList.equals(eObject.eGet(getFeature()));
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getEnumerationFeatureValues()
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        return FontFormat.VALUES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionPropertySection.java
new file mode 100644
index 0000000000..7a4426f5aa
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontNameExpressionPropertySection.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the fontNameExpression property of a LabelWidgetStyle object.
+ */
+public class LabelWidgetStyleFontNameExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontNameExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    @Override
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontNameExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), LabelWidgetStyleFontNameExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontSizePropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontSizePropertySection.java
new file mode 100644
index 0000000000..e520ede0bf
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleFontSizePropertySection.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractSpinnerPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the fontSize property of a LabelWidgetStyle object.
+ */
+public class LabelWidgetStyleFontSizePropertySection extends AbstractSpinnerPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontSize"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontSize();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureAsInteger()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String value = new String();
+        if (eObject.eGet(getFeature()) != null) {
+            value = toInteger(eObject.eGet(getFeature()).toString()).toString();
+        }
+        return value;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toInteger(newText) != null) {
+            equal = getFeatureAsText().equals(toInteger(newText).toString());
+        } else {
+            refresh();
+        }
+        return equal;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return toInteger(newText);
+    }
+
+    /**
+     * Converts the given text to the integer it represents if applicable.
+     *
+     * @return The integer the given text represents if applicable,
+     *         <code>null</code> otherwise.
+     */
+    private Integer toInteger(String text) {
+        Integer integerValue = null;
+        try {
+            integerValue = new Integer(text);
+        } catch (NumberFormatException e) {
+            // Not a Integer
+        }
+        return integerValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorPropertySection.java
new file mode 100644
index 0000000000..dd4f893260
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/labelwidgetstyle/LabelWidgetStyleForegroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the foregroundColor property of a LabelWidgetStyle object.
+ */
+public class LabelWidgetStyleForegroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "ForegroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getLabelWidgetStyle_ForegroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionDisplayExpressionPropertySection.java
index 1419a4521a..fe87b558de 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionDisplayExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionDisplayExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.multiplereferencesdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionValueExpressionPropertySection.java
index 055a36e35b..6cfd232630 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/multiplereferencesdescription/MultipleReferencesDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.multiplereferencesdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
index a172b08a22..63b7bfc7f6 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.pagedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
index 4b2d9251ff..6316700d9e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.pagedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
index f7734347c0..0693791ca5 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.pagedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
index 639fb49406..25605333c4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.pagedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java
index d9a9e83910..6eb63af182 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java
index f3c8760a4d..bdbfbe7235 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java
index 6c23e4b0ea..9482066009 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
index 08d7026854..d05d704cd0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
index 65fe647112..9ed600528c 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
index 10ea2a85ac..d4976b8239 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionDisplayExpressionPropertySection.java
index 8b77c7dc40..40a899de13 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionDisplayExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionDisplayExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.singlereferencedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionValueExpressionPropertySection.java
index 39d84d357e..9772ae5d6d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/singlereferencedescription/SingleReferenceDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.singlereferencedescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
index 242eba1947..4b06034a70 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.textdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleBackgroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleBackgroundColorPropertySection.java
index ae5a10ffb8..61a673e7a4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleBackgroundColorPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleBackgroundColorPropertySection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle;
 
 // Start of user code imports
 
@@ -26,9 +26,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 // End of user code imports
 
 /**
- * A section for the backgroundColor property of a TextStyle object.
+ * A section for the backgroundColor property of a TextWidgetStyle object.
  */
-public class TextStyleBackgroundColorPropertySection extends AbstractComboPropertySection {
+public class TextWidgetStyleBackgroundColorPropertySection extends AbstractComboPropertySection {
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
      */
@@ -55,7 +55,7 @@ public class TextStyleBackgroundColorPropertySection extends AbstractComboProper
      */
     @Override
     protected EReference getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_BackgroundColor();
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontFormatPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontFormatPropertySection.java
index 27c7a965a5..45a5283c6f 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontFormatPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontFormatPropertySection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle;
 
 import java.util.Iterator;
 import java.util.List;
@@ -20,9 +20,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
 /**
- * A section for the fontFormat property of a TextStyle object.
+ * A section for the fontFormat property of a TextWidgetStyle object.
  */
-public class TextStyleFontFormatPropertySection extends AbstractEditorDialogPropertySection {
+public class TextWidgetStyleFontFormatPropertySection extends AbstractEditorDialogPropertySection {
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
      */
@@ -49,7 +49,7 @@ public class TextStyleFontFormatPropertySection extends AbstractEditorDialogProp
      */
     @Override
     protected EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontFormat();
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontNameExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontNameExpressionPropertySection.java
index 2a7eb85761..f9240c23a4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontNameExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontNameExpressionPropertySection.java
@@ -7,9 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle;
-
-// Start of user code imports
+package org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
@@ -27,9 +25,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 // End of user code imports
 
 /**
- * A section for the fontNameExpression property of a TextStyle object.
+ * A section for the fontNameExpression property of a TextWidgetStyle object.
  */
-public class TextStyleFontNameExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+public class TextWidgetStyleFontNameExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
 
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
@@ -57,7 +55,7 @@ public class TextStyleFontNameExpressionPropertySection extends AbstractTextWith
      */
     @Override
     public EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontNameExpression();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontNameExpression();
     }
 
     /**
@@ -100,7 +98,7 @@ public class TextStyleFontNameExpressionPropertySection extends AbstractTextWith
         return new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), TextStyleFontNameExpressionPropertySection.this, text.getText());
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), TextWidgetStyleFontNameExpressionPropertySection.this, text.getText());
                 dialog.open();
                 text.setText(dialog.getResult());
                 handleTextModified();
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontSizePropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontSizePropertySection.java
index 7fedfef826..b9bf786698 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontSizePropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleFontSizePropertySection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractSpinnerPropertySection;
@@ -16,9 +16,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
 /**
- * A section for the fontSize property of a TextStyle object.
+ * A section for the fontSize property of a TextWidgetStyle object.
  */
-public class TextStyleFontSizePropertySection extends AbstractSpinnerPropertySection {
+public class TextWidgetStyleFontSizePropertySection extends AbstractSpinnerPropertySection {
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
      */
@@ -45,7 +45,7 @@ public class TextStyleFontSizePropertySection extends AbstractSpinnerPropertySec
      */
     @Override
     protected EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontSize();
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleForegroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleForegroundColorPropertySection.java
index 1b365fe567..54798a12df 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleForegroundColorPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textwidgetstyle/TextWidgetStyleForegroundColorPropertySection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle;
+package org.eclipse.sirius.properties.editor.properties.sections.properties.textwidgetstyle;
 
 // Start of user code imports
 
@@ -26,9 +26,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 // End of user code imports
 
 /**
- * A section for the foregroundColor property of a TextStyle object.
+ * A section for the foregroundColor property of a TextWidgetStyle object.
  */
-public class TextStyleForegroundColorPropertySection extends AbstractComboPropertySection {
+public class TextWidgetStyleForegroundColorPropertySection extends AbstractComboPropertySection {
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
      */
@@ -55,7 +55,7 @@ public class TextStyleForegroundColorPropertySection extends AbstractComboProper
      */
     @Override
     protected EReference getFeature() {
-        return PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+        return PropertiesPackage.eINSTANCE.getTextWidgetStyle_ForegroundColor();
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
index 3a4f94cb3e..37a5d6b21f 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.viewextensiondescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionHelpExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionHelpExpressionPropertySection.java
index 835c542cec..17eeca40c9 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionHelpExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionHelpExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
index a66820c087..d4e7b42075 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
index 63ab46459d..a00ebdac52 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
@@ -9,8 +9,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetdescription;
 
-// Start of user code imports
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelBackgroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelBackgroundColorPropertySection.java
new file mode 100644
index 0000000000..14d6402cbf
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelBackgroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the labelBackgroundColor property of a WidgetStyle object.
+ */
+public class WidgetStyleLabelBackgroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "LabelBackgroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelBackgroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontFormatPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontFormatPropertySection.java
new file mode 100644
index 0000000000..0d54a64967
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontFormatPropertySection.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the labelFontFormat property of a WidgetStyle object.
+ */
+public class WidgetStyleLabelFontFormatPropertySection extends AbstractEditorDialogPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "LabelFontFormat"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontFormat();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String string = new String();
+
+        if (eObject.eGet(getFeature()) != null) {
+            List<?> values = (List<?>) eObject.eGet(getFeature());
+            for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
+                string += getAdapterFactoryLabelProvider().getText(iterator.next());
+                if (iterator.hasNext()) {
+                    string += ", ";
+                }
+            }
+        }
+
+        return string;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(List)
+     */
+    @Override
+    protected boolean isEqual(List<?> newList) {
+        return newList.equals(eObject.eGet(getFeature()));
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getEnumerationFeatureValues()
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        return FontFormat.VALUES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontNameExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontNameExpressionPropertySection.java
new file mode 100644
index 0000000000..7833784da8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontNameExpressionPropertySection.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the labelFontNameExpression property of a WidgetStyle object.
+ */
+public class WidgetStyleLabelFontNameExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "LabelFontNameExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    @Override
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontNameExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), WidgetStyleLabelFontNameExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontSizePropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontSizePropertySection.java
new file mode 100644
index 0000000000..7a5d4d40e1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelFontSizePropertySection.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractSpinnerPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the labelFontSize property of a WidgetStyle object.
+ */
+public class WidgetStyleLabelFontSizePropertySection extends AbstractSpinnerPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "LabelFontSize"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontSize();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureAsInteger()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String value = new String();
+        if (eObject.eGet(getFeature()) != null) {
+            value = toInteger(eObject.eGet(getFeature()).toString()).toString();
+        }
+        return value;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toInteger(newText) != null) {
+            equal = getFeatureAsText().equals(toInteger(newText).toString());
+        } else {
+            refresh();
+        }
+        return equal;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return toInteger(newText);
+    }
+
+    /**
+     * Converts the given text to the integer it represents if applicable.
+     *
+     * @return The integer the given text represents if applicable,
+     *         <code>null</code> otherwise.
+     */
+    private Integer toInteger(String text) {
+        Integer integerValue = null;
+        try {
+            integerValue = new Integer(text);
+        } catch (NumberFormatException e) {
+            // Not a Integer
+        }
+        return integerValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelForegroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelForegroundColorPropertySection.java
new file mode 100644
index 0000000000..44ed2ae4dc
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetstyle/WidgetStyleLabelForegroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.widgetstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the labelForegroundColor property of a WidgetStyle object.
+ */
+public class WidgetStyleLabelForegroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "LabelForegroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetStyle_LabelForegroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonWidgetStyle.gif
new file mode 100644
index 0000000000..739ebbfa6a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetStyle.gif
new file mode 100644
index 0000000000..30f0c48da8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetStyle.gif
new file mode 100644
index 0000000000..498364f1c1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetStyle.gif
new file mode 100644
index 0000000000..89ad5da38a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetStyle.gif
new file mode 100644
index 0000000000..b1f8afa476
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif
deleted file mode 100644
index 904159880b..0000000000
--- a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif
+++ /dev/null
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetStyle.gif
new file mode 100644
index 0000000000..10d222998a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index d5669d7635..ff40f46c18 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -138,3 +138,29 @@ _UI_TextStyle_fontSize_feature = Font Size
 _UI_TextStyle_backgroundColor_feature = Background Color
 _UI_TextStyle_foregroundColor_feature = Foreground Color
 _UI_TextStyle_fontFormat_feature = Font Format
+_UI_LabelDescription_style_feature = Style
+_UI_TextWidgetStyle_type = Text Widget Style
+_UI_LabelWidgetStyle_type = Label Widget Style
+_UI_WidgetStyle_labelFontNameExpression_feature = Label Font Name Expression
+_UI_WidgetStyle_labelFontSize_feature = Label Font Size
+_UI_WidgetStyle_labelBackgroundColor_feature = Label Background Color
+_UI_WidgetStyle_labelForegroundColor_feature = Label Foreground Color
+_UI_WidgetStyle_labelFontFormat_feature = Label Font Format
+_UI_TextWidgetStyle_fontNameExpression_feature = Font Name Expression
+_UI_TextWidgetStyle_fontSize_feature = Font Size
+_UI_TextWidgetStyle_backgroundColor_feature = Background Color
+_UI_TextWidgetStyle_foregroundColor_feature = Foreground Color
+_UI_TextWidgetStyle_fontFormat_feature = Font Format
+_UI_LabelWidgetStyle_fontNameExpression_feature = Font Name Expression
+_UI_LabelWidgetStyle_fontSize_feature = Font Size
+_UI_LabelWidgetStyle_backgroundColor_feature = Background Color
+_UI_LabelWidgetStyle_foregroundColor_feature = Foreground Color
+_UI_LabelWidgetStyle_fontFormat_feature = Font Format
+_UI_CheckboxWidgetStyle_type = Checkbox Widget Style
+_UI_RadioWidgetStyle_type = Radio Widget Style
+_UI_ButtonWidgetStyle_type = Button Widget Style
+_UI_SelectWidgetStyle_type = Select Widget Style
+_UI_ButtonDescription_style_feature = Style
+_UI_CheckboxDescription_style_feature = Style
+_UI_SelectDescription_style_feature = Style
+_UI_RadioDescription_style_feature = Style
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
index 4f635dc525..349d9006a5 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
@@ -87,6 +88,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.BUTTON_DESCRIPTION__INITIAL_OPERATION);
+            childrenFeatures.add(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE);
         }
         return childrenFeatures;
     }
@@ -145,6 +147,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -163,6 +166,8 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createButtonWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..9f359e35e6
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.ButtonWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ButtonWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ButtonWidgetStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This returns ButtonWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ButtonWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetStyle_type") : getString("_UI_ButtonWidgetStyle_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
index 937edbd578..a9c002d326 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
@@ -66,10 +67,10 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CheckboxDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"),
-                PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CheckboxDescription_valueExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"),
+                        PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -87,6 +88,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
+            childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE);
         }
         return childrenFeatures;
     }
@@ -145,6 +147,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -163,6 +166,8 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..dd099cfd61
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.CheckboxWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CheckboxWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public CheckboxWidgetStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This returns CheckboxWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CheckboxWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((CheckboxWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetStyle_type") : getString("_UI_CheckboxWidgetStyle_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index e40a613309..39fd3993f7 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class ContainerDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class ContainerDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -74,10 +74,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ContainerDescription_identifier_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
-                PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ContainerDescription_identifier_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
+                        PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
index 035f6d5c53..659df0eebf 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
@@ -37,8 +37,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class CustomExpressionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class CustomExpressionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -85,10 +85,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addCustomExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_CustomExpression_customExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_customExpression_feature", "_UI_CustomExpression_type"),
-                PropertiesPackage.Literals.CUSTOM_EXPRESSION__CUSTOM_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_CustomExpression_customExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_CustomExpression_customExpression_feature", "_UI_CustomExpression_type"),
+                        PropertiesPackage.Literals.CUSTOM_EXPRESSION__CUSTOM_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
index 832d285c99..0a6ad7cfff 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  *
  * @generated
  */
-public class CustomOperationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class CustomOperationItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
index fd2203e548..ab5f633987 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class DynamicMappingForItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class DynamicMappingForItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
index f764c1d746..3d1f7eb0e8 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class DynamicMappingIfItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class DynamicMappingIfItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -74,10 +74,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_DynamicMappingIf_predicateExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingIf_predicateExpression_feature", "_UI_DynamicMappingIf_type"),
-                PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DynamicMappingIf_predicateExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingIf_predicateExpression_feature", "_UI_DynamicMappingIf_type"),
+                        PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index 441070c215..97d71145f1 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class GroupDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class GroupDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -90,8 +90,7 @@ IItemPropertySource {
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_GroupDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
+                getString("_UI_GroupDescription_labelExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
                 PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
index 0468968a32..4b222cc911 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
@@ -38,8 +38,8 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  *
  * @generated
  */
-public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -154,10 +154,10 @@ IItemPropertySource {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors
-        .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule()));
+                .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule()));
 
         newChildDescriptors
-        .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__PROPERTY_VALIDATION_RULES, PropertiesFactory.eINSTANCE.createPropertyValidationRule()));
+                .add(createChildParameter(PropertiesPackage.Literals.GROUP_VALIDATION_SET_DESCRIPTION__PROPERTY_VALIDATION_RULES, PropertiesFactory.eINSTANCE.createPropertyValidationRule()));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index ac10f3bef8..fa9b5b635a 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
@@ -16,11 +16,13 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
@@ -70,6 +72,39 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
      * This returns LabelDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -108,6 +143,9 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
         case PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
         }
         super.notifyChanged(notification);
     }
@@ -122,6 +160,8 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createLabelWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..c897d33099
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java
@@ -0,0 +1,182 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.LabelWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public LabelWidgetStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+            addFontNameExpressionPropertyDescriptor(object);
+            addFontSizePropertyDescriptor(object);
+            addBackgroundColorPropertyDescriptor(object);
+            addForegroundColorPropertyDescriptor(object);
+            addFontFormatPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Font Name Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontNameExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_LabelWidgetStyle_fontNameExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_LabelWidgetStyle_fontNameExpression_feature", "_UI_LabelWidgetStyle_type"),
+                        PropertiesPackage.Literals.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Font Size feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontSizePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_LabelWidgetStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelWidgetStyle_fontSize_feature", "_UI_LabelWidgetStyle_type"),
+                PropertiesPackage.Literals.LABEL_WIDGET_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Background Color feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addBackgroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_LabelWidgetStyle_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelWidgetStyle_backgroundColor_feature", "_UI_LabelWidgetStyle_type"),
+                PropertiesPackage.Literals.LABEL_WIDGET_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Foreground Color feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addForegroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_LabelWidgetStyle_foregroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelWidgetStyle_foregroundColor_feature", "_UI_LabelWidgetStyle_type"),
+                PropertiesPackage.Literals.LABEL_WIDGET_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Font Format feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontFormatPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_LabelWidgetStyle_fontFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_LabelWidgetStyle_fontFormat_feature", "_UI_LabelWidgetStyle_type"),
+                PropertiesPackage.Literals.LABEL_WIDGET_STYLE__FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This returns LabelWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((LabelWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_LabelWidgetStyle_type") : getString("_UI_LabelWidgetStyle_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+
+        switch (notification.getFeatureID(LabelWidgetStyle.class)) {
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE:
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
index 935cd4814e..422be9c46d 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
@@ -37,8 +37,8 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  *
  * @generated
  */
-public class OperationDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class OperationDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
index b839d2be75..aba670ea39 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  *
  * @generated
  */
-public class PageDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class PageDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
index 54cabeba36..51e3fc3636 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
@@ -37,8 +37,8 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  *
  * @generated
  */
-public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -151,7 +151,7 @@ IItemPropertySource {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors
-        .add(createChildParameter(PropertiesPackage.Literals.PAGE_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule()));
+                .add(createChildParameter(PropertiesPackage.Literals.PAGE_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES, ValidationFactory.eINSTANCE.createSemanticValidationRule()));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 256203ad97..b810310280 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -671,27 +671,152 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.TextStyle} instances. <!--
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
-    protected TextStyleItemProvider textStyleItemProvider;
+    protected TextWidgetStyleItemProvider textWidgetStyleItemProvider;
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.TextStyle}. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createTextWidgetStyleAdapter() {
+        if (textWidgetStyleItemProvider == null) {
+            textWidgetStyleItemProvider = new TextWidgetStyleItemProvider(this);
+        }
+
+        return textWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected LabelWidgetStyleItemProvider labelWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createLabelWidgetStyleAdapter() {
+        if (labelWidgetStyleItemProvider == null) {
+            labelWidgetStyleItemProvider = new LabelWidgetStyleItemProvider(this);
+        }
+
+        return labelWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CheckboxWidgetStyleItemProvider checkboxWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createCheckboxWidgetStyleAdapter() {
+        if (checkboxWidgetStyleItemProvider == null) {
+            checkboxWidgetStyleItemProvider = new CheckboxWidgetStyleItemProvider(this);
+        }
+
+        return checkboxWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.RadioWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected RadioWidgetStyleItemProvider radioWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.RadioWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createRadioWidgetStyleAdapter() {
+        if (radioWidgetStyleItemProvider == null) {
+            radioWidgetStyleItemProvider = new RadioWidgetStyleItemProvider(this);
+        }
+
+        return radioWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.ButtonWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected ButtonWidgetStyleItemProvider buttonWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.ButtonWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createButtonWidgetStyleAdapter() {
+        if (buttonWidgetStyleItemProvider == null) {
+            buttonWidgetStyleItemProvider = new ButtonWidgetStyleItemProvider(this);
+        }
+
+        return buttonWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.SelectWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected SelectWidgetStyleItemProvider selectWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.SelectWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
     @Override
-    public Adapter createTextStyleAdapter() {
-        if (textStyleItemProvider == null) {
-            textStyleItemProvider = new TextStyleItemProvider(this);
+    public Adapter createSelectWidgetStyleAdapter() {
+        if (selectWidgetStyleItemProvider == null) {
+            selectWidgetStyleItemProvider = new SelectWidgetStyleItemProvider(this);
         }
 
-        return textStyleItemProvider;
+        return selectWidgetStyleItemProvider;
     }
 
     /**
@@ -867,8 +992,23 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (widgetStyleItemProvider != null) {
             widgetStyleItemProvider.dispose();
         }
-        if (textStyleItemProvider != null) {
-            textStyleItemProvider.dispose();
+        if (textWidgetStyleItemProvider != null) {
+            textWidgetStyleItemProvider.dispose();
+        }
+        if (labelWidgetStyleItemProvider != null) {
+            labelWidgetStyleItemProvider.dispose();
+        }
+        if (checkboxWidgetStyleItemProvider != null) {
+            checkboxWidgetStyleItemProvider.dispose();
+        }
+        if (radioWidgetStyleItemProvider != null) {
+            radioWidgetStyleItemProvider.dispose();
+        }
+        if (buttonWidgetStyleItemProvider != null) {
+            buttonWidgetStyleItemProvider.dispose();
+        }
+        if (selectWidgetStyleItemProvider != null) {
+            selectWidgetStyleItemProvider.dispose();
         }
     }
 
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
index d2ca6eeb4f..571662f381 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
@@ -64,10 +64,10 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
      * @generated
      */
     protected void addTargetsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_PropertyValidationRule_targets_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_PropertyValidationRule_targets_feature", "_UI_PropertyValidationRule_type"),
-                PropertiesPackage.Literals.PROPERTY_VALIDATION_RULE__TARGETS, true, false, true, null, null, null));
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertyValidationRule_targets_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_PropertyValidationRule_targets_feature", "_UI_PropertyValidationRule_type"),
+                        PropertiesPackage.Literals.PROPERTY_VALIDATION_RULE__TARGETS, true, false, true, null, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
index af76c16779..06861afd28 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -69,8 +70,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RadioDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_valueExpression_feature", "_UI_RadioDescription_type"),
+                getString("_UI_RadioDescription_valueExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_valueExpression_feature", "_UI_RadioDescription_type"),
                 PropertiesPackage.Literals.RADIO_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
@@ -81,10 +81,10 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_RadioDescription_candidatesExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidatesExpression_feature", "_UI_RadioDescription_type"),
-                PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RadioDescription_candidatesExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidatesExpression_feature", "_UI_RadioDescription_type"),
+                        PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -115,6 +115,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION);
+            childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE);
         }
         return childrenFeatures;
     }
@@ -175,6 +176,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -193,6 +195,8 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createRadioWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..7f6cc82e33
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.RadioWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RadioWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public RadioWidgetStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This returns RadioWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RadioWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_RadioWidgetStyle_type") : getString("_UI_RadioWidgetStyle_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
index 16f2c84a3c..1ab2828f9b 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -68,10 +69,10 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectDescription_valueExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"),
-                PropertiesPackage.Literals.SELECT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SelectDescription_valueExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"),
+                        PropertiesPackage.Literals.SELECT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -115,6 +116,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION);
+            childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE);
         }
         return childrenFeatures;
     }
@@ -175,6 +177,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -193,6 +196,8 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createSelectWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..4502626603
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.SelectWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SelectWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public SelectWidgetStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This returns SelectWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((SelectWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_SelectWidgetStyle_type") : getString("_UI_SelectWidgetStyle_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
index 381c635862..bfca101561 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
@@ -205,8 +205,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
         Object childObject = child;
 
         boolean qualify = childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__CREATE_OPERATION
-                || childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION
-                || childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__UNSET_OPERATION
+                || childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION || childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__UNSET_OPERATION
                 || childFeature == PropertiesPackage.Literals.SINGLE_REFERENCE_DESCRIPTION__ON_CLICK_OPERATION;
 
         if (qualify) {
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index 88ed7b7075..5017a951ac 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -166,7 +166,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextStyle()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextWidgetStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java
index 1d22cadf2b..570d365daf 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextStyleItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java
@@ -21,23 +21,23 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.TextStyle} object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * {@link org.eclipse.sirius.properties.TextWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
  *
  * @generated
  */
-public class TextStyleItemProvider extends WidgetStyleItemProvider {
+public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
-    public TextStyleItemProvider(AdapterFactory adapterFactory) {
+    public TextWidgetStyleItemProvider(AdapterFactory adapterFactory) {
         super(adapterFactory);
     }
 
@@ -68,9 +68,10 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      * @generated
      */
     protected void addFontNameExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextStyle_fontNameExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontNameExpression_feature", "_UI_TextStyle_type"),
-                PropertiesPackage.Literals.TEXT_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TextWidgetStyle_fontNameExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_TextWidgetStyle_fontNameExpression_feature", "_UI_TextWidgetStyle_type"),
+                        PropertiesPackage.Literals.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -81,8 +82,8 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      */
     protected void addFontSizePropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontSize_feature", "_UI_TextStyle_type"),
-                PropertiesPackage.Literals.TEXT_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+                getString("_UI_TextWidgetStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextWidgetStyle_fontSize_feature", "_UI_TextWidgetStyle_type"),
+                PropertiesPackage.Literals.TEXT_WIDGET_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -93,8 +94,8 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      */
     protected void addBackgroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextStyle_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_backgroundColor_feature", "_UI_TextStyle_type"),
-                PropertiesPackage.Literals.TEXT_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null));
+                getString("_UI_TextWidgetStyle_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextWidgetStyle_backgroundColor_feature", "_UI_TextWidgetStyle_type"),
+                PropertiesPackage.Literals.TEXT_WIDGET_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null));
     }
 
     /**
@@ -105,8 +106,8 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      */
     protected void addForegroundColorPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextStyle_foregroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_foregroundColor_feature", "_UI_TextStyle_type"),
-                PropertiesPackage.Literals.TEXT_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null));
+                getString("_UI_TextWidgetStyle_foregroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextWidgetStyle_foregroundColor_feature", "_UI_TextWidgetStyle_type"),
+                PropertiesPackage.Literals.TEXT_WIDGET_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null));
     }
 
     /**
@@ -117,18 +118,19 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      */
     protected void addFontFormatPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TextStyle_fontFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontFormat_feature", "_UI_TextStyle_type"),
-                PropertiesPackage.Literals.TEXT_STYLE__FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+                getString("_UI_TextWidgetStyle_fontFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextWidgetStyle_fontFormat_feature", "_UI_TextWidgetStyle_type"),
+                PropertiesPackage.Literals.TEXT_WIDGET_STYLE__FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This returns TextStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * This returns TextWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
      *
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/TextStyle"));
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TextWidgetStyle"));
     }
 
     /**
@@ -139,8 +141,8 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextStyle) object).getFontNameExpression();
-        return label == null || label.length() == 0 ? getString("_UI_TextStyle_type") : getString("_UI_TextStyle_type") + " " + label;
+        String label = ((TextWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextWidgetStyle_type") : getString("_UI_TextWidgetStyle_type") + " " + label;
     }
 
     /**
@@ -155,10 +157,10 @@ public class TextStyleItemProvider extends WidgetStyleItemProvider {
     public void notifyChanged(Notification notification) {
         updateChildren(notification);
 
-        switch (notification.getFeatureID(TextStyle.class)) {
-        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
-        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
-        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+        switch (notification.getFeatureID(TextWidgetStyle.class)) {
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index 9e98db82b8..e8a1723132 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -39,8 +39,8 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  *
  * @generated
  */
-public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -75,10 +75,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_identifier_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewExtensionDescription_identifier_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
+                        PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -88,10 +88,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addMetamodelsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_ViewExtensionDescription_metamodels_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
-                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewExtensionDescription_metamodels_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
+                        PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
index 9c2fbe97ff..e39c0864e9 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
@@ -37,8 +37,8 @@ import org.eclipse.sirius.properties.WidgetDescription;
  *
  * @generated
  */
-public class WidgetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class WidgetDescriptionItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -86,10 +86,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WidgetDescription_labelExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
-                PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetDescription_labelExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
+                        PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -99,10 +99,10 @@ IItemPropertySource {
      * @generated
      */
     protected void addHelpExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_WidgetDescription_helpExpression_feature"),
-                getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_helpExpression_feature", "_UI_WidgetDescription_type"),
-                PropertiesPackage.Literals.WIDGET_DESCRIPTION__HELP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetDescription_helpExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_helpExpression_feature", "_UI_WidgetDescription_type"),
+                        PropertiesPackage.Literals.WIDGET_DESCRIPTION__HELP_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
index d3d3c7bb4e..dc824ab866 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
@@ -17,13 +17,18 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.WidgetStyle;
 
 /**
  * This is the item provider adapter for a
@@ -32,8 +37,8 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  *
  * @generated
  */
-public class WidgetStyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class WidgetStyleItemProvider extends ItemProviderAdapter
+        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -55,11 +60,77 @@ IItemPropertySource {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
+            addLabelFontNameExpressionPropertyDescriptor(object);
+            addLabelFontSizePropertyDescriptor(object);
+            addLabelBackgroundColorPropertyDescriptor(object);
+            addLabelForegroundColorPropertyDescriptor(object);
+            addLabelFontFormatPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
 
     /**
+     * This adds a property descriptor for the Label Font Name Expression
+     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addLabelFontNameExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(
+                createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_WidgetStyle_labelFontNameExpression_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontNameExpression_feature", "_UI_WidgetStyle_type"),
+                        PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Label Font Size feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addLabelFontSizePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetStyle_labelFontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontSize_feature", "_UI_WidgetStyle_type"),
+                PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Label Background Color feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addLabelBackgroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetStyle_labelBackgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelBackgroundColor_feature", "_UI_WidgetStyle_type"),
+                PropertiesPackage.Literals.WIDGET_STYLE__LABEL_BACKGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Label Foreground Color feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addLabelForegroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetStyle_labelForegroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelForegroundColor_feature", "_UI_WidgetStyle_type"),
+                PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FOREGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Label Font Format feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addLabelFontFormatPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetStyle_labelFontFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetStyle_labelFontFormat_feature", "_UI_WidgetStyle_type"),
+                PropertiesPackage.Literals.WIDGET_STYLE__LABEL_FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
      * This returns WidgetStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -78,7 +149,8 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_WidgetStyle_type");
+        String label = ((WidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetStyle_type") : getString("_UI_WidgetStyle_type") + " " + label;
     }
 
     /**
@@ -92,6 +164,14 @@ IItemPropertySource {
     @Override
     public void notifyChanged(Notification notification) {
         updateChildren(notification);
+
+        switch (notification.getFeatureID(WidgetStyle.class)) {
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION:
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE:
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        }
         super.notifyChanged(notification);
     }
 
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.ecore b/incubation/org.eclipse.sirius.properties/model/properties.ecore
index dbe16b4aac..04b53da494 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -71,7 +71,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//TextStyle"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//TextWidgetStyle"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ButtonDescription" eSuperTypes="#//WidgetDescription">
@@ -80,15 +80,21 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ButtonWidgetStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LabelDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="bodyExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//LabelWidgetStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CheckboxDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CheckboxWidgetStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SelectDescription" eSuperTypes="#//WidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -117,6 +123,8 @@
         <details key="documentation" value="Indicates how to display the input value."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//SelectWidgetStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DynamicMappingFor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="iterator" lowerBound="1"
@@ -166,6 +174,8 @@
         <details key="documentation" value="Indicates how to display the input value."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//RadioWidgetStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SingleReferenceDescription" eSuperTypes="#//WidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -256,8 +266,24 @@
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WidgetStyle"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TextStyle" eSuperTypes="#//WidgetStyle">
+  <eClassifiers xsi:type="ecore:EClass" name="WidgetStyle">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelFontNameExpression"
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelFontSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="labelBackgroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="labelForegroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelFontFormat" upperBound="4"
+        eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//FontFormat"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TextWidgetStyle" eSuperTypes="#//WidgetStyle">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontNameExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="backgroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="foregroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontFormat" upperBound="4"
+        eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//FontFormat"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LabelWidgetStyle" eSuperTypes="#//WidgetStyle">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontNameExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="backgroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
@@ -265,4 +291,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontFormat" upperBound="4"
         eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//FontFormat"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CheckboxWidgetStyle" eSuperTypes="#//WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RadioWidgetStyle" eSuperTypes="#//WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ButtonWidgetStyle" eSuperTypes="#//WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SelectWidgetStyle" eSuperTypes="#//WidgetStyle"/>
 </ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index c6c3895f77..61ff279377 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -63,19 +63,23 @@
     <genClasses ecoreClass="properties.ecore#//ButtonDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ButtonDescription/buttonLabelExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/initialOperation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//LabelDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//LabelDescription/bodyExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//LabelDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//CheckboxDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CheckboxDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/initialOperation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//SelectDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/initialOperation"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidatesExpression"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidateDisplayExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//DynamicMappingFor">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/iterator"/>
@@ -94,6 +98,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/initialOperation"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/candidatesExpression"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/candidateDisplayExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//SingleReferenceDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SingleReferenceDescription/valueExpression"/>
@@ -128,13 +133,30 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CustomOperation/identifier"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomOperation/initialOperation"/>
     </genClasses>
-    <genClasses ecoreClass="properties.ecore#//WidgetStyle"/>
-    <genClasses ecoreClass="properties.ecore#//TextStyle">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontNameExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontSize"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextStyle/backgroundColor"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextStyle/foregroundColor"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontFormat"/>
-    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//WidgetStyle">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetStyle/labelFontNameExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetStyle/labelFontSize"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//WidgetStyle/labelBackgroundColor"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//WidgetStyle/labelForegroundColor"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetStyle/labelFontFormat"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//TextWidgetStyle">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextWidgetStyle/fontNameExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextWidgetStyle/fontSize"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextWidgetStyle/backgroundColor"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextWidgetStyle/foregroundColor"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextWidgetStyle/fontFormat"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//LabelWidgetStyle">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//LabelWidgetStyle/fontNameExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//LabelWidgetStyle/fontSize"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//LabelWidgetStyle/backgroundColor"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//LabelWidgetStyle/foregroundColor"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//LabelWidgetStyle/fontFormat"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//CheckboxWidgetStyle"/>
+    <genClasses ecoreClass="properties.ecore#//RadioWidgetStyle"/>
+    <genClasses ecoreClass="properties.ecore#//ButtonWidgetStyle"/>
+    <genClasses ecoreClass="properties.ecore#//SelectWidgetStyle"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
index 2263aa80fa..dbbea393f6 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
@@ -19,6 +19,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
@@ -26,8 +27,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.ButtonDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ButtonDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription()
  * @model
@@ -98,4 +100,34 @@ public interface ButtonDescription extends WidgetDescription {
      */
     void setInitialOperation(InitialOperation value);
 
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(ButtonWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    ButtonWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getStyle
+     * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Style</em>' containment reference.
+     * @see #getStyle()
+     * @generated
+     */
+    void setStyle(ButtonWidgetStyle value);
+
 } // ButtonDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetStyle.java
new file mode 100644
index 0000000000..91b887d8e4
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetStyle.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Button Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface ButtonWidgetStyle extends WidgetStyle {
+} // ButtonWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
index 64f62e808b..63d9c0549f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
@@ -19,6 +19,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression
@@ -26,8 +27,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription()
  * @model
@@ -97,4 +99,34 @@ public interface CheckboxDescription extends WidgetDescription {
      */
     void setInitialOperation(InitialOperation value);
 
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(CheckboxWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    CheckboxWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription#getStyle
+     * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Style</em>' containment reference.
+     * @see #getStyle()
+     * @generated
+     */
+    void setStyle(CheckboxWidgetStyle value);
+
 } // CheckboxDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetStyle.java
new file mode 100644
index 0000000000..d0d168c328
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetStyle.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Checkbox Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface CheckboxWidgetStyle extends WidgetStyle {
+} // CheckboxWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
index e97069f536..6d7453aecb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
@@ -20,16 +20,16 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
  * <em>Identifier</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets <em>
- * Widgets</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets
+ * <em>Widgets</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.ContainerDescription#getDynamicMappings
  * <em>Dynamic Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
index 08ab1b4b17..0a98b13d5e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.CustomDescription#getCustomExpressions
@@ -27,7 +28,6 @@ import org.eclipse.emf.common.util.EList;
  * {@link org.eclipse.sirius.properties.CustomDescription#getCustomOperations
  * <em>Custom Operations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
index 6c4d83e408..d0ec70a08e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
@@ -19,14 +19,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.CustomExpression#getIdentifier <em>
- * Identifier</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.CustomExpression#getCustomExpression
+ * <li>{@link org.eclipse.sirius.properties.CustomExpression#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.CustomExpression#getCustomExpression
  * <em>Custom Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomExpression()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
index 5bc1945c46..74780a43a4 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
@@ -20,13 +20,13 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.CustomOperation#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.CustomOperation#getIdentifier
+ * <em>Identifier</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.CustomOperation#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomOperation()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
index ccbefe8f7a..b863890d45 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
@@ -20,16 +20,16 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator <em>
- * Iterator</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator
+ * <em>Iterator</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
  * <em>Domain Class Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIfs <em>Ifs
- * </em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIfs
+ * <em>Ifs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
index 3289383380..982252e10a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
@@ -19,14 +19,14 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.DynamicMappingIf#getPredicateExpression
  * <em>Predicate Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.DynamicMappingIf#getWidget <em>
- * Widget</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingIf#getWidget
+ * <em>Widget</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingIf()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
index e2a3f5d760..51f18e76bb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
@@ -19,22 +19,22 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier
+ * <em>Identifier</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
  * <em>Label Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>
- * Domain Class</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass
+ * <em>Domain Class</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
  * <em>Semantic Candidate Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>
- * Container</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getContainer
+ * <em>Container</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.GroupDescription#getValidationSet
  * <em>Validation Set</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
index 28e7c8f358..f700ae08f9 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
@@ -21,6 +21,7 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.GroupValidationSetDescription#getSemanticValidationRules
@@ -29,7 +30,6 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  * {@link org.eclipse.sirius.properties.GroupValidationSetDescription#getPropertyValidationRules
  * <em>Property Validation Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupValidationSetDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
index 0295b15c80..59968fa715 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
@@ -17,11 +17,13 @@ package org.eclipse.sirius.properties;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.LabelDescription#getBodyExpression
  * <em>Body Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.LabelDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription()
  * @model
@@ -59,4 +61,34 @@ public interface LabelDescription extends WidgetDescription {
      */
     void setBodyExpression(String value);
 
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(LabelWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    LabelWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelDescription#getStyle
+     * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Style</em>' containment reference.
+     * @see #getStyle()
+     * @generated
+     */
+    void setStyle(LabelWidgetStyle value);
+
 } // LabelDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetStyle.java
new file mode 100644
index 0000000000..b58e5556b8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetStyle.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Label Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontNameExpression
+ * <em>Font Name Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontSize
+ * <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.LabelWidgetStyle#getBackgroundColor
+ * <em>Background Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.LabelWidgetStyle#getForegroundColor
+ * <em>Foreground Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontFormat
+ * <em>Font Format</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface LabelWidgetStyle extends WidgetStyle {
+    /**
+     * Returns the value of the '<em><b>Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Name Expression</em>' attribute isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Name Expression</em>' attribute.
+     * @see #setFontNameExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle_FontNameExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getFontNameExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontNameExpression
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Font Name Expression</em>'
+     *            attribute.
+     * @see #getFontNameExpression()
+     * @generated
+     */
+    void setFontNameExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Font Size</b></em>' attribute. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Size</em>' attribute isn't clear, there
+     * really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Size</em>' attribute.
+     * @see #setFontSize(int)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle_FontSize()
+     * @model
+     * @generated
+     */
+    int getFontSize();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontSize
+     * <em>Font Size</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @param value
+     *            the new value of the '<em>Font Size</em>' attribute.
+     * @see #getFontSize()
+     * @generated
+     */
+    void setFontSize(int value);
+
+    /**
+     * Returns the value of the '<em><b>Background Color</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Background Color</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Background Color</em>' reference.
+     * @see #setBackgroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle_BackgroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getBackgroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getBackgroundColor
+     * <em>Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Background Color</em>' reference.
+     * @see #getBackgroundColor()
+     * @generated
+     */
+    void setBackgroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Foreground Color</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Foreground Color</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Foreground Color</em>' reference.
+     * @see #setForegroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle_ForegroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getForegroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getForegroundColor
+     * <em>Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Foreground Color</em>' reference.
+     * @see #getForegroundColor()
+     * @generated
+     */
+    void setForegroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Font Format</b></em>' attribute list.
+     * The list contents are of type
+     * {@link org.eclipse.sirius.viewpoint.FontFormat}. The literals are from
+     * the enumeration {@link org.eclipse.sirius.viewpoint.FontFormat}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Format</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Format</em>' attribute list.
+     * @see org.eclipse.sirius.viewpoint.FontFormat
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetStyle_FontFormat()
+     * @model upper="4"
+     * @generated
+     */
+    EList<FontFormat> getFontFormat();
+
+} // LabelWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
index e612ca1c35..e9deda0b9c 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
@@ -20,6 +20,7 @@ package org.eclipse.sirius.properties;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getValueExpression
@@ -46,7 +47,6 @@ package org.eclipse.sirius.properties;
  * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getDownOperation
  * <em>Down Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getMultipleReferencesDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
index 345bf8951a..b379feb118 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
@@ -20,12 +20,12 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.OperationDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getOperationDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
index 61659fe260..3cc383d525 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
@@ -20,22 +20,22 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getIdentifier
+ * <em>Identifier</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
  * <em>Label Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>
- * Domain Class</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getDomainClass
+ * <em>Domain Class</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
  * <em>Semantic Candidate Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.PageDescription#getGroups <em>Groups
- * </em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getGroups
+ * <em>Groups</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.PageDescription#getValidationSet
  * <em>Validation Set</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
index aa8404c86a..b43e88ea47 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
@@ -21,12 +21,12 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.PageValidationSetDescription#getSemanticValidationRules
  * <em>Semantic Validation Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getPageValidationSetDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
index 20af490939..58393d91a2 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
@@ -238,13 +238,58 @@ public interface PropertiesFactory extends EFactory {
     WidgetStyle createWidgetStyle();
 
     /**
-     * Returns a new object of class '<em>Text Style</em>'. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
+     * Returns a new object of class '<em>Text Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Text Widget Style</em>'.
+     * @generated
+     */
+    TextWidgetStyle createTextWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Label Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Label Widget Style</em>'.
+     * @generated
+     */
+    LabelWidgetStyle createLabelWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Checkbox Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Checkbox Widget Style</em>'.
+     * @generated
+     */
+    CheckboxWidgetStyle createCheckboxWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Radio Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Radio Widget Style</em>'.
+     * @generated
+     */
+    RadioWidgetStyle createRadioWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Button Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Button Widget Style</em>'.
+     * @generated
+     */
+    ButtonWidgetStyle createButtonWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Select Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @return a new object of class '<em>Text Style</em>'.
+     * @return a new object of class '<em>Select Widget Style</em>'.
      * @generated
      */
-    TextStyle createTextStyle();
+    SelectWidgetStyle createSelectWidgetStyle();
 
     /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
index 3c0844a283..d0cd7c9e4a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
@@ -656,13 +656,22 @@ public interface PropertiesPackage extends EPackage {
     int BUTTON_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
      * The number of structural features of the '<em>Button Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int BUTTON_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '
@@ -713,13 +722,22 @@ public interface PropertiesPackage extends EPackage {
     int LABEL_DESCRIPTION__BODY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+
+    /**
      * The number of structural features of the '<em>Label Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int LABEL_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int LABEL_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
@@ -779,13 +797,22 @@ public interface PropertiesPackage extends EPackage {
     int CHECKBOX_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
      * The number of structural features of the '<em>Checkbox Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '
@@ -863,13 +890,22 @@ public interface PropertiesPackage extends EPackage {
     int SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+
+    /**
      * The number of structural features of the '<em>Select Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+    int SELECT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
 
     /**
      * The meta object id for the '
@@ -1118,13 +1154,22 @@ public interface PropertiesPackage extends EPackage {
     int RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+
+    /**
      * The number of structural features of the '<em>Radio Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int RADIO_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+    int RADIO_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
 
     /**
      * The meta object id for the '
@@ -1537,25 +1582,115 @@ public interface PropertiesPackage extends EPackage {
     int WIDGET_STYLE = 23;
 
     /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = 0;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE__LABEL_FONT_SIZE = 1;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE__LABEL_BACKGROUND_COLOR = 2;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE__LABEL_FOREGROUND_COLOR = 3;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE__LABEL_FONT_FORMAT = 4;
+
+    /**
      * The number of structural features of the '<em>Widget Style</em>' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int WIDGET_STYLE_FEATURE_COUNT = 0;
+    int WIDGET_STYLE_FEATURE_COUNT = 5;
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.properties.impl.TextStyleImpl
-     * <em>Text Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl
+     * <em>Text Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.TextWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetStyle()
+     * @generated
+     */
+    int TEXT_WIDGET_STYLE = 24;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @see org.eclipse.sirius.properties.impl.TextStyleImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextStyle()
      * @generated
+     * @ordered
      */
-    int TEXT_STYLE = 24;
+    int TEXT_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
 
     /**
      * The feature id for the '<em><b>Font Name Expression</b></em>' attribute.
@@ -1564,7 +1699,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+    int TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Font Size</b></em>' attribute. <!--
@@ -1573,7 +1708,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_STYLE__FONT_SIZE = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 1;
+    int TEXT_WIDGET_STYLE__FONT_SIZE = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Background Color</b></em>' reference. <!--
@@ -1582,7 +1717,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_STYLE__BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 2;
+    int TEXT_WIDGET_STYLE__BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Foreground Color</b></em>' reference. <!--
@@ -1591,7 +1726,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_STYLE__FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 3;
+    int TEXT_WIDGET_STYLE__FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Font Format</b></em>' attribute list. <!--
@@ -1600,16 +1735,391 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_STYLE__FONT_FORMAT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 4;
+    int TEXT_WIDGET_STYLE__FONT_FORMAT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 4;
+
+    /**
+     * The number of structural features of the '<em>Text Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 5;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl
+     * <em>Label Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetStyle()
+     * @generated
+     */
+    int LABEL_WIDGET_STYLE = 25;
 
     /**
-     * The number of structural features of the '<em>Text Style</em>' class.
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The feature id for the '<em><b>Font Name Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int TEXT_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 5;
+    int LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__FONT_SIZE = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The feature id for the '<em><b>Background Color</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 2;
+
+    /**
+     * The feature id for the '<em><b>Foreground Color</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 3;
+
+    /**
+     * The feature id for the '<em><b>Font Format</b></em>' attribute list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE__FONT_FORMAT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 4;
+
+    /**
+     * The number of structural features of the '<em>Label Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 5;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.CheckboxWidgetStyleImpl
+     * <em>Checkbox Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.CheckboxWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetStyle()
+     * @generated
+     */
+    int CHECKBOX_WIDGET_STYLE = 26;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The number of structural features of the '<em>Checkbox Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.RadioWidgetStyleImpl
+     * <em>Radio Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.RadioWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetStyle()
+     * @generated
+     */
+    int RADIO_WIDGET_STYLE = 27;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The number of structural features of the '<em>Radio Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.ButtonWidgetStyleImpl
+     * <em>Button Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.ButtonWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetStyle()
+     * @generated
+     */
+    int BUTTON_WIDGET_STYLE = 28;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The number of structural features of the '<em>Button Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.SelectWidgetStyleImpl
+     * <em>Select Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.SelectWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetStyle()
+     * @generated
+     */
+    int SELECT_WIDGET_STYLE = 29;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The number of structural features of the '<em>Select Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
 
     /**
      * Returns the meta object for class '
@@ -2134,6 +2644,18 @@ public interface PropertiesPackage extends EPackage {
     EReference getButtonDescription_InitialOperation();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.ButtonDescription#getStyle()
+     * @see #getButtonDescription()
+     * @generated
+     */
+    EReference getButtonDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.LabelDescription
      * <em>Label Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2158,6 +2680,18 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getLabelDescription_BodyExpression();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.LabelDescription#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.LabelDescription#getStyle()
+     * @see #getLabelDescription()
+     * @generated
+     */
+    EReference getLabelDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.CheckboxDescription
      * <em>Checkbox Description</em>}'. <!-- begin-user-doc --> <!--
@@ -2197,6 +2731,18 @@ public interface PropertiesPackage extends EPackage {
     EReference getCheckboxDescription_InitialOperation();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.CheckboxDescription#getStyle()
+     * @see #getCheckboxDescription()
+     * @generated
+     */
+    EReference getCheckboxDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.SelectDescription
      * <em>Select Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2264,6 +2810,18 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getSelectDescription_CandidateDisplayExpression();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.SelectDescription#getStyle()
+     * @see #getSelectDescription()
+     * @generated
+     */
+    EReference getSelectDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.DynamicMappingFor
      * <em>Dynamic Mapping For</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2444,6 +3002,18 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getRadioDescription_CandidateDisplayExpression();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription#getStyle()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EReference getRadioDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription
      * <em>Single Reference Description</em>}'. <!-- begin-user-doc --> <!--
@@ -2676,79 +3246,272 @@ public interface PropertiesPackage extends EPackage {
     EClass getWidgetStyle();
 
     /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontNameExpression
+     * <em>Label Font Name Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for the attribute '
+     *         <em>Label Font Name Expression</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle#getLabelFontNameExpression()
+     * @see #getWidgetStyle()
+     * @generated
+     */
+    EAttribute getWidgetStyle_LabelFontNameExpression();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontSize
+     * <em>Label Font Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Label Font Size</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle#getLabelFontSize()
+     * @see #getWidgetStyle()
+     * @generated
+     */
+    EAttribute getWidgetStyle_LabelFontSize();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelBackgroundColor
+     * <em>Label Background Color</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for the reference '
+     *         <em>Label Background Color</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle#getLabelBackgroundColor()
+     * @see #getWidgetStyle()
+     * @generated
+     */
+    EReference getWidgetStyle_LabelBackgroundColor();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelForegroundColor
+     * <em>Label Foreground Color</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for the reference '
+     *         <em>Label Foreground Color</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle#getLabelForegroundColor()
+     * @see #getWidgetStyle()
+     * @generated
+     */
+    EReference getWidgetStyle_LabelForegroundColor();
+
+    /**
+     * Returns the meta object for the attribute list '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontFormat
+     * <em>Label Font Format</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the attribute list '
+     *         <em>Label Font Format</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle#getLabelFontFormat()
+     * @see #getWidgetStyle()
+     * @generated
+     */
+    EAttribute getWidgetStyle_LabelFontFormat();
+
+    /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.TextStyle <em>Text Style</em>}'.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle
+     * <em>Text Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Text Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle
+     * @generated
+     */
+    EClass getTextWidgetStyle();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontNameExpression
+     * <em>Font Name Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Font Name Expression</em>
+     *         '.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle#getFontNameExpression()
+     * @see #getTextWidgetStyle()
+     * @generated
+     */
+    EAttribute getTextWidgetStyle_FontNameExpression();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontSize
+     * <em>Font Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Font Size</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle#getFontSize()
+     * @see #getTextWidgetStyle()
+     * @generated
+     */
+    EAttribute getTextWidgetStyle_FontSize();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getBackgroundColor
+     * <em>Background Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Background Color</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle#getBackgroundColor()
+     * @see #getTextWidgetStyle()
+     * @generated
+     */
+    EReference getTextWidgetStyle_BackgroundColor();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getForegroundColor
+     * <em>Foreground Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Foreground Color</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle#getForegroundColor()
+     * @see #getTextWidgetStyle()
+     * @generated
+     */
+    EReference getTextWidgetStyle_ForegroundColor();
+
+    /**
+     * Returns the meta object for the attribute list '
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontFormat
+     * <em>Font Format</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @return the meta object for class '<em>Text Style</em>'.
-     * @see org.eclipse.sirius.properties.TextStyle
+     * @return the meta object for the attribute list '<em>Font Format</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle#getFontFormat()
+     * @see #getTextWidgetStyle()
      * @generated
      */
-    EClass getTextStyle();
+    EAttribute getTextWidgetStyle_FontFormat();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle
+     * <em>Label Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Label Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle
+     * @generated
+     */
+    EClass getLabelWidgetStyle();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontNameExpression
      * <em>Font Name Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
      * @return the meta object for the attribute '<em>Font Name Expression</em>
      *         '.
-     * @see org.eclipse.sirius.properties.TextStyle#getFontNameExpression()
-     * @see #getTextStyle()
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle#getFontNameExpression()
+     * @see #getLabelWidgetStyle()
      * @generated
      */
-    EAttribute getTextStyle_FontNameExpression();
+    EAttribute getLabelWidgetStyle_FontNameExpression();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.TextStyle#getFontSize
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontSize
      * <em>Font Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @return the meta object for the attribute '<em>Font Size</em>'.
-     * @see org.eclipse.sirius.properties.TextStyle#getFontSize()
-     * @see #getTextStyle()
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle#getFontSize()
+     * @see #getLabelWidgetStyle()
      * @generated
      */
-    EAttribute getTextStyle_FontSize();
+    EAttribute getLabelWidgetStyle_FontSize();
 
     /**
      * Returns the meta object for the reference '
-     * {@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getBackgroundColor
      * <em>Background Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
      * @return the meta object for the reference '<em>Background Color</em>'.
-     * @see org.eclipse.sirius.properties.TextStyle#getBackgroundColor()
-     * @see #getTextStyle()
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle#getBackgroundColor()
+     * @see #getLabelWidgetStyle()
      * @generated
      */
-    EReference getTextStyle_BackgroundColor();
+    EReference getLabelWidgetStyle_BackgroundColor();
 
     /**
      * Returns the meta object for the reference '
-     * {@link org.eclipse.sirius.properties.TextStyle#getForegroundColor
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getForegroundColor
      * <em>Foreground Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
      * @return the meta object for the reference '<em>Foreground Color</em>'.
-     * @see org.eclipse.sirius.properties.TextStyle#getForegroundColor()
-     * @see #getTextStyle()
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle#getForegroundColor()
+     * @see #getLabelWidgetStyle()
      * @generated
      */
-    EReference getTextStyle_ForegroundColor();
+    EReference getLabelWidgetStyle_ForegroundColor();
 
     /**
      * Returns the meta object for the attribute list '
-     * {@link org.eclipse.sirius.properties.TextStyle#getFontFormat
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle#getFontFormat
      * <em>Font Format</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @return the meta object for the attribute list '<em>Font Format</em>'.
-     * @see org.eclipse.sirius.properties.TextStyle#getFontFormat()
-     * @see #getTextStyle()
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle#getFontFormat()
+     * @see #getLabelWidgetStyle()
+     * @generated
+     */
+    EAttribute getLabelWidgetStyle_FontFormat();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetStyle
+     * <em>Checkbox Widget Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '<em>Checkbox Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.CheckboxWidgetStyle
+     * @generated
+     */
+    EClass getCheckboxWidgetStyle();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.RadioWidgetStyle
+     * <em>Radio Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Radio Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.RadioWidgetStyle
      * @generated
      */
-    EAttribute getTextStyle_FontFormat();
+    EClass getRadioWidgetStyle();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.ButtonWidgetStyle
+     * <em>Button Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Button Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.ButtonWidgetStyle
+     * @generated
+     */
+    EClass getButtonWidgetStyle();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.SelectWidgetStyle
+     * <em>Select Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Select Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.SelectWidgetStyle
+     * @generated
+     */
+    EClass getSelectWidgetStyle();
 
     /**
      * @generated
@@ -3279,6 +4042,14 @@ public interface PropertiesPackage extends EPackage {
         EReference BUTTON_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getButtonDescription_InitialOperation();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference BUTTON_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getButtonDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
          * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -3299,6 +4070,14 @@ public interface PropertiesPackage extends EPackage {
         EAttribute LABEL_DESCRIPTION__BODY_EXPRESSION = PropertiesPackage.eINSTANCE.getLabelDescription_BodyExpression();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference LABEL_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getLabelDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
          * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -3328,6 +4107,14 @@ public interface PropertiesPackage extends EPackage {
         EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getCheckboxDescription_InitialOperation();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference CHECKBOX_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getCheckboxDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
          * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -3375,6 +4162,14 @@ public interface PropertiesPackage extends EPackage {
         EAttribute SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getSelectDescription_CandidateDisplayExpression();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference SELECT_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getSelectDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
          * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
@@ -3507,6 +4302,14 @@ public interface PropertiesPackage extends EPackage {
         EAttribute RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getRadioDescription_CandidateDisplayExpression();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference RADIO_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getRadioDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
          * <em>Single Reference Description</em>}' class. <!-- begin-user-doc
@@ -3635,15 +4438,58 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.TextStyleImpl
-         * <em>Text Style</em>}' class. <!-- begin-user-doc --> <!--
+         * <em><b>Label Font Name Expression</b></em>' attribute feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontNameExpression();
+
+        /**
+         * The meta object literal for the '<em><b>Label Font Size</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontSize();
+
+        /**
+         * The meta object literal for the '
+         * <em><b>Label Background Color</b></em>' reference feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.eINSTANCE.getWidgetStyle_LabelBackgroundColor();
+
+        /**
+         * The meta object literal for the '
+         * <em><b>Label Foreground Color</b></em>' reference feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.eINSTANCE.getWidgetStyle_LabelForegroundColor();
+
+        /**
+         * The meta object literal for the '<em><b>Label Font Format</b></em>'
+         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.eINSTANCE.getWidgetStyle_LabelFontFormat();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl
+         * <em>Text Widget Style</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
          *
-         * @see org.eclipse.sirius.properties.impl.TextStyleImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextStyle()
+         * @see org.eclipse.sirius.properties.impl.TextWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetStyle()
          * @generated
          */
-        EClass TEXT_STYLE = PropertiesPackage.eINSTANCE.getTextStyle();
+        EClass TEXT_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getTextWidgetStyle();
 
         /**
          * The meta object literal for the '<em><b>Font Name Expression</b></em>
@@ -3651,7 +4497,7 @@ public interface PropertiesPackage extends EPackage {
          *
          * @generated
          */
-        EAttribute TEXT_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.eINSTANCE.getTextStyle_FontNameExpression();
+        EAttribute TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontNameExpression();
 
         /**
          * The meta object literal for the '<em><b>Font Size</b></em>' attribute
@@ -3659,7 +4505,7 @@ public interface PropertiesPackage extends EPackage {
          *
          * @generated
          */
-        EAttribute TEXT_STYLE__FONT_SIZE = PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+        EAttribute TEXT_WIDGET_STYLE__FONT_SIZE = PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontSize();
 
         /**
          * The meta object literal for the '<em><b>Background Color</b></em>'
@@ -3667,7 +4513,7 @@ public interface PropertiesPackage extends EPackage {
          *
          * @generated
          */
-        EReference TEXT_STYLE__BACKGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+        EReference TEXT_WIDGET_STYLE__BACKGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextWidgetStyle_BackgroundColor();
 
         /**
          * The meta object literal for the '<em><b>Foreground Color</b></em>'
@@ -3675,7 +4521,7 @@ public interface PropertiesPackage extends EPackage {
          *
          * @generated
          */
-        EReference TEXT_STYLE__FOREGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+        EReference TEXT_WIDGET_STYLE__FOREGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextWidgetStyle_ForegroundColor();
 
         /**
          * The meta object literal for the '<em><b>Font Format</b></em>'
@@ -3683,7 +4529,107 @@ public interface PropertiesPackage extends EPackage {
          *
          * @generated
          */
-        EAttribute TEXT_STYLE__FONT_FORMAT = PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+        EAttribute TEXT_WIDGET_STYLE__FONT_FORMAT = PropertiesPackage.eINSTANCE.getTextWidgetStyle_FontFormat();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl
+         * <em>Label Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetStyle()
+         * @generated
+         */
+        EClass LABEL_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getLabelWidgetStyle();
+
+        /**
+         * The meta object literal for the '<em><b>Font Name Expression</b></em>
+         * ' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontNameExpression();
+
+        /**
+         * The meta object literal for the '<em><b>Font Size</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute LABEL_WIDGET_STYLE__FONT_SIZE = PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontSize();
+
+        /**
+         * The meta object literal for the '<em><b>Background Color</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference LABEL_WIDGET_STYLE__BACKGROUND_COLOR = PropertiesPackage.eINSTANCE.getLabelWidgetStyle_BackgroundColor();
+
+        /**
+         * The meta object literal for the '<em><b>Foreground Color</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference LABEL_WIDGET_STYLE__FOREGROUND_COLOR = PropertiesPackage.eINSTANCE.getLabelWidgetStyle_ForegroundColor();
+
+        /**
+         * The meta object literal for the '<em><b>Font Format</b></em>'
+         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute LABEL_WIDGET_STYLE__FONT_FORMAT = PropertiesPackage.eINSTANCE.getLabelWidgetStyle_FontFormat();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.CheckboxWidgetStyleImpl
+         * <em>Checkbox Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.CheckboxWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetStyle()
+         * @generated
+         */
+        EClass CHECKBOX_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getCheckboxWidgetStyle();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.RadioWidgetStyleImpl
+         * <em>Radio Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.RadioWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetStyle()
+         * @generated
+         */
+        EClass RADIO_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getRadioWidgetStyle();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.ButtonWidgetStyleImpl
+         * <em>Button Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.ButtonWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetStyle()
+         * @generated
+         */
+        EClass BUTTON_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getButtonWidgetStyle();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.SelectWidgetStyleImpl
+         * <em>Select Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.SelectWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetStyle()
+         * @generated
+         */
+        EClass SELECT_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getSelectWidgetStyle();
 
         /**
          * The meta object literal for the ' end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertyValidationRule.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertyValidationRule.java
index 17afb444ad..4f6d99e863 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertyValidationRule.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertyValidationRule.java
@@ -20,11 +20,11 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.PropertyValidationRule#getTargets
  * <em>Targets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getPropertyValidationRule()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
index 5aed3a0d44..0a1e2c6880 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
@@ -22,11 +22,11 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.RadioDescription#getValueExpression
  * <em>Value Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
+ * <li>{@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
@@ -34,8 +34,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
  * <em>Candidate Display Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.RadioDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription()
  * @model
@@ -157,4 +158,34 @@ public interface RadioDescription extends WidgetDescription {
      */
     void setCandidateDisplayExpression(String value);
 
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(RadioWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    RadioWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getStyle
+     * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Style</em>' containment reference.
+     * @see #getStyle()
+     * @generated
+     */
+    void setStyle(RadioWidgetStyle value);
+
 } // RadioDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetStyle.java
new file mode 100644
index 0000000000..d92331d62e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetStyle.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Radio Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface RadioWidgetStyle extends WidgetStyle {
+} // RadioWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
index a5167d3132..699f470a08 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
@@ -22,9 +22,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
+ * <li>{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
  * <em>Value Expression</em>}</li>
  * <li>
  * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
@@ -35,8 +35,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
  * <em>Candidate Display Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.SelectDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription()
  * @model
@@ -158,4 +159,34 @@ public interface SelectDescription extends WidgetDescription {
      */
     void setCandidateDisplayExpression(String value);
 
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(SelectWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    SelectWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getStyle
+     * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Style</em>' containment reference.
+     * @see #getStyle()
+     * @generated
+     */
+    void setStyle(SelectWidgetStyle value);
+
 } // SelectDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetStyle.java
new file mode 100644
index 0000000000..1a71ef35e6
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetStyle.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Select Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface SelectWidgetStyle extends WidgetStyle {
+} // SelectWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
index ca9e451bbb..11ef8af305 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
@@ -20,6 +20,7 @@ package org.eclipse.sirius.properties;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getValueExpression
@@ -40,7 +41,6 @@ package org.eclipse.sirius.properties;
  * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getOnClickOperation
  * <em>On Click Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getSingleReferenceDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
index ef27deb1a7..996dbdf45f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
@@ -20,11 +20,11 @@ package org.eclipse.sirius.properties;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.TextAreaDescription#getLineCount
  * <em>Line Count</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getTextAreaDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
index eb217a2802..a637bdff00 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
@@ -19,15 +19,15 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.sirius.properties.TextDescription#getValueExpression
  * <em>Value Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.TextDescription#getStyle <em>Style
- * </em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextDescription#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription()
  * @model
@@ -107,12 +107,12 @@ public interface TextDescription extends WidgetDescription {
      * <!-- end-user-doc -->
      *
      * @return the value of the '<em>Style</em>' containment reference.
-     * @see #setStyle(TextStyle)
+     * @see #setStyle(TextWidgetStyle)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_Style()
      * @model containment="true"
      * @generated
      */
-    TextStyle getStyle();
+    TextWidgetStyle getStyle();
 
     /**
      * Sets the value of the '
@@ -125,6 +125,6 @@ public interface TextDescription extends WidgetDescription {
      * @see #getStyle()
      * @generated
      */
-    void setStyle(TextStyle value);
+    void setStyle(TextWidgetStyle value);
 
 } // TextDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextWidgetStyle.java
index 19ed1ab5af..1c394939ea 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextStyle.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextWidgetStyle.java
@@ -17,29 +17,30 @@ import org.eclipse.sirius.viewpoint.description.ColorDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Text Style</b></em>'. <!-- end-user-doc -->
+ * <em><b>Text Widget Style</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression <em>
- * Font Name Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontSize <em>Font Size
- * </em>}</li>
- * <li>{@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor <em>
- * Background Color</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.TextStyle#getForegroundColor <em>
- * Foreground Color</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontFormat <em>Font
- * Format</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontNameExpression
+ * <em>Font Name Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextWidgetStyle#getFontSize
+ * <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextWidgetStyle#getBackgroundColor
+ * <em>Background Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextWidgetStyle#getForegroundColor
+ * <em>Foreground Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextWidgetStyle#getFontFormat
+ * <em>Font Format</em>}</li>
  * </ul>
- * </p>
  *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle()
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle()
  * @model
  * @generated
  */
-public interface TextStyle extends WidgetStyle {
+public interface TextWidgetStyle extends WidgetStyle {
     /**
      * Returns the value of the '<em><b>Font Name Expression</b></em>'
      * attribute. <!-- begin-user-doc -->
@@ -51,7 +52,7 @@ public interface TextStyle extends WidgetStyle {
      *
      * @return the value of the '<em>Font Name Expression</em>' attribute.
      * @see #setFontNameExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontNameExpression()
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle_FontNameExpression()
      * @model dataType=
      *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
@@ -60,7 +61,7 @@ public interface TextStyle extends WidgetStyle {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontNameExpression
      * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -83,7 +84,7 @@ public interface TextStyle extends WidgetStyle {
      *
      * @return the value of the '<em>Font Size</em>' attribute.
      * @see #setFontSize(int)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontSize()
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle_FontSize()
      * @model
      * @generated
      */
@@ -91,7 +92,7 @@ public interface TextStyle extends WidgetStyle {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.TextStyle#getFontSize
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getFontSize
      * <em>Font Size</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -113,7 +114,7 @@ public interface TextStyle extends WidgetStyle {
      *
      * @return the value of the '<em>Background Color</em>' reference.
      * @see #setBackgroundColor(ColorDescription)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_BackgroundColor()
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle_BackgroundColor()
      * @model
      * @generated
      */
@@ -121,7 +122,7 @@ public interface TextStyle extends WidgetStyle {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getBackgroundColor
      * <em>Background Color</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -143,7 +144,7 @@ public interface TextStyle extends WidgetStyle {
      *
      * @return the value of the '<em>Foreground Color</em>' reference.
      * @see #setForegroundColor(ColorDescription)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_ForegroundColor()
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle_ForegroundColor()
      * @model
      * @generated
      */
@@ -151,7 +152,7 @@ public interface TextStyle extends WidgetStyle {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.TextStyle#getForegroundColor
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle#getForegroundColor
      * <em>Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -169,17 +170,17 @@ public interface TextStyle extends WidgetStyle {
      * the enumeration {@link org.eclipse.sirius.viewpoint.FontFormat}. <!--
      * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Font Format</em>' attribute isn't clear, there
-     * really should be more of a description here...
+     * If the meaning of the '<em>Font Format</em>' attribute list isn't clear,
+     * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
      *
      * @return the value of the '<em>Font Format</em>' attribute list.
      * @see org.eclipse.sirius.viewpoint.FontFormat
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontFormat()
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetStyle_FontFormat()
      * @model upper="4"
      * @generated
      */
     EList<FontFormat> getFontFormat();
 
-} // TextStyle
+} // TextWidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
index 0544131327..971423e4e2 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
@@ -21,6 +21,7 @@ import org.eclipse.sirius.viewpoint.description.Extension;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
@@ -33,7 +34,6 @@ import org.eclipse.sirius.viewpoint.description.Extension;
  * <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups
  * <em>Groups</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription()
  * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
index a91682a466..8e9bd0141f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
@@ -19,16 +19,15 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>
- * Identifier</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
+ * <li>{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
  * <em>Label Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.WidgetDescription#getHelpExpression
  * <em>Help Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription()
  * @model abstract="true"
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java
index c52603f783..6e5a115aa3 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java
@@ -11,16 +11,179 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Widget Style</b></em>'. <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontNameExpression
+ * <em>Label Font Name Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontSize
+ * <em>Label Font Size</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetStyle#getLabelBackgroundColor
+ * <em>Label Background Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetStyle#getLabelForegroundColor
+ * <em>Label Foreground Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontFormat
+ * <em>Label Font Format</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle()
  * @model
  * @generated
  */
 public interface WidgetStyle extends EObject {
+
+    /**
+     * Returns the value of the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label Font Name Expression</em>' attribute
+     * isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Label Font Name Expression</em>' attribute.
+     * @see #setLabelFontNameExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle_LabelFontNameExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getLabelFontNameExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontNameExpression
+     * <em>Label Font Name Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Label Font Name Expression</em>'
+     *            attribute.
+     * @see #getLabelFontNameExpression()
+     * @generated
+     */
+    void setLabelFontNameExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Label Font Size</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label Font Size</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Label Font Size</em>' attribute.
+     * @see #setLabelFontSize(int)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle_LabelFontSize()
+     * @model
+     * @generated
+     */
+    int getLabelFontSize();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelFontSize
+     * <em>Label Font Size</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Label Font Size</em>' attribute.
+     * @see #getLabelFontSize()
+     * @generated
+     */
+    void setLabelFontSize(int value);
+
+    /**
+     * Returns the value of the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label Background Color</em>' reference isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Label Background Color</em>' reference.
+     * @see #setLabelBackgroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle_LabelBackgroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getLabelBackgroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelBackgroundColor
+     * <em>Label Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Label Background Color</em>'
+     *            reference.
+     * @see #getLabelBackgroundColor()
+     * @generated
+     */
+    void setLabelBackgroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label Foreground Color</em>' reference isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Label Foreground Color</em>' reference.
+     * @see #setLabelForegroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle_LabelForegroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getLabelForegroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetStyle#getLabelForegroundColor
+     * <em>Label Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Label Foreground Color</em>'
+     *            reference.
+     * @see #getLabelForegroundColor()
+     * @generated
+     */
+    void setLabelForegroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Label Font Format</b></em>' attribute
+     * list. The list contents are of type
+     * {@link org.eclipse.sirius.viewpoint.FontFormat}. The literals are from
+     * the enumeration {@link org.eclipse.sirius.viewpoint.FontFormat}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label Font Format</em>' attribute list isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Label Font Format</em>' attribute list.
+     * @see org.eclipse.sirius.viewpoint.FontFormat
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle_LabelFontFormat()
+     * @model upper="4"
+     * @generated
+     */
+    EList<FontFormat> getLabelFontFormat();
 } // WidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
index 4b1dd56b5c..d746160a3f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
@@ -25,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Button Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getButtonLabelExpression
@@ -32,8 +34,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -72,6 +75,16 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
     protected InitialOperation initialOperation;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected ButtonWidgetStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -173,10 +186,65 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * @generated
      */
     @Override
+    public ButtonWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(ButtonWidgetStyle newStyle, NotificationChain msgs) {
+        ButtonWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(ButtonWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -193,6 +261,8 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
             return getButtonLabelExpression();
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return getInitialOperation();
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -211,6 +281,9 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) newValue);
             return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+            setStyle((ButtonWidgetStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -229,6 +302,9 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
             return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+            setStyle((ButtonWidgetStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -242,10 +318,12 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
-            return ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null : !ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT
-            .equals(buttonLabelExpression);
+            return ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null
+                    : !ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT.equals(buttonLabelExpression);
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
+        case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetStyleImpl.java
new file mode 100644
index 0000000000..3894f0afa7
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetStyleImpl.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Button Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ButtonWidgetStyleImpl extends WidgetStyleImpl implements ButtonWidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected ButtonWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.BUTTON_WIDGET_STYLE;
+    }
+
+} // ButtonWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
index 8c2080efec..accd93713e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
@@ -25,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Checkbox Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getValueExpression
@@ -32,8 +34,10 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -72,6 +76,16 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     protected InitialOperation initialOperation;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected CheckboxWidgetStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -173,10 +187,65 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * @generated
      */
     @Override
+    public CheckboxWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(CheckboxWidgetStyle newStyle, NotificationChain msgs) {
+        CheckboxWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(CheckboxWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -193,6 +262,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
             return getValueExpression();
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             return getInitialOperation();
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -211,6 +282,9 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) newValue);
             return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+            setStyle((CheckboxWidgetStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -229,6 +303,9 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
             return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+            setStyle((CheckboxWidgetStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -245,6 +322,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
             return CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetStyleImpl.java
new file mode 100644
index 0000000000..73376a8e0a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetStyleImpl.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Checkbox Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CheckboxWidgetStyleImpl extends WidgetStyleImpl implements CheckboxWidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CheckboxWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.CHECKBOX_WIDGET_STYLE;
+    }
+
+} // CheckboxWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
index ee831b6665..4d1d9ab8cb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * <em><b>Container Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getIdentifier
@@ -43,7 +44,6 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getDynamicMappings
  * <em>Dynamic Mappings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
index fcf4f9cd25..cb2283e147 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Custom Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl#getCustomExpressions
@@ -37,7 +38,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl#getCustomOperations
  * <em>Custom Operations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
index 10c241ba10..3e5e9abba0 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Custom Expression</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CustomExpressionImpl#getIdentifier
@@ -31,7 +32,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * {@link org.eclipse.sirius.properties.impl.CustomExpressionImpl#getCustomExpression
  * <em>Custom Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
index 971ce3edb7..2103c657b7 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Custom Operation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CustomOperationImpl#getIdentifier
@@ -34,7 +35,6 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * {@link org.eclipse.sirius.properties.impl.CustomOperationImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
index 719f950325..23dcee6c76 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Dynamic Mapping For</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIterator
@@ -41,7 +42,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIfs
  * <em>Ifs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -265,8 +265,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
             return DynamicMappingForImpl.ITERATOR_EDEFAULT == null ? iterator != null : !DynamicMappingForImpl.ITERATOR_EDEFAULT.equals(iterator);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-            return DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null : !DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT
-            .equals(domainClassExpression);
+            return DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null
+                    : !DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT.equals(domainClassExpression);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS:
             return ifs != null && !ifs.isEmpty();
         }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
index ba39631023..0586d045d7 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * <em><b>Dynamic Mapping If</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.DynamicMappingIfImpl#getPredicateExpression
@@ -33,7 +34,6 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingIfImpl#getWidget
  * <em>Widget</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
index 82bf4c905b..612a003c35 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Group Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getIdentifier
@@ -47,7 +48,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getValidationSet
  * <em>Validation Set</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -493,8 +493,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
         case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
             return GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            return GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
-            .equals(semanticCandidateExpression);
+            return GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null
+                    : !GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT.equals(semanticCandidateExpression);
         case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
             return container != null;
         case PropertiesPackage.GROUP_DESCRIPTION__VALIDATION_SET:
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
index f1c0f7560f..df9a20cd39 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  * <em><b>Group Validation Set Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.GroupValidationSetDescriptionImpl#getSemanticValidationRules
@@ -38,7 +39,6 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  * {@link org.eclipse.sirius.properties.impl.GroupValidationSetDescriptionImpl#getPropertyValidationRules
  * <em>Property Validation Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
index 954f1ac9d8..d8611eddbe 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
@@ -12,9 +12,12 @@
 package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
@@ -22,12 +25,14 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Label Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl#getBodyExpression
  * <em>Body Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -55,6 +60,16 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
     protected String bodyExpression = LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected LabelWidgetStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -103,10 +118,79 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
      * @generated
      */
     @Override
+    public LabelWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(LabelWidgetStyle newStyle, NotificationChain msgs) {
+        LabelWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_DESCRIPTION__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(LabelWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.LABEL_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.LABEL_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
         case PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION:
             return getBodyExpression();
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -122,6 +206,9 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         case PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION:
             setBodyExpression((String) newValue);
             return;
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            setStyle((LabelWidgetStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -137,6 +224,9 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         case PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION:
             setBodyExpression(LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT);
             return;
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            setStyle((LabelWidgetStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -151,6 +241,8 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         switch (featureID) {
         case PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION:
             return LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT == null ? bodyExpression != null : !LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT.equals(bodyExpression);
+        case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetStyleImpl.java
new file mode 100644
index 0000000000..02a9abaecc
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetStyleImpl.java
@@ -0,0 +1,420 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Label Widget Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl#getFontNameExpression
+ * <em>Font Name Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl#getFontSize
+ * <em>Font Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl#getBackgroundColor
+ * <em>Background Color</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl#getForegroundColor
+ * <em>Foreground Color</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetStyleImpl#getFontFormat
+ * <em>Font Format</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LabelWidgetStyleImpl extends WidgetStyleImpl implements LabelWidgetStyle {
+    /**
+     * The default value of the '{@link #getFontNameExpression()
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String FONT_NAME_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getFontNameExpression()
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected String fontNameExpression = LabelWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getFontSize() <em>Font Size</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontSize()
+     * @generated
+     * @ordered
+     */
+    protected static final int FONT_SIZE_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getFontSize() <em>Font Size</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontSize()
+     * @generated
+     * @ordered
+     */
+    protected int fontSize = LabelWidgetStyleImpl.FONT_SIZE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getBackgroundColor()
+     * <em>Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getBackgroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription backgroundColor;
+
+    /**
+     * The cached value of the '{@link #getForegroundColor()
+     * <em>Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getForegroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription foregroundColor;
+
+    /**
+     * The cached value of the '{@link #getFontFormat() <em>Font Format</em>}'
+     * attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontFormat()
+     * @generated
+     * @ordered
+     */
+    protected EList<FontFormat> fontFormat;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected LabelWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.LABEL_WIDGET_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getFontNameExpression() {
+        return fontNameExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setFontNameExpression(String newFontNameExpression) {
+        String oldFontNameExpression = fontNameExpression;
+        fontNameExpression = newFontNameExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION, oldFontNameExpression, fontNameExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setFontSize(int newFontSize) {
+        int oldFontSize = fontSize;
+        fontSize = newFontSize;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE, oldFontSize, fontSize));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getBackgroundColor() {
+        if (backgroundColor != null && backgroundColor.eIsProxy()) {
+            InternalEObject oldBackgroundColor = (InternalEObject) backgroundColor;
+            backgroundColor = (ColorDescription) eResolveProxy(oldBackgroundColor);
+            if (backgroundColor != oldBackgroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+                }
+            }
+        }
+        return backgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetBackgroundColor() {
+        return backgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setBackgroundColor(ColorDescription newBackgroundColor) {
+        ColorDescription oldBackgroundColor = backgroundColor;
+        backgroundColor = newBackgroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getForegroundColor() {
+        if (foregroundColor != null && foregroundColor.eIsProxy()) {
+            InternalEObject oldForegroundColor = (InternalEObject) foregroundColor;
+            foregroundColor = (ColorDescription) eResolveProxy(oldForegroundColor);
+            if (foregroundColor != oldForegroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+                }
+            }
+        }
+        return foregroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetForegroundColor() {
+        return foregroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setForegroundColor(ColorDescription newForegroundColor) {
+        ColorDescription oldForegroundColor = foregroundColor;
+        foregroundColor = newForegroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EList<FontFormat> getFontFormat() {
+        if (fontFormat == null) {
+            fontFormat = new EDataTypeUniqueEList<FontFormat>(FontFormat.class, this, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT);
+        }
+        return fontFormat;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            return getFontNameExpression();
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE:
+            return getFontSize();
+        case PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR:
+            if (resolve) {
+                return getBackgroundColor();
+            }
+            return basicGetBackgroundColor();
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR:
+            if (resolve) {
+                return getForegroundColor();
+            }
+            return basicGetForegroundColor();
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT:
+            return getFontFormat();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            setFontNameExpression((String) newValue);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE:
+            setFontSize((Integer) newValue);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR:
+            setBackgroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR:
+            setForegroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT:
+            getFontFormat().clear();
+            getFontFormat().addAll((Collection<? extends FontFormat>) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            setFontNameExpression(LabelWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE:
+            setFontSize(LabelWidgetStyleImpl.FONT_SIZE_EDEFAULT);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR:
+            setBackgroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR:
+            setForegroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT:
+            getFontFormat().clear();
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            return LabelWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT == null ? fontNameExpression != null : !LabelWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT.equals(fontNameExpression);
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE:
+            return fontSize != LabelWidgetStyleImpl.FONT_SIZE_EDEFAULT;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR:
+            return backgroundColor != null;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR:
+            return foregroundColor != null;
+        case PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT:
+            return fontFormat != null && !fontFormat.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (fontNameExpression: ");
+        result.append(fontNameExpression);
+        result.append(", fontSize: ");
+        result.append(fontSize);
+        result.append(", fontFormat: ");
+        result.append(fontFormat);
+        result.append(')');
+        return result.toString();
+    }
+
+} // LabelWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
index 60ea9b4d6e..836eb2244b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Multiple References Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl#getValueExpression
@@ -51,7 +52,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl#getDownOperation
  * <em>Down Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -692,8 +692,8 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__VALUE_EXPRESSION:
             return MultipleReferencesDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !MultipleReferencesDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__DISPLAY_EXPRESSION:
-            return MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null : !MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT
-            .equals(displayExpression);
+            return MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null
+                    : !MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT.equals(displayExpression);
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__CREATE_OPERATION:
             return createOperation != null;
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__SEARCH_OPERATION:
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
index 6b4f606702..ce049a1065 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Operation Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.OperationDescriptionImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
index 6ff2db11c6..18f0bcac5d 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em><b>Page Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getIdentifier
@@ -50,7 +51,6 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getValidationSet
  * <em>Validation Set</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -456,8 +456,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
         case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
             return PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            return PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
-            .equals(semanticCandidateExpression);
+            return PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null
+                    : !PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT.equals(semanticCandidateExpression);
         case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
             return groups != null && !groups.isEmpty();
         case PropertiesPackage.PAGE_DESCRIPTION__VALIDATION_SET:
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
index a869c0fcf1..8c50e6b30b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
@@ -29,12 +29,12 @@ import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRul
  * <em><b>Page Validation Set Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.PageValidationSetDescriptionImpl#getSemanticValidationRules
  * <em>Semantic Validation Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
index 57611df426..1a3d1aeeb3 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
@@ -17,7 +17,9 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
@@ -27,6 +29,7 @@ import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
 import org.eclipse.sirius.properties.PageDescription;
@@ -35,11 +38,13 @@ import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
 
@@ -132,8 +137,18 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createCustomOperation();
         case PropertiesPackage.WIDGET_STYLE:
             return createWidgetStyle();
-        case PropertiesPackage.TEXT_STYLE:
-            return createTextStyle();
+        case PropertiesPackage.TEXT_WIDGET_STYLE:
+            return createTextWidgetStyle();
+        case PropertiesPackage.LABEL_WIDGET_STYLE:
+            return createLabelWidgetStyle();
+        case PropertiesPackage.CHECKBOX_WIDGET_STYLE:
+            return createCheckboxWidgetStyle();
+        case PropertiesPackage.RADIO_WIDGET_STYLE:
+            return createRadioWidgetStyle();
+        case PropertiesPackage.BUTTON_WIDGET_STYLE:
+            return createButtonWidgetStyle();
+        case PropertiesPackage.SELECT_WIDGET_STYLE:
+            return createSelectWidgetStyle();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -387,9 +402,64 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * @generated
      */
     @Override
-    public TextStyle createTextStyle() {
-        TextStyleImpl textStyle = new TextStyleImpl();
-        return textStyle;
+    public TextWidgetStyle createTextWidgetStyle() {
+        TextWidgetStyleImpl textWidgetStyle = new TextWidgetStyleImpl();
+        return textWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public LabelWidgetStyle createLabelWidgetStyle() {
+        LabelWidgetStyleImpl labelWidgetStyle = new LabelWidgetStyleImpl();
+        return labelWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public CheckboxWidgetStyle createCheckboxWidgetStyle() {
+        CheckboxWidgetStyleImpl checkboxWidgetStyle = new CheckboxWidgetStyleImpl();
+        return checkboxWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public RadioWidgetStyle createRadioWidgetStyle() {
+        RadioWidgetStyleImpl radioWidgetStyle = new RadioWidgetStyleImpl();
+        return radioWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ButtonWidgetStyle createButtonWidgetStyle() {
+        ButtonWidgetStyleImpl buttonWidgetStyle = new ButtonWidgetStyleImpl();
+        return buttonWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public SelectWidgetStyle createSelectWidgetStyle() {
+        SelectWidgetStyleImpl selectWidgetStyle = new SelectWidgetStyleImpl();
+        return selectWidgetStyle;
     }
 
     /**
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index ad693d45eb..63f8ad8ba3 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -18,7 +18,9 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
@@ -28,6 +30,7 @@ import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
 import org.eclipse.sirius.properties.PageDescription;
@@ -36,11 +39,13 @@ import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
@@ -229,7 +234,42 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      *
      * @generated
      */
-    private EClass textStyleEClass = null;
+    private EClass textWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass labelWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass checkboxWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass radioWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass buttonWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass selectWidgetStyleEClass = null;
 
     /**
      * Creates an instance of the model <b>Package</b>, registered with
@@ -278,8 +318,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         }
 
         // Obtain or create and register package
-        PropertiesPackageImpl thePropertiesPackage = (PropertiesPackageImpl) (EPackage.Registry.INSTANCE.get(PropertiesPackage.eNS_URI) instanceof PropertiesPackageImpl ? EPackage.Registry.INSTANCE
-                .get(PropertiesPackage.eNS_URI) : new PropertiesPackageImpl());
+        PropertiesPackageImpl thePropertiesPackage = (PropertiesPackageImpl) (EPackage.Registry.INSTANCE.get(PropertiesPackage.eNS_URI) instanceof PropertiesPackageImpl
+                ? EPackage.Registry.INSTANCE.get(PropertiesPackage.eNS_URI) : new PropertiesPackageImpl());
 
         PropertiesPackageImpl.isInited = true;
 
@@ -716,6 +756,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getButtonDescription_Style() {
+        return (EReference) buttonDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getLabelDescription() {
         return labelDescriptionEClass;
     }
@@ -736,6 +786,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getLabelDescription_Style() {
+        return (EReference) labelDescriptionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getCheckboxDescription() {
         return checkboxDescriptionEClass;
     }
@@ -766,6 +826,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getCheckboxDescription_Style() {
+        return (EReference) checkboxDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getSelectDescription() {
         return selectDescriptionEClass;
     }
@@ -816,6 +886,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getSelectDescription_Style() {
+        return (EReference) selectDescriptionEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getDynamicMappingFor() {
         return dynamicMappingForEClass;
     }
@@ -956,6 +1036,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getRadioDescription_Style() {
+        return (EReference) radioDescriptionEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getSingleReferenceDescription() {
         return singleReferenceDescriptionEClass;
     }
@@ -1236,8 +1326,128 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EClass getTextStyle() {
-        return textStyleEClass;
+    public EAttribute getWidgetStyle_LabelFontNameExpression() {
+        return (EAttribute) widgetStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getWidgetStyle_LabelFontSize() {
+        return (EAttribute) widgetStyleEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getWidgetStyle_LabelBackgroundColor() {
+        return (EReference) widgetStyleEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getWidgetStyle_LabelForegroundColor() {
+        return (EReference) widgetStyleEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getWidgetStyle_LabelFontFormat() {
+        return (EAttribute) widgetStyleEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getTextWidgetStyle() {
+        return textWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextWidgetStyle_FontNameExpression() {
+        return (EAttribute) textWidgetStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextWidgetStyle_FontSize() {
+        return (EAttribute) textWidgetStyleEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextWidgetStyle_BackgroundColor() {
+        return (EReference) textWidgetStyleEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextWidgetStyle_ForegroundColor() {
+        return (EReference) textWidgetStyleEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextWidgetStyle_FontFormat() {
+        return (EAttribute) textWidgetStyleEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getLabelWidgetStyle() {
+        return labelWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getLabelWidgetStyle_FontNameExpression() {
+        return (EAttribute) labelWidgetStyleEClass.getEStructuralFeatures().get(0);
     }
 
     /**
@@ -1246,8 +1456,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EAttribute getTextStyle_FontNameExpression() {
-        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(0);
+    public EAttribute getLabelWidgetStyle_FontSize() {
+        return (EAttribute) labelWidgetStyleEClass.getEStructuralFeatures().get(1);
     }
 
     /**
@@ -1256,8 +1466,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EAttribute getTextStyle_FontSize() {
-        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(1);
+    public EReference getLabelWidgetStyle_BackgroundColor() {
+        return (EReference) labelWidgetStyleEClass.getEStructuralFeatures().get(2);
     }
 
     /**
@@ -1266,8 +1476,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EReference getTextStyle_BackgroundColor() {
-        return (EReference) textStyleEClass.getEStructuralFeatures().get(2);
+    public EReference getLabelWidgetStyle_ForegroundColor() {
+        return (EReference) labelWidgetStyleEClass.getEStructuralFeatures().get(3);
     }
 
     /**
@@ -1276,8 +1486,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EReference getTextStyle_ForegroundColor() {
-        return (EReference) textStyleEClass.getEStructuralFeatures().get(3);
+    public EAttribute getLabelWidgetStyle_FontFormat() {
+        return (EAttribute) labelWidgetStyleEClass.getEStructuralFeatures().get(4);
     }
 
     /**
@@ -1286,8 +1496,38 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EAttribute getTextStyle_FontFormat() {
-        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(4);
+    public EClass getCheckboxWidgetStyle() {
+        return checkboxWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getRadioWidgetStyle() {
+        return radioWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getButtonWidgetStyle() {
+        return buttonWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getSelectWidgetStyle() {
+        return selectWidgetStyleEClass;
     }
 
     /**
@@ -1371,19 +1611,23 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         buttonDescriptionEClass = createEClass(PropertiesPackage.BUTTON_DESCRIPTION);
         createEAttribute(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION);
         createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION);
+        createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__STYLE);
 
         labelDescriptionEClass = createEClass(PropertiesPackage.LABEL_DESCRIPTION);
         createEAttribute(labelDescriptionEClass, PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION);
+        createEReference(labelDescriptionEClass, PropertiesPackage.LABEL_DESCRIPTION__STYLE);
 
         checkboxDescriptionEClass = createEClass(PropertiesPackage.CHECKBOX_DESCRIPTION);
         createEAttribute(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
+        createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE);
 
         selectDescriptionEClass = createEClass(PropertiesPackage.SELECT_DESCRIPTION);
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION);
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION);
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
+        createEReference(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__STYLE);
 
         dynamicMappingForEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_FOR);
         createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR);
@@ -1402,6 +1646,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION);
         createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION);
         createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
+        createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__STYLE);
 
         singleReferenceDescriptionEClass = createEClass(PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION);
         createEAttribute(singleReferenceDescriptionEClass, PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__VALUE_EXPRESSION);
@@ -1437,13 +1682,33 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEReference(customOperationEClass, PropertiesPackage.CUSTOM_OPERATION__INITIAL_OPERATION);
 
         widgetStyleEClass = createEClass(PropertiesPackage.WIDGET_STYLE);
+        createEAttribute(widgetStyleEClass, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION);
+        createEAttribute(widgetStyleEClass, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE);
+        createEReference(widgetStyleEClass, PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR);
+        createEReference(widgetStyleEClass, PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR);
+        createEAttribute(widgetStyleEClass, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT);
+
+        textWidgetStyleEClass = createEClass(PropertiesPackage.TEXT_WIDGET_STYLE);
+        createEAttribute(textWidgetStyleEClass, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION);
+        createEAttribute(textWidgetStyleEClass, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE);
+        createEReference(textWidgetStyleEClass, PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR);
+        createEReference(textWidgetStyleEClass, PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR);
+        createEAttribute(textWidgetStyleEClass, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT);
+
+        labelWidgetStyleEClass = createEClass(PropertiesPackage.LABEL_WIDGET_STYLE);
+        createEAttribute(labelWidgetStyleEClass, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_NAME_EXPRESSION);
+        createEAttribute(labelWidgetStyleEClass, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_SIZE);
+        createEReference(labelWidgetStyleEClass, PropertiesPackage.LABEL_WIDGET_STYLE__BACKGROUND_COLOR);
+        createEReference(labelWidgetStyleEClass, PropertiesPackage.LABEL_WIDGET_STYLE__FOREGROUND_COLOR);
+        createEAttribute(labelWidgetStyleEClass, PropertiesPackage.LABEL_WIDGET_STYLE__FONT_FORMAT);
+
+        checkboxWidgetStyleEClass = createEClass(PropertiesPackage.CHECKBOX_WIDGET_STYLE);
+
+        radioWidgetStyleEClass = createEClass(PropertiesPackage.RADIO_WIDGET_STYLE);
 
-        textStyleEClass = createEClass(PropertiesPackage.TEXT_STYLE);
-        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION);
-        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_SIZE);
-        createEReference(textStyleEClass, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR);
-        createEReference(textStyleEClass, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR);
-        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_FORMAT);
+        buttonWidgetStyleEClass = createEClass(PropertiesPackage.BUTTON_WIDGET_STYLE);
+
+        selectWidgetStyleEClass = createEClass(PropertiesPackage.SELECT_WIDGET_STYLE);
     }
 
     /**
@@ -1495,7 +1760,12 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         singleReferenceDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         multipleReferencesDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         customDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
-        textStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        textWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        labelWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        checkboxWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        radioWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        buttonWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        selectWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
 
         // Initialize classes and features; add operations and parameters
         initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
@@ -1546,8 +1816,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getGroupDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getGroupDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getGroupDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getGroupDescription_SemanticCandidateExpression(), theDescriptionPackage.getInterpretedExpression(), "semanticCandidateExpression", null, 0, 1, GroupDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
@@ -1591,7 +1861,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getTextDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTextDescription_Style(), this.getTextStyle(), null, "style", null, 0, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+        initEReference(getTextDescription_Style(), this.getTextWidgetStyle(), null, "style", null, 0, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
 
@@ -1602,18 +1872,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getButtonDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, ButtonDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getButtonDescription_Style(), this.getButtonWidgetStyle(), null, "style", null, 0, 1, ButtonDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(labelDescriptionEClass, LabelDescription.class, "LabelDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getLabelDescription_BodyExpression(), theDescriptionPackage.getInterpretedExpression(), "bodyExpression", null, 0, 1, LabelDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getLabelDescription_Style(), this.getLabelWidgetStyle(), null, "style", null, 0, 1, LabelDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(checkboxDescriptionEClass, CheckboxDescription.class, "CheckboxDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCheckboxDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEAttribute(getCheckboxDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getCheckboxDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, CheckboxDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getCheckboxDescription_Style(), this.getCheckboxWidgetStyle(), null, "style", null, 0, 1, CheckboxDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(selectDescriptionEClass, SelectDescription.class, "SelectDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSelectDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, SelectDescription.class, !EPackageImpl.IS_TRANSIENT,
@@ -1627,6 +1905,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEAttribute(getSelectDescription_CandidateDisplayExpression(), theDescriptionPackage.getInterpretedExpression(), "candidateDisplayExpression", null, 0, 1, SelectDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
+        initEReference(getSelectDescription_Style(), this.getSelectWidgetStyle(), null, "style", null, 0, 1, SelectDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(dynamicMappingForEClass, DynamicMappingFor.class, "DynamicMappingFor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getDynamicMappingFor_Iterator(), theEcorePackage.getEString(), "iterator", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
@@ -1660,6 +1941,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEAttribute(getRadioDescription_CandidateDisplayExpression(), theDescriptionPackage.getInterpretedExpression(), "candidateDisplayExpression", null, 0, 1, RadioDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
+        initEReference(getRadioDescription_Style(), this.getRadioWidgetStyle(), null, "style", null, 0, 1, RadioDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(singleReferenceDescriptionEClass, SingleReferenceDescription.class, "SingleReferenceDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
@@ -1675,9 +1959,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getSingleReferenceDescription_SearchOperation(), this.getOperationDescription(), null, "searchOperation", null, 0, 1, SingleReferenceDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getSingleReferenceDescription_UnsetOperation(), this.getOperationDescription(), null, "unsetOperation", null, 0, 1, SingleReferenceDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getSingleReferenceDescription_UnsetOperation(), this.getOperationDescription(), null, "unsetOperation", null, 0, 1, SingleReferenceDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getSingleReferenceDescription_OnClickOperation(), this.getOperationDescription(), null, "onClickOperation", null, 0, 1, SingleReferenceDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
@@ -1707,9 +1991,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getMultipleReferencesDescription_OnClickOperation(), this.getOperationDescription(), null, "onClickOperation", null, 0, 1, MultipleReferencesDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getMultipleReferencesDescription_UpOperation(), this.getOperationDescription(), null, "upOperation", null, 0, 1, MultipleReferencesDescription.class,
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
-                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getMultipleReferencesDescription_UpOperation(), this.getOperationDescription(), null, "upOperation", null, 0, 1, MultipleReferencesDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEReference(getMultipleReferencesDescription_DownOperation(), this.getOperationDescription(), null, "downOperation", null, 0, 1, MultipleReferencesDescription.class,
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
@@ -1736,21 +2020,55 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(widgetStyleEClass, WidgetStyle.class, "WidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getWidgetStyle_LabelFontNameExpression(), theDescriptionPackage.getInterpretedExpression(), "labelFontNameExpression", null, 0, 1, WidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getWidgetStyle_LabelFontSize(), ecorePackage.getEInt(), "labelFontSize", null, 0, 1, WidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getWidgetStyle_LabelBackgroundColor(), theDescriptionPackage.getColorDescription(), null, "labelBackgroundColor", null, 0, 1, WidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getWidgetStyle_LabelForegroundColor(), theDescriptionPackage.getColorDescription(), null, "labelForegroundColor", null, 0, 1, WidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getWidgetStyle_LabelFontFormat(), theViewpointPackage.getFontFormat(), "labelFontFormat", null, 0, 4, WidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(textWidgetStyleEClass, TextWidgetStyle.class, "TextWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getTextWidgetStyle_FontNameExpression(), theDescriptionPackage.getInterpretedExpression(), "fontNameExpression", null, 0, 1, TextWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getTextWidgetStyle_FontSize(), ecorePackage.getEInt(), "fontSize", null, 0, 1, TextWidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextWidgetStyle_BackgroundColor(), theDescriptionPackage.getColorDescription(), null, "backgroundColor", null, 0, 1, TextWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextWidgetStyle_ForegroundColor(), theDescriptionPackage.getColorDescription(), null, "foregroundColor", null, 0, 1, TextWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getTextWidgetStyle_FontFormat(), theViewpointPackage.getFontFormat(), "fontFormat", null, 0, 4, TextWidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
-        initEClass(textStyleEClass, TextStyle.class, "TextStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTextStyle_FontNameExpression(), theDescriptionPackage.getInterpretedExpression(), "fontNameExpression", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+        initEClass(labelWidgetStyleEClass, LabelWidgetStyle.class, "LabelWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getLabelWidgetStyle_FontNameExpression(), theDescriptionPackage.getInterpretedExpression(), "fontNameExpression", null, 0, 1, LabelWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTextStyle_FontSize(), ecorePackage.getEInt(), "fontSize", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTextStyle_BackgroundColor(), theDescriptionPackage.getColorDescription(), null, "backgroundColor", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+        initEAttribute(getLabelWidgetStyle_FontSize(), ecorePackage.getEInt(), "fontSize", null, 0, 1, LabelWidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getLabelWidgetStyle_BackgroundColor(), theDescriptionPackage.getColorDescription(), null, "backgroundColor", null, 0, 1, LabelWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTextStyle_ForegroundColor(), theDescriptionPackage.getColorDescription(), null, "foregroundColor", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+        initEReference(getLabelWidgetStyle_ForegroundColor(), theDescriptionPackage.getColorDescription(), null, "foregroundColor", null, 0, 1, LabelWidgetStyle.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTextStyle_FontFormat(), theViewpointPackage.getFontFormat(), "fontFormat", null, 0, 4, TextStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+        initEAttribute(getLabelWidgetStyle_FontFormat(), theViewpointPackage.getFontFormat(), "fontFormat", null, 0, 4, LabelWidgetStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
+        initEClass(checkboxWidgetStyleEClass, CheckboxWidgetStyle.class, "CheckboxWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(radioWidgetStyleEClass, RadioWidgetStyle.class, "RadioWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(buttonWidgetStyleEClass, ButtonWidgetStyle.class, "ButtonWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(selectWidgetStyleEClass, SelectWidgetStyle.class, "SelectWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
         // Create resource
         createResource(PropertiesPackage.eNS_URI);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
index 5802836e02..29c4d7cc70 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
@@ -26,12 +26,12 @@ import org.eclipse.sirius.viewpoint.description.validation.impl.ValidationRuleIm
  * <em><b>Property Validation Rule</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.PropertyValidationRuleImpl#getTargets
  * <em>Targets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
index ad0a29d7cd..6ecf5b8462 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -25,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Radio Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getValueExpression
@@ -38,8 +40,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getCandidateDisplayExpression
  * <em>Candidate Display Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -122,6 +125,16 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
     protected String candidateDisplayExpression = RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected RadioWidgetStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -271,10 +284,65 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * @generated
      */
     @Override
+    public RadioWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(RadioWidgetStyle newStyle, NotificationChain msgs) {
+        RadioWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(RadioWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -295,6 +363,8 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
             return getCandidatesExpression();
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             return getCandidateDisplayExpression();
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -319,6 +389,9 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             setCandidateDisplayExpression((String) newValue);
             return;
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+            setStyle((RadioWidgetStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -343,6 +416,9 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             setCandidateDisplayExpression(RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
             return;
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+            setStyle((RadioWidgetStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -362,8 +438,10 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
             return RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-            return RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
-            .equals(candidateDisplayExpression);
+            return RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null
+                    : !RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
+        case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetStyleImpl.java
new file mode 100644
index 0000000000..6510bfd4f9
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetStyleImpl.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Radio Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RadioWidgetStyleImpl extends WidgetStyleImpl implements RadioWidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected RadioWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.RADIO_WIDGET_STYLE;
+    }
+
+} // RadioWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
index a05b12c572..fc99d74199 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -25,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Select Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getValueExpression
@@ -38,8 +40,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidateDisplayExpression
  * <em>Candidate Display Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -122,6 +125,16 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected String candidateDisplayExpression = SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected SelectWidgetStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -271,10 +284,65 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * @generated
      */
     @Override
+    public SelectWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(SelectWidgetStyle newStyle, NotificationChain msgs) {
+        SelectWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(SelectWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -295,6 +363,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
             return getCandidatesExpression();
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             return getCandidateDisplayExpression();
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -319,6 +389,9 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             setCandidateDisplayExpression((String) newValue);
             return;
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+            setStyle((SelectWidgetStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -343,6 +416,9 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             setCandidateDisplayExpression(SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
             return;
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+            setStyle((SelectWidgetStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -362,8 +438,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
             return SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-            return SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
-            .equals(candidateDisplayExpression);
+            return SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null
+                    : !SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
+        case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetStyleImpl.java
new file mode 100644
index 0000000000..27e25f56c7
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetStyleImpl.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Select Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SelectWidgetStyleImpl extends WidgetStyleImpl implements SelectWidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected SelectWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.SELECT_WIDGET_STYLE;
+    }
+
+} // SelectWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
index f1393ec1fc..e0290d4840 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.sirius.properties.SingleReferenceDescription;
  * <em><b>Single Reference Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl#getValueExpression
@@ -45,7 +46,6 @@ import org.eclipse.sirius.properties.SingleReferenceDescription;
  * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl#getOnClickOperation
  * <em>On Click Operation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -383,7 +383,8 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
         OperationDescription oldOnClickOperation = onClickOperation;
         onClickOperation = newOnClickOperation;
         if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, oldOnClickOperation, newOnClickOperation);
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, oldOnClickOperation,
+                    newOnClickOperation);
             if (msgs == null) {
                 msgs = notification;
             } else {
@@ -534,8 +535,8 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
             return SingleReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !SingleReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            return SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null : !SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT
-            .equals(displayExpression);
+            return SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null
+                    : !SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT.equals(displayExpression);
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__CREATE_OPERATION:
             return createOperation != null;
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION:
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
index 1aed3caf62..0688f9e034 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
@@ -22,12 +22,12 @@ import org.eclipse.sirius.properties.TextAreaDescription;
  * <em><b>Text Area Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.TextAreaDescriptionImpl#getLineCount
  * <em>Line Count</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
index 6fd29e9954..0041ef351e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -26,6 +26,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em><b>Text Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getValueExpression
@@ -36,7 +37,6 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getStyle
  * <em>Style</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -82,7 +82,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * @generated
      * @ordered
      */
-    protected TextStyle style;
+    protected TextWidgetStyle style;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -186,7 +186,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * @generated
      */
     @Override
-    public TextStyle getStyle() {
+    public TextWidgetStyle getStyle() {
         return style;
     }
 
@@ -195,8 +195,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      *
      * @generated
      */
-    public NotificationChain basicSetStyle(TextStyle newStyle, NotificationChain msgs) {
-        TextStyle oldStyle = style;
+    public NotificationChain basicSetStyle(TextWidgetStyle newStyle, NotificationChain msgs) {
+        TextWidgetStyle oldStyle = style;
         style = newStyle;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__STYLE, oldStyle, newStyle);
@@ -215,7 +215,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * @generated
      */
     @Override
-    public void setStyle(TextStyle newStyle) {
+    public void setStyle(TextWidgetStyle newStyle) {
         if (newStyle != style) {
             NotificationChain msgs = null;
             if (style != null) {
@@ -282,7 +282,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             setInitialOperation((InitialOperation) newValue);
             return;
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
-            setStyle((TextStyle) newValue);
+            setStyle((TextWidgetStyle) newValue);
             return;
         }
         super.eSet(featureID, newValue);
@@ -303,7 +303,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             setInitialOperation((InitialOperation) null);
             return;
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
-            setStyle((TextStyle) null);
+            setStyle((TextWidgetStyle) null);
             return;
         }
         super.eUnset(featureID);
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextWidgetStyleImpl.java
index 3358d703be..a4e7b2eb6d 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextStyleImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextWidgetStyleImpl.java
@@ -20,35 +20,36 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.description.ColorDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Text Style</b></em>'. <!-- end-user-doc -->
+ * <em><b>Text Widget Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontNameExpression
+ * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl#getFontNameExpression
  * <em>Font Name Expression</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontSize <em>
- * Font Size</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl#getFontSize
+ * <em>Font Size</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getBackgroundColor
+ * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl#getBackgroundColor
  * <em>Background Color</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getForegroundColor
+ * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl#getForegroundColor
  * <em>Foreground Color</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontFormat
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextWidgetStyleImpl#getFontFormat
  * <em>Font Format</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
+public class TextWidgetStyleImpl extends WidgetStyleImpl implements TextWidgetStyle {
     /**
      * The default value of the '{@link #getFontNameExpression()
      * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
@@ -69,7 +70,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
      * @generated
      * @ordered
      */
-    protected String fontNameExpression = TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT;
+    protected String fontNameExpression = TextWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT;
 
     /**
      * The default value of the '{@link #getFontSize() <em>Font Size</em>}'
@@ -89,7 +90,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
      * @generated
      * @ordered
      */
-    protected int fontSize = TextStyleImpl.FONT_SIZE_EDEFAULT;
+    protected int fontSize = TextWidgetStyleImpl.FONT_SIZE_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getBackgroundColor()
@@ -128,7 +129,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
      *
      * @generated
      */
-    protected TextStyleImpl() {
+    protected TextWidgetStyleImpl() {
         super();
     }
 
@@ -139,7 +140,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
      */
     @Override
     protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.TEXT_STYLE;
+        return PropertiesPackage.Literals.TEXT_WIDGET_STYLE;
     }
 
     /**
@@ -162,7 +163,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
         String oldFontNameExpression = fontNameExpression;
         fontNameExpression = newFontNameExpression;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION, oldFontNameExpression, fontNameExpression));
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION, oldFontNameExpression, fontNameExpression));
         }
     }
 
@@ -186,7 +187,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
         int oldFontSize = fontSize;
         fontSize = newFontSize;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FONT_SIZE, oldFontSize, fontSize));
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE, oldFontSize, fontSize));
         }
     }
 
@@ -202,7 +203,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
             backgroundColor = (ColorDescription) eResolveProxy(oldBackgroundColor);
             if (backgroundColor != oldBackgroundColor) {
                 if (eNotificationRequired()) {
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
                 }
             }
         }
@@ -228,7 +229,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
         ColorDescription oldBackgroundColor = backgroundColor;
         backgroundColor = newBackgroundColor;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
         }
     }
 
@@ -244,7 +245,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
             foregroundColor = (ColorDescription) eResolveProxy(oldForegroundColor);
             if (foregroundColor != oldForegroundColor) {
                 if (eNotificationRequired()) {
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
                 }
             }
         }
@@ -270,7 +271,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
         ColorDescription oldForegroundColor = foregroundColor;
         foregroundColor = newForegroundColor;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
         }
     }
 
@@ -282,7 +283,7 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
     @Override
     public EList<FontFormat> getFontFormat() {
         if (fontFormat == null) {
-            fontFormat = new EDataTypeUniqueEList<FontFormat>(FontFormat.class, this, PropertiesPackage.TEXT_STYLE__FONT_FORMAT);
+            fontFormat = new EDataTypeUniqueEList<FontFormat>(FontFormat.class, this, PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT);
         }
         return fontFormat;
     }
@@ -295,21 +296,21 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION:
             return getFontNameExpression();
-        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE:
             return getFontSize();
-        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR:
             if (resolve) {
                 return getBackgroundColor();
             }
             return basicGetBackgroundColor();
-        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR:
             if (resolve) {
                 return getForegroundColor();
             }
             return basicGetForegroundColor();
-        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT:
             return getFontFormat();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -324,19 +325,19 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION:
             setFontNameExpression((String) newValue);
             return;
-        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE:
             setFontSize((Integer) newValue);
             return;
-        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR:
             setBackgroundColor((ColorDescription) newValue);
             return;
-        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR:
             setForegroundColor((ColorDescription) newValue);
             return;
-        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT:
             getFontFormat().clear();
             getFontFormat().addAll((Collection<? extends FontFormat>) newValue);
             return;
@@ -352,19 +353,19 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
-            setFontNameExpression(TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT);
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            setFontNameExpression(TextWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT);
             return;
-        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
-            setFontSize(TextStyleImpl.FONT_SIZE_EDEFAULT);
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE:
+            setFontSize(TextWidgetStyleImpl.FONT_SIZE_EDEFAULT);
             return;
-        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR:
             setBackgroundColor((ColorDescription) null);
             return;
-        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR:
             setForegroundColor((ColorDescription) null);
             return;
-        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT:
             getFontFormat().clear();
             return;
         }
@@ -379,15 +380,15 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
-            return TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT == null ? fontNameExpression != null : !TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT.equals(fontNameExpression);
-        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
-            return fontSize != TextStyleImpl.FONT_SIZE_EDEFAULT;
-        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_NAME_EXPRESSION:
+            return TextWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT == null ? fontNameExpression != null : !TextWidgetStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT.equals(fontNameExpression);
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_SIZE:
+            return fontSize != TextWidgetStyleImpl.FONT_SIZE_EDEFAULT;
+        case PropertiesPackage.TEXT_WIDGET_STYLE__BACKGROUND_COLOR:
             return backgroundColor != null;
-        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FOREGROUND_COLOR:
             return foregroundColor != null;
-        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+        case PropertiesPackage.TEXT_WIDGET_STYLE__FONT_FORMAT:
             return fontFormat != null && !fontFormat.isEmpty();
         }
         return super.eIsSet(featureID);
@@ -415,4 +416,4 @@ public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
         return result.toString();
     }
 
-} // TextStyleImpl
+} // TextWidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
index 91514e7e19..5e59fc0d79 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  * <em><b>View Extension Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getIdentifier
@@ -48,7 +49,6 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getGroups
  * <em>Groups</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
index deaaec8323..16dfda1cdf 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * <em><b>Widget Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getIdentifier
@@ -34,7 +35,6 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getHelpExpression
  * <em>Help Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java
index b6b00f37d4..34300a614d 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java
@@ -11,21 +11,125 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetStyle;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
  * <em><b>Widget Style</b></em>'. <!-- end-user-doc -->
  * <p>
+ * The following features are implemented:
  * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl#getLabelFontNameExpression
+ * <em>Label Font Name Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl#getLabelFontSize
+ * <em>Label Font Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl#getLabelBackgroundColor
+ * <em>Label Background Color</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl#getLabelForegroundColor
+ * <em>Label Foreground Color</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl#getLabelFontFormat
+ * <em>Label Font Format</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class WidgetStyleImpl extends MinimalEObjectImpl.Container implements WidgetStyle {
     /**
+     * The default value of the '{@link #getLabelFontNameExpression()
+     * <em>Label Font Name Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getLabelFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String LABEL_FONT_NAME_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getLabelFontNameExpression()
+     * <em>Label Font Name Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getLabelFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected String labelFontNameExpression = WidgetStyleImpl.LABEL_FONT_NAME_EXPRESSION_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getLabelFontSize()
+     * <em>Label Font Size</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getLabelFontSize()
+     * @generated
+     * @ordered
+     */
+    protected static final int LABEL_FONT_SIZE_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getLabelFontSize()
+     * <em>Label Font Size</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getLabelFontSize()
+     * @generated
+     * @ordered
+     */
+    protected int labelFontSize = WidgetStyleImpl.LABEL_FONT_SIZE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getLabelBackgroundColor()
+     * <em>Label Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getLabelBackgroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription labelBackgroundColor;
+
+    /**
+     * The cached value of the '{@link #getLabelForegroundColor()
+     * <em>Label Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getLabelForegroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription labelForegroundColor;
+
+    /**
+     * The cached value of the '{@link #getLabelFontFormat()
+     * <em>Label Font Format</em>}' attribute list. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getLabelFontFormat()
+     * @generated
+     * @ordered
+     */
+    protected EList<FontFormat> labelFontFormat;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -44,4 +148,277 @@ public class WidgetStyleImpl extends MinimalEObjectImpl.Container implements Wid
         return PropertiesPackage.Literals.WIDGET_STYLE;
     }
 
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getLabelFontNameExpression() {
+        return labelFontNameExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setLabelFontNameExpression(String newLabelFontNameExpression) {
+        String oldLabelFontNameExpression = labelFontNameExpression;
+        labelFontNameExpression = newLabelFontNameExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION, oldLabelFontNameExpression, labelFontNameExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int getLabelFontSize() {
+        return labelFontSize;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setLabelFontSize(int newLabelFontSize) {
+        int oldLabelFontSize = labelFontSize;
+        labelFontSize = newLabelFontSize;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE, oldLabelFontSize, labelFontSize));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getLabelBackgroundColor() {
+        if (labelBackgroundColor != null && labelBackgroundColor.eIsProxy()) {
+            InternalEObject oldLabelBackgroundColor = (InternalEObject) labelBackgroundColor;
+            labelBackgroundColor = (ColorDescription) eResolveProxy(oldLabelBackgroundColor);
+            if (labelBackgroundColor != oldLabelBackgroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR, oldLabelBackgroundColor, labelBackgroundColor));
+                }
+            }
+        }
+        return labelBackgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetLabelBackgroundColor() {
+        return labelBackgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setLabelBackgroundColor(ColorDescription newLabelBackgroundColor) {
+        ColorDescription oldLabelBackgroundColor = labelBackgroundColor;
+        labelBackgroundColor = newLabelBackgroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR, oldLabelBackgroundColor, labelBackgroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getLabelForegroundColor() {
+        if (labelForegroundColor != null && labelForegroundColor.eIsProxy()) {
+            InternalEObject oldLabelForegroundColor = (InternalEObject) labelForegroundColor;
+            labelForegroundColor = (ColorDescription) eResolveProxy(oldLabelForegroundColor);
+            if (labelForegroundColor != oldLabelForegroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR, oldLabelForegroundColor, labelForegroundColor));
+                }
+            }
+        }
+        return labelForegroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetLabelForegroundColor() {
+        return labelForegroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setLabelForegroundColor(ColorDescription newLabelForegroundColor) {
+        ColorDescription oldLabelForegroundColor = labelForegroundColor;
+        labelForegroundColor = newLabelForegroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR, oldLabelForegroundColor, labelForegroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EList<FontFormat> getLabelFontFormat() {
+        if (labelFontFormat == null) {
+            labelFontFormat = new EDataTypeUniqueEList<FontFormat>(FontFormat.class, this, PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT);
+        }
+        return labelFontFormat;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION:
+            return getLabelFontNameExpression();
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE:
+            return getLabelFontSize();
+        case PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR:
+            if (resolve) {
+                return getLabelBackgroundColor();
+            }
+            return basicGetLabelBackgroundColor();
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR:
+            if (resolve) {
+                return getLabelForegroundColor();
+            }
+            return basicGetLabelForegroundColor();
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT:
+            return getLabelFontFormat();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION:
+            setLabelFontNameExpression((String) newValue);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE:
+            setLabelFontSize((Integer) newValue);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR:
+            setLabelBackgroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR:
+            setLabelForegroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT:
+            getLabelFontFormat().clear();
+            getLabelFontFormat().addAll((Collection<? extends FontFormat>) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION:
+            setLabelFontNameExpression(WidgetStyleImpl.LABEL_FONT_NAME_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE:
+            setLabelFontSize(WidgetStyleImpl.LABEL_FONT_SIZE_EDEFAULT);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR:
+            setLabelBackgroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR:
+            setLabelForegroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT:
+            getLabelFontFormat().clear();
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION:
+            return WidgetStyleImpl.LABEL_FONT_NAME_EXPRESSION_EDEFAULT == null ? labelFontNameExpression != null : !WidgetStyleImpl.LABEL_FONT_NAME_EXPRESSION_EDEFAULT.equals(labelFontNameExpression);
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE:
+            return labelFontSize != WidgetStyleImpl.LABEL_FONT_SIZE_EDEFAULT;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR:
+            return labelBackgroundColor != null;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR:
+            return labelForegroundColor != null;
+        case PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT:
+            return labelFontFormat != null && !labelFontFormat.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (labelFontNameExpression: ");
+        result.append(labelFontNameExpression);
+        result.append(", labelFontSize: ");
+        result.append(labelFontSize);
+        result.append(", labelFontFormat: ");
+        result.append(labelFontFormat);
+        result.append(')');
+        return result.toString();
+    }
+
 } // WidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
index b4d5c99744..4eda18e304 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
@@ -16,7 +16,9 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
@@ -26,6 +28,7 @@ import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
 import org.eclipse.sirius.properties.PageDescription;
@@ -33,11 +36,13 @@ import org.eclipse.sirius.properties.PageValidationSetDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
@@ -221,8 +226,33 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseTextStyle(TextStyle object) {
-            return createTextStyleAdapter();
+        public Adapter caseTextWidgetStyle(TextWidgetStyle object) {
+            return createTextWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseLabelWidgetStyle(LabelWidgetStyle object) {
+            return createLabelWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseCheckboxWidgetStyle(CheckboxWidgetStyle object) {
+            return createCheckboxWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseRadioWidgetStyle(RadioWidgetStyle object) {
+            return createRadioWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseButtonWidgetStyle(ButtonWidgetStyle object) {
+            return createButtonWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseSelectWidgetStyle(SelectWidgetStyle object) {
+            return createSelectWidgetStyleAdapter();
         }
 
         @Override
@@ -629,16 +659,97 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.properties.TextStyle <em>Text Style</em>}'.
-     * <!-- begin-user-doc --> This default implementation returns null so that
-     * we can easily ignore cases; it's useful to ignore a case when inheritance
-     * will catch all the cases anyway. <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.properties.TextWidgetStyle
+     * <em>Text Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.TextWidgetStyle
+     * @generated
+     */
+    public Adapter createTextWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.LabelWidgetStyle
+     * <em>Label Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.LabelWidgetStyle
+     * @generated
+     */
+    public Adapter createLabelWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetStyle
+     * <em>Checkbox Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.CheckboxWidgetStyle
+     * @generated
+     */
+    public Adapter createCheckboxWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.RadioWidgetStyle
+     * <em>Radio Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.RadioWidgetStyle
+     * @generated
+     */
+    public Adapter createRadioWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.ButtonWidgetStyle
+     * <em>Button Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.ButtonWidgetStyle
+     * @generated
+     */
+    public Adapter createButtonWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.SelectWidgetStyle
+     * <em>Select Widget Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
      *
      * @return the new adapter.
-     * @see org.eclipse.sirius.properties.TextStyle
+     * @see org.eclipse.sirius.properties.SelectWidgetStyle
      * @generated
      */
-    public Adapter createTextStyleAdapter() {
+    public Adapter createSelectWidgetStyleAdapter() {
         return null;
     }
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
index 167d452113..f21735c52a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
@@ -16,7 +16,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
@@ -26,6 +28,7 @@ import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
 import org.eclipse.sirius.properties.PageDescription;
@@ -33,11 +36,13 @@ import org.eclipse.sirius.properties.PageValidationSetDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
@@ -352,11 +357,66 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
-        case PropertiesPackage.TEXT_STYLE: {
-            TextStyle textStyle = (TextStyle) theEObject;
-            T result = caseTextStyle(textStyle);
+        case PropertiesPackage.TEXT_WIDGET_STYLE: {
+            TextWidgetStyle textWidgetStyle = (TextWidgetStyle) theEObject;
+            T result = caseTextWidgetStyle(textWidgetStyle);
             if (result == null) {
-                result = caseWidgetStyle(textStyle);
+                result = caseWidgetStyle(textWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.LABEL_WIDGET_STYLE: {
+            LabelWidgetStyle labelWidgetStyle = (LabelWidgetStyle) theEObject;
+            T result = caseLabelWidgetStyle(labelWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(labelWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.CHECKBOX_WIDGET_STYLE: {
+            CheckboxWidgetStyle checkboxWidgetStyle = (CheckboxWidgetStyle) theEObject;
+            T result = caseCheckboxWidgetStyle(checkboxWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(checkboxWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.RADIO_WIDGET_STYLE: {
+            RadioWidgetStyle radioWidgetStyle = (RadioWidgetStyle) theEObject;
+            T result = caseRadioWidgetStyle(radioWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(radioWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.BUTTON_WIDGET_STYLE: {
+            ButtonWidgetStyle buttonWidgetStyle = (ButtonWidgetStyle) theEObject;
+            T result = caseButtonWidgetStyle(buttonWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(buttonWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.SELECT_WIDGET_STYLE: {
+            SelectWidgetStyle selectWidgetStyle = (SelectWidgetStyle) theEObject;
+            T result = caseSelectWidgetStyle(selectWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(selectWidgetStyle);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -761,18 +821,103 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Text Style</em>'. <!-- begin-user-doc --> This implementation returns
-     * null; returning a non-null result will terminate the switch. <!--
+     * <em>Text Widget Style</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
      *
      * @param object
      *            the target of the switch.
      * @return the result of interpreting the object as an instance of '
-     *         <em>Text Style</em>'.
+     *         <em>Text Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseTextWidgetStyle(TextWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Label Widget Style</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Label Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseLabelWidgetStyle(LabelWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Checkbox Widget Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Checkbox Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseCheckboxWidgetStyle(CheckboxWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Radio Widget Style</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Radio Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseRadioWidgetStyle(RadioWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Button Widget Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Button Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseButtonWidgetStyle(ButtonWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Select Widget Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Select Widget Style</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseTextStyle(TextStyle object) {
+    public T caseSelectWidgetStyle(SelectWidgetStyle object) {
         return null;
     }
 
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index e9055c4a45..cf49ee1838 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -18,7 +18,9 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.eef.EEFButtonDescription;
+import org.eclipse.eef.EEFButtonStyle;
 import org.eclipse.eef.EEFCheckboxDescription;
+import org.eclipse.eef.EEFCheckboxStyle;
 import org.eclipse.eef.EEFContainerDescription;
 import org.eclipse.eef.EEFCustomExpression;
 import org.eclipse.eef.EEFCustomWidgetDescription;
@@ -26,11 +28,14 @@ import org.eclipse.eef.EEFDynamicMappingFor;
 import org.eclipse.eef.EEFDynamicMappingIf;
 import org.eclipse.eef.EEFGroupDescription;
 import org.eclipse.eef.EEFLabelDescription;
+import org.eclipse.eef.EEFLabelStyle;
 import org.eclipse.eef.EEFPageDescription;
 import org.eclipse.eef.EEFPropertyValidationRuleDescription;
 import org.eclipse.eef.EEFRadioDescription;
+import org.eclipse.eef.EEFRadioStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectDescription;
+import org.eclipse.eef.EEFSelectStyle;
 import org.eclipse.eef.EEFSemanticValidationRuleDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.EEFTextStyle;
@@ -38,6 +43,7 @@ import org.eclipse.eef.EEFValidationFixDescription;
 import org.eclipse.eef.EEFValidationRuleDescription;
 import org.eclipse.eef.EEFViewDescription;
 import org.eclipse.eef.EEFWidgetDescription;
+import org.eclipse.eef.EEFWidgetStyle;
 import org.eclipse.eef.EEF_VALIDATION_SEVERITY_DESCRIPTION;
 import org.eclipse.eef.EefFactory;
 import org.eclipse.emf.ecore.EObject;
@@ -45,7 +51,9 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.business.api.color.AbstractColorUpdater;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
@@ -53,16 +61,21 @@ import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
-import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.WidgetDescription;
+import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
+import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.RGBValues;
 import org.eclipse.sirius.viewpoint.description.ColorDescription;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
@@ -322,47 +335,121 @@ public class ViewDescriptionConverter {
         if (description != null) {
             description.setHelpExpression(widgetDescription.getHelpExpression());
             description.setLabelExpression(widgetDescription.getLabelExpression());
-
             this.widget2eefWidget.put(widgetDescription, description);
         }
 
         return description;
     }
 
-    private EEFTextDescription createEEFTextDescription(TextDescription textDescription) {
-        EEFTextDescription eefTextDescription = EefFactory.eINSTANCE.createEEFTextDescription();
-
-        eefTextDescription.setIdentifier(textDescription.getIdentifier());
-        eefTextDescription.setValueExpression(textDescription.getValueExpression());
-
-        InitialOperation initialOperation = textDescription.getInitialOperation();
-        eefTextDescription.setEditExpression(getExpressionForOperation(initialOperation));
-
-        TextStyle textStyle = textDescription.getStyle();
-        if (textStyle != null) {
-            EEFTextStyle eefTextStyle = EefFactory.eINSTANCE.createEEFTextStyle();
+    private EEFWidgetStyle createEEFWidgetStyle(WidgetStyle widgetStyle) {
+        EEFWidgetStyle eefWidgetStyle = null;
+
+        if (widgetStyle instanceof TextWidgetStyle) {
+            eefWidgetStyle = createEEFTextStyle((TextWidgetStyle) widgetStyle);
+        } else if (widgetStyle instanceof ButtonWidgetStyle) {
+            eefWidgetStyle = EefFactory.eINSTANCE.createEEFButtonStyle();
+        } else if (widgetStyle instanceof CheckboxWidgetStyle) {
+            eefWidgetStyle = EefFactory.eINSTANCE.createEEFCheckboxStyle();
+        } else if (widgetStyle instanceof RadioWidgetStyle) {
+            eefWidgetStyle = EefFactory.eINSTANCE.createEEFRadioStyle();
+        } else if (widgetStyle instanceof SelectWidgetStyle) {
+            eefWidgetStyle = EefFactory.eINSTANCE.createEEFSelectStyle();
+        }
 
-            ColorDescription backgroundColorDescription = textStyle.getBackgroundColor();
+        // Set label style
+        if (eefWidgetStyle != null) {
+            ColorDescription backgroundColorDescription = widgetStyle.getLabelBackgroundColor();
             if (backgroundColorDescription != null) {
                 String backgroundColorExpression = getColorExpression(backgroundColorDescription);
                 if (backgroundColorExpression != null) {
-                    eefTextStyle.setBackgroundColorExpression(backgroundColorExpression);
+                    eefWidgetStyle.setLabelBackgroundColorExpression(backgroundColorExpression);
                 }
             }
 
-            ColorDescription foregroundColorDescription = textStyle.getForegroundColor();
+            ColorDescription foregroundColorDescription = widgetStyle.getLabelForegroundColor();
             if (foregroundColorDescription != null) {
                 String foregroundColorExpression = getColorExpression(foregroundColorDescription);
                 if (foregroundColorExpression != null) {
-                    eefTextStyle.setForegroundColorExpression(foregroundColorExpression);
+                    eefWidgetStyle.setLabelForegroundColorExpression(foregroundColorExpression);
                 }
             }
 
-            eefTextStyle.setFontNameExpression(textStyle.getFontNameExpression());
-            eefTextStyle.setFontSizeExpression(Integer.toString(textStyle.getFontSize()));
-            eefTextStyle.setFontStyleExpression(textStyle.getFontFormat().toString().substring(1, textStyle.getFontFormat().toString().length() - 1));
+            eefWidgetStyle.setLabelFontNameExpression(widgetStyle.getLabelFontNameExpression());
+            eefWidgetStyle.setLabelFontSizeExpression(Integer.toString(widgetStyle.getLabelFontSize()));
+            eefWidgetStyle.setLabelFontStyleExpression(getFontStyleExpression(widgetStyle.getLabelFontFormat()));
+        }
+        return eefWidgetStyle;
+    }
+
+    private EEFTextStyle createEEFTextStyle(TextWidgetStyle textStyle) {
+        EEFTextStyle eefTextStyle = EefFactory.eINSTANCE.createEEFTextStyle();
 
-            eefTextDescription.setStyle(eefTextStyle);
+        ColorDescription backgroundColorDescription = textStyle.getBackgroundColor();
+        if (backgroundColorDescription != null) {
+            String backgroundColorExpression = getColorExpression(backgroundColorDescription);
+            if (backgroundColorExpression != null) {
+                eefTextStyle.setBackgroundColorExpression(backgroundColorExpression);
+            }
+        }
+
+        ColorDescription foregroundColorDescription = textStyle.getForegroundColor();
+        if (foregroundColorDescription != null) {
+            String foregroundColorExpression = getColorExpression(foregroundColorDescription);
+            if (foregroundColorExpression != null) {
+                eefTextStyle.setForegroundColorExpression(foregroundColorExpression);
+            }
+        }
+
+        eefTextStyle.setFontNameExpression(textStyle.getFontNameExpression());
+        eefTextStyle.setFontSizeExpression(Integer.toString(textStyle.getFontSize()));
+        eefTextStyle.setFontStyleExpression(getFontStyleExpression(textStyle.getFontFormat()));
+
+        return eefTextStyle;
+    }
+
+    private EEFLabelStyle createEEFLabelStyle(LabelWidgetStyle labelStyle) {
+        EEFLabelStyle eefLabelStyle = EefFactory.eINSTANCE.createEEFLabelStyle();
+
+        ColorDescription backgroundColorDescription = labelStyle.getBackgroundColor();
+        if (backgroundColorDescription != null) {
+            String backgroundColorExpression = getColorExpression(backgroundColorDescription);
+            if (backgroundColorExpression != null) {
+                eefLabelStyle.setBackgroundColorExpression(backgroundColorExpression);
+            }
+        }
+
+        ColorDescription foregroundColorDescription = labelStyle.getForegroundColor();
+        if (foregroundColorDescription != null) {
+            String foregroundColorExpression = getColorExpression(foregroundColorDescription);
+            if (foregroundColorExpression != null) {
+                eefLabelStyle.setForegroundColorExpression(foregroundColorExpression);
+            }
+        }
+
+        eefLabelStyle.setFontNameExpression(labelStyle.getFontNameExpression());
+        eefLabelStyle.setFontSizeExpression(Integer.toString(labelStyle.getFontSize()));
+        eefLabelStyle.setFontStyleExpression(getFontStyleExpression(labelStyle.getFontFormat()));
+
+        return eefLabelStyle;
+    }
+
+    private String getFontStyleExpression(List<FontFormat> fontFormats) {
+        String fontFormat = fontFormats.toString();
+        return fontFormat.substring(1, fontFormat.length() - 1);
+    }
+
+    private EEFTextDescription createEEFTextDescription(TextDescription textDescription) {
+        EEFTextDescription eefTextDescription = EefFactory.eINSTANCE.createEEFTextDescription();
+
+        eefTextDescription.setIdentifier(textDescription.getIdentifier());
+        eefTextDescription.setValueExpression(textDescription.getValueExpression());
+
+        InitialOperation initialOperation = textDescription.getInitialOperation();
+        eefTextDescription.setEditExpression(getExpressionForOperation(initialOperation));
+
+        TextWidgetStyle textStyle = textDescription.getStyle();
+        if (textStyle != null) {
+            eefTextDescription.setStyle((EEFTextStyle) createEEFWidgetStyle(textStyle));
         }
         return eefTextDescription;
     }
@@ -404,6 +491,12 @@ public class ViewDescriptionConverter {
 
         InitialOperation initialOperation = textDescription.getInitialOperation();
         eefTextDescription.setEditExpression(getExpressionForOperation(initialOperation));
+
+        TextWidgetStyle textStyle = textDescription.getStyle();
+        if (textStyle != null) {
+            EEFTextStyle eefTextStyle = createEEFTextStyle(textStyle);
+            eefTextDescription.setStyle(eefTextStyle);
+        }
         return eefTextDescription;
     }
 
@@ -412,6 +505,13 @@ public class ViewDescriptionConverter {
 
         eefLabelDescription.setIdentifier(labelDescription.getIdentifier());
         eefLabelDescription.setBodyExpression(labelDescription.getBodyExpression());
+        LabelWidgetStyle bodyStyle = labelDescription.getStyle();
+        if (bodyStyle != null) {
+            EEFLabelStyle eefLabelStyle = createEEFLabelStyle(bodyStyle);
+            eefLabelDescription.setStyle(eefLabelStyle);
+
+        }
+
         return eefLabelDescription;
     }
 
@@ -422,6 +522,12 @@ public class ViewDescriptionConverter {
         eefButtonDescription.setButtonLabelExpression(buttonDescription.getButtonLabelExpression());
         InitialOperation initialOperation = buttonDescription.getInitialOperation();
         eefButtonDescription.setPushExpression(getExpressionForOperation(initialOperation));
+
+        ButtonWidgetStyle buttonStyle = buttonDescription.getStyle();
+        if (buttonStyle != null) {
+            eefButtonDescription.setStyle((EEFButtonStyle) createEEFWidgetStyle(buttonStyle));
+        }
+
         return eefButtonDescription;
     }
 
@@ -430,6 +536,12 @@ public class ViewDescriptionConverter {
 
         eefCheckboxDescription.setIdentifier(checkboxDescription.getIdentifier());
         eefCheckboxDescription.setValueExpression(checkboxDescription.getValueExpression());
+
+        CheckboxWidgetStyle checkboxStyle = checkboxDescription.getStyle();
+        if (checkboxStyle != null) {
+            eefCheckboxDescription.setStyle((EEFCheckboxStyle) createEEFWidgetStyle(checkboxStyle));
+        }
+
         return eefCheckboxDescription;
     }
 
@@ -440,6 +552,12 @@ public class ViewDescriptionConverter {
         eefSelectDescription.setValueExpression(selectDescription.getValueExpression());
         eefSelectDescription.setCandidatesExpression(selectDescription.getCandidatesExpression());
         eefSelectDescription.setCandidateDisplayExpression(selectDescription.getCandidateDisplayExpression());
+
+        SelectWidgetStyle selectStyle = selectDescription.getStyle();
+        if (selectStyle != null) {
+            eefSelectDescription.setStyle((EEFSelectStyle) createEEFWidgetStyle(selectStyle));
+        }
+
         return eefSelectDescription;
     }
 
@@ -450,9 +568,15 @@ public class ViewDescriptionConverter {
         eefRadioDescription.setValueExpression(radioDescription.getValueExpression());
         eefRadioDescription.setCandidatesExpression(radioDescription.getCandidatesExpression());
         eefRadioDescription.setCandidateDisplayExpression(radioDescription.getCandidateDisplayExpression());
+
+        RadioWidgetStyle radioStyle = radioDescription.getStyle();
+        if (radioStyle != null) {
+            eefRadioDescription.setStyle((EEFRadioStyle) createEEFWidgetStyle(radioStyle));
+        }
+
         return eefRadioDescription;
     }
-    
+
     private EEFCustomWidgetDescription createEEFCustomDescription(CustomDescription customDescription) {
         EEFCustomWidgetDescription eefCustomDescription = EefFactory.eINSTANCE.createEEFCustomWidgetDescription();
         eefCustomDescription.setIdentifier(customDescription.getIdentifier());