[143776] Web Content Settings PropertyPage appears in all of the WTP created projects
diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 4f0aa63..83bb063 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -581,34 +581,42 @@
 			name="%JSPFragmentContentSettings.name"
 			class="org.eclipse.jst.jsp.ui.internal.contentproperties.ui.ProjectJSPFContentSettingsPropertyPage"
 			id="org.eclipse.jst.jsp.ui.internal.contentproperties.ProjectJSPFContentSettingsPropertyPage">
-			<filter
-				name="nature"
-				value="org.eclipse.wst.common.project.facet.core.nature">
-			</filter>
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IProject">
+						<or> 
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="jst.web" />
+						</or>
+					</adapt>
+				</and> 
+			</enabledWhen>
 		</page>
 		<page
 			objectClass="org.eclipse.core.resources.IFile"
 			adaptable="true"
 			name="%JSPFragmentContentSettings.name"
 			class="org.eclipse.jst.jsp.ui.internal.contentproperties.ui.JSPFContentSettingsPropertyPage"
-			id="org.eclipse.jst.jsp.ui.internal.contentproperties.JSPFContentSettingsPropertyPage.jspf">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.jst.jsp.core.jspfragmentsource">
-			</filter>
+			id="org.eclipse.jst.jsp.ui.internal.contentproperties.JSPFContentSettingsPropertyPage">
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IFile">
+						<or> 
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.jst.jsp.core.jspfragmentsource" />
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.jst.jsp.core.cssjspfragmentsource" />
+						</or>
+					</adapt>
+				</and> 
+			</enabledWhen>
 		</page>
-		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
-			name="%JSPFragmentContentSettings.name"
-			class="org.eclipse.jst.jsp.ui.internal.contentproperties.ui.JSPFContentSettingsPropertyPage"
-			id="org.eclipse.jst.jsp.css.ui.internal.contentproperties.JSPFContentSettingsPropertyPage.jspf">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.jst.jsp.core.cssjspfragmentsource">
-			</filter>
-		</page>
-
 	</extension>	
 	<!--  jsp-for-css editor configurations -->		
 	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 7b0966d..e694ecb 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -96,57 +96,53 @@
 			name="%WebContentSettings.name"
 			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.ProjectWebContentSettingsPropertyPage"
 			id="org.eclipse.wst.html.ui.dynamicprojectpropertypage">
-			<filter
-				name="nature"
-				value="org.eclipse.wst.common.project.facet.core.nature">
-			</filter>
-		</page>
-		<!-- for static web project -->
-		<!--
-		<page
-			objectClass="org.eclipse.core.resources.IProject"
-			adaptable="true"
-			name="%WebContentSettings.name"
-			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.ProjectContentSettingsPropertyPage"
-			id="org.eclipse.wst.html.ui.staticprojectpropertypage">
-			<filter
-				name="nature"
-				value="org.eclipse.wst.common.project.facet.core.nature">
-			</filter>
-		</page>
-		-->
-		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
-			name="%WebContentSettings.name"
-			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage"
-			id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage.html">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.wst.html.core.htmlsource">
-			</filter>
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IProject">
+						<or> 
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="jst.web" />
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="wst.web" />
+						</or>
+					</adapt>
+				</and> 
+			</enabledWhen>
 		</page>
 		<page
 			objectClass="org.eclipse.core.resources.IFile"
 			adaptable="true"
 			name="%WebContentSettings.name"
 			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage"
-			id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage.jsp">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.jst.jsp.core.jspsource">
-			</filter>
-		</page>
-		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
-			name="%WebContentSettings.name"
-			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage"
-			id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage.jspf">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.jst.jsp.core.jspfragmentsource">
-			</filter>
+			id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage">
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IFile">
+						<or> 
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.wst.html.core.htmlsource" />
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.jst.jsp.core.jspsource" />
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.jst.jsp.core.jspfragmentsource" />
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.jst.jsp.core.cssjspfragmentsource" />
+						</or>
+					</adapt>
+				</and> 
+			</enabledWhen>
 		</page>
 	</extension>
 	<!-- Editor actionsets -->