3 files changed, 29 insertions, 10 deletions
diff --git a/data/sisu/conf/syntax/sisu.xml b/data/sisu/conf/syntax/sisu.xml
index 9467ec44..61135285 100644
--- a/data/sisu/conf/syntax/sisu.xml
+++ b/data/sisu/conf/syntax/sisu.xml
@@ -8,10 +8,20 @@
     </list>
     <contexts>
     <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+      <StringDetect String="&lt;br&gt;" attribute="Break" context="#pop" />
+      <RegExpr String="\s+$" attribute="Warn" context="#pop" />
+      <RegExpr String="&lt;\S+&gt;" attribute="Warn" context="#pop"  />
+      <RegExpr String="&lt;a href=\S+&gt;" attribute="Warn" context="#pop"  />
+      <RegExpr String="&lt;a href=" attribute="Warn" context="#pop"  />
+      <RegExpr String="&lt;/a&gt;" attribute="Warn" context="#pop" />
+      <RegExpr String="&lt;https?:\/\/\S+&gt;" attribute="Warn" context="#pop"/>
+      <RegExpr String="&gt;https?:\/\/\S+" attribute="Warn" context="#pop"/>
+      <RegExpr String="&lt;&lt;\s+&#124;" attribute="Link" context="#pop"/>
+      <RegExpr String="https?:\/\/\S+&lt;" attribute="Warn" context="#pop"/>
       <keyword attribute="Keyword" context="#stay" String="somename" />
       <DetectChar attribute="String" context="string" char="&quot;" />
       <RegExpr String="^(0~\S+|@\S+)\s.+$" attribute="Header" context="#pop" />
-      <RegExpr String="^:?[A-C1-6]~.+$" attribute="Heading" context="#pop" />
+      <RegExpr String="^:?[A-C1-9]~.+$" attribute="Heading" context="#pop" />
       <StringDetect String="~{" attribute="Endnote" context="footnote"/>
       <StringDetect String="^~" attribute="Endnote" context="endnote"/>
       <StringDetect String="!{" attribute="Bold" context="emphasis"/>
@@ -22,11 +32,13 @@
       <StringDetect String=",{" attribute="Subscript" context="subscript"/>
       <StringDetect String="-{" attribute="Strike" context="strike"/>
       <StringDetect String="+{" attribute="Insert" context="insert"/>
-      <StringDetect String="&lt;br&gt;" attribute="Break" context="#pop" />
-      <RegExpr String="\{.+?\}(http:\/\/\S+|image)" attribute="Link" context="#stay"/>
-      <RegExpr String="(^|\s)http:\/\/\S+" attribute="Link" context="#stay"/>
+      <RegExpr String="\{[\s\S]+\}https?:\/\/\S+(\s|$)" attribute="Link" context="#pop" minimal="true" />
+      <RegExpr String="\{[\s\S]+\}\.\.\/\S+(\s|$)" attribute="Link" context="#stay" minimal="true" />
+      <RegExpr String="\{[\s\S]+\}image(\s|$)" attribute="Link" context="#stay" minimal="true" />
+      <RegExpr String="\s_?https?:\/\/\S+" attribute="Link" context="#stay"/>
+      <RegExpr String="^_?https?:\/\/\S+" attribute="Link" context="#stay"/>
       <RegExpr String="^!_ .+" attribute="Bold" context="boldline"/>
-      <RegExpr String="^(_[12]|_\*|_[12]\*)\s" attribute="Indent" context="#stay"/>
+      <RegExpr String="^(_[1-9]|_\*|_[1-9]\*)\s" attribute="Indent" context="#stay"/>
       <RegExpr String="~\^" attribute="Endnote" context="#stay"/>
       <RegExpr String="^%+\s.+$" attribute="Comment" context="#stay" endRegion="regionMarker" firstNonSpace="true" />
     </context>
@@ -35,6 +47,11 @@
     </context>
     <context attribute="Endnote" lineEndContext="#stay" name="footnote" >
       <StringDetect attribute="Endnote" context="#pop" String="}~" />
+      <RegExpr String="\{[\s\S]+\}https?:\/\/\S+(\s|$)" attribute="Link" context="#pop" minimal="true" />
+      <RegExpr String="\{[\s\S]+\}\.\.\/\S+(\s|$)" attribute="Link" context="#stay" minimal="true" />
+      <RegExpr String="\{[\s\S]+\}image(\s|$)" attribute="Link" context="#stay" minimal="true" />
+      <RegExpr String="\s_?https?:\/\/\S+" attribute="Link" context="#stay"/>
+      <RegExpr String="^_?https?:\/\/\S+" attribute="Link" context="#stay"/>
       <StringDetect String="!{" attribute="Bold" context="emphasis"/>
       <StringDetect String="*{" attribute="Bold" context="bold"/>
       <StringDetect String="/{" attribute="Italic" context="italic"/>
@@ -106,11 +123,11 @@
       <StringDetect attribute="Strike" context="#pop" String="}-" />
       <StringDetect String="!{" attribute="Bold" context="emphasis"/>
       <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
+      <StringDetect  String="/{" attribute="Italic" context="italic"/>
       <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <StringDetect  String="^{" attribute="Superscript" context="superscript"/>
+      <StringDetect  String=",{" attribute="Subscript" context="subscript"/>
+      <StringDetect  String="+{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Insert" lineEndContext="#stay" name="insert" >
       <StringDetect attribute="Insert" context="#pop" String="}+" />
@@ -125,6 +142,7 @@
     <context attribute="Endnote" lineEndContext="#pop" name="endnote" />
     <context attribute="Bold" lineEndContext="#pop" name="boldline" />
     <context attribute="Indent" lineEndContext="#pop" name="indent" />
+    <context attribute="Warn" lineEndContext="#pop"  name="warn" />
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal" />
@@ -138,7 +156,7 @@
       <itemData name="Strike" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
       <itemData name="Insert" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
       <itemData name="Keyword" defStyleNum="dsKeyword" />
-      <itemData name="Endnote" defStyleNum="dsNormal" color="#086800" selColor="#60FFFF" bold="0" italic="0"/>
+      <itemData name="Endnote" defStyleNum="dsNormal" color="#0AAA00" selColor="#60FFFF" bold="0" italic="0"/>
       <itemData name="Link" defStyleNum="dsNormal" color="#0000FF" selColor="#60FFFF" bold="0" italic="0"/>
       <itemData name="String" defStyleNum="dsString" />
       <itemData name="Comment" defStyleNum="dsComment"/>
@@ -146,6 +164,7 @@
       <itemData name="Break" defStyleNum="dsNormal" color="#FF0000" selColor="#60FFFF" bold="0" italic="0"/>
       <itemData name="Indent" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
       <itemData name="Structure" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
+      <itemData name="Warn" defStyleNum="dsError" color="#FF00FF" selColor="#000000" bold="1" italic="0"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/data/sisu/image/b_info.png b/data/sisu/image/b_info.png
new file mode 100644
index 00000000..133fd8b6
--- /dev/null
+++ b/data/sisu/image/b_info.png
diff --git a/data/sisu/image/bluebell.png b/data/sisu/image/bluebell.png
deleted file mode 100644
index 99c572d4..00000000
--- a/data/sisu/image/bluebell.png
+++ /dev/null