diff --git a/src/client/less/markdown.less b/src/client/less/markdown.less
index 5f5bcb9..9d29d70 100644
--- a/src/client/less/markdown.less
+++ b/src/client/less/markdown.less
@@ -110,7 +110,7 @@
     background-color: #F8F8F8;
   }
 
-  .fixme {
+  .todo {
     border: 1px solid @colorText;
     border-radius: 4px;
     background-color: #ffd703;
diff --git a/src/server/logic/RenderService.php b/src/server/logic/RenderService.php
index 57f8286..7fab70a 100644
--- a/src/server/logic/RenderService.php
+++ b/src/server/logic/RenderService.php
@@ -17,8 +17,8 @@ class RenderService {
         require_once __DIR__ . '/../lib/parsedown/Parsedown.php';
         $html = Parsedown::instance()->text($markdownText);
 
-        // Support `FIXME`
-        $html = preg_replace('/(^|\\W)FIXME(\\W|$)/', '$1<span class="fixme">FIXME</span>$2', $html);
+        // Support `TODO` and `FIXME`
+        $html = preg_replace('/(^|\\W)(TODO|FIXME):?(\\W|$)/', '$1<span class="todo">$2</span>$3', $html);
 
         if ($isEditMode) {
             // Append `?edit` to local links (in order to stay in edit mode)