diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd b/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd
index ca4cd68..34ef7e4 100644
--- a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd
+++ b/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd
@@ -4,17 +4,24 @@ Anchor: GSWGenericContainer
         name = anchorName;
 }
 
+ShouldDisplay: GSWConditional
+{
+        condition = shouldDisplay;
+}
+
 Link: GSWHyperlink
 {
 	action = toggleVisibilityAction;
-        disabled = ^disabled;
+        disabled = isDisabled;
+        displayDisabled = ^displayDisabled;        
         fragmentIdentifier = anchorName;
+        class = ~linkClass;
 };
 
 Image: GSWImage
 {
     filename = imageFileName;
-    framework = "GSWExtensions";
+    //framework = "GSWExtensions";
     alt = helpString;
     name = helpString;
     border = "0";
@@ -25,6 +32,7 @@ Label: GSWString
 {
     value = label;
     escapeHTML = NO;
+    class = ~labelClass;
 }
 
 Condition: GSWConditional
diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html b/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html
index 68d9f71..ad90575 100644
--- a/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html
+++ b/GSWExtensions.framework/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.html
@@ -1 +1 @@
-<gsweb name="Anchor"></gsweb><gsweb name="Link"><gsweb name="Image"></gsweb></gsweb> <gsweb name="Label"></gsweb><gsweb name="Condition"><gsweb name="Content"></gsweb></gsweb>
\ No newline at end of file
+<gsweb name="Anchor"></gsweb><gsweb name="ShouldDisplay"><gsweb name="Link"><gsweb name="Image"></gsweb></gsweb> <gsweb name="Label"></gsweb><gsweb name="Condition"><gsweb name="Content"></gsweb></gsweb></gsweb>
\ No newline at end of file