GMF-Tooling plan - adopted to Indigo (part 3: Theme & priorities)
diff --git a/gmf-tooling/project-info/plan.xml b/gmf-tooling/project-info/plan.xml
index 2aca5d6..420a1dd 100644
--- a/gmf-tooling/project-info/plan.xml
+++ b/gmf-tooling/project-info/plan.xml
@@ -69,25 +69,10 @@
 				<html:a href="http://www.eclipse.org/org/councils/roadmap_v4_0/themesandpriorities.html">Eclipse Themes and Priorities</html:a>).
 			</html:p>
 		</preamble>
-		<theme name="Usability">
-      		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3+M1&amp;target_milestone=2.3+M2&amp;target_milestone=2.3+M3&amp;target_milestone=2.3+M4&amp;target_milestone=2.3+M5&amp;target_milestone=2.3+M6&amp;target_milestone=2.3+M7&amp;target_milestone=2.3+RC&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Usability&amp;classification=Modeling&amp;product=GMF&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
-    	</theme>
-    	<theme name="Extensibility">
-      		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3+M1&amp;target_milestone=2.3+M2&amp;target_milestone=2.3+M3&amp;target_milestone=2.3+M4&amp;target_milestone=2.3+M5&amp;target_milestone=2.3+M6&amp;target_milestone=2.3+M7&amp;target_milestone=2.3+RC&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-  			<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Extensibility&amp;classification=Modeling&amp;product=GMF&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
-    	</theme>
-    	<theme name="Release Currency">
-      		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3+M1&amp;target_milestone=2.3+M2&amp;target_milestone=2.3+M3&amp;target_milestone=2.3+M4&amp;target_milestone=2.3+M5&amp;target_milestone=2.3+M6&amp;target_milestone=2.3+M7&amp;target_milestone=2.3+RC&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=2.3&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
-      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMF&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
-    	</theme>
-    	<theme name="(Temporary Borrowed) from GMF Runtime">
-      		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMP&amp;component=GMF-runtime&amp;target_milestone=1.5.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=indigo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=ingigo-" />
-      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMF&amp;target_milestone=1.5.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=indigo&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=indigo-" />
-      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=GMF&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=indigo-" />
+    	<theme name="Maturity and Project Readiness">
+      		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?type1-0-0=notsubstring;field0-0-0=flagtypes.name;classification=Modeling;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=Maturity%20and%20Project%20Readiness;value1-0-0=indigo-;version=2.4;type0-0-0=substring;value0-0-0=indigo;component=GMF-tooling;field1-0-0=flagtypes.name;product=GMP" />
+      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?type1-0-0=notsubstring;field0-0-0=flagtypes.name;classification=Modeling;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=Maturity%20and%20Project%20Readiness;value1-0-0=indigo-;version=2.4;type0-0-0=substring;value0-0-0=indigo;component=GMF-tooling;field1-0-0=flagtypes.name;product=GMP" />
+      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?status_whiteboard_type=allwordssubstr;query_format=advanced;field0-0-0=flagtypes.name;status_whiteboard=Maturity%20and%20Project%20Readiness;version=2.4;type0-0-0=substring;value0-0-0=indigo-;component=GMF-tooling;classification=Modeling;product=GMP" />
     	</theme>
 	</themes_and_priorities>
  </plan>
\ No newline at end of file