diff --git a/common/content/completion.js b/common/content/completion.js
index 3135db74..a917fd93 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1436,15 +1436,17 @@ function Completion() //{{{
 
         colorScheme: function colorScheme(context)
         {
-            // TODO: use path for the description?
+            let colors = [];
+
             io.getRuntimeDirectories("colors").forEach(function (dir) {
-                context.fork(dir.path, 0, null, function (context) {
-                    context.filter = dir.path + io.pathSeparator + context.filter;
-                    completion.file(context);
-                    context.title = ["Color Scheme"];
-                    context.quote = ["", function (text) text.replace(/\.vimp$/, ""), ""];
+                io.readDirectory(dir).forEach(function (file) {
+                    if (/\.vimp$/.test(file.leafName) && !colors.some(function (c) c.leafName == file.leafName))
+                        colors.push(file);
                 });
             });
+
+            context.title = ["Color Scheme", "Runtime Path"];
+            context.completions = [[c.leafName.replace(/\.vimp$/, ""), c.parent.path] for ([,c] in Iterator(colors))]
         },
 
         command: function command(context)
diff --git a/common/content/ui.js b/common/content/ui.js
index a23e5de7..d01f2a2c 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1298,15 +1298,8 @@ function CommandLine() //{{{
                 // user pressed ENTER to carry out a command
                 // user pressing ESCAPE is handled in the global onEscape
                 //   FIXME: <Esc> should trigger "cancel" event
-                //   FIXME: This should not be waiting, some kind of callback mechanism on completion would be better.
                 if (events.isAcceptKey(key))
                 {
-                    while (completions.context.incomplete)
-                    {
-                        liberator.threadYield(true);
-                        command = this.command;
-                    }
-
                     let mode = currentExtendedMode; // save it here, as modes.pop() resets it
                     keepCommand = true;
                     currentExtendedMode = null; // Don't let modes.pop trigger "cancel"
diff --git a/vimperator/TODO b/vimperator/TODO
index c2175204..d6f0d711 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -39,6 +39,8 @@ BUGS:
 - URLs in :ls output are no longer hyperlinks
 
 FEATURES:
+9 change the extension ID to vimperator@vimperator.org rather than
+  vimperator@mozdev.org
 9 finish :help TODOs
 9 fix local options
 9 adaptive timeout for auto-completions, :set completions can be updated more often than