diff --git a/org.eclipse.mylyn.trac.wiki/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.wiki/META-INF/MANIFEST.MF
index f4a6238..bd1d740 100644
--- a/org.eclipse.mylyn.trac.wiki/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.wiki/META-INF/MANIFEST.MF
@@ -1,44 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Tasks UI
-Bundle-SymbolicName: org.eclipse.mylyn.tasks.ui;singleton:=true
+Bundle-Name: Mylyn Trac Connector Wiki Plug-in
+Bundle-SymbolicName: org.eclipse.mylyn.trac.wiki;singleton:=true
 Bundle-Version: 2.0.0.v20070817-1700
-Bundle-Activator: org.eclipse.mylyn.tasks.ui.TasksUiPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.ui.forms,
- org.eclipse.jface.text,
- org.eclipse.mylyn.context.core,
- org.eclipse.update.core,
- org.eclipse.ui.browser,
- org.eclipse.ui.editors,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.tasks.core,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.search,
- org.eclipse.mylyn,
- org.eclipse.ui.net,
- org.eclipse.mylyn.web.core
 Eclipse-AutoStart: true
 Bundle-Vendor: Eclipse.org
-Export-Package: org.eclipse.mylyn.internal.tasks.ui,
- org.eclipse.mylyn.internal.tasks.ui.actions,
- org.eclipse.mylyn.internal.tasks.ui.commands,
- org.eclipse.mylyn.internal.tasks.ui.editors,
- org.eclipse.mylyn.internal.tasks.ui.planner,
- org.eclipse.mylyn.internal.tasks.ui.preferences,
- org.eclipse.mylyn.internal.tasks.ui.properties,
- org.eclipse.mylyn.internal.tasks.ui.search,
- org.eclipse.mylyn.internal.tasks.ui.util,
- org.eclipse.mylyn.internal.tasks.ui.views,
- org.eclipse.mylyn.internal.tasks.ui.wizards,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.mylyn.tasks.ui.editors,
- org.eclipse.mylyn.tasks.ui.search,
- org.eclipse.mylyn.tasks.ui.wizards
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.trac.wiki/build.properties b/org.eclipse.mylyn.trac.wiki/build.properties
index c832f72..d0b03c8 100644
--- a/org.eclipse.mylyn.trac.wiki/build.properties
+++ b/org.eclipse.mylyn.trac.wiki/build.properties
@@ -6,18 +6,12 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ###############################################################################
 bin.includes = plugin.xml,\
-               icons/,\
                META-INF/,\
                about.html,\
-               schema/,\
-               doc/,\
                .
-src.includes = icons/,\
-               plugin.xml,\
+src.includes = plugin.xml,\
                src/,\
                META-INF/,\
-               schema/,\
-               about.html,\
-               doc/
+               about.html
 jre.compilation.profile = J2SE-1.5
 source.. = src/
