diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 1c813871..4e7d66b1 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -37,158 +37,211 @@
 
 define(function(require, exports, module) {
 
-var PluginManager = require("pilot/plugin_manager").PluginManager;
+var canon = require("pilot/canon");
 
-PluginManager.registerCommand("selectall", function(env, args, request) {
-    env.selection.selectAll();
+canon.addCommand({
+    name: "selectall",
+    exec: function(env, args, request) { env.selection.selectAll(); }
 });
-PluginManager.registerCommand("removeline", function(env, args, request) {
-    env.editor.removeLines();
+canon.addCommand({
+    name: "removeline",
+    exec: function(env, args, request) { env.editor.removeLines(); }
 });
-PluginManager.registerCommand("gotoline", function(env, args, request) {
-    var line = parseInt(prompt("Enter line number:"));
-    if (!isNaN(line)) {
-        env.editor.gotoLine(line);
+canon.addCommand({
+    name: "gotoline",
+    exec: function(env, args, request) {
+        var line = parseInt(prompt("Enter line number:"));
+        if (!isNaN(line)) {
+            env.editor.gotoLine(line);
+        }
     }
 });
-PluginManager.registerCommand("togglecomment", function(env, args, request) {
-    env.editor.toggleCommentLines();
+canon.addCommand({
+    name: "togglecomment",
+    exec: function(env, args, request) { env.editor.toggleCommentLines(); }
 });
-PluginManager.registerCommand("findnext", function(env, args, request) {
-    env.editor.findNext();
+canon.addCommand({
+    name: "findnext",
+    exec: function(env, args, request) { env.editor.findNext(); }
 });
-PluginManager.registerCommand("findprevious", function(env, args, request) {
-    env.editor.findPrevious();
+canon.addCommand({
+    name: "findprevious",
+    exec: function(env, args, request) { env.editor.findPrevious(); }
 });
-PluginManager.registerCommand("find", function(env, args, request) {
-    var needle = prompt("Find:");
-    env.editor.find(needle);
+canon.addCommand({
+    name: "find",
+    exec: function(env, args, request) {
+        var needle = prompt("Find:");
+        env.editor.find(needle);
+    }
 });
-PluginManager.registerCommand("undo", function(env, args, request) {
-    env.editor.undo();
+canon.addCommand({
+    name: "undo",
+    exec: function(env, args, request) { env.editor.undo(); }
 });
-PluginManager.registerCommand("redo", function(env, args, request) {
-    env.editor.redo();
+canon.addCommand({
+    name: "redo",
+    exec: function(env, args, request) { env.editor.redo(); }
 });
-PluginManager.registerCommand("redo", function(env, args, request) {
-    env.editor.redo();
+canon.addCommand({
+    name: "redo",
+    exec: function(env, args, request) { env.editor.redo(); }
 });
-PluginManager.registerCommand("overwrite", function(env, args, request) {
-    env.editor.toggleOverwrite();
+canon.addCommand({
+    name: "overwrite",
+    exec: function(env, args, request) { env.editor.toggleOverwrite(); }
 });
-PluginManager.registerCommand("copylinesup", function(env, args, request) {
-    env.editor.copyLinesUp();
+canon.addCommand({
+    name: "copylinesup",
+    exec: function(env, args, request) { env.editor.copyLinesUp(); }
 });
-PluginManager.registerCommand("movelinesup", function(env, args, request) {
-    env.editor.moveLinesUp();
+canon.addCommand({
+    name: "movelinesup",
+    exec: function(env, args, request) { env.editor.moveLinesUp(); }
 });
-PluginManager.registerCommand("selecttostart", function(env, args, request) {
-    env.selection.selectFileStart();
+canon.addCommand({
+    name: "selecttostart",
+    exec: function(env, args, request) { env.selection.selectFileStart(); }
 });
-PluginManager.registerCommand("gotostart", function(env, args, request) {
-    env.editor.navigateFileStart();
+canon.addCommand({
+    name: "gotostart",
+    exec: function(env, args, request) { env.editor.navigateFileStart(); }
 });
-PluginManager.registerCommand("selectup", function(env, args, request) {
-    env.selection.selectUp();
+canon.addCommand({
+    name: "selectup",
+    exec: function(env, args, request) { env.selection.selectUp(); }
 });
-PluginManager.registerCommand("golineup", function(env, args, request) {
-    env.editor.navigateUp();
+canon.addCommand({
+    name: "golineup",
+    exec: function(env, args, request) { env.editor.navigateUp(); }
 });
-PluginManager.registerCommand("copylinesdown", function(env, args, request) {
-    env.editor.copyLinesDown();
+canon.addCommand({
+    name: "copylinesdown",
+    exec: function(env, args, request) { env.editor.copyLinesDown(); }
 });
-PluginManager.registerCommand("movelinesdown", function(env, args, request) {
-    env.editor.moveLinesDown();
+canon.addCommand({
+    name: "movelinesdown",
+    exec: function(env, args, request) { env.editor.moveLinesDown(); }
 });
-PluginManager.registerCommand("selecttoend", function(env, args, request) {
-    env.selection.selectFileEnd();
+canon.addCommand({
+    name: "selecttoend",
+    exec: function(env, args, request) { env.selection.selectFileEnd(); }
 });
-PluginManager.registerCommand("gotoend", function(env, args, request) {
-    env.editor.navigateFileEnd();
+canon.addCommand({
+    name: "gotoend",
+    exec: function(env, args, request) { env.editor.navigateFileEnd(); }
 });
-PluginManager.registerCommand("selectdown", function(env, args, request) {
-    env.selection.selectDown();
+canon.addCommand({
+    name: "selectdown",
+    exec: function(env, args, request) { env.selection.selectDown(); }
 });
-PluginManager.registerCommand("godown", function(env, args, request) {
-    env.editor.navigateDown();
+canon.addCommand({
+    name: "godown",
+    exec: function(env, args, request) { env.editor.navigateDown(); }
 });
-PluginManager.registerCommand("selectwordleft", function(env, args, request) {
-    env.selection.selectWordLeft();
+canon.addCommand({
+    name: "selectwordleft",
+    exec: function(env, args, request) { env.selection.selectWordLeft(); }
 });
-PluginManager.registerCommand("gotowordleft", function(env, args, request) {
-    env.editor.navigateWordLeft();
+canon.addCommand({
+    name: "gotowordleft",
+    exec: function(env, args, request) { env.editor.navigateWordLeft(); }
 });
-PluginManager.registerCommand("selecttolinestart", function(env, args, request) {
-    env.selection.selectLineStart();
+canon.addCommand({
+    name: "selecttolinestart",
+    exec: function(env, args, request) { env.selection.selectLineStart(); }
 });
-PluginManager.registerCommand("gotolinestart", function(env, args, request) {
-    env.editor.navigateLineStart();
+canon.addCommand({
+    name: "gotolinestart",
+    exec: function(env, args, request) { env.editor.navigateLineStart(); }
 });
-PluginManager.registerCommand("selectleft", function(env, args, request) {
-    env.selection.selectLeft();
+canon.addCommand({
+    name: "selectleft",
+    exec: function(env, args, request) { env.selection.selectLeft(); }
 });
-PluginManager.registerCommand("gotoleft", function(env, args, request) {
-    env.editor.navigateLeft();
+canon.addCommand({
+    name: "gotoleft",
+    exec: function(env, args, request) { env.editor.navigateLeft(); }
 });
-PluginManager.registerCommand("selectwordright", function(env, args, request) {
-    env.selection.selectWordRight();
+canon.addCommand({
+    name: "selectwordright",
+    exec: function(env, args, request) { env.selection.selectWordRight(); }
 });
-PluginManager.registerCommand("gotowordright", function(env, args, request) {
-    env.editor.navigateWordRight();
+canon.addCommand({
+    name: "gotowordright",
+    exec: function(env, args, request) { env.editor.navigateWordRight(); }
 });
-PluginManager.registerCommand("selecttolineend", function(env, args, request) {
-    env.selection.selectLineEnd();
+canon.addCommand({
+    name: "selecttolineend",
+    exec: function(env, args, request) { env.selection.selectLineEnd(); }
 });
-PluginManager.registerCommand("gotolineend", function(env, args, request) {
-    env.editor.navigateLineEnd();
+canon.addCommand({
+    name: "gotolineend",
+    exec: function(env, args, request) { env.editor.navigateLineEnd(); }
 });
-PluginManager.registerCommand("selectright", function(env, args, request) {
-    env.selection.selectRight();
+canon.addCommand({
+    name: "selectright",
+    exec: function(env, args, request) { env.selection.selectRight(); }
 });
-PluginManager.registerCommand("gotoright", function(env, args, request) {
-    env.editor.navigateRight();
+canon.addCommand({
+    name: "gotoright",
+    exec: function(env, args, request) { env.editor.navigateRight(); }
 });
-PluginManager.registerCommand("selectpagedown", function(env, args, request) {
-    env.editor.selectPageDown();
+canon.addCommand({
+    name: "selectpagedown",
+    exec: function(env, args, request) { env.editor.selectPageDown(); }
 });
-PluginManager.registerCommand("pagedown", function(env, args, request) {
-    env.editor.scrollPageDown();
+canon.addCommand({
+    name: "pagedown",
+    exec: function(env, args, request) { env.editor.scrollPageDown(); }
 });
-PluginManager.registerCommand("gotopagedown", function(env, args, request) {
-    env.editor.gotoPageDown();
+canon.addCommand({
+    name: "gotopagedown",
+    exec: function(env, args, request) { env.editor.gotoPageDown(); }
 });
-PluginManager.registerCommand("selectpageup", function(env, args, request) {
-    env.editor.selectPageUp();
+canon.addCommand({
+    name: "selectpageup",
+    exec: function(env, args, request) { env.editor.selectPageUp(); }
 });
-PluginManager.registerCommand("pageup", function(env, args, request) {
-    env.editor.scrollPageUp();
+canon.addCommand({
+    name: "pageup",
+    exec: function(env, args, request) { env.editor.scrollPageUp(); }
 });
-PluginManager.registerCommand("gotopageup", function(env, args, request) {
-    env.editor.gotoPageUp();
+canon.addCommand({
+    name: "gotopageup",
+    exec: function(env, args, request) { env.editor.gotoPageUp(); }
 });
-PluginManager.registerCommand("selectlinestart", function(env, args, request) {
-    env.selection.selectLineStart();
+canon.addCommand({
+    name: "selectlinestart",
+    exec: function(env, args, request) { env.selection.selectLineStart(); }
 });
-PluginManager.registerCommand("gotolinestart", function(env, args, request) {
-    env.editor.navigateLineStart();
+canon.addCommand({
+    name: "gotolinestart",
+    exec: function(env, args, request) { env.editor.navigateLineStart(); }
 });
-PluginManager.registerCommand("selectlineend", function(env, args, request) {
-    env.selection.selectLineEnd();
+canon.addCommand({
+    name: "selectlineend",
+    exec: function(env, args, request) { env.selection.selectLineEnd(); }
 });
-PluginManager.registerCommand("gotolineend", function(env, args, request) {
-    env.editor.navigateLineEnd();
+canon.addCommand({
+    name: "gotolineend",
+    exec: function(env, args, request) { env.editor.navigateLineEnd(); }
 });
-PluginManager.registerCommand("del", function(env, args, request) {
-    env.editor.removeRight();
+canon.addCommand({
+    name: "del",
+    exec: function(env, args, request) { env.editor.removeRight(); }
 });
-PluginManager.registerCommand("backspace", function(env, args, request) {
-    env.editor.removeLeft();
+canon.addCommand({
+    name: "backspace",
+    exec: function(env, args, request) { env.editor.removeLeft(); }
 });
-PluginManager.registerCommand("outdent", function(env, args, request) {
-    env.editor.blockOutdent();
+canon.addCommand({
+    name: "outdent",
+    exec: function(env, args, request) { env.editor.blockOutdent(); }
 });
-PluginManager.registerCommand("indent", function(env, args, request) {
-    env.editor.indent();
+canon.addCommand({
+    name: "indent",
+    exec: function(env, args, request) { env.editor.indent(); }
 });
 
-});
\ No newline at end of file
+});