diff --git a/README.md b/README.md
index c41acad..b1776ba 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@
 
 Example
 =======
-![screenshot](https://rossmarks.uk/git/0xRM/moodlog_sublime/raw/950f6e30bdb7f81855d3d258252a2ab6e90fb6dc/moodlog_sublime_example.png)
+![screenshot](moodlog_sublime_example.png)

diff --git a/README.md b/README.md
index c41acad..b1776ba 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@
 
 Example
 =======
-![screenshot](https://rossmarks.uk/git/0xRM/moodlog_sublime/raw/950f6e30bdb7f81855d3d258252a2ab6e90fb6dc/moodlog_sublime_example.png)
+![screenshot](moodlog_sublime_example.png)
diff --git a/moodlog.sublime-syntax b/moodlog.sublime-syntax
index ee5fc5c..9d44e8c 100755
--- a/moodlog.sublime-syntax
+++ b/moodlog.sublime-syntax
@@ -11,6 +11,8 @@
   yellow: hsl(54, 100%, 50%)
 contexts:
   main:
+    - include: hashtags
+
     - match: '{{time}}{1,2}'
       comment: moodlog time
       scope: constant.numeric.moodlogtxt.time
@@ -20,21 +22,25 @@
       scope: string.unquoted.scheduler.config
 
     - match: (^\@\S+)|(\s\@\S+)
-      comment: moodlog positive item context
+      comment: context
       scope: comment.block.moodlogtxt.context
 
+    - match: (^\#\S+)|(\s\#\S+)
+      comment: hashtag
+      scope: variable.function
+
     - match: (^\+\S+)|(\s\+\S+)
-      comment: Todo item project
+      comment: positive
       scope: entity.name.class.moodlogtxt.project
 
     - match: (^\-\S+)|(\s\-\S+)
-      comment: Todo item project
+      comment: negative
       scope: entity.name.tag.moodlogtxt.context
 
     - match: '{{date}}(?= ){1,2}'
       comment: Todo item done or creation date
       scope: constant.numeric.moodlogtxt.date
 
-    - match: '(?:[^x])((?!\s([@\+\-])|({{date}})).)+'
+    - match: '(?:[^x])((?!\s([@\+\-\#])|({{date}})).)+'
       comment: Todo item text
-      scope: entity.task.moodlogtxt
\ No newline at end of file
+      scope: entity.task.moodlogtxt

diff --git a/README.md b/README.md
index c41acad..b1776ba 100644
--- a/README.md
+++ b/README.md
@@ -12,4 +12,4 @@
 
 Example
 =======
-![screenshot](https://rossmarks.uk/git/0xRM/moodlog_sublime/raw/950f6e30bdb7f81855d3d258252a2ab6e90fb6dc/moodlog_sublime_example.png)
+![screenshot](moodlog_sublime_example.png)
diff --git a/moodlog.sublime-syntax b/moodlog.sublime-syntax
index ee5fc5c..9d44e8c 100755
--- a/moodlog.sublime-syntax
+++ b/moodlog.sublime-syntax
@@ -11,6 +11,8 @@
   yellow: hsl(54, 100%, 50%)
 contexts:
   main:
+    - include: hashtags
+
     - match: '{{time}}{1,2}'
       comment: moodlog time
       scope: constant.numeric.moodlogtxt.time
@@ -20,21 +22,25 @@
       scope: string.unquoted.scheduler.config
 
     - match: (^\@\S+)|(\s\@\S+)
-      comment: moodlog positive item context
+      comment: context
       scope: comment.block.moodlogtxt.context
 
+    - match: (^\#\S+)|(\s\#\S+)
+      comment: hashtag
+      scope: variable.function
+
     - match: (^\+\S+)|(\s\+\S+)
-      comment: Todo item project
+      comment: positive
       scope: entity.name.class.moodlogtxt.project
 
     - match: (^\-\S+)|(\s\-\S+)
-      comment: Todo item project
+      comment: negative
       scope: entity.name.tag.moodlogtxt.context
 
     - match: '{{date}}(?= ){1,2}'
       comment: Todo item done or creation date
       scope: constant.numeric.moodlogtxt.date
 
-    - match: '(?:[^x])((?!\s([@\+\-])|({{date}})).)+'
+    - match: '(?:[^x])((?!\s([@\+\-\#])|({{date}})).)+'
       comment: Todo item text
-      scope: entity.task.moodlogtxt
\ No newline at end of file
+      scope: entity.task.moodlogtxt
diff --git a/moodlog_sublime_example.png b/moodlog_sublime_example.png
index fe25949..ca82153 100755
--- a/moodlog_sublime_example.png
+++ b/moodlog_sublime_example.png
Binary files differ