diff --git a/org.eclipse.mylyn.trac.wiki/plugin.xml b/org.eclipse.mylyn.trac.wiki/plugin.xml
new file mode 100644
index 0000000..b4f458a
--- /dev/null
+++ b/org.eclipse.mylyn.trac.wiki/plugin.xml
@@ -0,0 +1,954 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+    <extension-point id="actions" name="Tasklist Actions" schema="schema/actions.exsd"/>
+    <extension-point id="repositories" name="Task Repositories" schema="schema/repositories.exsd"/>
+    <extension-point id="editors" name="Task Editors" schema="schema/editors.exsd"/>
+    <extension-point id="projectLinkProviders" name="Linking Provider from Project to the Task Repository" schema="schema/projectLinkProviders.exsd"/>
+    <extension-point id="duplicateDetectors" name="duplicateDetectors" schema="schema/duplicateDetectors.exsd"/>
+    <extension-point id="presentations" name="presentations" schema="schema/presentations.exsd"/>
+
+    <extension
+          point="org.eclipse.mylyn.context.core.bridges">
+       <contextStore
+             class="org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore">
+       </contextStore>
+    </extension> 
+    
+	<extension point="org.eclipse.ui.views">
+      <category name="Mylyn" id="org.eclipse.mylyn.ui"/>
+      <view
+         allowMultiple="true"
+         category="org.eclipse.mylyn.ui"
+         class="org.eclipse.mylyn.internal.tasks.ui.views.TaskListView"
+         icon="icons/eview16/task-list.gif"
+         id="org.eclipse.mylyn.tasks.ui.views.tasks"
+         name="Task List"/> 
+      <view
+            id="org.eclipse.mylyn.tasks.ui.views.repositories"
+            allowMultiple="false"
+            category="org.eclipse.mylyn.ui"
+            class="org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesView"
+            icon="icons/eview16/repositories.gif"
+            name="Task Repositories">
+      </view>
+  	</extension>
+     	
+    <extension point="org.eclipse.ui.newWizards">
+        <category name="Mylyn" id="org.eclipse.mylyn.ui.wizards.new"/>
+    </extension>
+
+    <extension
+         name="Task List Startup (required)"
+         point="org.eclipse.ui.startup">
+    </extension>
+
+   <!--
+	<extension
+         id="org.eclipse.mylyn.helpDocs"
+         name="Mylyn Help"
+         point="org.eclipse.help.toc">
+      <toc
+            file="doc/toc.xml"
+            primary="false">
+      </toc>
+    </extension>
+    -->
+ <extension
+         point="org.eclipse.ui.elementFactories">
+      <factory
+            class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorInputFactory"
+            id="org.eclipse.mylyn.tasks.ui.elementFactories.task.editor">
+      </factory>
+   </extension>
+    <extension point="org.eclipse.ui.newWizards">
+      <!--<wizard
+            canFinishEarly="true" 
+            category="org.eclipse.mylyn.wizards"
+            class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalTaskWizard"
+            hasPages="false"
+            icon="icons/etool16/task-new.gif"
+            id="org.eclipse.mylyn.tasks.ui.wizards.new.task"
+            name="Task"/> -->
+      <wizard
+            canFinishEarly="true"
+            category="org.eclipse.mylyn.ui.wizards.new"
+            class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewLocalCategoryWizard"
+            hasPages="false"
+            icon="icons/etool16/category-new.gif"
+            id="org.eclipse.mylyn.tasks.ui.wizards.new.category"
+            name="Category">
+      </wizard>
+	  <wizard
+            category="org.eclipse.mylyn.ui.wizards.new"
+            class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewTaskWizard"
+            icon="icons/etool16/task-new.gif"
+            id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task"
+            name="Task"/>
+      <wizard
+            category="org.eclipse.mylyn.ui.wizards.new"
+            class="org.eclipse.mylyn.internal.tasks.ui.wizards.NewQueryWizard"
+            icon="icons/etool16/query-new.gif"
+            id="org.eclipse.mylyn.tasks.ui.wizards.new.query"
+            name="Query"/>
+	</extension>
+
+  <extension
+        point="org.eclipse.ui.importWizards">
+     <wizard
+           category="org.eclipse.mylyn.tasks.ui.wizards.import.category"
+           class="org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard"
+           icon="icons/eview16/task-list.gif"
+           id="org.eclipse.mylyn.tasks.ui.wizards.import"
+           name="Task Data">
+        <description>
+           Import task data files from file system.
+        </description>
+     </wizard>
+     <category
+           id="org.eclipse.mylyn.tasks.ui.wizards.import.category"
+           name="Mylyn"/>
+  </extension>
+
+     <extension point="org.eclipse.ui.exportWizards"> 
+      <wizard
+            category="org.eclipse.mylyn.tasks.ui.wizards.export.category"
+            class="org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataExportWizard"
+            icon="icons/eview16/task-list.gif"
+            id="org.eclipse.mylyn.tasks.ui.wizards.export"
+            name="Task Data"> 
+         <description> 
+            Export Task List data files to the file system.
+         </description> 
+      </wizard>
+      <category
+            id="org.eclipse.mylyn.tasks.ui.wizards.export.category"
+            name="Mylyn"/> 
+    </extension> 
+
+   <extension point="org.eclipse.ui.decorators">
+      <decorator
+            class="org.eclipse.mylyn.internal.tasks.ui.TaskLabelDecorator"
+            id="org.eclipse.mylyn.tasks.ui.decorators.task"
+            label="Mylyn Task Decorator"
+            lightweight="true"
+            state="true">
+         <description>
+			Overlays information such as due date notifications
+		 </description>
+         <enablement>
+            <or>
+               <objectClass
+                     name="org.eclipse.mylyn.tasks.core.AbstractTaskContainer">
+               </objectClass>
+               <objectClass
+                     name="org.eclipse.mylyn.tasks.core.TaskRepository">
+               </objectClass>
+            </or>
+         </enablement>
+      </decorator>
+   </extension>
+
+  	<extension
+        point="org.eclipse.ui.editors">
+     <editor
+           class="org.eclipse.mylyn.tasks.ui.editors.TaskEditor"
+           contributorClass="org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor"
+           icon="icons/etool16/task.gif"
+           id="org.eclipse.mylyn.tasks.ui.editors.task"
+           name="Task Editor"/>
+	    <editor
+           icon="icons/etool16/task.gif"
+           class="org.eclipse.mylyn.internal.tasks.ui.editors.CategoryEditor"
+           name="Category Editor"
+           id="org.eclipse.mylyn.tasks.ui.editors.category"/>   
+     </extension>
+   
+      <extension point="org.eclipse.ui.perspectiveExtensions">
+          <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
+               <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.tasks"/>
+               <view
+                     closeable="true"
+                     id="org.eclipse.mylyn.tasks.ui.views.tasks"
+                     minimized="false"
+                     moveable="true"
+                     ratio="0.5"
+                     relationship="top"
+                     relative="org.eclipse.ui.views.ContentOutline"
+                     visible="true"/>
+               <newWizardShortcut
+                     id="org.eclipse.mylyn.tasks.ui.wizards.new.task">
+               </newWizardShortcut>
+               <newWizardShortcut
+                     id="org.eclipse.mylyn.tasks.ui.wizards.new.task">
+               </newWizardShortcut>
+               <newWizardShortcut
+                     id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task">
+               </newWizardShortcut>
+          </perspectiveExtension>
+		  <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
+               <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.tasks"/>
+          </perspectiveExtension>
+      	<perspectiveExtension
+            targetID="org.eclipse.ui.resourcePerspective">
+            <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.tasks"/>
+	         <view
+                closeable="true"
+                id="org.eclipse.mylyn.tasks.ui.views.tasks"
+                minimized="false"
+                relationship="stack"
+                relative="org.eclipse.ui.views.ContentOutline">
+         </view>
+          <newWizardShortcut
+                id="org.eclipse.mylyn.tasks.ui.wizards.new.task">
+          </newWizardShortcut>
+          <newWizardShortcut
+                id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task">
+          </newWizardShortcut> 
+      </perspectiveExtension>
+     <perspectiveExtension
+           targetID="org.eclipse.mylyn.tasks.ui.perspectives.planning">
+        <newWizardShortcut
+              id="org.eclipse.mylyn.tasks.ui.wizards.new.task">
+        </newWizardShortcut>
+        <newWizardShortcut
+              id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task">
+        </newWizardShortcut>
+        <viewShortcut
+              id="org.eclipse.mylyn.tasks.ui.views.repositories">
+        </viewShortcut>
+     </perspectiveExtension>
+       
+       <perspectiveExtension targetID="org.eclipse.team.cvs.ui.cvsPerspective">
+        <view
+              id="org.eclipse.mylyn.tasks.ui.views.repositories"
+              minimized="false"
+              ratio="0.7"
+              relationship="bottom"
+              relative="org.eclipse.team.ccvs.ui.RepositoriesView"
+              visible="true"/>
+        <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.repositories"/>
+     </perspectiveExtension>
+     <perspectiveExtension targetID="org.tigris.subversion.subclipse.ui.svnPerspective">
+        <view
+              id="org.eclipse.mylyn.tasks.ui.views.repositories"
+              minimized="false"
+              ratio="0.7"
+              relationship="bottom"
+              relative="org.tigris.subversion.subclipse.ui.repository.RepositoriesView"
+              visible="true"/>
+        <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.repositories"/>
+     </perspectiveExtension>
+     <perspectiveExtension targetID="org.eclipse.team.ui.TeamSynchronizingPerspective">
+        <view
+              id="org.eclipse.mylyn.tasks.ui.views.repositories"
+              minimized="false"
+              ratio="0.7"
+              relationship="bottom"
+              relative="org.eclipse.team.sync.views.SynchronizeView"
+              visible="true"/>
+        <viewShortcut id="org.eclipse.mylyn.tasks.ui.views.repositories"/>
+     </perspectiveExtension>
+	</extension>
+  
+   <extension point="org.eclipse.ui.viewActions"> 
+		<viewContribution 
+			id="org.eclipse.mylyn.tasks.ui.actions.view" 
+	   		targetID="org.eclipse.mylyn.tasks.ui.views.tasks">
+  		
+  		<action
+          class="org.eclipse.mylyn.internal.tasks.ui.actions.SynchronizeAllAction"
+          enablesFor="*"
+          icon="icons/etool16/repository-synchronize.gif"
+          id="org.eclipse.mylyn.tasks.ui.synchronize.changed"
+          label="Synchronize Changed"
+          menubarPath="tasks"
+          toolbarPath="new"
+          tooltip="Synchronize Changed">
+         </action>
+    <action
+          class="org.eclipse.mylyn.internal.tasks.ui.actions.RestoreTaskListAction"
+          icon="icons/etool16/import.gif"
+          id="org.eclipse.mylyn.tasks.ui.tasks.restore"
+          label="Restore Tasks from History..."
+          menubarPath="tasks"
+          style="push">
+    </action>
+
+  		<action
+          class="org.eclipse.mylyn.internal.tasks.ui.actions.ShowTaskRepositoriesViewAction"
+          enablesFor="*"
+          icon="icons/eview16/repositories.gif"
+          id="org.eclipse.mylyn.tasks.ui.open.repositories.view"
+          label="Show Task Repositories View"
+          menubarPath="tasks"
+          tooltip="Show Task Repositories View">
+         </action>
+    <action
+          class="org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskSearchAction"
+          icon="icons/elcl16/task-search.gif"
+          id="org.eclipse.mylyn.tasks.ui.search.open"
+          label="Search Repository..."
+          menubarPath="tasks">
+    </action>
+           		
+  		<action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction"
+               enablesFor="*"
+               icon="icons/etool16/task-new.gif"
+               id="org.eclipse.mylyn.tasks.ui.actions.new.repository.task"
+               label="New Task"
+               style="push"
+               toolbarPath="new"
+               tooltip="New Task"> 
+  		</action>
+    <!--<action
+          class="org.eclipse.mylyn.internal.tasks.ui.actions.NewLocalTaskAction"
+          icon="icons/etool16/task-new.gif"
+          id="org.eclipse.mylyn.tasks.ui.actions.new.task"
+          label="Task"
+          style="push"
+          toolbarPath="new"
+          tooltip="New Task">
+    </action> -->
+         <!--
+    	<action
+          class="org.eclipse.mylyn.internal.tasklist.ui.actions.CopyDetailsAction"
+          id="org.eclipse.mylyn.tasklist.copy.details"
+          label="Copy Details"
+          style="push"/>
+  		-->
+	    </viewContribution> 
+	</extension>
+
+  <extension point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            id="org.eclipse.mylyn.tasklist.ui.viewerContribution"
+            targetID="org.eclipse.mylyn.tasks.ui.views.tasks">
+
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.SynchronizeSelectedAction"
+               definitionId="org.eclipse.ui.file.refresh"
+               enablesFor="*"
+               icon="icons/etool16/repository-synchronize.gif"
+               id="org.eclipse.mylyn.tasks.ui.actions.synchronize.selected"
+               label="Synchronize"
+               menubarPath="repository"
+               tooltip="Synchronize with Repository">
+            <enablement>
+               <or>
+					<objectClass name="org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery"/>
+               		<objectClass name="org.eclipse.mylyn.tasks.core.AbstractTask"/>
+                 <objectClass name="org.eclipse.mylyn.tasks.core.AbstractTaskContainer"/>
+               </or>
+            </enablement>
+         </action>
+         
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.QueryCloneAction"
+               definitionId="org.eclipse.ui.query.clone"
+               enablesFor="org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery"
+               id="org.eclipse.mylyn.tasks.ui.actions.clone.query"
+               label="Clone Query..."
+               menubarPath="repository"
+               tooltip="Clone Repository Query">
+         </action>
+         
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.QueryExportAction"
+               definitionId="org.eclipse.ui.query.export"
+               enablesFor="org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery"
+               id="org.eclipse.mylyn.tasks.ui.actions.export.query"
+               label="Export Query..."
+               menubarPath="repository"
+               tooltip="Export Repository Query">
+         </action>
+  		
+		  <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.QueryImportAction"
+               definitionId="org.eclipse.ui.query.import"
+               enablesFor="*"
+               icon="icons/etool16/import.gif"
+               id="org.eclipse.mylyn.tasks.ui.actions.import.query"
+               label="Import Query..."
+               menubarPath="repository"
+               tooltip="Import Repository Query">
+         </action>
+
+  		<action
+	        class="org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction"
+	        enablesFor="*"
+	        icon="icons/etool16/task-new.gif"
+	        id="org.eclipse.mylyn.tasks.ui.new.repository.task"
+	        label="Task..."
+	        menubarPath="org.eclipse.mylyn.tasks.ui.menu.new/repository"
+	        tooltip="New Task"/>
+	              
+		<action
+              class="org.eclipse.mylyn.internal.tasks.ui.actions.NewQueryAction"
+              enablesFor="*"
+              icon="icons/etool16/query-new.gif"
+              id="org.eclipse.mylyn.tasks.ui.new.query"
+              menubarPath="org.eclipse.mylyn.tasks.ui.menu.new/repository"
+              label="Query..."
+              style="push"
+              tooltip="New Query"> 
+  		</action>
+  <menu
+        id="org.eclipse.mylyn.tasks.ui.menu.new"
+        label="New"
+        path="new">
+     <separator
+           name="local">
+     </separator>
+     <separator
+           name="repository">
+     </separator>
+  </menu>
+  <!--<action
+        class="org.eclipse.mylyn.internal.tasks.ui.actions.NewLocalTaskAction"
+        icon="icons/etool16/task-new.gif"
+        id="org.eclipse.mylyn.tasks.ui.actions.new.task"
+        label="Task"
+        menubarPath="org.eclipse.mylyn.tasks.ui.menu.new/local"
+        style="push"
+        tooltip="New Task">
+  </action>-->
+  <action
+        class="org.eclipse.mylyn.internal.tasks.ui.actions.NewCategoryAction"
+        icon="icons/etool16/category-new.gif"
+        id="org.eclipse.mylyn.tasks.ui.actions.new.category"
+        label="Category"
+        menubarPath="org.eclipse.mylyn.tasks.ui.menu.new/local"
+        tooltip="New Category">
+  </action>
+      </viewerContribution>
+      <viewerContribution
+            id="org.eclipse.mylyn.tasks.ui.viewerContribution"
+            targetID="org.eclipse.mylyn.tasks.ui.views.repositories">
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.OpenRepositoryTask"
+               definitionId="org.eclipse.mylyn.tasks.ui.command.openRemoteTask"
+               icon="icons/etool16/open-repository-task.gif"
+               id="org.eclipse.mylyn.tasks.ui.open.task.remote"
+               label="Open &amp;Repository Task..."
+               menubarPath="repository"
+               style="push"
+               tooltip="Open Repository Task">
+            <enablement>
+              <objectState name="hasRepository" value="true"/>
+            </enablement>   
+         </action>
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.NewQueryAction:skipFirstPage"
+               enablesFor="*"
+               icon="icons/etool16/query-new.gif"
+               id="org.eclipse.mylyn.tasks.ui.new.query"
+               label="New Query..."
+               menubarPath="repository"
+               style="push"
+               tooltip="New Query">
+            <enablement>
+              <objectState name="supportQuery" value="true"/>
+            </enablement>   
+         </action>
+         <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction:skipFirstPage"
+               enablesFor="*"
+               icon="icons/etool16/task-new.gif"
+               id="org.eclipse.mylyn.tasks.ui.new.repository.task"
+               label="New Task..."
+               menubarPath="repository"
+               tooltip="New Task">
+            <enablement>
+              <objectState name="supportNewTask" value="true"/>
+            </enablement>
+         </action>      
+      </viewerContribution>
+      
+   </extension>
+
+  <extension point="org.eclipse.ui.preferencePages">
+	  <page
+            name="Mylyn"
+            class="org.eclipse.mylyn.internal.tasks.ui.preferences.TaskFocusedUiPreferencePage"
+            id="org.eclipse.mylyn.ui.preferences">
+            <keywordReference id="org.eclipse.mylyn.tasks.keywords"/>
+      </page>  
+      <page 
+         name="Task List"
+         class="org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage"
+         id="org.eclipse.mylyn.tasks.ui.preferences"
+         category="org.eclipse.mylyn.ui.preferences">
+         <keywordReference id="org.eclipse.mylyn.tasks.ui.keywords"/>
+      </page> 
+   </extension>
+   
+   <extension
+   		point="org.eclipse.ui.keywords">
+      <keyword
+            label="mylyn tasks"
+            id="org.eclipse.mylyn.tasks.ui.keywords"/>
+   </extension>
+ 
+  <extension point="org.eclipse.ui.bindings">
+      <key
+            sequence="M2+M3+Q K"
+            contextId="org.eclipse.ui.contexts.window"
+            commandId="org.eclipse.ui.views.showView"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+            <parameter 
+            	id="org.eclipse.ui.views.showView.viewId"
+            	value="org.eclipse.mylyn.tasks.ui.views.tasks"/>
+      </key>
+  </extension>
+  
+   <extension
+         point="org.eclipse.ui.themes">
+      <themeElementCategory
+           id="org.eclipse.mylyn.tasks.ui.presentation"
+           label="Tasks"/>         
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.foreground.overdue"
+           isEditable="true"
+           label="Tasks - Overdue"
+           value="198,4,38"> 
+         <description>
+            Text color for overdue tasks.
+         </description>
+     </colorDefinition>
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.foreground.today.scheduled"
+           isEditable="true"
+           label="Tasks - Scheduled for Today"
+           value="32,21,223">  
+         <description>
+            Text color for tasks scheduled for today.
+         </description>
+     </colorDefinition>
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.foreground.thisweek.scheduled"
+           isEditable="true"
+           label="Tasks - Scheduled for This Week"
+           value="0,0,0">  
+         <description>
+            Text color for tasks scheduled for this week
+         </description>
+     </colorDefinition>
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.foreground.today.completed"
+           isEditable="true"
+           label="Tasks - Completed Today"
+           value="107,169,128">  
+         <description>
+            Text color for tasks completed today.
+         </description>
+     </colorDefinition>
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.foreground.completed"
+           isEditable="true"
+           label="Tasks - Completed"
+           value="128,128,128">  
+         <description>
+            Text color for completed tasks.
+         </description>
+     </colorDefinition>
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.incoming.background"
+           isEditable="true"
+           label="Task Editor - Incoming Changes"
+           value="225,236,255"> 
+         <description>
+            Background color of attributes with incoming changes.
+         </description>
+     </colorDefinition>  
+
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.category.gradient.start"
+           isEditable="true"
+           label="Task List - Category Gradient Top"
+           value="240,240,240"> 
+         <description>
+            Background start color for Task List category gradients.
+         </description>
+     </colorDefinition> 
+ 
+     <colorDefinition
+           categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+           id="org.eclipse.mylyn.tasks.ui.colors.category.gradient.end"
+           isEditable="true"
+           label="Task List - Category Gradient Bottom"
+           value="220,220,220"> <!-- was all 220, 234,233,237 -->
+         <description>
+            Background end color for Task List category gradients.
+         </description>
+     </colorDefinition> 
+
+	<fontDefinition
+       categoryId="org.eclipse.mylyn.tasks.ui.presentation"
+       id="org.eclipse.mylyn.tasks.ui.fonts.task.editor.comment"
+       isEditable="true"
+       label="Task Editor - Notes and Comments"
+       value="org.eclipse.jface.dialogfont">
+	     <fontValue
+            ws="win32" 
+            value="Tahoma-regular-10">
+         </fontValue>
+         <description>
+            Text font used for task editor text areas.
+         </description>
+      </fontDefinition>
+   </extension>
+   <!-- defaultsTo="org.eclipse.jface.dialogfont"-->
+
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.eclipse.mylyn.internal.tasks.ui.PlanningPerspectiveFactory"
+            icon="icons/eview16/perspective-planning.png"
+            id="org.eclipse.mylyn.tasks.ui.perspectives.planning"
+            name="Planning"/>
+   </extension>
+  
+     
+   <extension point="org.eclipse.mylyn.tasks.ui.actions">    
+      <dynamicPopupMenu
+            class="org.eclipse.mylyn.internal.tasks.ui.ScheduleTaskMenuContributor"
+            menuPath="tasks"/>
+      <dynamicPopupMenu
+            class="org.eclipse.mylyn.internal.tasks.ui.TaskStatusMenuContributor"
+            menuPath="tasks"/>
+      <dynamicPopupMenu
+            class="org.eclipse.mylyn.internal.tasks.ui.MoveToCategoryMenuContributor"
+            menuPath="tasks"/>
+   </extension>
+   
+  <extension
+         point="org.eclipse.mylyn.tasks.ui.editors">
+      <hyperlinkDetector
+            class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskUrlHyperlinkDetector"
+            id="org.eclipse.mylyn.tasks.ui.hyperlink.detector.url"/>
+      
+   </extension>
+   <extension
+          point="org.eclipse.mylyn.tasks.ui.editors">
+       <hyperlinkDetector
+             class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector"
+             id="org.eclipse.mylyn.tasks.ui.hyperlink.detector.tasks"/>
+    </extension>
+   
+   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            id="org.eclipse.mylyn.tasks.ui.navigation"
+            label="Mylyn Task Navigation"
+            visible="true">
+		<action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.DeactivateAllTasksAction"
+               definitionId="org.eclipse.mylyn.tasks.ui.command.deactivateAllTasks"
+               icon="icons/etool16/task-inactive-centered.gif"
+               id="org.eclipse.mylyn.tasks.ui.deactivateAllTasks"
+               label="&amp;Deactivate Task"
+               menubarPath="navigate/open.ext3"
+               style="push"/>
+		<action
+        	class="org.eclipse.mylyn.internal.tasks.ui.actions.ActivateTaskDialogAction"
+        	definitionId="org.eclipse.mylyn.tasks.ui.command.activateTask"
+        	icon="icons/etool16/task-active-centered.gif"
+        	id="org.eclipse.mylyn.tasks.ui.switchTask"
+        	label="&amp;Activate Task..."
+        	menubarPath="navigate/open.ext3"
+        	style="push"/>
+        <action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.OpenTaskAction"
+               definitionId="org.eclipse.mylyn.tasks.ui.command.openTask"
+               icon="icons/etool16/open-task.gif"
+               id="org.eclipse.mylyn.tasks.ui.openTask"
+               label="Open Tas&amp;k..."
+               menubarPath="navigate/open.ext3"
+               style="push"
+               toolbarPath="org.eclipse.search.searchActionSet/Search"
+               tooltip="Open Task"/>
+      </actionSet>
+   </extension>
+   
+   <extension point="org.eclipse.ui.commands">
+      <command id="org.eclipse.mylyn.tasks.ui.command.previousTask"
+               defaultHandler="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryHandler"
+               name="Previous Task Command"/>
+      <command id="org.eclipse.mylyn.ui.context.capture.pause.command"
+               name="Pause Capturing Context Command"
+               defaultHandler="org.eclipse.mylyn.internal.tasks.ui.ContextCapturePauseHandler"/>
+   </extension>
+
+  <!-- command-based implementation of the previousTask/history dropdown, 
+       the problem is that it doesn't work well with the actionSet  
+  <extension point="org.eclipse.ui.menus">
+    <menuContribution locationURI="menu:org.eclipse.mylyn.tasks.ui.previous.task">
+      <dynamic
+         class="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown"
+         id="org.eclipse.mylyn.tasks.ui.previous.task.dropdown"/>
+    </menuContribution>
+  </extension>  
+   
+  <extension point="org.eclipse.ui.menus">
+    <menuContribution locationURI="toolbar:org.eclipse.ui.workbench.navigate">
+        <command id="org.eclipse.mylyn.tasks.ui.previous.task"
+                 commandId="org.eclipse.mylyn.tasks.ui.command.previousTask"
+                 icon="icons/etool16/navigate-previous.gif"
+                 label="Activate Previous Task"
+                 tooltip="Activate Previous Task"
+                 style="pulldown">
+          <visibleWhen>
+            <with variable="activeContexts">
+              <iterate operator="or">
+                <equals value="org.eclipse.mylyn.tasks.ui.navigation.additions"/>
+              </iterate>
+            </with>              
+          </visibleWhen>
+        </command>
+    </menuContribution>
+  </extension>
+  -->
+
+   <extension point="org.eclipse.ui.actionSets">
+      <actionSet
+            id="org.eclipse.mylyn.tasks.ui.navigation.additions"
+            label="Mylyn Task Navigation Extras"
+            visible="false">
+  		<action
+	          allowLabelUpdate="true"
+	          class="org.eclipse.mylyn.internal.tasks.ui.actions.ActivateTaskHistoryDropDownAction"
+	          icon="icons/etool16/navigate-previous.gif"
+	          id="org.eclipse.mylyn.java.ui.editor.folding.auto"
+	          label="Activate Previous Task"
+	          pulldown="true"
+	          style="pulldown"
+	          toolbarPath="org.eclipse.ui.workbench.navigate/Tasks"
+	          tooltip="Activate Previous Task">
+      	</action>       
+      	<action
+               class="org.eclipse.mylyn.internal.tasks.ui.actions.OpenRepositoryTask"
+               definitionId="org.eclipse.mylyn.tasks.ui.command.openRemoteTask"
+               icon="icons/etool16/open-repository-task.gif"
+               id="org.eclipse.mylyn.tasks.ui.open.task.remote"
+               label="Open &amp;Repository Task..."
+               menubarPath="navigate/open.ext3"
+               style="push"
+               tooltip="Open Repository Task"/>     
+      </actionSet>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.ui.category.navigate"
+            id="org.eclipse.mylyn.tasks.ui.command.openTask"
+            name="Open Task"/>
+      <command
+            categoryId="org.eclipse.ui.category.navigate"
+            id="org.eclipse.mylyn.tasks.ui.command.openRemoteTask"
+            name="Open Remote Task"/>
+      <command
+            categoryId="org.eclipse.ui.category.navigate"
+            id="org.eclipse.mylyn.tasks.ui.command.activateTask"
+            name="Activate Task"/>
+      <command
+            categoryId="org.eclipse.ui.category.navigate"
+            id="org.eclipse.mylyn.tasks.ui.command.deactivateAllTasks"
+            name="Deactivate Task"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="org.eclipse.mylyn.tasks.ui.command.openTask"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+F12"/>
+      <key
+            commandId="org.eclipse.mylyn.tasks.ui.command.openRemoteTask"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M2+F12"/>
+      <key
+            commandId="org.eclipse.mylyn.tasks.ui.command.activateTask"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+F9"/>
+      <key
+            commandId="org.eclipse.mylyn.tasks.ui.command.deactivateAllTasks"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M2+F9"/>
+   </extension>
+   
+   <extension
+         id="org.eclipse.mylyn.tasks.ui.search.results"
+         point="org.eclipse.search.searchResultViewPages">
+      <viewPage
+            class="org.eclipse.mylyn.internal.tasks.ui.search.RepositorySearchResultView"
+            searchResultClass="org.eclipse.mylyn.tasks.ui.search.RepositorySearchResult"
+            id="org.eclipse.mylyn.internal.tasks.ui.search.RepositorySearchResultView"/>
+<!--            id="org.eclipse.mylyn.bugzilla.BugzillaSearchResultPage"/>-->
+   </extension>
+    <extension
+         id="org.eclipse.mylyn.tasks.ui.repositorySearchPage"
+         name="Task Search Page"
+         point="org.eclipse.search.searchPages">
+       <page
+            class="org.eclipse.mylyn.internal.tasks.ui.TaskSearchPage"
+            enabled="true" 
+            icon="icons/elcl16/task-search.gif"
+            id="org.eclipse.mylyn.tasks.ui.search.page"
+            label="Task Search" 
+            tabPosition="999"/>
+   </extension>
+    <extension
+          point="org.eclipse.ui.propertyPages">
+       <page
+             adaptable="true"
+             class="org.eclipse.mylyn.internal.tasks.ui.properties.ProjectTaskRepositoryPage"
+             id="org.eclipse.mylyn.tasks.ui.properties.pages.project.repository"
+             name="Task Repository"
+             objectClass="org.eclipse.core.resources.IProject"/>
+    </extension>
+    <extension
+          point="org.eclipse.ui.commands">
+       <category
+             id="org.eclipse.mylyn.tasks.ui.commands"
+             name="Task Repositories">
+       </category>
+       <command
+             category="org.eclipse.mylyn.tasks.ui.commands"
+             categoryId="org.eclipse.mylyn.tasks.ui.commands"
+             defaultHandler="org.eclipse.mylyn.internal.tasks.ui.commands.AddTaskRepositoryHandler"
+             id="org.eclipse.mylyn.tasks.ui.command.addTaskRepository"
+             name="Add Task Repository">
+          <commandParameter
+                id="org.eclipse.mylyn.tasks.ui.command.taskRepositoryId"
+                name="Repository Type"
+                optional="true"
+                values="org.eclipse.mylyn.internal.tasks.ui.commands.TaskRepositoryParameterValues">
+          </commandParameter>
+       </command>
+    </extension>
+    <extension
+          point="org.eclipse.mylyn.tasks.ui.projectLinkProviders">
+       <linkProvider
+             class="org.eclipse.mylyn.internal.tasks.ui.properties.ProjectPropertiesLinkProvider"
+             name="Default Repository Link"
+             order="1000"
+             id="org.eclipse.mylyn.tasks.ui.defaultRepositoryLinkProvider">
+       </linkProvider>
+    </extension>
+    <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.mylyn.tasks.core.AbstractTaskContainer"
+            class="org.eclipse.mylyn.internal.tasks.ui.search.SearchScoreComputerAdapterFactory">
+         <adapter
+               type="org.eclipse.search.ui.ISearchPageScoreComputer">
+         </adapter>
+      </factory>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
+      <hyperlinkDetector            
+            class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector"
+            id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.task"
+            name="Mylyn Tasks"
+            targetId="org.eclipse.ui.DefaultTextEditor">
+      </hyperlinkDetector>
+      <hyperlinkDetector
+            class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskUrlHyperlinkDetector"
+            description="Mylyn enabled URL hyperlink detector"
+            id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.url"
+            name="Mylyn URLs"
+            targetId="org.eclipse.ui.DefaultTextEditor">
+      </hyperlinkDetector>
+   </extension>
+   
+	<extension 
+		point="org.eclipse.ui.workingSets">
+		<workingSet
+        elementAdapterClass="org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetElementAdapter"
+        icon="icons/obj16/workingSet.gif"
+        id="org.eclipse.mylyn.tasks.ui.workingSet"
+        name="Tasks and Resources"
+        pageClass="org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetPage"
+        updaterClass="org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetUpdater"/>
+	</extension>
+
+ <extension point="org.eclipse.core.runtime.adapters">
+    <factory
+          adaptableType="org.eclipse.mylyn.tasks.core.AbstractTaskContainer"
+          class="org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetAdapterFactory">
+       <adapter type="org.eclipse.ui.IPersistableElement"/>
+    </factory>
+    <factory
+          adaptableType="org.eclipse.mylyn.tasks.core.TaskRepository"
+          class="org.eclipse.mylyn.internal.tasks.ui.TaskRepositoryAdapterFactory">
+       <adapter type="org.eclipse.ui.IActionFilter"/>
+    </factory>
+ </extension>
+
+ <extension
+       point="org.eclipse.ui.elementFactories">
+    <factory
+          class="org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetElementFactory"
+          id="org.eclipse.mylyn.tasks.ui.workingSets.elementFactory">
+    </factory>
+</extension>
+    <extension
+         id="org.eclipse.mylyn.tasks.local.repository" 
+         name="Local Task Repository"
+         point="org.eclipse.mylyn.tasks.ui.repositories">
+
+      <connectorCore
+            class="org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector"
+            id="org.eclipse.mylyn.tasks.connector.local"
+            name="Local Repository Connector"
+            type="local"
+            userManaged="false"/>
+            
+      <connectorUi
+            brandingIcon="icons/etool16/person.gif"
+            class="org.eclipse.mylyn.internal.tasks.ui.LocalTaskConnectorUi"
+            name="Local Repository Ui"
+            overlayIcon="icons/ovr16/overlay-local.gif"/>
+             
+      <taskListFactory
+            class="org.eclipse.mylyn.internal.tasks.core.LocalTaskListFactory"
+            id="org.eclipse.mylyn.tasks.ui.local.factory"/>
+   </extension>
+   
+   <extension point="org.eclipse.ui.bindings">
+     <key commandId="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
+          sequence="M1+1"
+          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+          contextId="org.eclipse.ui.contexts.dialogAndWindow" />
+          <!-- contextId="org.eclipse.ui.contexts.dialog"/> -->
+   </extension>
+      
+   <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
+     <target id="org.eclipse.mylyn.tasks.ui.TaskEditor" name="Task Editor"/>
+   </extension>
+
+   <extension point="org.eclipse.mylyn.tasks.ui.presentations">
+      <presentation 
+            id="org.eclipse.mylyn.tasks.ui.categorized"
+            name="Categorized"
+            icon="icons/etool16/category.gif"
+            contentProvider="org.eclipse.mylyn.internal.tasks.ui.views.TaskListContentProvider"/>
+      <presentation
+            id="org.eclipse.mylyn.tasks.ui.scheduled"
+            name="Scheduled"
+            icon="icons/etool16/calendar.gif"
+            contentProvider="org.eclipse.mylyn.internal.tasks.ui.views.TaskScheduleContentProvider"/>
+   </extension>
+   
+</plugin>
diff --git a/org.eclipse.mylyn.trac.wiki/src/empty.txt b/org.eclipse.mylyn.trac.wiki/src/empty.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.mylyn.trac.wiki/src/empty.txt