Merge branch 'upstream' into debian/sid

15 files changed, 495 insertions, 162 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index b373eea7..dc024147 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,27 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
+
+  * options, maintenance -M (--maintenance, new alias --keep-processing-files)
+    * new alias --keep-processing-files (see Bug#622902)
+    * minor rearrangement of regex
+
+  * cgi, sample-search-form
+    * results still not right, (ruby1.9.2 libraries? double check script)
+    * not yet done variable directory path fixing for result links
+
+  * vim colors colorscheme Slate reviewed, cterm 8 colors, & frugal added
+    * Slate, review conflicting group colors
+    * 8, cterm colors to work with
+    * frugal, cterm colors ... my term oddly has 8 colors plus 242 for
+      dark grey possibly more but odd numbers to set
+
+  * sisu-mode.el header notes copyright assignment to FSF 2011-04-08
+    (GNU EMACS)
+    * url to sisu git repo source (when possible also track GNU EMACS location)
+
 %% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8660f162..d69759ef 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,78 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.7.orig.tar.gz (2011-04-20:16/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
+  sisu_3.0.7.orig.tar.gz
+  sisu_3.0.7-1.dsc
+  sisu_3.0.7-1.debian.tar.gz
+
+  * param, md remove md.cmd and md.mod shortcut methods, use use md.opt
+    (md.opt.cmd md.opt.mod)
+    * affects many files that now use @md.opt.cmd & @md.opt.mod
+      (instead of @md.cmd & @md.mod)
+
+  * options
+    * new alias (for -M / --maintenance) --keep-processing-files (see Bug#622902)
+    * introduce opt.act booleans made up of opt.cmd and opt.mod, more flexible
+      than overused cmd characters
+    * where possible move option setting from hub to options
+    * separate out a few methods
+
+  * odf:odt
+    * maintenance, processing in separate subdirectories, that can be
+      kept
+    * odt.zip (bin) directory renamed odt from odf
+
+  * hub
+    * some option setting moved to options
+    * favor use of opt.act over opt.cmd where appropriate
+
+  * sysenv
+    * variable directory path fixing (language, filetype, filname), making
+      the stub for at least manifest and html available early for processing
+      that do not or should not need to process individual markup files
+      completely, such as the cgi search form and harvest
+    * odf:odt paths adjusted for changes in maintenance and odt.zip
+
+  * harvest
+    * place with document manifests
+    * variable directory path fixing (language, filetype, filname)
+
+  * cgi, sample-search-form
+    * results still not right, (ruby1.9.2 libraries? double check script)
+    * not yet done variable directory path fixing for result links
+
+  * vim colors colorscheme Slate reviewed, cterm 8 colors, & frugal added
+    * Slate, review conflicting group colors
+    * 8, cterm colors to work with
+    * frugal, cterm colors ... my term oddly has 8 colors plus 242 for
+      dark grey possibly more but odd numbers to set
+
+  * sisu-mode.el header notes copyright assignment to FSF 2011-04-08
+    (GNU EMACS)
+    * url to sisu git repo source (when possible also track GNU EMACS location)
+
+  * screen_text_color (ansi colors) touched, consider reviewing later
+
+  * urls, report output locations
+    * fix show all urls -U
+    * share/reuse code
+    * fix maintenance urls -M (where processing files are kept for examination)
+    * odf maintenance added
+    * html_tune maintenance fix
+
+  * documentation, sisu-markup-samples, man page, html
+    * document existence of new alias for -M (--maintenance)
+      --keep-maintenance-files (see Bug#622902)
+
 %% 3.0.6.orig.tar.gz (2011-03-30:13/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
-  sisu_3.0.6.orig.tar.gz
-  sisu_3.0.6-1.dsc
-  sisu_3.0.6-1.debian.tar.gz
+  daa6671a08dd4eeb5848f73b3ecff23b05b7fa0e338b91cd9992dee8a005441e 1923985 sisu_3.0.6.orig.tar.gz
+  a0ca253a6d9b8254f1acaf73d771e5afea12418d971a10d394e20c76c840ef7e 1216 sisu_3.0.6-1.dsc
+  9710bf09eb70fc6e456d7ee0fba746a5fe3486fa14a59001d7e17fcddc608aa8 284254 sisu_3.0.6-1.debian.tar.gz
 
   * (ruby 1.9.2 (transition related) fixes)
     * dal_doc_str
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index 357adb3b..b982a989 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -317,99 +317,96 @@ file (scroll.html). Alias -h
 <dd>see --manpage
 <p> </dd>
 
+<dt><b>--keep-processing-files [filename/wildcard/url]</b>
+</dt>
+<dd>
+<p>see --maintenance
+<p> </dd>
+
 <dt><b>-L</b> </dt>
 <dd>prints license information.
-
 <p> </dd>
 
 <dt><b>--machine [filename/wildcard/url]</b> </dt>
 <dd>see --dal (document abstraction level/layer)
-
 <p> </dd>
 
 <dt><b>--maintenance [filename/wildcard/url]</b> </dt>
-<dd>maintenance mode files created for
-processing preserved and their locations indicated. (also see -V). Alias -M
-
+<dd>maintenance mode, interim processing files are preserved and their locations
+indicated. (also see -V). Aliases -M and --keep-processing-files
 <p> </dd>
 
 <dt><b>--manpage [filename/wildcard]</b> </dt>
-<dd>produces man page of file, not suitable for
-all outputs. Alias -i
+<dd>produces man page of file, not suitable for all outputs. Alias -i
 <p> </dd>
 
 <dt><b>-M [filename/wildcard/url]</b> </dt>
 <dd>see --maintenance
 <p> </dd>
 
-<dt><b>-m [filename/wildcard/url]</b>
-</dt>
-<dd>see --dal (document abstraction level/layer)
+<dt><b>-m [filename/wildcard/url]</b> </dt>
+<dd>see --dal (document abstraction
+level/layer)
 <p> </dd>
 
 <dt><b>--no-ocn</b> </dt>
-<dd>[with &nbsp;--html &nbsp;--pdf &nbsp;or &nbsp;--epub]
-switches off object citation numbering. Produce output without identifying
-numbers in margins of html or LaTeX/pdf output.
+<dd>[with &nbsp;--html &nbsp;--pdf &nbsp;or &nbsp;--epub] switches off object citation
+numbering. Produce output without identifying numbers in margins of html
+or LaTeX/pdf output.
 <p> </dd>
 
-<dt><b>-N [filename/wildcard/url]</b>
-</dt>
-<dd>document digest or document content certificate ( DCC ) as md5 digest tree
-of the document: the digest for the document, and digests for each object
-contained within the document (together with information on software versions
-that produced it) (digest.txt). -NV for verbose digest output to screen.
+<dt><b>-N [filename/wildcard/url]</b> </dt>
+<dd>document digest or document
+content certificate ( DCC ) as md5 digest tree of the document: the digest
+for the document, and digests for each object contained within the document
+(together with information on software versions that produced it) (digest.txt).
+-NV for verbose digest output to screen.
 <p> </dd>
 
-<dt><b>-n
-[filename/wildcard/url]</b> </dt>
-<dd>skip the creation of intermediate processing files
-(document abstraction) if they already exist, this skips the equivalent
-of -m which is otherwise assumed by most processing flags.
+<dt><b>-n [filename/wildcard/url]</b> </dt>
+<dd>skip the creation of intermediate processing files (document abstraction) if
+they already exist, this skips the equivalent of -m which is otherwise assumed
+by most processing flags.
 <p> </dd>
 
-<dt><b>--odf [filename/wildcard/url]</b>
-</dt>
-<dd>
-<p>see --odt
+<dt><b>--odf [filename/wildcard/url]</b> </dt>
+<dd>see --odt
 <p> </dd>
 
 <dt><b>--odt [filename/wildcard/url]</b> </dt>
-<dd>output basic document in opendocument
-file format (opendocument.odt). Alias -o
+<dd>output basic document in opendocument file format (opendocument.odt). Alias
+-o
 <p> </dd>
 
 <dt><b>-o [filename/wildcard/url]</b> </dt>
 <dd>see --odt
-
 <p> </dd>
 
 <dt><b>--pdf [filename/wildcard]</b> </dt>
-<dd>produces LaTeX pdf (portrait.pdf &amp; landscape.pdf).
-Default paper size is set in config file, or document header, or provided
-with additional command line parameter, e.g. --papersize-a4 preset sizes include:
-&rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and
+<dd>produces
+LaTeX pdf (portrait.pdf &amp; landscape.pdf). Default paper size is set in config
+file, or document header, or provided with additional command line parameter,
+e.g. --papersize-a4 preset sizes include: &rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and
 <p> </dd>
 
-<dt><b>--pg [instruction] [filename]</b> </dt>
-<dd>database postgresql ( --pgsql
-may be used instead) possible instructions, include: --createdb; --create;
---dropall; --import [filename]; --update [filename]; --remove [filename]; see database
-section below. Alias -D
+<dt><b>--pg [instruction]
+[filename]</b> </dt>
+<dd>database postgresql ( --pgsql may be used instead) possible instructions,
+include: --createdb; --create; --dropall; --import [filename]; --update [filename];
+--remove [filename]; see database section below. Alias -D
 <p> </dd>
 
-<dt><b>--po [language_directory/filename &nbsp;language_directory]</b>
-</dt>
-<dd>
-<p>see --po4a
+<dt><b>--po [language_directory/filename
+&nbsp;language_directory]</b> </dt>
+<dd>see --po4a
 <p> </dd>
 
-<dt><b>--po4a [language_directory/filename &nbsp;language_directory]</b> </dt>
-<dd>produces
-.pot and po files for the file in the languages specified by the language
-directory. <b>SiSU</b> markup is placed in subdirectories named with the language
-code, e.g. en/ fr/ es/. The sisu config file must set the output directory
-structure to multilingual. v3, experimental
+<dt><b>--po4a [language_directory/filename &nbsp;language_directory]</b>
+</dt>
+<dd>produces .pot and po files for the file in the languages specified by the
+language directory. <b>SiSU</b> markup is placed in subdirectories named with the
+language code, e.g. en/ fr/ es/. The sisu config file must set the output
+directory structure to multilingual. v3, experimental
 <p> </dd>
 
 <dt><b>-P [language_directory/filename
diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
index eb01a388..4994663c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
@@ -123,6 +123,9 @@ see --texinfo
 !_ -i [filename/wildcard] <br>
 see --manpage
 
+!_ --keep-processing-files [filename/wildcard/url] <br>
+see --maintenance
+
 !_ -L <br>
 prints license information.
 
@@ -130,7 +133,7 @@ prints license information.
 see --dal (document abstraction level/layer)
 
 !_ --maintenance [filename/wildcard/url] <br>
-maintenance mode files created for processing preserved and their locations indicated. (also see -V). Alias -M
+maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files
 
 !_ --manpage [filename/wildcard] <br>
 produces man page of file, not suitable for all outputs. Alias -i
diff --git a/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
index 5b5cec5c..8ea5c023 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v2/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,7 +1,9 @@
 ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
-;; @Author: Ambrose Kofi Laing (& Ralph Amissah)
-;; @Keywords: text, processes, tools
-;; @Version: 2.8.2 2011-03-11 (2008-12-14)
+;; @Author: Ambrose Kofi Laing & Ralph Amissah
+;; @Keywords: text, syntax, processes, tools
+;; @Version: 3.0.7 2011-04-20 (2008-12-14)
+;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
+;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS)
 ;; @License: GPLv3
 ;; @Home URL: SiSU:   http://www.jus.uio.no/sisu
 ;; originally looked at (based on) doc-mode, with kind permission of the author
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim
new file mode 100644
index 00000000..9d2e6edb
--- /dev/null
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim
@@ -0,0 +1,55 @@
+" Vim color file
+" Name:            8
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
+:set background=dark
+:hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+:let colors_name = "8"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+":hi Normal
+":hi Cursor         term=reverse        cterm=reverse
+":hi lCursor        term=reverse        cterm=reverse
+:hi StatusLine     term=bold,reverse   cterm=bold,reverse
+:hi StatusLineNC   term=reverse        cterm=reverse
+:hi Search         term=reverse                            ctermbg=3
+:hi IncSearch      term=reverse        cterm=reverse
+:hi SpecialKey     term=bold                                                   ctermfg=4
+:hi Visual         term=reverse        cterm=reverse
+:hi VisualNOS      term=bold,underline cterm=bold,underline
+:hi MoreMsg        term=bold                                                   ctermfg=2
+:hi ModeMsg        term=bold           cterm=bold
+:hi Question       term=standout                                               ctermfg=2
+:hi Title          term=bold                                                   ctermfg=1
+:hi NonText        term=bold           cterm=bold                              ctermfg=4
+:hi LineNr         term=underline                          ctermbg=7           ctermfg=0
+":hi LineNr         term=underline      cterm=bold          ctermbg=0           ctermfg=0*
+:hi Directory      term=bold                                                   ctermfg=4
+:hi WildMenu       term=standout                           ctermbg=3           ctermfg=0
+:hi VertSplit      term=reverse        cterm=reverse
+:hi Folded         term=standout                           ctermbg=7           ctermfg=0
+:hi FoldColumn     term=standout                           ctermbg=7           ctermfg=4
+:hi DiffChange                         cterm=none          ctermbg=3           ctermfg=7
+:hi DiffText                           cterm=none          ctermbg=6           ctermfg=7
+:hi DiffAdd                            cterm=none          ctermbg=2           ctermfg=7
+:hi DiffDelete                         cterm=none          ctermbg=7           ctermfg=0
+:hi String                                                                     ctermfg=6
+:hi Comment        term=bold                                                   ctermfg=7
+:hi Constant       term=underline                                              ctermfg=1
+:hi Special        term=bold                                                   ctermfg=3
+:hi Identifier     term=underline                                              ctermfg=6
+:hi Statement      term=bold                                                   ctermfg=2
+:hi PreProc        term=underline                                              ctermfg=1
+:hi Type           term=underline                                              ctermfg=2
+:hi Ignore                             cterm=bold                              ctermfg=7
+:hi Todo           term=standout                           ctermbg=3           ctermfg=0
+:hi SpellBad       term=standout
+:hi SpellCap       term=standout
+:hi SpellLocal     term=standout
+:hi SpellRare      term=standout
+:hi WarningMsg     term=standout                                               ctermfg=1
+:hi ErrorMsg       term=standout       cterm=bold          ctermbg=1           ctermfg=7
+:hi Error          term=reverse        cterm=bold          ctermbg=1           ctermfg=7
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim
new file mode 100644
index 00000000..8128790f
--- /dev/null
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -0,0 +1,55 @@
+" Vim color file
+" Name:            frugal
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
+:set background=dark
+:hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+:let colors_name = "frugal"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+":hi Normal
+":hi Cursor         term=reverse             cterm=reverse
+":hi lCursor        term=reverse             cterm=reverse
+:hi StatusLine     term=reverse             cterm=reverse
+:hi StatusLineNC   term=reverse             cterm=reverse
+:hi Search         term=reverse                                 ctermbg=2
+:hi IncSearch      term=reverse             cterm=reverse
+:hi SpecialKey     term=bold                                                        ctermfg=4
+:hi Visual         term=reverse             cterm=reverse
+:hi VisualNOS      term=bold,underline      cterm=bold,underline
+:hi MoreMsg        term=bold                                                        ctermfg=2
+:hi ModeMsg        term=bold                cterm=bold
+:hi Question       term=standout                                                    ctermfg=2
+:hi Title          term=bold                                                        ctermfg=1
+:hi NonText        term=bold                cterm=bold                              ctermfg=4
+:hi LineNr         term=underline           cterm=bold          ctermbg=0           ctermfg=0*
+":hi LineNr         term=underline                               ctermbg=7           ctermfg=0
+:hi Directory      term=bold                                                        ctermfg=4
+:hi WildMenu       term=standout                                ctermbg=3           ctermfg=0
+:hi VertSplit      term=reverse             cterm=reverse
+:hi Folded         term=standout                                ctermbg=242         ctermfg=0
+:hi FoldColumn     term=standout                                ctermbg=7           ctermfg=4
+:hi DiffChange                              cterm=none          ctermbg=3           ctermfg=7
+:hi DiffText                                cterm=none          ctermbg=6           ctermfg=7
+:hi DiffAdd                                 cterm=none          ctermbg=2           ctermfg=7
+:hi DiffDelete                              cterm=none          ctermbg=7           ctermfg=0
+:hi String                                                                          ctermfg=6
+:hi Comment        term=bold                                                        ctermfg=7
+:hi Constant       term=underline                                                   ctermfg=1
+:hi Special        term=bold                                                        ctermfg=3
+:hi Identifier     term=underline                                                   ctermfg=6
+:hi Statement      term=bold                                                        ctermfg=2
+:hi PreProc        term=underline                                                   ctermfg=1
+:hi Type           term=underline                                                   ctermfg=2
+:hi Ignore                                  cterm=bold                              ctermfg=7
+:hi Todo           term=standout                                ctermbg=3           ctermfg=0
+:hi SpellBad       term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellCap       term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellLocal     term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellRare      term=underline,standout                      ctermbg=7           ctermfg=5
+:hi WarningMsg     term=standout                                                    ctermfg=1
+:hi ErrorMsg       term=standout            cterm=bold          ctermbg=1           ctermfg=7
+:hi Error          term=reverse             cterm=bold          ctermbg=1           ctermfg=7
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
index 01a6c057..57f7925b 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,8 @@
 "%% SiSU Vim color file
-" Name:             Slate
-" Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" last updated:     2011-03-30
+" Name:            Slate
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
@@ -12,50 +13,60 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal                                                                              guibg=grey15      guifg=white
-:hi Cursor                                                                              guibg=khaki       guifg=slategrey
-:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
-:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
-:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
-:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
-:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
-:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
-:hi Question                                              ctermfg=green                                   guifg=springgreen
-:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
-:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
-:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
-:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
-:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
-:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
-:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
-:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
-:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
-:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
-:hi Identifier                                            ctermfg=red                                     guifg=salmon
-:hi Include                                               ctermfg=red                                     guifg=red
-:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
-:hi Operator                                              ctermfg=red                                     guifg=red
-:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
-:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
-:hi Function                                              ctermfg=brown                                   guifg=navajowhite
-:hi Structure                                             ctermfg=green                                   guifg=green
-:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
-:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
-:hi Todo                                                                                guibg=yellow2     guifg=orangered
-:hi Directory                                             ctermfg=darkcyan
+:hi Normal                             ctermbg=black                                     guibg=grey15        guifg=white
+:hi Cursor                                                                               guibg=khaki         guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Folded                             ctermbg=black       ctermfg=grey                  guibg=black         guifg=grey40
+:hi FoldColumn                         ctermbg=grey        ctermfg=darkblue              guibg=black         guifg=grey20
+:hi IncSearch    cterm=none            ctermbg=green       ctermfg=yellow                guibg=black         guifg=green
+:hi ModeMsg      cterm=none                                ctermfg=brown                                     guifg=goldenrod
+:hi MoreMsg                                                ctermfg=darkgreen                                 guifg=SeaGreen
+:hi NonText      cterm=bold                                ctermfg=blue                  guibg=grey15        guifg=RoyalBlue
+:hi Question                                               ctermfg=green                                     guifg=springgreen
+:hi Search                             ctermbg=yellow      ctermfg=darkgreen             guibg=peru          guifg=wheat
+:hi SpecialKey                                             ctermfg=darkgreen                                 guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none  guibg=#c2bfa5       guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Title        cterm=bold                                ctermfg=yellow      gui=bold                      guifg=gold
+:hi Statement                                              ctermfg=lightblue                                 guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none  guibg=olivedrab     guifg=khaki
+:hi String                                                 ctermfg=darkcyan                                  guifg=SkyBlue
+:hi Comment      term=bold                                 ctermfg=grey                                      guifg=grey40
+:hi Constant                                               ctermfg=brown                                     guifg=#ffa0a0
+:hi Special                                                ctermfg=brown                                     guifg=darkkhaki
+:hi Identifier                                             ctermfg=red                                       guifg=salmon
+:hi Include                                                ctermfg=red                                       guifg=red
+:hi PreProc                                                ctermfg=red                   guibg=white         guifg=red
+:hi Operator                                               ctermfg=red                                       guifg=red
+:hi Define                                                 ctermfg=yellow      gui=bold                      guifg=gold
+:hi Type                                                   ctermfg=darkgreen                                 guifg=CornflowerBlue
+:hi Function                                               ctermfg=brown                                     guifg=navajowhite
+:hi Structure                                              ctermfg=green                                     guifg=green
+:hi LineNr                             ctermbg=darkgrey    ctermfg=black                                     guifg=grey50
+:hi Ignore       cterm=bold                                ctermfg=grey                                      guifg=grey40
+:hi Todo                                                                                 guibg=yellow2       guifg=orangered
+:hi Directory                                              ctermfg=darkcyan
 :hi VisualNOS    cterm=bold,underline
-:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
-:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
-:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
-:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
-:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
-:hi Underlined   cterm=underline                          ctermfg=darkmagenta
-:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
-:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
-:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi CursorLine                        ctermbg=black                                     guibg=black
-:hi CursorColumn                      ctermbg=black                                     guibg=black
+:hi WildMenu                           ctermbg=darkyellow  ctermfg=black                 guibg=darkyellow    guifg=black
+:hi DiffChange   cterm=none            ctermbg=darkgrey    ctermfg=white                 guibg=darkgrey      guifg=white
+:hi DiffText     cterm=none            ctermbg=darkcyan    ctermfg=white                 guibg=darkcyan      guifg=white
+:hi DiffAdd      cterm=none            ctermbg=darkgreen   ctermfg=white                 guibg=darkgreen     guifg=white
+:hi DiffDelete   cterm=none            ctermbg=darkgrey    ctermfg=black                 guibg=darkgrey      guifg=black
+:hi Underlined   term=underline                            ctermfg=darkmagenta
+:hi WarningMsg                         ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta   guifg=salmon
+:hi ErrorMsg     cterm=bold            ctermbg=darkmagenta ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi Error        cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellErrors  cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellBad     cterm=bold            ctermbg=magenta     ctermfg=black                 guibg=darkmagenta   guifg=white
+:hi SpellLocal                         ctermbg=blue        ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi CursorLine                         ctermbg=black                                     guibg=black
+:hi CursorColumn                       ctermbg=black                                     guibg=black
+:hi Black                              ctermbg=grey        ctermfg=black                 guibg=grey          guifg=black
+:hi Red                                ctermbg=black       ctermfg=red                   guibg=black         guifg=red
+:hi Magenta                            ctermbg=black       ctermfg=magenta               guibg=black         guifg=magenta
+:hi Blue                               ctermbg=black       ctermfg=blue                  guibg=black         guifg=blue
+:hi Cyan                               ctermbg=black       ctermfg=cyan                  guibg=black         guifg=cyan
+:hi Green                              ctermbg=black       ctermfg=green                 guibg=black         guifg=green
+:hi Yellow                             ctermbg=black       ctermfg=yellow                guibg=black         guifg=yellow
+:hi White                              ctermbg=black       ctermfg=white                 guibg=black         guifg=white
 
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index a5549d42..f83eb61d 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.9.1
-:date_stamp: 2011w13/3
-:date: "2011-03-30"
+:version: 2.9.2
+:date_stamp: 2011w16/3
+:date: "2011-04-20"
 :project: SiSU
diff --git a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
index e8a668da..8ea5c023 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,7 +1,9 @@
 ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
-;; @Author: Ambrose Kofi Laing (& Ralph Amissah)
-;; @Keywords: text, processes, tools
-;; @Version: 3.0.3 2011-03-11 (2008-12-14)
+;; @Author: Ambrose Kofi Laing & Ralph Amissah
+;; @Keywords: text, syntax, processes, tools
+;; @Version: 3.0.7 2011-04-20 (2008-12-14)
+;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
+;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS)
 ;; @License: GPLv3
 ;; @Home URL: SiSU:   http://www.jus.uio.no/sisu
 ;; originally looked at (based on) doc-mode, with kind permission of the author
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
new file mode 100644
index 00000000..9d2e6edb
--- /dev/null
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
@@ -0,0 +1,55 @@
+" Vim color file
+" Name:            8
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
+:set background=dark
+:hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+:let colors_name = "8"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+":hi Normal
+":hi Cursor         term=reverse        cterm=reverse
+":hi lCursor        term=reverse        cterm=reverse
+:hi StatusLine     term=bold,reverse   cterm=bold,reverse
+:hi StatusLineNC   term=reverse        cterm=reverse
+:hi Search         term=reverse                            ctermbg=3
+:hi IncSearch      term=reverse        cterm=reverse
+:hi SpecialKey     term=bold                                                   ctermfg=4
+:hi Visual         term=reverse        cterm=reverse
+:hi VisualNOS      term=bold,underline cterm=bold,underline
+:hi MoreMsg        term=bold                                                   ctermfg=2
+:hi ModeMsg        term=bold           cterm=bold
+:hi Question       term=standout                                               ctermfg=2
+:hi Title          term=bold                                                   ctermfg=1
+:hi NonText        term=bold           cterm=bold                              ctermfg=4
+:hi LineNr         term=underline                          ctermbg=7           ctermfg=0
+":hi LineNr         term=underline      cterm=bold          ctermbg=0           ctermfg=0*
+:hi Directory      term=bold                                                   ctermfg=4
+:hi WildMenu       term=standout                           ctermbg=3           ctermfg=0
+:hi VertSplit      term=reverse        cterm=reverse
+:hi Folded         term=standout                           ctermbg=7           ctermfg=0
+:hi FoldColumn     term=standout                           ctermbg=7           ctermfg=4
+:hi DiffChange                         cterm=none          ctermbg=3           ctermfg=7
+:hi DiffText                           cterm=none          ctermbg=6           ctermfg=7
+:hi DiffAdd                            cterm=none          ctermbg=2           ctermfg=7
+:hi DiffDelete                         cterm=none          ctermbg=7           ctermfg=0
+:hi String                                                                     ctermfg=6
+:hi Comment        term=bold                                                   ctermfg=7
+:hi Constant       term=underline                                              ctermfg=1
+:hi Special        term=bold                                                   ctermfg=3
+:hi Identifier     term=underline                                              ctermfg=6
+:hi Statement      term=bold                                                   ctermfg=2
+:hi PreProc        term=underline                                              ctermfg=1
+:hi Type           term=underline                                              ctermfg=2
+:hi Ignore                             cterm=bold                              ctermfg=7
+:hi Todo           term=standout                           ctermbg=3           ctermfg=0
+:hi SpellBad       term=standout
+:hi SpellCap       term=standout
+:hi SpellLocal     term=standout
+:hi SpellRare      term=standout
+:hi WarningMsg     term=standout                                               ctermfg=1
+:hi ErrorMsg       term=standout       cterm=bold          ctermbg=1           ctermfg=7
+:hi Error          term=reverse        cterm=bold          ctermbg=1           ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
new file mode 100644
index 00000000..8128790f
--- /dev/null
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -0,0 +1,55 @@
+" Vim color file
+" Name:            frugal
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
+:set background=dark
+:hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+:let colors_name = "frugal"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+":hi Normal
+":hi Cursor         term=reverse             cterm=reverse
+":hi lCursor        term=reverse             cterm=reverse
+:hi StatusLine     term=reverse             cterm=reverse
+:hi StatusLineNC   term=reverse             cterm=reverse
+:hi Search         term=reverse                                 ctermbg=2
+:hi IncSearch      term=reverse             cterm=reverse
+:hi SpecialKey     term=bold                                                        ctermfg=4
+:hi Visual         term=reverse             cterm=reverse
+:hi VisualNOS      term=bold,underline      cterm=bold,underline
+:hi MoreMsg        term=bold                                                        ctermfg=2
+:hi ModeMsg        term=bold                cterm=bold
+:hi Question       term=standout                                                    ctermfg=2
+:hi Title          term=bold                                                        ctermfg=1
+:hi NonText        term=bold                cterm=bold                              ctermfg=4
+:hi LineNr         term=underline           cterm=bold          ctermbg=0           ctermfg=0*
+":hi LineNr         term=underline                               ctermbg=7           ctermfg=0
+:hi Directory      term=bold                                                        ctermfg=4
+:hi WildMenu       term=standout                                ctermbg=3           ctermfg=0
+:hi VertSplit      term=reverse             cterm=reverse
+:hi Folded         term=standout                                ctermbg=242         ctermfg=0
+:hi FoldColumn     term=standout                                ctermbg=7           ctermfg=4
+:hi DiffChange                              cterm=none          ctermbg=3           ctermfg=7
+:hi DiffText                                cterm=none          ctermbg=6           ctermfg=7
+:hi DiffAdd                                 cterm=none          ctermbg=2           ctermfg=7
+:hi DiffDelete                              cterm=none          ctermbg=7           ctermfg=0
+:hi String                                                                          ctermfg=6
+:hi Comment        term=bold                                                        ctermfg=7
+:hi Constant       term=underline                                                   ctermfg=1
+:hi Special        term=bold                                                        ctermfg=3
+:hi Identifier     term=underline                                                   ctermfg=6
+:hi Statement      term=bold                                                        ctermfg=2
+:hi PreProc        term=underline                                                   ctermfg=1
+:hi Type           term=underline                                                   ctermfg=2
+:hi Ignore                                  cterm=bold                              ctermfg=7
+:hi Todo           term=standout                                ctermbg=3           ctermfg=0
+:hi SpellBad       term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellCap       term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellLocal     term=underline,standout                      ctermbg=7           ctermfg=5
+:hi SpellRare      term=underline,standout                      ctermbg=7           ctermfg=5
+:hi WarningMsg     term=standout                                                    ctermfg=1
+:hi ErrorMsg       term=standout            cterm=bold          ctermbg=1           ctermfg=7
+:hi Error          term=reverse             cterm=bold          ctermbg=1           ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
index 01a6c057..57f7925b 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,8 @@
 "%% SiSU Vim color file
-" Name:             Slate
-" Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" last updated:     2011-03-30
+" Name:            Slate
+" Maintainer:      Ralph Amissah <ralph@amissah.com>
+" Last Change:     2011-04-20
+" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
@@ -12,50 +13,60 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal                                                                              guibg=grey15      guifg=white
-:hi Cursor                                                                              guibg=khaki       guifg=slategrey
-:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
-:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
-:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
-:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
-:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
-:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
-:hi Question                                              ctermfg=green                                   guifg=springgreen
-:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
-:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
-:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
-:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
-:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
-:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
-:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
-:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
-:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
-:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
-:hi Identifier                                            ctermfg=red                                     guifg=salmon
-:hi Include                                               ctermfg=red                                     guifg=red
-:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
-:hi Operator                                              ctermfg=red                                     guifg=red
-:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
-:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
-:hi Function                                              ctermfg=brown                                   guifg=navajowhite
-:hi Structure                                             ctermfg=green                                   guifg=green
-:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
-:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
-:hi Todo                                                                                guibg=yellow2     guifg=orangered
-:hi Directory                                             ctermfg=darkcyan
+:hi Normal                             ctermbg=black                                     guibg=grey15        guifg=white
+:hi Cursor                                                                               guibg=khaki         guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Folded                             ctermbg=black       ctermfg=grey                  guibg=black         guifg=grey40
+:hi FoldColumn                         ctermbg=grey        ctermfg=darkblue              guibg=black         guifg=grey20
+:hi IncSearch    cterm=none            ctermbg=green       ctermfg=yellow                guibg=black         guifg=green
+:hi ModeMsg      cterm=none                                ctermfg=brown                                     guifg=goldenrod
+:hi MoreMsg                                                ctermfg=darkgreen                                 guifg=SeaGreen
+:hi NonText      cterm=bold                                ctermfg=blue                  guibg=grey15        guifg=RoyalBlue
+:hi Question                                               ctermfg=green                                     guifg=springgreen
+:hi Search                             ctermbg=yellow      ctermfg=darkgreen             guibg=peru          guifg=wheat
+:hi SpecialKey                                             ctermfg=darkgreen                                 guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none  guibg=#c2bfa5       guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Title        cterm=bold                                ctermfg=yellow      gui=bold                      guifg=gold
+:hi Statement                                              ctermfg=lightblue                                 guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none  guibg=olivedrab     guifg=khaki
+:hi String                                                 ctermfg=darkcyan                                  guifg=SkyBlue
+:hi Comment      term=bold                                 ctermfg=grey                                      guifg=grey40
+:hi Constant                                               ctermfg=brown                                     guifg=#ffa0a0
+:hi Special                                                ctermfg=brown                                     guifg=darkkhaki
+:hi Identifier                                             ctermfg=red                                       guifg=salmon
+:hi Include                                                ctermfg=red                                       guifg=red
+:hi PreProc                                                ctermfg=red                   guibg=white         guifg=red
+:hi Operator                                               ctermfg=red                                       guifg=red
+:hi Define                                                 ctermfg=yellow      gui=bold                      guifg=gold
+:hi Type                                                   ctermfg=darkgreen                                 guifg=CornflowerBlue
+:hi Function                                               ctermfg=brown                                     guifg=navajowhite
+:hi Structure                                              ctermfg=green                                     guifg=green
+:hi LineNr                             ctermbg=darkgrey    ctermfg=black                                     guifg=grey50
+:hi Ignore       cterm=bold                                ctermfg=grey                                      guifg=grey40
+:hi Todo                                                                                 guibg=yellow2       guifg=orangered
+:hi Directory                                              ctermfg=darkcyan
 :hi VisualNOS    cterm=bold,underline
-:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
-:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
-:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
-:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
-:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
-:hi Underlined   cterm=underline                          ctermfg=darkmagenta
-:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
-:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
-:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi CursorLine                        ctermbg=black                                     guibg=black
-:hi CursorColumn                      ctermbg=black                                     guibg=black
+:hi WildMenu                           ctermbg=darkyellow  ctermfg=black                 guibg=darkyellow    guifg=black
+:hi DiffChange   cterm=none            ctermbg=darkgrey    ctermfg=white                 guibg=darkgrey      guifg=white
+:hi DiffText     cterm=none            ctermbg=darkcyan    ctermfg=white                 guibg=darkcyan      guifg=white
+:hi DiffAdd      cterm=none            ctermbg=darkgreen   ctermfg=white                 guibg=darkgreen     guifg=white
+:hi DiffDelete   cterm=none            ctermbg=darkgrey    ctermfg=black                 guibg=darkgrey      guifg=black
+:hi Underlined   term=underline                            ctermfg=darkmagenta
+:hi WarningMsg                         ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta   guifg=salmon
+:hi ErrorMsg     cterm=bold            ctermbg=darkmagenta ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi Error        cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellErrors  cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellBad     cterm=bold            ctermbg=magenta     ctermfg=black                 guibg=darkmagenta   guifg=white
+:hi SpellLocal                         ctermbg=blue        ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi CursorLine                         ctermbg=black                                     guibg=black
+:hi CursorColumn                       ctermbg=black                                     guibg=black
+:hi Black                              ctermbg=grey        ctermfg=black                 guibg=grey          guifg=black
+:hi Red                                ctermbg=black       ctermfg=red                   guibg=black         guifg=red
+:hi Magenta                            ctermbg=black       ctermfg=magenta               guibg=black         guifg=magenta
+:hi Blue                               ctermbg=black       ctermfg=blue                  guibg=black         guifg=blue
+:hi Cyan                               ctermbg=black       ctermfg=cyan                  guibg=black         guifg=cyan
+:hi Green                              ctermbg=black       ctermfg=green                 guibg=black         guifg=green
+:hi Yellow                             ctermbg=black       ctermfg=yellow                guibg=black         guifg=yellow
+:hi White                              ctermbg=black       ctermfg=white                 guibg=black         guifg=white
 
diff --git a/data/sisu/v3/odf/odt.zip b/data/sisu/v3/odf/odt.zip
index 47c6008e..81df6e6c 100644
--- a/data/sisu/v3/odf/odt.zip
+++ b/data/sisu/v3/odf/odt.zip
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 4d06712b..e4915326 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.6-beta-rb1.9.2p180
-:date_stamp: 2011w13/3
-:date: "2011-03-30"
+:version: 3.0.7-beta-rb1.9.2p180
+:date_stamp: 2011w16/3
+:date: "2011-04-20"
 :project: SiSU