diff --git a/markdown.nanorc b/markdown.nanorc
index 5c513bd..d103cc0 100644
--- a/markdown.nanorc
+++ b/markdown.nanorc
@@ -1,17 +1,47 @@
 syntax "markdown" "\.(md|mkd|mkdn|markdown)$"
 
+# Tables (Github extension)
+color cyan ".*[ :]\|[ :].*"
+
+# quotes
+color brightblack  "^>.*"
+
 # Emphasis
 color green "(^|[[:space:]])(_[^ ][^_]*_|\*[^ ][^*]*\*)"
 
 # Strong emphasis
 color brightgreen "(^|[[:space:]])(__[^ ][^_]*__|\*\*[^ ][^*]*\*\*)"
 
-color brightmagenta  "^=====*$|^-----*$|^#{1,6}.*"
-color blue   "^[[:space:]]*[\*+-] |^[[:space:]]*[0-9]+\. "
-color black    "^[[:space:]]+"
-color magenta   "\(([CcRr]|[Tt][Mm])\)" "\.{3}" "(^|[[:space:]])\-\-($$)"
-color brightyellow "\!?\[[^]]*\]([[:space:]]*\[[^]]*\]|\(.*\))?"
-color brightyellow "^\[.*\]:[[:space:]]*[^"]*"
-color yellow   "`[^`]*`|^ {4}[^-+*].*"
-color brightblack  "^>.*"
+# strike-through
+color red "(^|[[:space:]])~~[^ ][^~]*~~"
 
+# horizontal rules
+color brightmagenta "^(---+|===+|___+|\*\*\*+)\s*$"
+
+# headlines
+color brightmagenta  "^#{1,6}.*"
+
+# lists
+color blue   "^[[:space:]]*[\*+-] |^[[:space:]]*[0-9]+\. "
+
+# leading whitespace
+color black    "^[[:space:]]+"
+
+# misc
+color magenta   "\(([CcRr]|[Tt][Mm])\)" "\.{3}" "(^|[[:space:]])\-\-($|[[:space:]])"
+
+# links
+color brightblue "\[[^]]+\]"
+color brightblue "\[([^][]|\[[^]]*\])*\]\([^)]+\)"
+
+# images
+color magenta "!\[[^][]*\](\([^)]+\)|\[[^]]+\])"
+
+# urls
+color brightyellow "https?://[^ )>]+"
+
+# code
+color yellow   "`[^`]*`|^ {4}[^-+*].*"
+# code blocks
+color yellow start="^```[^$]" end="^```$"
+color yellow "^```$"