diff --git a/mobile/html/boot.ts b/mobile/html/boot.ts
index efc4bdd3..ac818ddd 100644
--- a/mobile/html/boot.ts
+++ b/mobile/html/boot.ts
@@ -1,33 +1,33 @@
-declare namespace window {
-  var ReactNativeWebView: any;
-  var receiveMessage: any;
-}
-
-function safeRun(fn: () => Promise<void>) {
-  fn().catch((e) => {
-    console.error(e);
-  });
-}
-
-window.receiveMessage = (msg: string) => {
-  console.log("Received message", msg);
-};
-// @ts-ignore
-window.onerror = (msg, source, lineno, colno, error) => {
-  console.error("Error", msg, source, lineno, error);
-};
-
-console.log = (...args) => {
-  window.ReactNativeWebView.postMessage(
-    JSON.stringify({ type: "console.log", args: args })
-  );
-};
-
-console.error = (...args) => {
-  window.ReactNativeWebView.postMessage(
-    JSON.stringify({ type: "console.error", args: args })
-  );
-};
+// declare namespace window {
+//   var ReactNativeWebView: any;
+//   var receiveMessage: any;
+// }
+//
+// function safeRun(fn: () => Promise<void>) {
+//   fn().catch((e) => {
+//     console.error(e);
+//   });
+// }
+//
+// window.receiveMessage = (msg: string) => {
+//   console.log("Received message", msg);
+// };
+// // @ts-ignore
+// window.onerror = (msg, source, lineno, colno, error) => {
+//   console.error("Error", msg, source, lineno, error);
+// };
+//
+// console.log = (...args) => {
+//   window.ReactNativeWebView.postMessage(
+//     JSON.stringify({ type: "console.log", args: args })
+//   );
+// };
+//
+// console.error = (...args) => {
+//   window.ReactNativeWebView.postMessage(
+//     JSON.stringify({ type: "console.error", args: args })
+//   );
+// };
 try {
   // let editor = new Editor(
   //   new Space(`http://192.168.2.22:3000/fs`, null),
diff --git a/plugs/core/navigate.ts b/plugs/core/navigate.ts
index ca50f49e..791ad10e 100644
--- a/plugs/core/navigate.ts
+++ b/plugs/core/navigate.ts
@@ -6,10 +6,11 @@ import {
   navigate as navigateTo,
   openUrl,
 } from "plugos-silverbullet-syscall/editor";
+import { taskToggleAtPos } from "../tasks/task";
 
 const materializedQueryPrefix = /<!--\s*#query\s+/;
 
-async function navigate(syntaxNode: any) {
+async function actionClickOrActionEnter(syntaxNode: any) {
   if (!syntaxNode) {
     return;
   }
@@ -38,16 +39,19 @@ async function navigate(syntaxNode: any) {
         await openUrl(match[1]);
       }
       break;
+    case "TaskMarker":
+      await taskToggleAtPos(syntaxNode.from + 1);
+      break;
   }
 }
 
 export async function linkNavigate() {
-  await navigate(await getSyntaxNodeUnderCursor());
+  await actionClickOrActionEnter(await getSyntaxNodeUnderCursor());
 }
 
 export async function clickNavigate(event: ClickEvent) {
   if (event.ctrlKey || event.metaKey) {
     let syntaxNode = await getSyntaxNodeAtPos(event.pos);
-    await navigate(syntaxNode);
+    await actionClickOrActionEnter(syntaxNode);
   }
 }
diff --git a/plugs/tasks/task.ts b/plugs/tasks/task.ts
index c72ff6ff..d754674b 100644
--- a/plugs/tasks/task.ts
+++ b/plugs/tasks/task.ts
@@ -2,7 +2,7 @@ import type { ClickEvent } from "../../webapp/app_event";
 import { IndexEvent } from "../../webapp/app_event";
 
 import { whiteOutQueries } from "../core/materialized_queries";
-import { batchSet, scanPrefixGlobal } from "plugos-silverbullet-syscall/index";
+import { batchSet } from "plugos-silverbullet-syscall/index";
 import { readPage, writePage } from "plugos-silverbullet-syscall/space";
 import {
   dispatch,
@@ -10,10 +10,9 @@ import {
   getSyntaxNodeAtPos,
 } from "plugos-silverbullet-syscall/editor";
 
-const allTasksPageName = "ALL TASKS";
-const taskRe = /[\-\*]\s*\[([ Xx])\]\s*(.*)/g;
 const taskFullRe =
   /(?<prefix>[\t ]*)[\-\*]\s*\[([ Xx])\]\s*([^\n]+)(\n\k<prefix>\s+[\-\*][^\n]+)*/g;
+
 const extractPageLink = /[\-\*]\s*\[[ Xx]\]\s\[\[([^\]]+)@(\d+)\]\]\s*(.*)/;
 
 type Task = {
@@ -24,10 +23,6 @@ type Task = {
 };
 
 export async function indexTasks({ name, text }: IndexEvent) {
-  if (name === allTasksPageName) {
-    return;
-  }
-
   console.log("Indexing tasks");
   let tasks: { key: string; value: Task }[] = [];
   text = whiteOutQueries(text);
@@ -54,41 +49,12 @@ export async function indexTasks({ name, text }: IndexEvent) {
   await batchSet(name, tasks);
 }
 
-export async function updateTaskPage() {
-  let allTasks = await scanPrefixGlobal("task:");
-  let pageTasks = new Map<string, Task[]>();
-  for (let {
-    key,
-    page,
-    value: { task, complete },
-  } of allTasks) {
-    if (complete) {
-      continue;
-    }
-    let [, pos] = key.split(":");
-    let tasks = pageTasks.get(page) || [];
-    tasks.push({ task, complete, pos: +pos });
-    pageTasks.set(page, tasks);
-  }
-
-  let mdPieces = [];
-  for (let pageName of [...pageTasks.keys()].sort()) {
-    mdPieces.push(`\n## ${pageName}\n`);
-    for (let task of pageTasks.get(pageName)!) {
-      mdPieces.push(
-        `* [${task.complete ? "x" : " "}] [[${pageName}@${task.pos}]] ${
-          task.task
-        }`
-      );
-    }
-  }
-
-  let taskMd = mdPieces.join("\n");
-  await writePage(allTasksPageName, taskMd);
+export async function taskToggle(event: ClickEvent) {
+  return taskToggleAtPos(event.pos);
 }
 
-export async function taskToggle(event: ClickEvent) {
-  let syntaxNode = await getSyntaxNodeAtPos(event.pos);
+export async function taskToggleAtPos(pos: number) {
+  let syntaxNode = await getSyntaxNodeAtPos(pos);
   if (syntaxNode && syntaxNode.name === "TaskMarker") {
     let changeTo = "[x]";
     if (syntaxNode.text === "[x]" || syntaxNode.text === "[X]") {
@@ -101,26 +67,28 @@ export async function taskToggle(event: ClickEvent) {
         insert: changeTo,
       },
       selection: {
-        anchor: event.pos,
+        anchor: pos,
       },
     });
-    if (event.page === allTasksPageName) {
-      // Propagate back to the page in question
-      let line = await getLineUnderCursor();
-      let match = line.match(extractPageLink);
-      if (match) {
-        let [, page, posS] = match;
-        let pos = +posS;
-        let pageData = await readPage(page);
-        let text = pageData.text;
+    // In case there's a page reference with @ position in the task, let's propagate this change back to that page
+    // Example: * [ ] [[MyPage@123]] My task
+    let line = await getLineUnderCursor();
+    let match = line.match(extractPageLink);
+    if (match) {
+      console.log("Found a remote task reference, updating other page");
+      let [, page, posS] = match;
+      let pos = +posS;
+      let pageData = await readPage(page);
+      let text = pageData.text;
 
-        // Apply the toggle
-        text =
-          text.substring(0, pos) +
-          text.substring(pos).replace(/^([\-\*]\s*)\[[ xX]\]/, "$1" + changeTo);
+      // Apply the toggle
+      text =
+        text.substring(0, pos) +
+        text
+          .substring(pos)
+          .replace(/^(\s*[\-\*]\s*)\[[ xX]\]/, "$1" + changeTo);
 
-        await writePage(page, text);
-      }
+      await writePage(page, text);
     }
   }
 }
diff --git a/plugs/tasks/tasks.plug.yaml b/plugs/tasks/tasks.plug.yaml
index f0cff928..4f33dd42 100644
--- a/plugs/tasks/tasks.plug.yaml
+++ b/plugs/tasks/tasks.plug.yaml
@@ -3,10 +3,6 @@ functions:
     path: "./task.ts:indexTasks"
     events:
       - page:index
-  updateTaskPage:
-    path: "./task.ts:updateTaskPage"
-    command:
-      name: "Tasks: Update Page"
   taskToggle:
     path: "./task.ts:taskToggle"
     events:
diff --git a/server/server.ts b/server/server.ts
index 79f875d8..838010d0 100755
--- a/server/server.ts
+++ b/server/server.ts
@@ -3,22 +3,22 @@
 import express from "express";
 import http from "http";
 import yargs from "yargs";
-import {hideBin} from "yargs/helpers";
-import {SilverBulletHooks} from "../common/manifest";
-import {ExpressServer} from "./api_server";
-import {DiskPlugLoader} from "../plugos/plug_loader";
-import {System} from "../plugos/system";
+import { hideBin } from "yargs/helpers";
+import { SilverBulletHooks } from "../common/manifest";
+import { ExpressServer } from "./api_server";
+import { DiskPlugLoader } from "../plugos/plug_loader";
+import { System } from "../plugos/system";
 
 let args = yargs(hideBin(process.argv))
-    .option("port", {
-        type: "number",
-        default: 3000,
-    })
-    .parse();
+  .option("port", {
+    type: "number",
+    default: 3000,
+  })
+  .parse();
 
 if (!args._.length) {
-    console.error("Usage: silverbullet <path-to-pages>");
-    process.exit(1);
+  console.error("Usage: silverbullet <path-to-pages>");
+  process.exit(1);
 }
 
 const pagesPath = args._[0] as string;