diff --git a/gmf-tooling/project-info/plan.xml b/gmf-tooling/project-info/plan.xml
index 326db83..1eb2b46 100644
--- a/gmf-tooling/project-info/plan.xml
+++ b/gmf-tooling/project-info/plan.xml
@@ -75,13 +75,23 @@
 		</preamble>
     	<theme name="Currency">
       		<committed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?bug_id=358929;bug_id_type=anyexact;query_format=advanced" />
+      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno+&amp;status_whiteboard=Currency" />
       		<proposed bugzilla=
       			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-1-0=juno+&amp;value0-2-0=juno-&amp;status_whiteboard=Currency" />
       		<deferred bugzilla=
       			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno-&amp;status_whiteboard=Currency" />
     	</theme>
-    	<theme name="Diagram Features">
+    	<theme name="Design for Extensibility">
+    		<!-- whiteboard="Extensibility" -->
+      		<committed bugzilla=
+      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno+&amp;status_whiteboard=Extensibility" />
+      		<proposed bugzilla=
+      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-1-0=juno+&amp;value0-2-0=juno-&amp;status_whiteboard=Extensibility" />
+      		<deferred bugzilla=
+      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno-&amp;status_whiteboard=Extensibility" />
+    	</theme>
+    	<theme name="Ease Of Use">
+    		<!-- whiteboard="Diagram%20Features" -->
       		<committed bugzilla=
       			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno+&amp;status_whiteboard=Diagram%20Features" />
       		<proposed bugzilla=
@@ -89,36 +99,5 @@
       		<deferred bugzilla=
       			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring&amp;type0-1-0=notsubstring&amp;type0-2-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;field0-1-0=flagtypes.name&amp;field0-2-0=flagtypes.name&amp;version=3.0&amp;classification=Modeling&amp;product=GMF-Tooling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;value0-0-0=juno-&amp;status_whiteboard=Diagram%20Features" />
     	</theme>
-
-<!--    	
-
-
-      		<proposed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type1-0-0=notsubstring&amp;field0-0-0=flagtypes.name&amp;classification=Modeling&amp;status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;status_whiteboard=Maturity%20and%20Project%20Readiness&amp;value1-0-0=indigo-&amp;version=2.4&amp;type0-0-0=substring&amp;value0-0-0=indigo&amp;component=GMF-tooling&amp;field1-0-0=flagtypes.name&amp;product=GMP" />
-      		<deferred bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?status_whiteboard_type=allwordssubstr&amp;query_format=advanced&amp;field0-0-0=flagtypes.name&amp;status_whiteboard=Maturity%20and%20Project%20Readiness&amp;version=2.4&amp;type0-0-0=substring&amp;value0-0-0=indigo-&amp;component=GMF-tooling&amp;classification=Modeling&amp;product=GMP" />
-
-
-    	<theme name="Development">
-      		<committed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-0-0=juno+;status_whiteboard=Development" />
-      		<proposed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-1-0=juno+;value0-2-0=juno-;status_whiteboard=Development" />
-      		<deferred bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-0-0=juno-;status_whiteboard=Development" />
-    	</theme>
-    	<theme name="Development - With Line Breaks">
-      		<committed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-0-0=juno+;
-      				status_whiteboard=Development" />
-      		<proposed bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-1-0=juno+;value0-2-0=juno-;
-      				status_whiteboard=Development" />
-      		<deferred bugzilla=
-      			"https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-0=substring;type0-1-0=notsubstring;type0-2-0=notsubstring;field0-0-0=flagtypes.name;field0-1-0=flagtypes.name;field0-2-0=flagtypes.name;version=3.0;classification=Modeling;product=GMF-Tooling;status_whiteboard_type=allwordssubstr;query_format=advanced;value0-0-0=juno-;
-      				status_whiteboard=Development" />
-    	</theme>
--->    	
-    	
 	</themes_and_priorities>
  </plan>
\ No newline at end of file