diff --git a/lib/coderay/scanners/taskpaper.rb b/lib/coderay/scanners/taskpaper.rb
new file mode 100644
index 00000000..c6eb3b3b
--- /dev/null
+++ b/lib/coderay/scanners/taskpaper.rb
@@ -0,0 +1,34 @@
+module CodeRay
+module Scanners
+  
+  class Taskpaper < Scanner
+    
+    register_for :taskpaper
+    file_extension 'taskpaper'
+    
+  protected
+    
+    def scan_tokens encoder, options
+      until eos?
+        if match = scan(/^\S.*:.*$/)                  # project
+          encoder.text_token(match, :project)
+        elsif match = scan(/^-.+@done(?:\(.*)?.*$/)   # completed task
+          encoder.text_token(match, :complete)
+        elsif match = scan(/^-.+$/)                   # task
+          encoder.text_token(match, :plain)
+        elsif match = scan(/^.+$/)                    # comment
+          encoder.text_token(match, :comment)
+        elsif match = scan(/\s+/)                     # space
+          encoder.text_token(match, :space)
+        else                                          # other
+          encoder.text_token getch, :error
+        end
+      end
+      
+      encoder
+    end
+    
+  end
+  
+end
+end
diff --git a/lib/coderay/styles/alpha.rb b/lib/coderay/styles/alpha.rb
index 8506d103..259e4589 100644
--- a/lib/coderay/styles/alpha.rb
+++ b/lib/coderay/styles/alpha.rb
@@ -134,6 +134,9 @@ class Alpha < Style
 .delete .delete { color: #c00; background:transparent; font-weight:bold }
 .change .change { color: #88f }
 .head .head { color: #f4f }
+
+.project  { color: #707; font-weight: bold }
+.complete { text-decoration: line-through; color: gray }
     TOKENS
 
   end
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
index 3b8d07e4..a36d877d 100755
--- a/lib/coderay/token_kinds.rb
+++ b/lib/coderay/token_kinds.rb
@@ -74,6 +74,9 @@ module CodeRay
     :insert              => 'insert',
     
     :eyecatcher          => 'eyecatcher',
+
+    :project             => 'project',
+    :complete            => 'complete',
     
     :ident               => false,
     :operator            => false,